merge with dev

rtgui/epd.cc

@@ -69,12 +69,13 @@ void EdgePreservingDecompositionUI::read(const ProcParams *pp, const ParamsEdite
 
     setEnabled(pp->epd.enabled);
     strength->set_sensitive (true);
+    gamma->set_sensitive (true);
 /*
-    if(pp->wavelet.enabled) {
-        if(pp->wavelet.tmrs == 0) {
+    if(pp->wavelet.enabled) { 
+        if(pp->wavelet.tmrs == 0 || pp->wavelet.TMmethod == "cont") {
             strength->set_sensitive (true);
             gamma->set_sensitive (true);
-        } else {
+        } else if(pp->wavelet.tmrs != 0 && pp->wavelet.TMmethod == "tm") {
             strength->set_sensitive (false);
             gamma->set_sensitive (false);
         }
@@ -98,12 +99,13 @@ void EdgePreservingDecompositionUI::write(ProcParams *pp, ParamsEdited *pedited)
     pp->epd.reweightingIterates = reweightingIterates->getValue();
     pp->epd.enabled = getEnabled();
     strength->set_sensitive (true);
+    gamma->set_sensitive (true);
 /*
-    if(pp->wavelet.enabled) {
-        if(pp->wavelet.tmrs == 0) {
+    if(pp->wavelet.enabled) { 
+        if(pp->wavelet.tmrs == 0 || pp->wavelet.TMmethod == "cont") {
             strength->set_sensitive (true);
             gamma->set_sensitive (true);
-        } else {
+        } else if(pp->wavelet.tmrs != 0 && pp->wavelet.TMmethod == "tm") {
             strength->set_sensitive (false);
             gamma->set_sensitive (false);
         }

rtgui/filterpanel.cc

@@ -14,7 +14,7 @@
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
- *  along with RawTherapee.  If not, see <https://www.gnu.org/licenses/>.
+ *  along with RawTherapee.  If not, see <http://www.gnu.org/licenses/>.
  */
 #include "filterpanel.h"
 #include "multilangmgr.h"
@@ -107,8 +107,8 @@ FilterPanel::FilterPanel () : listener (nullptr)
     scamera->set_policy(Gtk::POLICY_AUTOMATIC, Gtk::POLICY_ALWAYS);
     scamera->set_size_request(-1, 80);
     scamera->add(*camera);
-    cvb->pack_start (*scamera, Gtk::PACK_SHRINK, 0);
-    pack_start (*cvb, Gtk::PACK_SHRINK, 4);
+    cvb->pack_start (*scamera, Gtk::PACK_EXPAND_WIDGET, 0);
+    pack_start (*cvb, Gtk::PACK_EXPAND_WIDGET, 4);
 
     enaLens = Gtk::manage(new Gtk::CheckButton(M("EXIFFILTER_LENS") + ":"));
     Gtk::VBox* lvb = Gtk::manage(new Gtk::VBox ());
@@ -119,8 +119,8 @@ FilterPanel::FilterPanel () : listener (nullptr)
     slens->set_policy(Gtk::POLICY_AUTOMATIC, Gtk::POLICY_ALWAYS);
     slens->set_size_request(-1, 80);
     slens->add(*lens);
-    lvb->pack_start (*slens, Gtk::PACK_SHRINK, 0);
-    pack_start (*lvb, Gtk::PACK_SHRINK, 4);
+    lvb->pack_start (*slens, Gtk::PACK_EXPAND_WIDGET, 0);
+    pack_start (*lvb, Gtk::PACK_EXPAND_WIDGET, 4);
 
     enaFiletype = Gtk::manage(new Gtk::CheckButton(M("EXIFFILTER_FILETYPE") + ":"));
     Gtk::VBox* ftvb = Gtk::manage(new Gtk::VBox ());
@@ -131,8 +131,8 @@ FilterPanel::FilterPanel () : listener (nullptr)
     sfiletype->set_policy(Gtk::POLICY_AUTOMATIC, Gtk::POLICY_ALWAYS);
     sfiletype->set_size_request(-1, 80);
     sfiletype->add(*filetype);
-    ftvb->pack_start (*sfiletype, Gtk::PACK_SHRINK, 0);
-    pack_start (*ftvb, Gtk::PACK_SHRINK, 4);
+    ftvb->pack_start (*sfiletype, Gtk::PACK_EXPAND_WIDGET, 0);
+    pack_start (*ftvb, Gtk::PACK_EXPAND_WIDGET, 4);
 
     // add panel ending
     Gtk::VBox* vboxpe = Gtk::manage (new Gtk::VBox ());

rtgui/lensgeom.cc

@@ -17,6 +17,8 @@
  *  along with RawTherapee.  If not, see <https://www.gnu.org/licenses/>.
  */
 #include "lensgeom.h"
+
+#include "eventmapper.h"
 #include "guiutils.h"
 #include "rtimage.h"
 
@@ -28,6 +30,18 @@ using namespace rtengine::procparams;
 LensGeometry::LensGeometry () : FoldableToolPanel(this, "lensgeom", M("TP_LENSGEOM_LABEL")), rlistener(nullptr), lastFill(false)
 {
 
+    auto m = ProcEventMapper::getInstance();
+    EvTransMethod = m->newEvent(TRANSFORM, "HISTORY_MSG_TRANS_METHOD");
+
+    Gtk::HBox* hb1 = Gtk::manage (new Gtk::HBox ());
+    hb1->pack_start (*Gtk::manage (new Gtk::Label ( M("TP_RAW_DMETHOD") + ": ")), Gtk::PACK_SHRINK, 4);
+    method = Gtk::manage (new MyComboBoxText ());
+    method->append(M("TP_LENSGEOM_LOG"));
+    method->append(M("TP_LENSGEOM_LIN"));
+    method->set_active(0);
+    hb1->pack_end (*method, Gtk::PACK_EXPAND_WIDGET, 4);
+    pack_start( *hb1, Gtk::PACK_SHRINK, 4);
+
     fill = Gtk::manage (new Gtk::CheckButton (M("TP_LENSGEOM_FILL")));
     pack_start (*fill);
 
@@ -39,8 +53,9 @@ LensGeometry::LensGeometry () : FoldableToolPanel(this, "lensgeom", M("TP_LENSGE
     packBox = Gtk::manage (new ToolParamBlock ());
     pack_start (*packBox);
 
-    autoCrop->signal_pressed().connect( sigc::mem_fun(*this, &LensGeometry::autoCropPressed) );
-    fillConn = fill->signal_toggled().connect( sigc::mem_fun(*this, &LensGeometry::fillPressed) );
+    method->connect(method->signal_changed().connect(sigc::mem_fun(*this, &LensGeometry::methodChanged)));
+    autoCrop->signal_pressed().connect(sigc::mem_fun(*this, &LensGeometry::autoCropPressed));
+    fillConn = fill->signal_toggled().connect(sigc::mem_fun(*this, &LensGeometry::fillPressed));
 
     fill->set_active (true);
     show_all ();
@@ -55,8 +70,14 @@ void LensGeometry::read (const ProcParams* pp, const ParamsEdited* pedited)
 {
 
     disableListener ();
+    method->block (true);
+    method->set_active(pp->commonTrans.method == "log" ? 0 : 1);
 
     if (pedited) {
+        if(!pedited->commonTrans.method) {
+            method->set_active_text(M("GENERAL_UNCHANGED"));
+        }
+
         fill->set_inconsistent (!pedited->commonTrans.autofill);
     }
 
@@ -67,15 +88,20 @@ void LensGeometry::read (const ProcParams* pp, const ParamsEdited* pedited)
 
     lastFill = pp->commonTrans.autofill;
 
+    method->block (false);
     enableListener ();
 }
 
 void LensGeometry::write (ProcParams* pp, ParamsEdited* pedited)
 {
-
+    int currentRow = method->get_active_row_number();
+    if( currentRow >= 0 && method->get_active_text() != M("GENERAL_UNCHANGED")) {
+        pp->commonTrans.method = currentRow == 0 ? "log" : "lin";
+    }
     pp->commonTrans.autofill   = fill->get_active ();
 
     if (pedited) {
+        pedited->commonTrans.method = method->get_active_text() != M("GENERAL_UNCHANGED");
         pedited->commonTrans.autofill   = !fill->get_inconsistent();
     }
 }
@@ -115,6 +141,14 @@ void LensGeometry::fillPressed ()
     }
 }
 
+void LensGeometry::methodChanged ()
+{
+
+    if (listener && method->get_active_row_number() >= 0) {
+        listener->panelChanged(EvTransMethod, method->get_active_text());
+    }
+}
+
 void LensGeometry::setBatchMode (bool batchMode)
 {
 

rtgui/lensgeom.h

@@ -29,6 +29,7 @@ class LensGeometry final :
 {
 
 protected:
+    MyComboBoxText*     method;
     Gtk::Button*        autoCrop;
     LensGeomListener*   rlistener;
     Gtk::CheckButton*   fill;
@@ -36,6 +37,7 @@ protected:
     sigc::connection    fillConn;
     ToolParamBlock*     packBox;
 
+    rtengine::ProcEvent EvTransMethod;
 public:
 
     LensGeometry ();
@@ -50,6 +52,7 @@ public:
     void write          (rtengine::procparams::ProcParams* pp, ParamsEdited* pedited = nullptr) override;
     void setBatchMode   (bool batchMode) override;
 
+    void methodChanged();
     void fillPressed            ();
     void autoCropPressed        ();
     void setLensGeomListener    (LensGeomListener* l)

rtgui/lensprofile.cc

@@ -586,6 +586,9 @@ void LensProfilePanel::onCorrModeChanged(const Gtk::RadioButton* rbChanged)
 
 LensProfilePanel::LFDbHelper::LFDbHelper()
 {
+    lensfunCameraModel = Gtk::TreeStore::create(lensfunModelCam);
+    lensfunLensModel = Gtk::TreeStore::create(lensfunModelLens);
+
 #ifdef _OPENMP
 #pragma omp parallel sections if (!settings->verbose)
 #endif
@@ -594,14 +597,12 @@ LensProfilePanel::LFDbHelper::LFDbHelper()
 #pragma omp section
 #endif
         {
-            lensfunCameraModel = Gtk::TreeStore::create(lensfunModelCam);
             fillLensfunCameras();
         }
 #ifdef _OPENMP
 #pragma omp section
 #endif
         {
-            lensfunLensModel = Gtk::TreeStore::create(lensfunModelLens);
             fillLensfunLenses();
         }
     }

rtgui/paramsedited.cc

@@ -321,6 +321,7 @@ void ParamsEdited::set(bool v)
     coarse.rotate = v;
     coarse.hflip = v;
     coarse.vflip = v;
+    commonTrans.method = v;
     commonTrans.autofill = v;
     rotate.degree = v;
     distortion.amount = v;
@@ -915,6 +916,7 @@ void ParamsEdited::initFrom(const std::vector<rtengine::procparams::ProcParams>&
         coarse.rotate = coarse.rotate && p.coarse.rotate == other.coarse.rotate;
         coarse.hflip = coarse.hflip && p.coarse.hflip == other.coarse.hflip;
         coarse.vflip = coarse.vflip && p.coarse.vflip == other.coarse.vflip;
+        commonTrans.method = commonTrans.method && p.commonTrans.method == other.commonTrans.method;
         commonTrans.autofill = commonTrans.autofill && p.commonTrans.autofill == other.commonTrans.autofill;
         rotate.degree = rotate.degree && p.rotate.degree == other.rotate.degree;
         distortion.amount = distortion.amount && p.distortion.amount == other.distortion.amount;
@@ -2287,6 +2289,10 @@ void ParamsEdited::combine(rtengine::procparams::ProcParams& toEdit, const rteng
         toEdit.coarse.vflip = mods.coarse.vflip;
     }
 
+    if (commonTrans.method) {
+        toEdit.commonTrans.method = mods.commonTrans.method;
+    }
+
     if (commonTrans.autofill) {
         toEdit.commonTrans.autofill = mods.commonTrans.autofill;
     }

rtgui/paramsedited.h

@@ -365,6 +365,7 @@ struct CoarseTransformParamsEdited {
 };
 
 struct CommonTransformParamsEdited {
+    bool method;
     bool autofill;
 };