1.0.18: feature ScanTailor-Advanced#47: prefilter EdgeDiv: combine prefilters EdgePlus and BlurDiv.

Author: zvezdochiot

src/app/DefaultParamsDialog.cpp

@@ -48,6 +48,9 @@ DefaultParamsDialog::DefaultParamsDialog(QWidget* parent)
   thresholdMethodBox->addItem(tr("Otsu"), OTSU);
   thresholdMethodBox->addItem(tr("Sauvola"), SAUVOLA);
   thresholdMethodBox->addItem(tr("Wolf"), WOLF);
+  thresholdMethodBox->addItem(tr("EdgePlus"), EDGEPLUS);
+  thresholdMethodBox->addItem(tr("BlurDiv"), BLURDIV);
+  thresholdMethodBox->addItem(tr("EdgeDiv"), EDGEDIV);
 
   pictureShapeSelector->addItem(tr("Off"), OFF_SHAPE);
   pictureShapeSelector->addItem(tr("Free"), FREE_SHAPE);
@@ -662,7 +665,8 @@ std::unique_ptr<DefaultParams> DefaultParamsDialog::buildParams() const {
   blackWhiteOptions.setBinarizationMethod(binarizationMethod);
   blackWhiteOptions.setThresholdAdjustment(thresholdSlider->value());
   blackWhiteOptions.setSauvolaCoef(sauvolaCoef->value());
-  if (binarizationMethod == SAUVOLA) {
+  if (binarizationMethod == SAUVOLA || binarizationMethod == EDGEPLUS || binarizationMethod == BLURDIV
+      || binarizationMethod == EDGEDIV) {
     blackWhiteOptions.setWindowSize(sauvolaWindowSize->value());
   } else if (binarizationMethod == WOLF) {
     blackWhiteOptions.setWindowSize(wolfWindowSize->value());

src/app/MainWindow.cpp

@@ -2080,8 +2080,9 @@ void MainWindow::execGotoPageDialog() {
   bool ok;
   const PageSequence pageSequence = m_thumbSequence->toPageSequence();
   const PageId& selectionLeader = m_thumbSequence->selectionLeader().id();
-  int pageNumber = QInputDialog::getInt(this, tr("Go To Page"), tr("Enter the page number:"),
-                                        pageSequence.pageNo(selectionLeader) + 1, 1, pageSequence.numPages(), 1, &ok);
+  int pageNumber
+      = QInputDialog::getInt(this, tr("Go To Page"), tr("Enter the page number:"),
+                             pageSequence.pageNo(selectionLeader) + 1, 1, (int) (pageSequence.numPages()), 1, &ok);
   if (ok) {
     const PageId& newSelectionLeader = pageSequence.pageAt(pageNumber - 1).id();
     if (selectionLeader != newSelectionLeader) {

src/app/RelinkablePathVisualization.cpp

@@ -53,7 +53,7 @@ void RelinkablePathVisualization::clear() {
 
 void RelinkablePathVisualization::setPath(const RelinkablePath& path, bool clickable) {
   clear();
-#if QT_VERSION_MAJOR == 5 and QT_VERSION_MINOR < 14
+#if QT_VERSION_MAJOR == 5 && QT_VERSION_MINOR < 14
   auto opt = QString::SkipEmptyParts;
 #else
   auto opt = Qt::SkipEmptyParts;

src/core/Application.cpp

@@ -58,7 +58,7 @@ std::list<QString> Application::getLanguagesList() const {
 }
 
 void Application::initTranslations() {
-#if QT_VERSION_MAJOR == 5 and QT_VERSION_MINOR < 14
+#if QT_VERSION_MAJOR == 5 && QT_VERSION_MINOR < 14
   auto opt = QString::SkipEmptyParts;
 #else
   auto opt = Qt::SkipEmptyParts;

src/core/BackgroundTask.h

@@ -27,15 +27,15 @@ class BackgroundTask : public AbstractCommand<FilterResultPtr>, public TaskStatu
   Type type() const { return m_type; }
 
   void cancel() override {
-#if QT_VERSION_MAJOR == 5 and QT_VERSION_MINOR < 14
+#if QT_VERSION_MAJOR == 5 && QT_VERSION_MINOR < 14
     m_cancelFlag.store(1);
 #else
     m_cancelFlag.storeRelaxed(1);
 #endif
   }
 
   bool isCancelled() const override {
-#if QT_VERSION_MAJOR == 5 and QT_VERSION_MINOR < 14
+#if QT_VERSION_MAJOR == 5 && QT_VERSION_MINOR < 14
     return m_cancelFlag.load() != 0;
 #else
     return m_cancelFlag.loadRelaxed() != 0;

src/core/RelinkablePath.cpp

@@ -12,7 +12,7 @@ QString RelinkablePath::normalize(const QString& path) {
   frontSlashes.replace(QChar('\\'), QLatin1String("/"));
 
   QStringList newComponents;
-#if QT_VERSION_MAJOR == 5 and QT_VERSION_MINOR < 14
+#if QT_VERSION_MAJOR == 5 && QT_VERSION_MINOR < 14
   auto opt = QString::KeepEmptyParts;
 #else
   auto opt = Qt::KeepEmptyParts;

src/core/filters/output/BlackWhiteOptions.cpp

@@ -72,6 +72,12 @@ BinarizationMethod BlackWhiteOptions::parseBinarizationMethod(const QString& str
     return WOLF;
   } else if (str == "sauvola") {
     return SAUVOLA;
+  } else if (str == "edgeplus") {
+    return EDGEPLUS;
+  } else if (str == "blurdiv") {
+    return BLURDIV;
+  } else if (str == "edgediv") {
+    return EDGEDIV;
   } else {
     return OTSU;
   }
@@ -89,6 +95,15 @@ QString BlackWhiteOptions::formatBinarizationMethod(BinarizationMethod type) {
     case WOLF:
       str = "wolf";
       break;
+    case EDGEPLUS:
+      str = "edgeplus";
+      break;
+    case BLURDIV:
+      str = "blurdiv";
+      break;
+    case EDGEDIV:
+      str = "edgediv";
+      break;
   }
   return str;
 }
@@ -129,4 +144,4 @@ bool BlackWhiteOptions::ColorSegmenterOptions::operator==(const BlackWhiteOption
 bool BlackWhiteOptions::ColorSegmenterOptions::operator!=(const BlackWhiteOptions::ColorSegmenterOptions& other) const {
   return !(*this == other);
 }
-}  // namespace output
+}  // namespace output

src/core/filters/output/BlackWhiteOptions.h

@@ -9,7 +9,7 @@ class QDomDocument;
 class QDomElement;
 
 namespace output {
-enum BinarizationMethod { OTSU, SAUVOLA, WOLF };
+enum BinarizationMethod { OTSU, SAUVOLA, WOLF, EDGEPLUS, BLURDIV, EDGEDIV };
 
 class BlackWhiteOptions {
  public:

src/core/filters/output/DewarpingView.cpp

@@ -214,7 +214,7 @@ void DewarpingView::onPaint(QPainter& painter, const InteractionState& interacti
     const dewarping::Curve& bottomCurve = m_distortionModel.bottomCurve();
     painter.drawLine(topCurve.polyline().front(), bottomCurve.polyline().front());
     painter.drawLine(topCurve.polyline().back(), bottomCurve.polyline().back());
-#if QT_VERSION_MAJOR == 5 and QT_VERSION_MINOR < 14
+#if QT_VERSION_MAJOR == 5 && QT_VERSION_MINOR < 14
     painter.drawPolyline(QVector<QPointF>::fromStdVector(topCurve.polyline()));
     painter.drawPolyline(QVector<QPointF>::fromStdVector(bottomCurve.polyline()));
 #else

src/core/filters/output/OptionsWidget.cpp

@@ -42,6 +42,9 @@ OptionsWidget::OptionsWidget(std::shared_ptr<Settings> settings, const PageSelec
   thresholdMethodBox->addItem(tr("Otsu"), OTSU);
   thresholdMethodBox->addItem(tr("Sauvola"), SAUVOLA);
   thresholdMethodBox->addItem(tr("Wolf"), WOLF);
+  thresholdMethodBox->addItem(tr("EdgePlus"), EDGEPLUS);
+  thresholdMethodBox->addItem(tr("BlurDiv"), BLURDIV);
+  thresholdMethodBox->addItem(tr("EdgeDiv"), EDGEDIV);
 
   fillingColorBox->addItem(tr("Background"), FILL_BACKGROUND);
   fillingColorBox->addItem(tr("White"), FILL_WHITE);
@@ -51,13 +54,22 @@ OptionsWidget::OptionsWidget(std::shared_ptr<Settings> settings, const PageSelec
   QPointer<BinarizationOptionsWidget> sauvolaBinarizationOptionsWidget
       = new SauvolaBinarizationOptionsWidget(m_settings);
   QPointer<BinarizationOptionsWidget> wolfBinarizationOptionsWidget = new WolfBinarizationOptionsWidget(m_settings);
+  QPointer<BinarizationOptionsWidget> edgeplusBinarizationOptionsWidget
+      = new SauvolaBinarizationOptionsWidget(m_settings);
+  QPointer<BinarizationOptionsWidget> blurdivBinarizationOptionsWidget
+      = new SauvolaBinarizationOptionsWidget(m_settings);
+  QPointer<BinarizationOptionsWidget> edgedivBinarizationOptionsWidget
+      = new SauvolaBinarizationOptionsWidget(m_settings);
 
   while (binarizationOptions->count() != 0) {
     binarizationOptions->removeWidget(binarizationOptions->widget(0));
   }
   addBinarizationOptionsWidget(otsuBinarizationOptionsWidget);
   addBinarizationOptionsWidget(sauvolaBinarizationOptionsWidget);
   addBinarizationOptionsWidget(wolfBinarizationOptionsWidget);
+  addBinarizationOptionsWidget(edgeplusBinarizationOptionsWidget);
+  addBinarizationOptionsWidget(blurdivBinarizationOptionsWidget);
+  addBinarizationOptionsWidget(edgedivBinarizationOptionsWidget);
   updateBinarizationOptionsDisplay(binarizationOptions->currentIndex());
 
   pictureShapeSelector->addItem(tr("Off"), OFF_SHAPE);
@@ -983,4 +995,4 @@ void OptionsWidget::applyProcessingParamsConfirmed(const std::set<PageId>& pages
 void OptionsWidget::updateProcessingDisplay() {
   blackOnWhiteCB->setChecked(m_settings->getParams(m_pageId).isBlackOnWhite());
 }
-}  // namespace output
+}  // namespace output