From 2c7adc1f7a8191f734c3ba5ccb5531dc8da0bb24 Mon Sep 17 00:00:00 2001
From: Pandagrapher <pierre.cab@gmail.com>
Date: Wed, 22 Apr 2020 21:27:27 +0200
Subject: [PATCH] Updates in RT-spot panel GUI

- Adjusters "transitweak_" and "thresh_" are now present in all modes
- Modification of maximum value of "transitweak_" adjuster
---
 rtgui/controlspotpanel.cc | 13 +++----------
 rtgui/locallab.cc         | 11 ++---------
 2 files changed, 5 insertions(+), 19 deletions(-)

diff --git a/rtgui/controlspotpanel.cc b/rtgui/controlspotpanel.cc
index 715d30b2b..e7edb9522 100644
--- a/rtgui/controlspotpanel.cc
+++ b/rtgui/controlspotpanel.cc
@@ -65,7 +65,7 @@ ControlSpotPanel::ControlSpotPanel():
     centerY_(Gtk::manage(new Adjuster(M("TP_LOCALLAB_CENTER_Y"), -1000, 1000, 1, 0))),
     circrad_(Gtk::manage(new Adjuster(M("TP_LOCALLAB_CIRCRADIUS"), 2, 150, 1, 18))),
     transit_(Gtk::manage(new Adjuster(M("TP_LOCALLAB_TRANSITVALUE"), 2., 100., 0.1, 60.))),
-    transitweak_(Gtk::manage(new Adjuster(M("TP_LOCALLAB_TRANSITWEAK"), 0.5, 15.0, 0.1, 1.0))),
+    transitweak_(Gtk::manage(new Adjuster(M("TP_LOCALLAB_TRANSITWEAK"), 0.5, 25.0, 0.1, 1.0))),
     transitgrad_(Gtk::manage(new Adjuster(M("TP_LOCALLAB_TRANSITGRAD"), -1.0, 1.0, 0.01, 0.0))),
     feather_(Gtk::manage(new Adjuster(M("TP_LOCALLAB_FEATVALUE"), 10., 100., 0.1, 25.))),
     struc_(Gtk::manage(new Adjuster(M("TP_LOCALLAB_THRES"), 1.0, 12.0, 0.1, 4.0))),
@@ -311,15 +311,8 @@ ControlSpotPanel::ControlSpotPanel():
     feather_->setAdjusterListener(this);
     scopemask_->setAdjusterListener(this);
     transitBox->pack_start(*transit_);
-
-    if (complexsoft < 2) {
-        transitBox->pack_start(*transitweak_);
-    }
-
-    if (complexsoft < 2) {
-        transitBox->pack_start(*transitgrad_);
-    }
-
+    transitBox->pack_start(*transitweak_);
+    transitBox->pack_start(*transitgrad_);
     transitBox->pack_start(*feather_);
     transitFrame->add(*transitBox);
     pack_start(*transitFrame);
diff --git a/rtgui/locallab.cc b/rtgui/locallab.cc
index 487938b01..76c787d66 100644
--- a/rtgui/locallab.cc
+++ b/rtgui/locallab.cc
@@ -293,15 +293,8 @@ void Locallab::read(const rtengine::procparams::ProcParams* pp, const ParamsEdit
         }
 
         r->transit = pp->locallab.spots.at(i).transit;
-
-        if (complexsoft < 2) {
-            r->transitweak = pp->locallab.spots.at(i).transitweak;
-            r->transitgrad = pp->locallab.spots.at(i).transitgrad;
-        } else {
-            r->transitweak = 1.;
-            r->transitgrad = 0.;
-        }
-
+        r->transitweak = pp->locallab.spots.at(i).transitweak;
+        r->transitgrad = pp->locallab.spots.at(i).transitgrad;
         r->feather = pp->locallab.spots.at(i).feather;
         r->struc = pp->locallab.spots.at(i).struc;
         r->thresh = pp->locallab.spots.at(i).thresh;