Merge pull request #77 from ImageProcessing-ElectronicPublications/ma…

…ster 1.0.19: colors: wiener denoiser
ScanTailor-Advanced · Aug 22, 2023 · 7601370 · 7601370 · zvezdochiot · Aug 26, 2023
2 parents c575887 + ab6018d
commit 7601370
Show file tree

Hide file tree

Showing 9 changed files with 334 additions and 5 deletions.
diff --git a/src/core/filters/output/ColorCommonOptions.cpp b/src/core/filters/output/ColorCommonOptions.cpp
@@ -7,14 +7,28 @@
 
 namespace output {
 ColorCommonOptions::ColorCommonOptions()
-    : m_fillOffcut(true), m_fillMargins(true), m_normalizeIllumination(false), m_fillingColor(FILL_BACKGROUND) {}
+    : m_fillOffcut(true),
+      m_fillMargins(true),
+      m_normalizeIllumination(false),
+      m_fillingColor(FILL_BACKGROUND),
+      m_wienerCoef(0.0),
+      m_wienerWindowSize(5) {}
 
 ColorCommonOptions::ColorCommonOptions(const QDomElement& el)
     : m_fillOffcut(el.attribute("fillOffcut") == "1"),
       m_fillMargins(el.attribute("fillMargins") == "1"),
       m_normalizeIllumination(el.attribute("normalizeIlluminationColor") == "1"),
       m_fillingColor(parseFillingColor(el.attribute("fillingColor"))),
-      m_posterizationOptions(el.namedItem("posterization-options").toElement()) {}
+      m_posterizationOptions(el.namedItem("posterization-options").toElement()),
+      m_wienerCoef(el.attribute("wienerCoef").toDouble()),
+      m_wienerWindowSize(el.attribute("wienerWinSize").toInt()) {
+  if (m_wienerCoef < 0.0 || m_wienerCoef > 1.0) {
+    m_wienerCoef = 0.0;
+  }
+  if (m_wienerWindowSize < 3) {
+    m_wienerWindowSize = 5;
+  }
+}
 
 QDomElement ColorCommonOptions::toXml(QDomDocument& doc, const QString& name) const {
   QDomElement el(doc.createElement(name));
@@ -23,13 +37,16 @@ QDomElement ColorCommonOptions::toXml(QDomDocument& doc, const QString& name) co
   el.setAttribute("normalizeIlluminationColor", m_normalizeIllumination ? "1" : "0");
   el.setAttribute("fillingColor", formatFillingColor(m_fillingColor));
   el.appendChild(m_posterizationOptions.toXml(doc, "posterization-options"));
+  el.setAttribute("wienerCoef", m_wienerCoef);
+  el.setAttribute("wienerWinSize", m_wienerWindowSize);
   return el;
 }
 
 bool ColorCommonOptions::operator==(const ColorCommonOptions& other) const {
   return (m_normalizeIllumination == other.m_normalizeIllumination) && (m_fillMargins == other.m_fillMargins)
          && (m_fillOffcut == other.m_fillOffcut) && (m_fillingColor == other.m_fillingColor)
-         && (m_posterizationOptions == other.m_posterizationOptions);
+         && (m_posterizationOptions == other.m_posterizationOptions) && (m_wienerCoef == other.m_wienerCoef)
+         && (m_wienerWindowSize == other.m_wienerWindowSize);
 }
 
 bool ColorCommonOptions::operator!=(const ColorCommonOptions& other) const {
@@ -91,4 +108,4 @@ bool ColorCommonOptions::PosterizationOptions::operator==(const ColorCommonOptio
 bool ColorCommonOptions::PosterizationOptions::operator!=(const ColorCommonOptions::PosterizationOptions& other) const {
   return !(*this == other);
 }
-}  // namespace output
+}  // namespace output
diff --git a/src/core/filters/output/ColorCommonOptions.h b/src/core/filters/output/ColorCommonOptions.h
@@ -68,6 +68,11 @@ class ColorCommonOptions {
 
   void setNormalizeIllumination(bool val);
 
+  double wienerCoef() const;
+  void setWienerCoef(double val);
+  int wienerWindowSize() const;
+  void setWienerWindowSize(int val);
+
   FillingColor getFillingColor() const;
 
   void setFillingColor(FillingColor fillingColor);
@@ -89,6 +94,8 @@ class ColorCommonOptions {
   bool m_fillOffcut;
   bool m_fillMargins;
   bool m_normalizeIllumination;
+  double m_wienerCoef;
+  int m_wienerWindowSize;
   FillingColor m_fillingColor;
   PosterizationOptions m_posterizationOptions;
 };
@@ -118,6 +125,19 @@ inline void ColorCommonOptions::setNormalizeIllumination(bool val) {
   m_normalizeIllumination = val;
 }
 
+inline double ColorCommonOptions::wienerCoef() const {
+  return m_wienerCoef;
+}
+inline void ColorCommonOptions::setWienerCoef(double val) {
+  m_wienerCoef = val;
+}
+inline int ColorCommonOptions::wienerWindowSize() const {
+  return m_wienerWindowSize;
+}
+inline void ColorCommonOptions::setWienerWindowSize(int val) {
+  m_wienerWindowSize = val;
+}
+
 inline const ColorCommonOptions::PosterizationOptions& ColorCommonOptions::getPosterizationOptions() const {
   return m_posterizationOptions;
 }

diff --git a/src/core/filters/output/OptionsWidget.cpp b/src/core/filters/output/OptionsWidget.cpp
@@ -634,6 +634,8 @@ void OptionsWidget::updateColorsDisplay() {
     posterizeCB->setEnabled(true);
     posterizeOptionsWidget->setEnabled(colorCommonOptions.getPosterizationOptions().isEnabled());
   }
+  wienerCoef->setValue(colorCommonOptions.wienerCoef());
+  wienerWindowSize->setValue(colorCommonOptions.wienerWindowSize());
   colorSegmentationCB->setChecked(blackWhiteOptions.getColorSegmenterOptions().isEnabled());
   reduceNoiseSB->setValue(blackWhiteOptions.getColorSegmenterOptions().getNoiseReduction());
   redAdjustmentSB->setValue(blackWhiteOptions.getColorSegmenterOptions().getRedThresholdAdjustment());
@@ -764,6 +766,24 @@ void OptionsWidget::originalBackgroundToggled(bool checked) {
   emit reloadRequested();
 }
 
+void OptionsWidget::wienerCoefChanged(double value) {
+  ColorCommonOptions colorCommonOptions = m_colorParams.colorCommonOptions();
+  colorCommonOptions.setWienerCoef(value);
+  m_colorParams.setColorCommonOptions(colorCommonOptions);
+  m_settings->setColorParams(m_pageId, m_colorParams);
+
+  m_delayedReloadRequest.start(750);
+}
+
+void OptionsWidget::wienerWindowSizeChanged(int value) {
+  ColorCommonOptions colorCommonOptions = m_colorParams.colorCommonOptions();
+  colorCommonOptions.setWienerWindowSize(value);
+  m_colorParams.setColorCommonOptions(colorCommonOptions);
+  m_settings->setColorParams(m_pageId, m_colorParams);
+
+  m_delayedReloadRequest.start(750);
+}
+
 void OptionsWidget::colorSegmentationToggled(bool checked) {
   BlackWhiteOptions blackWhiteOptions = m_colorParams.blackWhiteOptions();
   BlackWhiteOptions::ColorSegmenterOptions segmenterOptions = blackWhiteOptions.getColorSegmenterOptions();
@@ -908,6 +928,8 @@ void OptionsWidget::setupUiConnections() {
   CONNECT(pictureShapeSensitivitySB, SIGNAL(valueChanged(int)), this, SLOT(pictureShapeSensitivityChanged(int)));
   CONNECT(higherSearchSensitivityCB, SIGNAL(clicked(bool)), this, SLOT(higherSearchSensivityToggled(bool)));
 
+  CONNECT(wienerCoef, SIGNAL(valueChanged(double)), this, SLOT(wienerCoefChanged(double)));
+  CONNECT(wienerWindowSize, SIGNAL(valueChanged(int)), this, SLOT(wienerWindowSizeChanged(int)));
   CONNECT(colorSegmentationCB, SIGNAL(clicked(bool)), this, SLOT(colorSegmentationToggled(bool)));
   CONNECT(reduceNoiseSB, SIGNAL(valueChanged(int)), this, SLOT(reduceNoiseChanged(int)));
   CONNECT(redAdjustmentSB, SIGNAL(valueChanged(int)), this, SLOT(redAdjustmentChanged(int)));

diff --git a/src/core/filters/output/OptionsWidget.h b/src/core/filters/output/OptionsWidget.h
@@ -94,6 +94,10 @@ class OptionsWidget : public FilterOptionsWidget, private Ui::OptionsWidget {
 
   void higherSearchSensivityToggled(bool checked);
 
+  void wienerCoefChanged(double value);
+
+  void wienerWindowSizeChanged(int value);
+
   void colorSegmentationToggled(bool checked);
 
   void reduceNoiseChanged(int value);

diff --git a/src/core/filters/output/OptionsWidget.ui b/src/core/filters/output/OptionsWidget.ui
@@ -456,6 +456,46 @@
            <property name="bottomMargin">
             <number>5</number>
            </property>
+           <item>
+            <layout class="QGridLayout" name="filterColorOptions">
+             <item row="0" column="0">
+              <widget class="QLabel" name="wienerLabel">
+               <property name="text">
+                <string>Wiener denoiser</string>
+               </property>
+              </widget>
+             </item>
+             <item row="0" column="1">
+              <widget class="QDoubleSpinBox" name="wienerCoef">
+               <property name="toolTip">
+                <string>Value is 0.0 .. 1.0..</string>
+               </property>
+               <property name="minimum">
+                <double>0.0</double>
+               </property>
+               <property name="maximum">
+                <double>1.0</double>
+               </property>
+               <property name="singleStep">
+                <double>0.01</double>
+               </property>
+              </widget>
+             </item>
+             <item row="0" column="2">
+              <widget class="QSpinBox" name="wienerWindowSize">
+               <property name="toolTip">
+                <string>The dimensions of a pixel neighborhood to consider.</string>
+               </property>
+               <property name="minimum">
+                <number>3</number>
+               </property>
+               <property name="maximum">
+                <number>9999</number>
+               </property>
+              </widget>
+             </item>
+            </layout>
+           </item>
            <item>
             <widget class="QCheckBox" name="colorSegmentationCB">
              <property name="toolTip">

diff --git a/src/core/filters/output/OutputGenerator.cpp b/src/core/filters/output/OutputGenerator.cpp
@@ -37,6 +37,7 @@
 #include <imageproc/PolygonUtils.h>
 #include <imageproc/Posterizer.h>
 #include <imageproc/SkewFinder.h>
+#include <imageproc/WienerFilter.h>
 
 #include <QColor>
 #include <QDebug>
@@ -1267,6 +1268,11 @@ std::unique_ptr<OutputImage> OutputGenerator::Processor::processWithoutDewarping
     m_dbg->add(maybeNormalized, "maybeNormalized");
   }
 
+  const ColorCommonOptions& colorCommonOptions = m_colorParams.colorCommonOptions();
+  wienerColorFilterInPlace(maybeNormalized,
+                           QSize(colorCommonOptions.wienerWindowSize(), colorCommonOptions.wienerWindowSize()),
+                           colorCommonOptions.wienerCoef());
+
   if (m_renderParams.normalizeIllumination()) {
     m_outsideBackgroundColor
         = BackgroundColorCalculator::calcDominantBackgroundColor(maybeNormalized, m_outCropAreaInWorkingCs);
@@ -1554,6 +1560,11 @@ std::unique_ptr<OutputImage> OutputGenerator::Processor::processWithDewarping(Zo
 
   m_status.throwIfCancelled();
 
+  const ColorCommonOptions& colorCommonOptions = m_colorParams.colorCommonOptions();
+  wienerColorFilterInPlace(normalizedOriginal,
+                           QSize(colorCommonOptions.wienerWindowSize(), colorCommonOptions.wienerWindowSize()),
+                           colorCommonOptions.wienerCoef());
+
   // Picture mask (white indicate a picture) in the same coordinates as
   // warpedGrayOutput.  Only built for Mixed mode.
   BinaryImage warpedBwMask;

diff --git a/src/imageproc/CMakeLists.txt b/src/imageproc/CMakeLists.txt
@@ -25,6 +25,7 @@ set(sources
     PolygonRasterizer.cpp PolygonRasterizer.h
     HoughLineDetector.cpp HoughLineDetector.h
     GaussBlur.cpp GaussBlur.h
+    WienerFilter.cpp WienerFilter.h
     Sobel.h
     MorphGradientDetect.cpp MorphGradientDetect.h
     PolynomialLine.cpp PolynomialLine.h
@@ -57,4 +58,4 @@ add_library(imageproc STATIC ${sources})
 target_link_libraries(imageproc PUBLIC foundation math)
 target_include_directories(imageproc PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}")
 
-add_subdirectory(tests)
+add_subdirectory(tests)