Update auto fov values in OptionsWidget panels

Author: noobie-iv

src/core/filters/deskew/OptionsWidget.cpp

@@ -21,6 +21,7 @@
 #include "Settings.h"
 #include "DistortionType.h"
 #include "ScopedIncDec.h"
+#include "dewarping/CylindricalSurfaceDewarper.h"
 
 namespace deskew
 {
@@ -271,6 +272,8 @@ OptionsWidget::manualDistortionModelSetExternally(
     }
 
     m_ptrSettings->setPageParams(m_pageId, m_pageParams);
+
+    updateAutoValuesOnPanels();
     updateModeIndication(MODE_MANUAL);
     emit invalidateThumbnail(m_pageId);
 }
@@ -334,13 +337,15 @@ OptionsWidget::postUpdateUI(Params const& page_params)
         updateFramePanel(page_params.perspectiveParams().frameParams());
         updateSizePanel(page_params.perspectiveParams().sizeParams());
         updateMarginsPanel(page_params.perspectiveParams().marginsParams());
+        updateAutoValuesOnPanels();
         break;
     case DistortionType::WARP:
         updateFovPanel(page_params.dewarpingParams().fovParams());
         updateFramePanel(page_params.dewarpingParams().frameParams());
         updateBendPanel(page_params.dewarpingParams().bendParams());
         updateSizePanel(page_params.dewarpingParams().sizeParams());
         updateMarginsPanel(page_params.dewarpingParams().marginsParams());
+        updateAutoValuesOnPanels();
         break;
     }
 
@@ -507,6 +512,8 @@ OptionsWidget::fovAutoManualModeChanged(bool auto_mode)
 
     m_ptrSettings->setPageParams(m_pageId, m_pageParams);
 
+    updateAutoValuesOnPanels();
+
     if (auto_mode)
     {
         emit reloadRequested();
@@ -574,6 +581,8 @@ OptionsWidget::fovMinSpinBoxValueChanged(double fov_min_new)
     ui.fovSpinBox->setMinimum(fov_min_new);
     ui.fovMaxSpinBox->setMinimum(fov_min_new);
 
+    updateAutoValuesOnPanels();
+
     emit fovParamsSetByUser(fov_params);
     emit invalidateThumbnail(m_pageId);
 }
@@ -627,6 +636,8 @@ OptionsWidget::fovMaxSpinBoxValueChanged(double fov_max_new)
     ui.fovSpinBox->setMaximum(fov_max_new);
     ui.fovMinSpinBox->setMaximum(fov_max_new);
 
+    updateAutoValuesOnPanels();
+
     emit fovParamsSetByUser(fov_params);
     emit invalidateThumbnail(m_pageId);
 }
@@ -1318,6 +1329,34 @@ OptionsWidget::updateMarginsPanel(dewarping::MarginsParams const& margins_params
     ui.marginsMaxPixelScaleSpinBox->setValue(margins_params.maxPixelScale());
 }
 
+void
+OptionsWidget::updateAutoValuesOnPanels()
+try
+{
+    switch (m_pageParams.distortionType())
+    {
+    case DistortionType::WARP:
+        if (m_pageParams.dewarpingParams().fovParams().mode() == MODE_AUTO)
+        {
+            dewarping::CylindricalSurfaceDewarper dewarper(
+                m_pageParams.dewarpingParams().distortionModel().topCurve().polyline(),
+                m_pageParams.dewarpingParams().distortionModel().bottomCurve().polyline(),
+                m_pageParams.dewarpingParams().fovParams(),
+                m_pageParams.dewarpingParams().frameParams(),
+                m_pageParams.dewarpingParams().bendParams()
+            );
+            ui.fovSpinBox->setValue(dewarper.fov());
+            ui.fovSlider->setValue(fovToSlider(dewarper.fov()));
+        }
+        break;
+    }
+}
+catch (std::runtime_error const&)
+{
+    ui.fovSpinBox->setSpecialValueText("?");
+    ui.fovSpinBox->setValue(ui.fovSpinBox->minimum());
+}
+
 void
 OptionsWidget::setSpinBoxUnknownState()
 {

src/core/filters/deskew/OptionsWidget.h

@@ -159,6 +159,8 @@ private slots:
 
     void updateMarginsPanel(dewarping::MarginsParams const& margins_params);
 
+    void updateAutoValuesOnPanels();
+
     void setSpinBoxUnknownState();
 
     void setSpinBoxKnownState(double angle);

src/dewarping/CylindricalSurfaceDewarper.h

@@ -80,6 +80,11 @@ class CylindricalSurfaceDewarper
         return m_directrixArcLength;
     }
 
+    double fov() const
+    {
+        return m_fov;
+    }
+
     Generatrix mapGeneratrix(double crv_x, State& state) const;
 
     /**