Iprovment to preview selection deltaE

rtgui/controlspotpanel.cc

@@ -70,6 +70,7 @@ ControlSpotPanel::ControlSpotPanel():
     iter_(Gtk::manage(new Adjuster(M("TP_LOCALLAB_PROXI"), 0.2, 10.0, 0.1, 2.0))),
     balan_(Gtk::manage(new Adjuster(M("TP_LOCALLAB_BALAN"), 0.2, 2.5, 0.1, 1.0, Gtk::manage(new RTImage("rawtherapee-logo-16.png")), Gtk::manage(new RTImage("circle-white-small.png"))))),
     balanh_(Gtk::manage(new Adjuster(M("TP_LOCALLAB_BALANH"), 0.2, 2.5, 0.1, 1.0, Gtk::manage(new RTImage("rawtherapee-logo-16.png")),Gtk::manage(new RTImage("circle-red-green-small.png"))))),
+    colorde_(Gtk::manage(new Adjuster(M("TP_LOCALLAB_COLORDE"), -11, 11, 2, -5, Gtk::manage(new RTImage("circle-blue-small.png")),Gtk::manage(new RTImage("circle-yellow-small.png"))))),
     transitweak_(Gtk::manage(new Adjuster(M("TP_LOCALLAB_TRANSITWEAK"), 0.5, 15.0, 0.1, 1.0))),
     transitgrad_(Gtk::manage(new Adjuster(M("TP_LOCALLAB_TRANSITGRAD"), -1.0, 1.0, 0.01, 0.0))),
     scopemask_(Gtk::manage(new Adjuster(M("TP_LOCALLAB_SCOPEMASK"), 0, 100, 1, 60))),
@@ -379,11 +380,13 @@ ControlSpotPanel::ControlSpotPanel():
 //    if (complexsoft < 2) {
         artifBox->pack_start(*balan_);
         artifBox->pack_start(*balanh_);
+        artifBox->pack_start(*colorde_);
 //    }
 
     iter_->setAdjusterListener(this);
     balan_->setAdjusterListener(this);
     balanh_->setAdjusterListener(this);
+    colorde_->setAdjusterListener(this);
     artifFrame->add(*artifBox);
     pack_start(*artifFrame);
     
@@ -771,6 +774,7 @@ void ControlSpotPanel::load_ControlSpot_param()
     iter_->setValue((double)row[spots_.iter]);
     balan_->setValue((double)row[spots_.balan]);
     balanh_->setValue((double)row[spots_.balanh]);
+    colorde_->setValue((double)row[spots_.colorde]);
     transitweak_->setValue((double)row[spots_.transitweak]);
     transitgrad_->setValue((double)row[spots_.transitgrad]);
     scopemask_->setValue((double)row[spots_.scopemask]);
@@ -1263,6 +1267,14 @@ void ControlSpotPanel::adjusterChanged(Adjuster* a, double newval)
         }
     }
 
+    if (a == colorde_) {
+        row[spots_.colorde] = colorde_->getValue();
+
+        if (listener) {
+            listener->panelChanged(EvLocallabSpotcolorde, colorde_->getTextValue());
+        }
+    }
+
     if (a == transitweak_) {
         row[spots_.transitweak] = transitweak_->getValue();
 
@@ -1540,6 +1552,7 @@ void ControlSpotPanel::disableParamlistener(bool cond)
     iter_->block(cond);
     balan_->block(cond);
     balanh_->block(cond);
+    colorde_->block(cond);
     transitweak_->block(cond);
     transitgrad_->block(cond);
     scopemask_->block(cond);
@@ -1578,6 +1591,7 @@ void ControlSpotPanel::setParamEditable(bool cond)
     iter_->set_sensitive(cond);
     balan_->set_sensitive(cond);
     balanh_->set_sensitive(cond);
+    colorde_->set_sensitive(cond);
     transitweak_->set_sensitive(cond);
     transitgrad_->set_sensitive(cond);
     scopemask_->set_sensitive(cond);
@@ -2224,6 +2238,7 @@ ControlSpotPanel::SpotRow* ControlSpotPanel::getSpot(const int id)
             r->iter = row[spots_.iter];
             r->balan = row[spots_.balan];
             r->balanh = row[spots_.balanh];
+            r->colorde = row[spots_.colorde];
             r->transitweak = row[spots_.transitweak];
             r->transitgrad = row[spots_.transitgrad];
             r->scopemask = row[spots_.scopemask];
@@ -2361,6 +2376,7 @@ void ControlSpotPanel::addControlSpot(SpotRow* newSpot)
     row[spots_.iter] = newSpot->iter;
     row[spots_.balan] = newSpot->balan;
     row[spots_.balanh] = newSpot->balanh;
+    row[spots_.colorde] = newSpot->colorde;
     row[spots_.transitweak] = newSpot->transitweak;
     row[spots_.transitgrad] = newSpot->transitgrad;
     row[spots_.scopemask] = newSpot->scopemask;
@@ -2417,6 +2433,7 @@ int ControlSpotPanel::updateControlSpot(SpotRow* spot)
             row[spots_.iter] = spot->iter;
             row[spots_.balan] = spot->balan;
             row[spots_.balanh] = spot->balanh;
+            row[spots_.colorde] = spot->colorde;
             row[spots_.transitweak] = spot->transitweak;
             row[spots_.transitgrad] = spot->transitgrad;
             row[spots_.scopemask] = spot->scopemask;
@@ -2519,6 +2536,7 @@ ControlSpotPanel::SpotEdited* ControlSpotPanel::getEditedStates()
     se->iter = iter_->getEditedState();
     se->balan = balan_->getEditedState();
     se->balanh = balanh_->getEditedState();
+    se->colorde = colorde_->getEditedState();
     se->transitweak = transitweak_->getEditedState();
     se->transitgrad = transitgrad_->getEditedState();
     se->scopemask = scopemask_->getEditedState();
@@ -2606,6 +2624,7 @@ void ControlSpotPanel::setEditedStates(SpotEdited* se)
     iter_->setEditedState(se->iter ? Edited : UnEdited);
     balan_->setEditedState(se->balan ? Edited : UnEdited);
     balanh_->setEditedState(se->balanh ? Edited : UnEdited);
+    colorde_->setEditedState(se->colorde ? Edited : UnEdited);
     transitweak_->setEditedState(se->transitweak ? Edited : UnEdited);
     transitgrad_->setEditedState(se->transitgrad ? Edited : UnEdited);
     scopemask_->setEditedState(se->scopemask ? Edited : UnEdited);
@@ -2660,6 +2679,7 @@ void ControlSpotPanel::setDefaults(const rtengine::procparams::ProcParams * defP
     iter_->setDefault(defSpot->iter);
     balan_->setDefault(defSpot->balan);
     balanh_->setDefault(defSpot->balanh);
+    colorde_->setDefault(defSpot->colorde);
     transitweak_->setDefault(defSpot->transitweak);
     transitgrad_->setDefault(defSpot->transitgrad);
     scopemask_->setDefault(defSpot->scopemask);
@@ -2683,6 +2703,7 @@ void ControlSpotPanel::setDefaults(const rtengine::procparams::ProcParams * defP
         iter_->setDefaultEditedState(Irrelevant);
         balan_->setDefaultEditedState(Irrelevant);
         balanh_->setDefaultEditedState(Irrelevant);
+        colorde_->setDefaultEditedState(Irrelevant);
         transitweak_->setDefaultEditedState(Irrelevant);
         transitgrad_->setDefaultEditedState(Irrelevant);
         scopemask_->setDefaultEditedState(Irrelevant);
@@ -2710,6 +2731,7 @@ void ControlSpotPanel::setDefaults(const rtengine::procparams::ProcParams * defP
         iter_->setDefaultEditedState(defSpotState->iter ? Edited : UnEdited);
         balan_->setDefaultEditedState(defSpotState->balan ? Edited : UnEdited);
         balanh_->setDefaultEditedState(defSpotState->balanh ? Edited : UnEdited);
+        colorde_->setDefaultEditedState(defSpotState->colorde ? Edited : UnEdited);
         transitweak_->setDefaultEditedState(defSpotState->transitweak ? Edited : UnEdited);
         transitgrad_->setDefaultEditedState(defSpotState->transitgrad ? Edited : UnEdited);
         scopemask_->setDefaultEditedState(defSpotState->scopemask ? Edited : UnEdited);
@@ -2738,6 +2760,7 @@ void ControlSpotPanel::setBatchMode(bool batchMode)
     iter_->showEditedCB();
     balan_->showEditedCB();
     balanh_->showEditedCB();
+    colorde_->showEditedCB();
     transitweak_->showEditedCB();
     transitgrad_->showEditedCB();
     scopemask_->showEditedCB();
@@ -2784,6 +2807,7 @@ ControlSpotPanel::ControlSpots::ControlSpots()
     add(iter);
     add(balan);
     add(balanh);
+    add(colorde);
     add(transitweak);
     add(transitgrad);
     add(scopemask);