Changes for FFTW expert - confirmed

rtgui/locallab.cc

@@ -1139,10 +1139,12 @@ pe(nullptr)
 
     struFrame->set_label_align(0.025, 0.5);
     ToolParamBlock* const strumBox = Gtk::manage(new ToolParamBlock());
+
     if (complexsoft < 2) {
         strumBox->pack_start(*strumaskcol);
         strumBox->pack_start(*toolcol);
     }
+
     struFrame->add(*strumBox);
 
     if (complexsoft < 2) {
@@ -1152,7 +1154,7 @@ pe(nullptr)
     blurFrame->set_label_align(0.025, 0.5);
     ToolParamBlock* const blurmBox = Gtk::manage(new ToolParamBlock());
 
-    if (complexsoft < 1) {
+    if (complexsoft < 2) {
         blurmBox->pack_start(*fftColorMask, Gtk::PACK_SHRINK, 0);
     }
 
@@ -1160,10 +1162,12 @@ pe(nullptr)
         if (complexsoft < 1) {
 //           blurcol->setLimits (0.2, 1000., 0.5, 0.2);
         }
+
         blurmBox->pack_start(*contcol);
         blurcol->setAdjusterListener(this);
         blurmBox->pack_start(*blurcol);
     }
+
     blurFrame->add(*blurmBox);
 
     if (complexsoft < 2) {
@@ -1239,9 +1243,11 @@ pe(nullptr)
     }
 
     expMethod->append(M("TP_LOCALLAB_STD"));
+
     if (complexsoft == 1) {
         expMethod->append(M("TP_LOCALLAB_PDE"));
     }
+
     if (complexsoft == 0) {
         expMethod->append(M("TP_LOCALLAB_PDE2"));
     }
@@ -6765,11 +6771,13 @@ void Locallab::enaColorMaskChanged()
 void Locallab::fftColorMaskChanged()
 {
     double temp = blurcol->getValue();
+
     if (fftColorMask->get_active()) {
         blurcol->setLimits(0.2, 1000., 0.5, 0.2);
     } else {
         blurcol->setLimits(0.2, 100., 0.5, 0.2);
     }
+
     blurcol->setValue(temp);
 
     if (multiImage) {
@@ -6916,11 +6924,13 @@ void Locallab::fftwblChanged()
 {
     // printf("fftwblChanged\n");
     double temp = radius->getValue();
+
     if (fftwbl->get_active()) {
         radius->setLimits(1.5, 1000., 0.5, 1.5);
     } else {
         radius->setLimits(1.5, 100., 0.5, 1.5);
     }
+
     radius->setValue(temp);
 
     if (multiImage) {
@@ -7400,11 +7410,13 @@ void Locallab::fftwlcChanged()
 {
     // printf("fftwlcChanged\n");
     double temp = lcradius->getValue();
+
     if (fftwlc->get_active()) {
         lcradius->setLimits(20, 1000, 1, 80);
     } else {
         lcradius->setLimits(20, 100, 1, 80);
     }
+
     lcradius->setValue(temp);
 
     if (multiImage) {
@@ -10408,8 +10420,6 @@ void Locallab::updateLocallabGUI(const rtengine::procparams::ProcParams* pp, con
         gammaskcol->setValue(pp->locallab.spots.at(index).gammaskcol);
         slomaskcol->setValue(pp->locallab.spots.at(index).slomaskcol);
 
-//        if(fftColorMask->get_active()){
-//        }
         shadmaskcol->setValue(pp->locallab.spots.at(index).shadmaskcol);
         strumaskcol->setValue(pp->locallab.spots.at(index).strumaskcol);
         lapmaskcol->setValue(pp->locallab.spots.at(index).lapmaskcol);
@@ -10439,15 +10449,16 @@ void Locallab::updateLocallabGUI(const rtengine::procparams::ProcParams* pp, con
             toolcol->set_active(false);
             merMethod->set_active(0);
         }
+
         if (complexsoft > 0) {
             LLmaskcolshapewav->reset();
-            fftColorMask->set_active(false);
         }
 
         if (complexsoft == 2) {
             lapmaskcol->setValue(0);
             blurcol->setValue(0.2);
             contcol->setValue(0.);
+            fftColorMask->set_active(false);
         }
 
         if (fftColorMask->get_active()) {
@@ -10455,8 +10466,14 @@ void Locallab::updateLocallabGUI(const rtengine::procparams::ProcParams* pp, con
         } else {
             blurcol->setLimits(0.2, 100., 0.5, 0.2);
         }
+
         blurcol->setValue(pp->locallab.spots.at(index).blurcol);
 
+        if (complexsoft == 2) {
+            blurcol->setLimits(0.2, 100., 0.5, 0.2);
+            blurcol->setValue(pp->locallab.spots.at(index).blurcol);
+        }
+
         // Exposure
         expexpose->setEnabled(pp->locallab.spots.at(index).expexpose);
         expcomp->setValue(pp->locallab.spots.at(index).expcomp);
@@ -10753,8 +10770,15 @@ void Locallab::updateLocallabGUI(const rtengine::procparams::ProcParams* pp, con
         } else {
             radius->setLimits(1.5, 100., 0.5, 1.5);
         }
+
         radius->setValue(pp->locallab.spots.at(index).radius);
 
+        if (complexsoft == 2) {
+            radius->setLimits(1.5, 100., 0.5, 1.5);
+            radius->setValue(pp->locallab.spots.at(index).radius);
+        }
+
+
         // Tone Mapping
         exptonemap->setEnabled(pp->locallab.spots.at(index).exptonemap);
         stren->setValue(pp->locallab.spots.at(index).stren);
@@ -10898,8 +10922,14 @@ void Locallab::updateLocallabGUI(const rtengine::procparams::ProcParams* pp, con
         } else {
             lcradius->setLimits(20, 100, 1, 80);
         }
+
         lcradius->setValue(pp->locallab.spots.at(index).lcradius);
 
+        if (complexsoft == 2) {
+        lcradius->setLimits(20, 100, 1, 80);
+            lcradius->setValue(pp->locallab.spots.at(index).lcradius);
+        }
+
         // Contrast by detail levels
         expcbdl->setEnabled(pp->locallab.spots.at(index).expcbdl);