Abstract Profile - Contrast enhancement -- Selective Editing Cam16 and JzCzHz - improvments

rtdata/languages/default

@@ -3072,7 +3072,7 @@ TP_LOCALLAB_CHROMASK_TOOLTIP;Changes the chroma of the mask if one exists (i.e.
 TP_LOCALLAB_CHROML;Chroma (C)
 TP_LOCALLAB_CHRRT;Chroma
 TP_LOCALLAB_CIE;Color Appearance (Cam16 & JzCzHz)
-TP_LOCALLAB_CIE_SMOOTHFRAME;Tone mapping operators *
+TP_LOCALLAB_CIE_SMOOTHFRAME;Tone mapping operators
 TP_LOCALLAB_CIE_SMOOTH_LEVELS;RGB channel Slope
 TP_LOCALLAB_CIE_SMOOTH_LEVELSTRC;RGB channel TRC
 TP_LOCALLAB_CIE_SMOOTH_SIG;Sigmoid based
@@ -3313,7 +3313,7 @@ TP_LOCALLAB_JZFORCE_TOOLTIP;Allows you to force the maximum Jz value to 1 for be
 TP_LOCALLAB_JZFRA;Jz Cz Hz Image Adjustments
 TP_LOCALLAB_JZHFRA;Curves Hz
 TP_LOCALLAB_JZHJZFRA;Curve Jz(Hz)
-TP_LOCALLAB_JZHUECIE;Hue Rotation
+TP_LOCALLAB_JZHUECIE;Hue rotation
 TP_LOCALLAB_JZLIGHT;Brightness
 TP_LOCALLAB_JZLOG;Log Encoding Jz
 TP_LOCALLAB_JZLOGWBS_TOOLTIP;Black Ev and White Ev adjustments can be different depending on whether Log Encoding or Sigmoid is used.\nFor Sigmoid, a change (increase in most cases) of White Ev may be necessary to obtain a better rendering of highlights, contrast and saturation.
@@ -3332,7 +3332,7 @@ TP_LOCALLAB_JZSHFRA;Shadows/Highlights Jz
 TP_LOCALLAB_JZSOFTCIE;Soft radius (GuidedFilter)
 TP_LOCALLAB_JZSTRSOFTCIE;Strength GuidedFilter
 TP_LOCALLAB_JZTARGET_EV;Viewing Mean luminance (Yb%)
-TP_LOCALLAB_JZTHRHCIE;Threshold Chroma for Jz(Hz)
+TP_LOCALLAB_JZTHRHCIE;Threshold chroma for Jz(Hz)
 TP_LOCALLAB_JZWAVEXP;Wavelet Jz
 TP_LOCALLAB_LABBLURM;Blur Mask
 TP_LOCALLAB_LABEL;Selective Editing
@@ -3381,7 +3381,7 @@ TP_LOCALLAB_LOGAUTO_TOOLTIP;Pressing this button will calculate the dynamic rang
 TP_LOCALLAB_LOGBASE_TOOLTIP;Default = 2.\nValues less than 2 reduce the action of the algorithm making the shadows darker and the highlights brighter.\nWith values greater than 2, the shadows are grayer and the highlights become more washed out.
 TP_LOCALLAB_LOGCATAD_TOOLTIP;Chromatic adaptation allows us to interpret a color according to its spatio-temporal environment.\nUseful when the white balance deviates significantly from the D50 reference.\nAdapts colors to the illuminant of the output device.
 TP_LOCALLAB_LOGCIE;Log Encoding
-TP_LOCALLAB_LOGCIEQ;Log Encoding Q - with Ciecam - Deprecated
+TP_LOCALLAB_LOGCIEQ;Log Encoding Q with CIECAM (deprecated)
 TP_LOCALLAB_LOGCIEQ_TOOLTIP;Activating the checkbox allows you to switch between Log Encoding based on the 3 RGB channels, and Log Encoding based solely on Ciecam’s brightness (Q) channel.\nUsing the Q channel instead of the RGB channels helps avoid undesirable edge effects such as hue and saturation shifts.\nHowever, the settings are more difficult to optimise because Q is unbounded and Ciecam alters the data to take into account the surround conditions, simultaneous contrast, etc.\nYou may have to adjust the following:\n   Scene conditions: Mean luminance (Yb), Whites & Blacks distribution, Black Ev, White Ev.\n   Source Data Adjustments : Brightness compression, Strength.\n\nNote: when using Log Encoding (Q), be careful not to activate the Disable Ciecam option in the Scene Conditions, Surround menu.
 TP_LOCALLAB_LOGCIE_TOOLTIP;Allows you to use Black Ev, White Ev, White and Black distribution, Scene Mean luminance(Yb%) and Viewing Mean luminance(Yb%) for tone-mapping using 'Log Encoding' with Brightness compression.
 TP_LOCALLAB_LOGCOLORFL;Colorfulness (M)
@@ -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.
+TP_LOCALLAB_QJMODE_TOOLTIP;The tone-mapping operators that use brightness data (Q for CAM 16 and J for Jz) have been modified in RawTherapee version 5.12. This allows you to select either the current or the deprecated version.
 TP_LOCALLAB_QUAAGRES;Aggressive
 TP_LOCALLAB_QUACONSER;Conservative
 TP_LOCALLAB_QUALCURV_METHOD;Curve type
@@ -3688,11 +3688,11 @@ TP_LOCALLAB_SHTRC_TOOLTIP;Based on 'working profile' (only those provided), modi
 TP_LOCALLAB_SH_TOOLNAME;Shadows/Highlights & Tone Equalizer
 TP_LOCALLAB_SIGBLACKSSCIE;Blacks distribution
 TP_LOCALLAB_SIGCIE;Sigmoid
-TP_LOCALLAB_SIGFRA;Sigmoid Q & Slope based *
-TP_LOCALLAB_SIGFRA11;Sigmoid Q - deprecated
+TP_LOCALLAB_SIGFRA;Sigmoid Q & Slope based
+TP_LOCALLAB_SIGFRA11;Sigmoid Q (deprecated)
 TP_LOCALLAB_SIGGAMJCIE;Gamma
-TP_LOCALLAB_SIGJZFRA;Sigmoid Jz *
-TP_LOCALLAB_SIGJZFRA11;Sigmoid Jz
+TP_LOCALLAB_SIGJZFRA;Sigmoid Jz
+TP_LOCALLAB_SIGJZFRA11;Sigmoid Jz (deprecated)
 TP_LOCALLAB_SIGMAWAV;Attenuation response
 TP_LOCALLAB_SIGMOID16_TOOLTIP;Allows you to simulate a tone mapping appearance using both 'Ciecam' and 'Sigmoid Q' or 'Slope based Q'. Sigmoid Q has three sliders:\na) Contrast acts on the shape of the sigmoid curve and consequently on the strength\nb) Skew (gray point) distributes the action according to the luminance.\nc) Display White point (cd/m2) - mode advanced. \n\nSlope based has only one slider: Gray balance (slope).\n\nThis new version of Sigmoid is incompatible with previous versions 5.11 and earlier. Log encoding inside Ciecam is removed.
 TP_LOCALLAB_SIGMOIDBL;Display White point (cd/m2)
@@ -3704,7 +3704,7 @@ TP_LOCALLAB_SIGMOIDNORMCIE;Scale Yb Scene
 TP_LOCALLAB_SIGMOIDNORMCIE11;Normalize Luminance
 TP_LOCALLAB_SIGMOIDNORMCIEBLEND_TOOLTIP;Blend acts on the final aspect of the image, contrast and luminance. Ratio between original and output image.
 TP_LOCALLAB_SIGMOIDNORMCIE_TOOLTIP;Reconstruct luminance so that the mean and variance of the output image take into account those of the original.\nAll the adjustments acting on J or Q are taken into account, including those which are not relative to Sigmoid Q.
-TP_LOCALLAB_SIGMOIDNORMCIEDISP_TOOLTIP;(provisional). Adapts the white point to the output device to make it compatible with its peak luminance. This feature is not at the desired location in the pipeline, because it is too far from the final output process. So use with caution.
+TP_LOCALLAB_SIGMOIDNORMCIEDISP_TOOLTIP;Allows you to adapt the white point to the peak luminance of the display device. Its position in the processing pipeline is not optimal so use with caution.
 TP_LOCALLAB_SIGMOIDQJ;Tone mapping Q
 TP_LOCALLAB_SIGMOIDQJ11;Black Ev & White Ev
 TP_LOCALLAB_SIGMOIDQJCOMPRCIE_TOOLTIP;When the combo box selection 'Uses Black Ev and White Ev' is 'Sigmoid and Log Encoding Q' or 'Log Encoding instead of Sigmoid' checked. This algorithm compress the data above the threshold slider value. The last value stands for brightness (Q) and should be close as possible to the value 'Compression threshold' (calculate when 'Auto threshold" checked, often > 1).

rtgui/icmpanel.cc

@@ -273,7 +273,7 @@ ICMPanel::ICMPanel() : FoldableToolPanel(this, TOOL_NAME, M("TP_ICM_LABEL")), iu
     offstrc = Gtk::manage(new Adjuster(M("TP_WAVELET_OFFSFIN"), 0.33, 1.66, 0.01, 1.));
     pyrwavtrc = Gtk::manage(new Adjuster(M("TP_WAVELET_PYRWAVTRC"), 1, 5, 1, 2));
     residtrc = Gtk::manage(new Adjuster(M("TP_WAVELET_RESIDTRC"), -100., 100., 1., 0.));
-    opacityCurveEditorWLI = new CurveEditorGroup(options.lastIcmCurvesDir, M("TP_ICM_OPACITYWLI"));
+    opacityCurveEditorWLI = std::unique_ptr<CurveEditorGroup>(new CurveEditorGroup(options.lastIcmCurvesDir, M("TP_ICM_OPACITYWLI")));
     opacityCurveEditorWLI->setCurveListener(this);
     const ColorManagementParams default_params;
 
@@ -771,7 +771,6 @@ void ICMPanel::updateRenderingIntent(const Glib::ustring &profile)
 ICMPanel::~ICMPanel()
 {
     idle_register.destroy();
-    delete opacityCurveEditorWLI;
 
 }
 

rtgui/icmpanel.h

@@ -73,7 +73,7 @@ class ICMPanel final :
     Adjuster* pyrwavtrc;
     Adjuster* residtrc;
 
-    CurveEditorGroup* opacityCurveEditorWLI;
+    std::unique_ptr<CurveEditorGroup> opacityCurveEditorWLI;
     FlatCurveEditor* opacityShapeWLI;
 
     Adjuster* redx;

rtgui/locallabtools2.cc

@@ -9503,6 +9503,7 @@ void Locallabcie::updateAdviceTooltips(const bool showTooltips)
         blackscie->set_tooltip_text(M("TP_LOCALLAB_SIGMOIDWHITESCIE_TOOLTIP"));
         normcie12->set_tooltip_text(M("TP_LOCALLAB_SIGMOIDNORMCIE_TOOLTIP"));
         sigmoidblcie12->set_tooltip_text(M("TP_LOCALLAB_SIGMOIDNORMCIEDISP_TOOLTIP"));
+        sigmoidbljzcie12->set_tooltip_text(M("TP_LOCALLAB_SIGMOIDNORMCIEDISP_TOOLTIP"));
         sigmoidblcie->set_tooltip_text(M("TP_LOCALLAB_SIGMOIDNORMCIEBLEND_TOOLTIP"));
         catBox->set_tooltip_text(M("TP_ICM_WORKING_CAT_TOOLTIP"));
         wprimBox->set_tooltip_text(M("TP_ICM_WORKING_PRIM_TOOLTIP"));
@@ -9586,6 +9587,7 @@ void Locallabcie::updateAdviceTooltips(const bool showTooltips)
         blackscie->set_tooltip_text("");
         normcie12->set_tooltip_text("");
         sigmoidblcie12->set_tooltip_text("");
+        sigmoidbljzcie12->set_tooltip_text("");
         catBox->set_tooltip_text("");
         expprecam->set_tooltip_text("");
         wprimBox->set_tooltip_text("");