Implement requested changes

rtgui/addsetids.h

@@ -20,10 +20,10 @@ enum {
     ADDSET_WB_GREEN,
     ADDSET_ROTATE_DEGREE,
     ADDSET_DIST_AMOUNT,
+    ADDSET_DIST_DEFISH,
     ADDSET_DIST_FOCAL_LENGTH,
     ADDSET_PERSPECTIVE,
     ADDSET_PERSP_CAM_ANGLE,
-    ADDSET_PERSP_CAM_DEFISH,
     ADDSET_PERSP_CAM_FOCAL_LENGTH,
     ADDSET_PERSP_CAM_SHIFT,
     ADDSET_PERSP_PROJ_ANGLE,

rtgui/batchtoolpanelcoord.cc

@@ -151,7 +151,7 @@ void BatchToolPanelCoordinator::initSession ()
             colorappearance->setAdjusterBehavior (false, false, false, false, false, false, false, false, false, false, false, false, false, false, false);
             rotate->setAdjusterBehavior (false);
             resize->setAdjusterBehavior (false);
-            distortion->setAdjusterBehavior (false);
+            distortion->setAdjusterBehavior (false, false);
             perspective->setAdjusterBehavior (false, false, false, false, false, false, false);
             gradient->setAdjusterBehavior (false, false, false, false);
             pcvignette->setAdjusterBehavior (false, false, false);
@@ -196,7 +196,10 @@ void BatchToolPanelCoordinator::initSession ()
             colorappearance->setAdjusterBehavior (options.baBehav[ADDSET_CAT_DEGREE], options.baBehav[ADDSET_CAT_ADAPTSCENE], options.baBehav[ADDSET_CAT_ADAPTVIEWING], options.baBehav[ADDSET_CAT_BADPIX], options.baBehav[ADDSET_CAT_LIGHT], options.baBehav[ADDSET_CAT_CHROMA], options.baBehav[ADDSET_CAT_CONTRAST], options.baBehav[ADDSET_CAT_RSTPRO], options.baBehav[ADDSET_CAT_BRIGHT], options.baBehav[ADDSET_CAT_CONTRAST_Q], options.baBehav[ADDSET_CAT_CHROMA_S], options.baBehav[ADDSET_CAT_CHROMA_M], options.baBehav[ADDSET_CAT_HUE],options.baBehav[ADDSET_CAT_DEGREEOUT], options.baBehav[ADDSET_CAT_TEMPOUT] );
             rotate->setAdjusterBehavior (options.baBehav[ADDSET_ROTATE_DEGREE]);
             resize->setAdjusterBehavior (options.baBehav[ADDSET_RESIZE_SCALE]);
-            distortion->setAdjusterBehavior (options.baBehav[ADDSET_DIST_AMOUNT]);
+            distortion->setAdjusterBehavior (
+                  options.baBehav[ADDSET_DIST_AMOUNT],
+                  options.baBehav[ADDSET_DIST_FOCAL_LENGTH]
+                  );
             perspective->setAdjusterBehavior (
                 options.baBehav[ADDSET_PERSPECTIVE],
                 options.baBehav[ADDSET_PERSP_CAM_FOCAL_LENGTH],

rtgui/distortion.cc

@@ -159,13 +159,10 @@ void Distortion::defishChanged()
     }
 }
 
-void Distortion::focalLengthChanged(Adjuster *a, const double newval)
+void Distortion::setAdjusterBehavior (bool vadd, bool focal_length_add)
-{
-}
-
-void Distortion::setAdjusterBehavior (bool vadd)
 {
     distor->setAddMode(vadd);
+    focal_length->setAddMode(focal_length_add);
 }
 
 void Distortion::trimValues (rtengine::procparams::ProcParams* pp)

rtgui/distortion.h

@@ -57,7 +57,7 @@ public:
     void setBatchMode   (bool batchMode) override;
 
     void adjusterChanged     (Adjuster* a, double newval) override;
-    void setAdjusterBehavior (bool vadd);
+    void setAdjusterBehavior (bool vadd, bool focal_length_add);
     void trimValues          (rtengine::procparams::ProcParams* pp) override;
     void idPressed           ();
     void setLensGeomListener (LensGeomListener* l)
@@ -65,5 +65,4 @@ public:
         rlistener = l;
     }
     void defishChanged (void);
-    void focalLengthChanged(Adjuster* a, double const newval);
 };

rtgui/lensgeom.cc

@@ -135,7 +135,9 @@ void LensGeometry::adjusterChanged(Adjuster *a, double newval)
                     Glib::ustring::format(scale->getValue()));
         }
         else {
-            std::cout << "Unknown adjuster given in LensGeometry::adjusterChanged, file " << __FILE__ << " line " << __LINE__ << std::endl;
+            if (settings->verbose) {
+                std::cout << "Unknown adjuster given in LensGeometry::adjusterChanged, file " << __FILE__ << " line " << __LINE__ << std::endl;
+            }
         }
     }
 }

rtgui/preferences.cc

@@ -368,6 +368,8 @@ Gtk::Widget* Preferences::getBatchProcPanel()
     mi = behModel->append();
     mi->set_value(behavColumns.label, M("TP_DISTORTION_LABEL"));
     appendBehavList(mi, M("TP_DISTORTION_AMOUNT"), ADDSET_DIST_AMOUNT, false);
+    appendBehavList(mi, M("TP_DISTORTION_DEFISH"), ADDSET_DIST_DEFISH, false);
+    appendBehavList(mi, M("TP_DISTORTION_FOCAL_LENGTH"), ADDSET_DIST_FOCAL_LENGTH, false);
 
     mi = behModel->append();
     mi->set_value(behavColumns.label, M("TP_PERSPECTIVE_LABEL"));
@@ -378,7 +380,6 @@ Gtk::Widget* Preferences::getBatchProcPanel()
     appendBehavList(mi, M("TP_PERSPECTIVE_POST_CORRECTION_ADJUSTMENT_FRAME") + " - " + M("TP_PERSPECTIVE_PROJECTION_SHIFT_HORIZONTAL") + ", " + M("TP_PERSPECTIVE_PROJECTION_SHIFT_VERTICAL"), ADDSET_PERSP_PROJ_SHIFT, false);
     appendBehavList(mi, M("TP_PERSPECTIVE_PROJECTION_ROTATE"), ADDSET_PERSP_PROJ_ROTATE, false);
     appendBehavList(mi, M("TP_PERSPECTIVE_RECOVERY_FRAME") + " - " + M("TP_PERSPECTIVE_PROJECTION_YAW") + ", " + M("TP_PERSPECTIVE_PROJECTION_PITCH"), ADDSET_PERSP_PROJ_ANGLE, false);
-    appendBehavList(mi, M("TP_PERSPECTIVE_CAMERA_DEFISH"), ADDSET_PERSP_CAM_DEFISH, false);
 
     mi = behModel->append();
     mi->set_value(behavColumns.label, M("TP_GRADIENT_LABEL"));