Change modeQJ method for 5.11 in function ppversion

Beep6581 · Jan 14, 2025 · bc23858 · bc23858
1 parent 0d011a5
commit bc23858
Show file tree

Hide file tree

Showing 2 changed files with 34 additions and 4 deletions.
diff --git a/rtdata/languages/default b/rtdata/languages/default
@@ -3571,7 +3571,7 @@ TP_LOCALLAB_PROXI;ΔE decay
 TP_LOCALLAB_QJMODE;Tone mapping operators Q(Cam16) & J(Jz) 
 TP_LOCALLAB_QJMODE_511;5.11 deprecated
 TP_LOCALLAB_QJMODE_512;5.12
-TP_LOCALLAB_QJMODE_TOOLTIP;(provisional). Allows you to choose, for tone-mapping operators using Brightness data: Q for Cam16 - and J for Jz, between the current (recommended) version 5.12 and previous versions 5.11. This choice is more guided to maintain historical traceability (Feedback), than to ensure software compatibility.\n\nThe preferred mode in all cases is 5.12 whether it is a new user or an old one who has used 5.11.\nIf you want to try 5.11 out of curiosity, or to see the difference, it will be a voluntary act on your part - choosing 5.11 and activating the corresponding checkbox.
+TP_LOCALLAB_QJMODE_TOOLTIP;(provisional). Allows you to choose, for tone-mapping operators using Brightness data: Q for Cam16 - and J for Jz, between the current (recommended) version 5.12 and previous versions 5.11.
 TP_LOCALLAB_QUAAGRES;Aggressive
 TP_LOCALLAB_QUACONSER;Conservative
 TP_LOCALLAB_QUALCURV_METHOD;Curve type

diff --git a/rtengine/procparams.cc b/rtengine/procparams.cc
@@ -10363,15 +10363,45 @@ int ProcParams::load(const Glib::ustring& fname, ParamsEdited* pedited)
                 assignFromKeyfile(keyFile, "Locallab", "Sigjz12_" + index_str, spot.sigjz12, spotEdited.sigjz12);
                 assignFromKeyfile(keyFile, "Locallab", "Sigjz_" + index_str, spot.sigjz, spotEdited.sigjz);
                 assignFromKeyfile(keyFile, "Locallab", "Forcebw_" + index_str, spot.forcebw, spotEdited.forcebw);
+                assignFromKeyfile(keyFile, "Locallab", "ModeQJ_" + index_str, spot.modeQJ, spotEdited.modeQJ);
+                assignFromKeyfile(keyFile, "Locallab", "Modecie_" + index_str, spot.modecie, spotEdited.modecie);
+                assignFromKeyfile(keyFile, "Locallab", "Modecam_" + index_str, spot.modecam, spotEdited.modecam);
+
                 assignFromKeyfile(keyFile, "Locallab", "Sigq12_" + index_str, spot.sigq12, spotEdited.sigq12);
                 assignFromKeyfile(keyFile, "Locallab", "Sigq_" + index_str, spot.sigq, spotEdited.sigq);
+
+                if (ppVersion < 352) {//change behavior Log encoding Q and Sigmoid Q and SigmoidJz when 'in the loop' Cam16
+                    if (keyFile.has_key("Locallab", "Sigq_" + index_str)) {
+                        if (spot.sigq == true) {
+                            spot.modeQJ = "511";
+                            spot.sigq12 = false;
+                            spotEdited.modeQJ = true;
+                            spotEdited.sigq12 = true;                             
+                        }
+                    }
+                    if (keyFile.has_key("Locallab", "logcieq_" + index_str)) {
+                        if (spot.logcieq == true) {
+                            spot.modeQJ = "511";
+                            spotEdited.modeQJ = true;
+                            spotEdited.logcieq = true;                             
+                        }
+                    }
+
+                    if (keyFile.has_key("Locallab", "Sigjz_" + index_str)) {
+                        if (spot.sigjz == true) {
+                            spot.modeQJ = "511";
+                            spot.sigjz12 = false;
+                            spotEdited.modeQJ = true;
+                            spotEdited.sigjz12 = true;                             
+                        }
+                    }
+
+                } 
+
                 assignFromKeyfile(keyFile, "Locallab", "chjzcie_" + index_str, spot.chjzcie, spotEdited.chjzcie);
                 assignFromKeyfile(keyFile, "Locallab", "SourceGraycie_" + index_str, spot.sourceGraycie, spotEdited.sourceGraycie);
                 assignFromKeyfile(keyFile, "Locallab", "Sourceabscie_" + index_str, spot.sourceabscie, spotEdited.sourceabscie);
                 assignFromKeyfile(keyFile, "Locallab", "Sursourcie_" + index_str, spot.sursourcie, spotEdited.sursourcie);
-                assignFromKeyfile(keyFile, "Locallab", "Modecie_" + index_str, spot.modecie, spotEdited.modecie);
-                assignFromKeyfile(keyFile, "Locallab", "Modecam_" + index_str, spot.modecam, spotEdited.modecam);
-                assignFromKeyfile(keyFile, "Locallab", "ModeQJ_" + index_str, spot.modeQJ, spotEdited.modeQJ);
                 assignFromKeyfile(keyFile, "Locallab", "bwevMethod12_" + index_str,  spot.bwevMethod12, spotEdited.bwevMethod12);
                 assignFromKeyfile(keyFile, "Locallab", "bwevMethod_" + index_str,  spot.bwevMethod, spotEdited.bwevMethod);
                 assignFromKeyfile(keyFile, "Locallab", "Saturlcie_" + index_str, spot.saturlcie, spotEdited.saturlcie);