diff --git a/src/app/DefaultParamsDialog.cpp b/src/app/DefaultParamsDialog.cpp index 4fc036577..b3b147061 100644 --- a/src/app/DefaultParamsDialog.cpp +++ b/src/app/DefaultParamsDialog.cpp @@ -50,8 +50,6 @@ DefaultParamsDialog::DefaultParamsDialog(QWidget* parent) thresholdMethodBox->addItem(tr("Wolf"), T_WOLF); thresholdMethodBox->addItem(tr("Bradley"), T_BRADLEY); thresholdMethodBox->addItem(tr("Grad"), T_GRAD); - thresholdMethodBox->addItem(tr("EdgePlus"), T_EDGEPLUS); - thresholdMethodBox->addItem(tr("BlurDiv"), T_BLURDIV); thresholdMethodBox->addItem(tr("EdgeDiv"), T_EDGEDIV); pictureShapeSelector->addItem(tr("Off"), OFF_SHAPE); @@ -670,8 +668,7 @@ std::unique_ptr DefaultParamsDialog::buildParams() const { blackWhiteOptions.setBinarizationMethod(binarizationMethod); blackWhiteOptions.setThresholdAdjustment(thresholdSlider->value()); blackWhiteOptions.setSauvolaCoef(sauvolaCoef->value()); - if (binarizationMethod == T_SAUVOLA || binarizationMethod == T_BRADLEY || binarizationMethod == T_EDGEPLUS - || binarizationMethod == T_BLURDIV || binarizationMethod == T_EDGEDIV) { + if (binarizationMethod == T_SAUVOLA || binarizationMethod == T_BRADLEY || binarizationMethod == T_EDGEDIV) { blackWhiteOptions.setWindowSize(sauvolaWindowSize->value()); } else if (binarizationMethod == T_WOLF || binarizationMethod == T_GRAD) { blackWhiteOptions.setWindowSize(wolfWindowSize->value()); diff --git a/src/core/Application.cpp b/src/core/Application.cpp index c6f5d21a0..73d509de8 100644 --- a/src/core/Application.cpp +++ b/src/core/Application.cpp @@ -65,7 +65,7 @@ void Application::initTranslations() { #endif const QStringList translationDirs(QString::fromUtf8(TRANSLATION_DIRS).split(QChar(':'), opt)); - const QStringList languageFileFilter("scantailor_*.qm"); + const QStringList languageFileFilter("scantailor-advanced_*.qm"); for (const QString& path : translationDirs) { QDir dir = (QDir::isAbsolutePath(path)) ? QDir(path) : QDir::cleanPath(applicationDirPath() + '/' + path); if (dir.exists()) { diff --git a/src/core/filters/output/BlackWhiteOptions.cpp b/src/core/filters/output/BlackWhiteOptions.cpp index a8626191a..15b66dabc 100644 --- a/src/core/filters/output/BlackWhiteOptions.cpp +++ b/src/core/filters/output/BlackWhiteOptions.cpp @@ -80,10 +80,6 @@ BinarizationMethod BlackWhiteOptions::parseBinarizationMethod(const QString& str return T_BRADLEY; } else if (str == "grad") { return T_GRAD; - } else if (str == "edgeplus") { - return T_EDGEPLUS; - } else if (str == "blurdiv") { - return T_BLURDIV; } else if (str == "edgediv") { return T_EDGEDIV; } else { @@ -115,12 +111,6 @@ QString BlackWhiteOptions::formatBinarizationMethod(BinarizationMethod type) { case T_GRAD: str = "grad"; break; - case T_EDGEPLUS: - str = "edgeplus"; - break; - case T_BLURDIV: - str = "blurdiv"; - break; case T_EDGEDIV: str = "edgediv"; break; diff --git a/src/core/filters/output/BlackWhiteOptions.h b/src/core/filters/output/BlackWhiteOptions.h index 0435c912a..a103c3509 100644 --- a/src/core/filters/output/BlackWhiteOptions.h +++ b/src/core/filters/output/BlackWhiteOptions.h @@ -17,8 +17,6 @@ enum BinarizationMethod { T_WINDOW, T_BRADLEY, T_GRAD, - T_EDGEPLUS, - T_BLURDIV, T_EDGEDIV }; diff --git a/src/core/filters/output/OptionsWidget.cpp b/src/core/filters/output/OptionsWidget.cpp index 07b2eeda4..43135d315 100644 --- a/src/core/filters/output/OptionsWidget.cpp +++ b/src/core/filters/output/OptionsWidget.cpp @@ -46,8 +46,6 @@ OptionsWidget::OptionsWidget(std::shared_ptr settings, const PageSelec thresholdMethodBox->addItem(tr("Window"), T_WINDOW); thresholdMethodBox->addItem(tr("Bradley"), T_BRADLEY); thresholdMethodBox->addItem(tr("Grad"), T_GRAD); - thresholdMethodBox->addItem(tr("EdgePlus"), T_EDGEPLUS); - thresholdMethodBox->addItem(tr("BlurDiv"), T_BLURDIV); thresholdMethodBox->addItem(tr("EdgeDiv"), T_EDGEDIV); fillingColorBox->addItem(tr("Background"), FILL_BACKGROUND); @@ -63,10 +61,6 @@ OptionsWidget::OptionsWidget(std::shared_ptr settings, const PageSelec QPointer bradleyOptionsWidgetBinarization = new OptionsWidgetBinarizationSauvola(m_settings); QPointer gradOptionsWidgetBinarization = new OptionsWidgetBinarizationWolf(m_settings); - QPointer edgeplusOptionsWidgetBinarization - = new OptionsWidgetBinarizationSauvola(m_settings); - QPointer blurdivOptionsWidgetBinarization - = new OptionsWidgetBinarizationSauvola(m_settings); QPointer edgedivOptionsWidgetBinarization = new OptionsWidgetBinarizationSauvola(m_settings); @@ -80,8 +74,6 @@ OptionsWidget::OptionsWidget(std::shared_ptr settings, const PageSelec addOptionsWidgetBinarization(windowOptionsWidgetBinarization); addOptionsWidgetBinarization(bradleyOptionsWidgetBinarization); addOptionsWidgetBinarization(gradOptionsWidgetBinarization); - addOptionsWidgetBinarization(edgeplusOptionsWidgetBinarization); - addOptionsWidgetBinarization(blurdivOptionsWidgetBinarization); addOptionsWidgetBinarization(edgedivOptionsWidgetBinarization); updateBinarizationOptionsDisplay(binarizationOptions->currentIndex()); diff --git a/src/core/filters/output/OutputGenerator.cpp b/src/core/filters/output/OutputGenerator.cpp index e00169169..c6ecec439 100644 --- a/src/core/filters/output/OutputGenerator.cpp +++ b/src/core/filters/output/OutputGenerator.cpp @@ -2374,22 +2374,6 @@ BinaryImage OutputGenerator::Processor::binarize(const QImage& image) const { binarized = binarizeGrad(image, windowsSize, lowerBound, upperBound, thresholdCoef, thresholdDelta); break; } - case T_EDGEPLUS: { - const double thresholdDelta = blackWhiteOptions.thresholdAdjustment(); - const QSize windowsSize = QSize(blackWhiteOptions.getWindowSize(), blackWhiteOptions.getWindowSize()); - const double thresholdCoef = blackWhiteOptions.getSauvolaCoef(); - - binarized = binarizeEdgeDiv(image, windowsSize, thresholdCoef, 0.0, thresholdDelta); - break; - } - case T_BLURDIV: { - const double thresholdDelta = blackWhiteOptions.thresholdAdjustment(); - const QSize windowsSize = QSize(blackWhiteOptions.getWindowSize(), blackWhiteOptions.getWindowSize()); - const double thresholdCoef = blackWhiteOptions.getSauvolaCoef(); - - binarized = binarizeEdgeDiv(image, windowsSize, 0.0, thresholdCoef, thresholdDelta); - break; - } case T_EDGEDIV: { const double thresholdDelta = blackWhiteOptions.thresholdAdjustment(); const QSize windowsSize = QSize(blackWhiteOptions.getWindowSize(), blackWhiteOptions.getWindowSize());