diff --git a/rtengine/procparams.cc b/rtengine/procparams.cc index eaf90d5c2..e85c91d41 100644 --- a/rtengine/procparams.cc +++ b/rtengine/procparams.cc @@ -3795,8 +3795,8 @@ int ProcParams::load (Glib::ustring fname, ParamsEdited* pedited) } } - if (keyFile.has_key ("Retinex", "Retinexmet")) { - retinex.retinexMethod = keyFile.get_string ("Retinex", "Retinexmet"); + if (keyFile.has_key ("Retinex", "RetinexMethod")) { + retinex.retinexMethod = keyFile.get_string ("Retinex", "RetinexMethod"); if (pedited) { pedited->retinex.retinexMethod = true; diff --git a/rtgui/addsetids.h b/rtgui/addsetids.h index 5db492db3..244c22946 100644 --- a/rtgui/addsetids.h +++ b/rtgui/addsetids.h @@ -94,7 +94,7 @@ #define ADDSET_WA_THRESHOLD2 86 #define ADDSET_WA_CHRO 87 #define ADDSET_WA_CHROMA 88 -#define ADDSET_WA_CONTRAST 89 +#define ADDSET_WA_CONTRAST 89 #define ADDSET_WA_RESCON 90 #define ADDSET_WA_RESCONH 91 #define ADDSET_WA_RESCHRO 92 @@ -107,17 +107,16 @@ #define ADDSET_WA_EDGEDETECTTHR2 99 #define ADDSET_WA_TMRS 100 #define ADDSET_WA_GAMMA 101 -#define ADDSET_RETI_STR 102 -#define ADDSET_RETI_SCAL 103 -#define ADDSET_RETI_NEIGH 104 -#define ADDSET_RETI_LIMD 105 -#define ADDSET_RETI_GAIN 106 -#define ADDSET_RETI_OFFS 107 -#define ADDSET_RETI_VART 108 -#define ADDSET_RETI_GAM 109 -#define ADDSET_RETI_SLO 110 +#define ADDSET_RETI_STR 102 +#define ADDSET_RETI_NEIGH 103 +#define ADDSET_RETI_LIMD 104 +#define ADDSET_RETI_GAIN 105 +#define ADDSET_RETI_OFFS 106 +#define ADDSET_RETI_VART 107 +#define ADDSET_RETI_GAM 108 +#define ADDSET_RETI_SLO 109 // When adding items, make sure to update ADDSET_PARAM_NUM -#define ADDSET_PARAM_NUM 111 // THIS IS USED AS A DELIMITER!! +#define ADDSET_PARAM_NUM 110 // THIS IS USED AS A DELIMITER!! #endif diff --git a/rtgui/batchtoolpanelcoord.cc b/rtgui/batchtoolpanelcoord.cc index e1d78a19f..9a4e15b89 100644 --- a/rtgui/batchtoolpanelcoord.cc +++ b/rtgui/batchtoolpanelcoord.cc @@ -167,7 +167,7 @@ void BatchToolPanelCoordinator::initSession () blackwhite->setAdjusterBehavior (false, false); colortoning->setAdjusterBehavior (false, false, false, false, false); filmSimulation->setAdjusterBehavior(false); - retinex->setAdjusterBehavior (false, false, false, false, false, false, false, false, false); + retinex->setAdjusterBehavior (false, false, false, false, false, false, false, false); shadowshighlights->setAdjusterBehavior (false, false, false); dirpyrequalizer->setAdjusterBehavior (false, false, false); @@ -204,7 +204,7 @@ void BatchToolPanelCoordinator::initSession () // colortoning->setAdjusterBehavior (options.baBehav[ADDSET_COLORTONING_SPLIT], options.baBehav[ADDSET_COLORTONING_SATTHRESHOLD], options.baBehav[ADDSET_COLORTONING_SATOPACITY], options.baBehav[ADDSET_COLORTONING_STRPROTECT], options.baBehav[ADDSET_COLORTONING_BALANCE]); colortoning->setAdjusterBehavior (options.baBehav[ADDSET_COLORTONING_SPLIT], options.baBehav[ADDSET_COLORTONING_SATTHRESHOLD], options.baBehav[ADDSET_COLORTONING_SATOPACITY], options.baBehav[ADDSET_COLORTONING_STRENGTH], options.baBehav[ADDSET_COLORTONING_BALANCE]); filmSimulation->setAdjusterBehavior(options.baBehav[ADDSET_FILMSIMULATION_STRENGTH]); - retinex->setAdjusterBehavior (options.baBehav[ADDSET_RETI_STR], options.baBehav[ADDSET_RETI_SCAL], options.baBehav[ADDSET_RETI_NEIGH], options.baBehav[ADDSET_RETI_LIMD], options.baBehav[ADDSET_RETI_GAIN], options.baBehav[ADDSET_RETI_OFFS], options.baBehav[ADDSET_RETI_VART], options.baBehav[ADDSET_RETI_GAM], options.baBehav[ADDSET_RETI_SLO]); + retinex->setAdjusterBehavior (options.baBehav[ADDSET_RETI_STR], options.baBehav[ADDSET_RETI_NEIGH], options.baBehav[ADDSET_RETI_LIMD], options.baBehav[ADDSET_RETI_GAIN], options.baBehav[ADDSET_RETI_OFFS], options.baBehav[ADDSET_RETI_VART], options.baBehav[ADDSET_RETI_GAM], options.baBehav[ADDSET_RETI_SLO]); chmixer->setAdjusterBehavior (options.baBehav[ADDSET_CHMIXER] ); blackwhite->setAdjusterBehavior (options.baBehav[ADDSET_BLACKWHITE_HUES], options.baBehav[ADDSET_BLACKWHITE_GAMMA]); @@ -582,10 +582,6 @@ void BatchToolPanelCoordinator::initSession () pparams.retinex.str = 0; } - if (options.baBehav[ADDSET_RETI_SCAL]) { - pparams.retinex.scal = 0; - } - if (options.baBehav[ADDSET_RETI_NEIGH]) { pparams.retinex.neigh = 0; } diff --git a/rtgui/options.cc b/rtgui/options.cc index 7b6858e13..6d0b6a0d0 100644 --- a/rtgui/options.cc +++ b/rtgui/options.cc @@ -599,7 +599,6 @@ void Options::setDefaults () 0, //ADDSET_WA_TMRS 0, //ADDSET_WA_GAMMA 0, //ADDSET_RETI_STR - 0, //ADDSET_RETI_SCAL 0, //ADDSET_RETI_NEIGH 0, //ADDSET_RETI_LIMD 0, //ADDSET_RETI_GAIN diff --git a/rtgui/paramsedited.cc b/rtgui/paramsedited.cc index 08433357c..ac2fe6523 100644 --- a/rtgui/paramsedited.cc +++ b/rtgui/paramsedited.cc @@ -1082,9 +1082,9 @@ void ParamsEdited::combine (rtengine::procparams::ProcParams& toEdit, const rten toEdit.retinex.str = dontforceSet && options.baBehav[ADDSET_RETI_STR] ? toEdit.retinex.str + mods.retinex.str : mods.retinex.str; } - if (retinex.scal) { - toEdit.retinex.scal = dontforceSet && options.baBehav[ADDSET_RETI_SCAL] ? toEdit.retinex.scal + mods.retinex.scal : mods.retinex.scal; - } +// if (retinex.scal) { +// toEdit.retinex.scal = dontforceSet && options.baBehav[ADDSET_RETI_SCAL] ? toEdit.retinex.scal + mods.retinex.scal : mods.retinex.scal; +// } if (retinex.medianmap) { toEdit.retinex.medianmap = mods.retinex.medianmap; @@ -2702,4 +2702,4 @@ bool LensProfParamsEdited::isUnchanged() const bool RetinexParamsEdited::isUnchanged() const { return enabled && retinexcolorspace && gammaretinex && gam && slope; -} \ No newline at end of file +} diff --git a/rtgui/preferences.cc b/rtgui/preferences.cc index 22c53aa00..f6feef35f 100644 --- a/rtgui/preferences.cc +++ b/rtgui/preferences.cc @@ -174,13 +174,12 @@ Gtk::Widget* Preferences::getBatchProcPanel () mi->set_value (behavColumns.label, M("TP_RETINEX_LABEL")); appendBehavList (mi, M("TP_RETINEX_STRENGTH"), ADDSET_RETI_STR, false); appendBehavList (mi, M("TP_RETINEX_NEIGHBOR"), ADDSET_RETI_NEIGH, false); + appendBehavList (mi, M("TP_RETINEX_VARIANCE"), ADDSET_RETI_VART, false); appendBehavList (mi, M("TP_RETINEX_GAMMA"), ADDSET_RETI_GAM, false); appendBehavList (mi, M("TP_RETINEX_SLOPE"), ADDSET_RETI_SLO, false); - appendBehavList (mi, M("TP_RETINEX_SCALES"), ADDSET_RETI_SCAL, false); appendBehavList (mi, M("TP_RETINEX_GAIN"), ADDSET_RETI_GAIN, false); appendBehavList (mi, M("TP_RETINEX_OFFSET"), ADDSET_RETI_OFFS, false); appendBehavList (mi, M("TP_RETINEX_THRESHOLD"), ADDSET_RETI_LIMD, false); - appendBehavList (mi, M("TP_RETINEX_VARIANCE"), ADDSET_RETI_VART, false); mi = behModel->append (); mi->set_value (behavColumns.label, M("TP_SHADOWSHLIGHTS_LABEL")); diff --git a/rtgui/retinex.cc b/rtgui/retinex.cc index 809eefd4f..2f13f88a5 100644 --- a/rtgui/retinex.cc +++ b/rtgui/retinex.cc @@ -808,11 +808,10 @@ void Retinex::setDefaults (const ProcParams* defParams, const ParamsEdited* pedi } } -void Retinex::setAdjusterBehavior (bool strAdd, bool neighAdd, bool scalAdd, bool limdAdd, bool gainAdd, bool offsAdd, bool vartAdd, bool gamAdd, bool slopeAdd) +void Retinex::setAdjusterBehavior (bool strAdd, bool neighAdd, bool limdAdd, bool gainAdd, bool offsAdd, bool vartAdd, bool gamAdd, bool slopeAdd) { str->setAddMode(strAdd); neigh->setAddMode(neighAdd); - scal->setAddMode(scalAdd); limd->setAddMode(limdAdd); gain->setAddMode(gainAdd); offs->setAddMode(offsAdd); diff --git a/rtgui/retinex.h b/rtgui/retinex.h index a9b462808..59001ce18 100644 --- a/rtgui/retinex.h +++ b/rtgui/retinex.h @@ -97,7 +97,7 @@ public: void ColorSpaceUpdateUI(); void writeOptions (std::vector &tpOpen); void updateToolState (std::vector &tpOpen); - void setAdjusterBehavior (bool strAdd, bool neighAdd, bool scalAdd, bool limdAdd, bool gainAdd, bool offsAdd, bool vartAdd, bool gamAdd, bool slopeAdd); + void setAdjusterBehavior (bool strAdd, bool neighAdd, bool limdAdd, bool gainAdd, bool offsAdd, bool vartAdd, bool gamAdd, bool slopeAdd); void updateCurveBackgroundHistogram (LUTu & histToneCurve, LUTu & histLCurve, LUTu & histCCurve,/* LUTu & histCLurve, LUTu & histLLCurve,*/ LUTu & histLCAM, LUTu & histCCAM, LUTu & histRed, LUTu & histGreen, LUTu & histBlue, LUTu & histLuma, LUTu & histLRETI); virtual void colorForValue (double valX, double valY, enum ColorCaller::ElemType elemType, int callerId, ColorCaller* caller);