Merge branch 'main' of https://github.com/ImageProcessing-ElectronicPublications/scantailor-experimental

Author: plzombie

src/filters/output/BlackWhiteOptions.cpp

@@ -26,6 +26,7 @@ namespace output
 
 BlackWhiteOptions::BlackWhiteOptions()
     :   m_thresholdMethod(OTSU),
+        m_morphology(true),
         m_dimmingColoredCoef(0.0),
         m_thresholdAdjustment(0),
         m_thresholdWindowSize(200),
@@ -41,6 +42,7 @@ BlackWhiteOptions::BlackWhiteOptions()
 
 BlackWhiteOptions::BlackWhiteOptions(QDomElement const& el)
     :   m_thresholdMethod(parseThresholdMethod(el.attribute("thresholdMethod"))),
+        m_morphology(el.attribute("morphology") == "1"),
         m_dimmingColoredCoef(el.attribute("dimmingColoredCoef").toDouble()),
         m_thresholdAdjustment(el.attribute("thresholdAdj").toInt()),
         m_thresholdWindowSize(el.attribute("thresholdWinSize").toInt()),
@@ -91,6 +93,7 @@ BlackWhiteOptions::toXml(QDomDocument& doc, QString const& name) const
 {
     QDomElement el(doc.createElement(name));
     el.setAttribute("thresholdMethod", formatThresholdMethod(m_thresholdMethod));
+    el.setAttribute("morphology", m_morphology ? "1" : "0");
     el.setAttribute("dimmingColoredCoef", m_dimmingColoredCoef);
     el.setAttribute("thresholdAdj", m_thresholdAdjustment);
     el.setAttribute("thresholdWinSize", m_thresholdWindowSize);
@@ -111,6 +114,10 @@ BlackWhiteOptions::operator==(BlackWhiteOptions const& other) const
     {
         return false;
     }
+    if (m_morphology != other.m_morphology)
+    {
+        return false;
+    }
     if (m_dimmingColoredCoef != other.m_dimmingColoredCoef)
     {
         return false;

src/filters/output/BlackWhiteOptions.h

@@ -46,6 +46,15 @@ class BlackWhiteOptions
         m_thresholdMethod = val;
     }
 
+    bool morphology() const
+    {
+        return m_morphology;
+    }
+    void setMorphology(bool val)
+    {
+        m_morphology = val;
+    }
+
     double dimmingColoredCoef() const
     {
         return m_dimmingColoredCoef;
@@ -141,6 +150,7 @@ class BlackWhiteOptions
     bool operator!=(BlackWhiteOptions const& other) const;
 private:
     ThresholdFilter m_thresholdMethod;
+    bool m_morphology;
     double m_dimmingColoredCoef;
     int m_thresholdAdjustment;
     int m_thresholdWindowSize;

src/filters/output/OptionsWidget.cpp

@@ -205,6 +205,10 @@ OptionsWidget::OptionsWidget(
         thresholdMethodSelector, SIGNAL(currentIndexChanged(int)),
         this, SLOT(thresholdMethodChanged(int))
     );
+    connect(
+        morphologyCB, SIGNAL(clicked(bool)),
+        this, SLOT(morphologyToggled(bool))
+    );
     connect(
         dimmingColoredCoef, SIGNAL(valueChanged(double)),
         this, SLOT(dimmingColoredCoefChanged(double))
@@ -569,6 +573,16 @@ OptionsWidget::thresholdMethodChanged(int idx)
     emit reloadRequested();
 }
 
+void
+OptionsWidget::morphologyToggled(bool const checked)
+{
+    BlackWhiteOptions black_white_options(m_colorParams.blackWhiteOptions());
+    black_white_options.setMorphology(checked);
+    m_colorParams.setBlackWhiteOptions(black_white_options);
+    m_ptrSettings->setColorParams(m_pageId, m_colorParams);
+    emit reloadRequested();
+}
+
 void
 OptionsWidget::setLighterThreshold()
 {
@@ -926,6 +940,7 @@ OptionsWidget::updateColorsDisplay()
     {
         BlackWhiteOptions black_white_options(m_colorParams.blackWhiteOptions());
         thresholdMethodSelector->setCurrentIndex((int) black_white_options.thresholdMethod());
+        morphologyCB->setChecked(black_white_options.morphology());
         dimmingColoredCoef->setValue(black_white_options.dimmingColoredCoef());
         thresholdSlider->setValue(black_white_options.thresholdAdjustment());
         thresholdWindowSize->setValue(black_white_options.thresholdWindowSize());

src/filters/output/OptionsWidget.h

@@ -103,6 +103,8 @@ private slots:
 
     void thresholdMethodChanged(int idx);
 
+    void morphologyToggled(bool checked);
+
     void dimmingColoredCoefChanged(double value);
 
     void bwThresholdChanged();

src/filters/output/OutputGenerator.cpp

@@ -427,9 +427,8 @@ OutputGenerator::process(
     status.throwIfCancelled();
 
     QImage maybe_smoothed;
-
     // We only do smoothing if we are going to do binarization later.
-    if (render_params.needBinarization())
+    if ((render_params.needBinarization()) && (black_white_options.morphology()))
     {
         maybe_smoothed = smoothToGrayscale(transformed_image, accel_ops);
         coloredDimmingFilterInPlace(maybe_smoothed, coloredSignificance);
@@ -442,6 +441,7 @@ OutputGenerator::process(
     {
         maybe_smoothed = transformed_image;
     }
+
     BinaryImage colored_mask;
     if ((black_white_options.dimmingColoredCoef() > 0.0) && (black_white_options.coloredMaskCoef() > 0.0))
     {

src/filters/output/ui/OutputOptionsWidget.ui

@@ -612,7 +612,21 @@
             </widget>
            </item>
            <item row="0" column="1">
-            <widget class="QComboBox" name="thresholdMethodSelector"/>
+            <widget class="QComboBox" name="thresholdMethodSelector">
+             <property name="toolTip">
+              <string>Select threshold method.</string>
+             </property>
+            </widget>
+           </item>
+           <item row="0" column="2">
+            <widget class="QCheckBox" name="morphologyCB">
+             <property name="text">
+              <string>M</string>
+             </property>
+             <property name="toolTip">
+              <string>Morphology ON/OFF.</string>
+             </property>
+            </widget>
            </item>
           </layout>
          </item>

src/version.h

@@ -20,6 +20,6 @@
 #define SCANTAILOR_VERSION_H_
 
 #define STFAMILY "experimental"
-#define VERSION "0.2023.10.18" // Must be "x.x.x.x" or an empty string.
+#define VERSION "0.2023.10.24" // Must be "x.x.x.x" or an empty string.
 
 #endif