From 466099b68bfe4c86e981d4f029ae9802e1563fcd Mon Sep 17 00:00:00 2001
From: Desmis <jdesmis@gmail.com>
Date: Sat, 27 Jun 2020 17:11:49 +0200
Subject: [PATCH] change blendmask blendmaskab from int to double

---
 rtengine/procparams.cc  |  4 ++--
 rtengine/procparams.h   |  4 ++--
 rtgui/locallabtools2.cc | 12 ++++++------
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/rtengine/procparams.cc b/rtengine/procparams.cc
index 689f4dacf..6b67726a0 100644
--- a/rtengine/procparams.cc
+++ b/rtengine/procparams.cc
@@ -3738,8 +3738,8 @@ LocallabParams::LocallabSpot::LocallabSpot() :
     complexmask(0),
     expmask(false),
     sensimask(60),
-    blendmask(-10),
-    blendmaskab(-10),
+    blendmask(-10.),
+    blendmaskab(-10.),
     softradiusmask(1.0),
     enamask(false),
     fftmask(true),
diff --git a/rtengine/procparams.h b/rtengine/procparams.h
index 1d08049cd..a82e87dd1 100644
--- a/rtengine/procparams.h
+++ b/rtengine/procparams.h
@@ -1426,8 +1426,8 @@ struct LocallabParams {
         int complexmask;
         bool expmask;
         int sensimask;
-        int blendmask;
-        int blendmaskab;
+        double blendmask;
+        double blendmaskab;
         double softradiusmask;
         bool enamask;
         bool fftmask;
diff --git a/rtgui/locallabtools2.cc b/rtgui/locallabtools2.cc
index fee80a664..f2f17917e 100644
--- a/rtgui/locallabtools2.cc
+++ b/rtgui/locallabtools2.cc
@@ -4731,8 +4731,8 @@ LocallabMask::LocallabMask():
 
     // Comon mask specific widgets
     sensimask(Gtk::manage(new Adjuster(M("TP_LOCALLAB_SENSI"), 0, 100, 1, 60))),
-    blendmask(Gtk::manage(new Adjuster(M("TP_LOCALLAB_BLENDMASKMASK"), -100, 100, 1, -10))),
-    blendmaskab(Gtk::manage(new Adjuster(M("TP_LOCALLAB_BLENDMASKMASKAB"), -100, 100, 1, -10))),
+    blendmask(Gtk::manage(new Adjuster(M("TP_LOCALLAB_BLENDMASKMASK"), -100., 100., 0.1, -10.))),
+    blendmaskab(Gtk::manage(new Adjuster(M("TP_LOCALLAB_BLENDMASKMASKAB"), -100., 100., 0.1, -10.))),
     softradiusmask(Gtk::manage(new Adjuster(M("TP_LOCALLAB_SOFTRADIUSCOL"), 0.0, 100.0, 0.5, 1.))),
 
     showmask_Method(Gtk::manage(new MyComboBoxText())),
@@ -5059,8 +5059,8 @@ void LocallabMask::write(rtengine::procparams::ProcParams* pp, ParamsEdited* ped
         spot.complexmask = complexity->get_active_row_number();
 
         spot.sensimask = sensimask->getIntValue();
-        spot.blendmask = blendmask->getIntValue();
-        spot.blendmaskab = blendmaskab->getIntValue();
+        spot.blendmask = blendmask->getValue();
+        spot.blendmaskab = blendmaskab->getValue();
         spot.softradiusmask = softradiusmask->getValue();
         spot.enamask = enamask->get_active();
         spot.CCmask_curve = CCmask_shape->getCurve();
@@ -5117,8 +5117,8 @@ void LocallabMask::setDefaults(const rtengine::procparams::ProcParams* defParams
         sensimask->setDefault((double)defSpot.sensimask);
         strumaskmask->setDefault(defSpot.strumaskmask);
         toolmask->set_active(defSpot.toolmask);
-        blendmask->setDefault((double)defSpot.blendmask);
-        blendmaskab->setDefault((double)defSpot.blendmaskab);
+        blendmask->setDefault(defSpot.blendmask);
+        blendmaskab->setDefault(defSpot.blendmaskab);
         softradiusmask->setDefault((double)defSpot.softradiusmask);
         radmask->setDefault(defSpot.radmask);
         lapmask->setDefault(defSpot.lapmask);