Merge branch 'dev' into favorites-gui

rtgui/flatfield.h

@@ -23,6 +23,7 @@
 #include <gtkmm.h>
 
 #include "adjuster.h"
+#include "checkbox.h"
 #include "guiutils.h"
 #include "toolpanel.h"
 
@@ -42,7 +43,7 @@ public:
     // add other info here
 };
 
-class FlatField final : public ToolParamBlock, public AdjusterListener, public FoldableToolPanel, public rtengine::FlatFieldAutoClipListener
+class FlatField final : public ToolParamBlock, public AdjusterListener, public CheckBoxListener, public FoldableToolPanel, public rtengine::FlatFieldAutoClipListener
 {
 
 protected:
@@ -52,6 +53,7 @@ protected:
     Gtk::Label *ffInfo;
     Gtk::Button *flatFieldFileReset;
     Gtk::CheckButton* flatFieldAutoSelect;
+    CheckBox* flatFieldFromMetaData;
     Adjuster* flatFieldClipControl;
     Adjuster* flatFieldBlurRadius;
     MyComboBoxText* flatFieldBlurType;
@@ -64,8 +66,10 @@ protected:
     Glib::ustring lastShortcutPath;
     bool b_filter_asCurrent;
     bool israw;
+    rtengine::ProcEvent EvFlatFieldFromMetaData;
 
     IdleRegister idle_register;
+
 public:
     static const Glib::ustring TOOL_NAME;
 
@@ -91,4 +95,6 @@ public:
         ffp = p;
     };
     void flatFieldAutoClipValueChanged(int n = 0) override;
+    void checkBoxToggled(CheckBox* c, CheckValue newval) override;
+    void setGainMap(bool enabled);
 };