diff --git a/rtdata/languages/default b/rtdata/languages/default index c361da52f..e7a2b97f6 100644 --- a/rtdata/languages/default +++ b/rtdata/languages/default @@ -642,7 +642,7 @@ HISTORY_MSG_408;Retinex - Radius HISTORY_MSG_409;Retinex - Contrast HISTORY_MSG_410;Retinex - Brightness HISTORY_MSG_411;Retinex - Strength -HISTORY_MSG_412;Retinex - G. Gradient +HISTORY_MSG_412;Retinex - Gaussian Gradient HISTORY_MSG_413;Retinex - Variance HISTORY_MSG_414;Retinex - Histogram - Lab HISTORY_MSG_415;Retinex - Transmission @@ -658,17 +658,18 @@ HISTORY_MSG_424;Retinex - HL threshold HISTORY_MSG_425;Retinex - Log base HISTORY_MSG_426;Retinex - Hue equalizer HISTORY_MSG_427;Output rendering intent -HISTORY_MSG_428;Retinex - Iterations -HISTORY_MSG_429;Retinex - T. Gradient -HISTORY_MSG_430;Retinex - S. Gradient -HISTORY_MSG_431;Retinex - Mask highlights -HISTORY_MSG_432;Retinex - Mask TW highlights -HISTORY_MSG_433;Retinex - Mask shadows -HISTORY_MSG_434;Retinex - Mask TW shadows -HISTORY_MSG_435;Retinex - Mask radius -HISTORY_MSG_436;Retinex - Mask method -HISTORY_MSG_437;Retinex - Mask curve -HISTORY_MSG_438;Retinex - Preview +HISTORY_MSG_428;Monitor rendering intent +HISTORY_MSG_429;Retinex - Iterations +HISTORY_MSG_430;Retinex - Transmission Gradient +HISTORY_MSG_431;Retinex - Strength Gradient +HISTORY_MSG_432;Retinex - M - Highlights +HISTORY_MSG_433;Retinex - M - Highlights TW +HISTORY_MSG_434;Retinex - M - Shadows +HISTORY_MSG_435;Retinex - M - Shadows TW +HISTORY_MSG_436;Retinex - M - Radius +HISTORY_MSG_437;Retinex - M - Method +HISTORY_MSG_438;Retinex - M - Equalizer +HISTORY_MSG_439;Retinex - Preview HISTORY_NEWSNAPSHOT;Add HISTORY_NEWSNAPSHOT_TOOLTIP;Shortcut: Alt-s HISTORY_SNAPSHOT;Snapshot @@ -1657,13 +1658,13 @@ TP_RETINEX_CONTEDIT_LAB;Histogram equalizer L*a*b* TP_RETINEX_CONTEDIT_LH;Hue equalizer TP_RETINEX_CONTEDIT_MAP;Mask equalizer TP_RETINEX_CURVEEDITOR_MAP;L=f(L) -TP_RETINEX_CURVEEDITOR_MAP_TOOLTIP;This Curve can be applied alone or with gaussian mask or wavelet mask\nBe aware to artifacts +TP_RETINEX_CURVEEDITOR_MAP_TOOLTIP;This curve can be applied alone or with a Gaussian mask or wavelet mask.\nBeware of artifacts! TP_RETINEX_CURVEEDITOR_CD;L=f(L) TP_RETINEX_CURVEEDITOR_CD_TOOLTIP;Luminance according to luminance L=f(L)\nCorrect raw data to reduce halos and artifacts. TP_RETINEX_CURVEEDITOR_LH;Strength=f(H) TP_RETINEX_CURVEEDITOR_LH_TOOLTIP;Strength according to hue Strength=f(H)\nThis curve also acts on chroma when using the "Highlight" retinex method. TP_RETINEX_FREEGAMMA;Free gamma -TP_RETINEX_GAIN;Gain +TP_RETINEX_GAIN;Contrast TP_RETINEX_GAIN_TOOLTIP;Acts on the restored image.\n\nThis is very different from the others settings. Used for black or white pixels, and to help balance the histogram. TP_RETINEX_GAMMA;Gamma TP_RETINEX_GAMMA_FREE;Free @@ -1679,17 +1680,17 @@ TP_RETINEX_HIGHLIGHT_TOOLTIP;Increase action of High algorithm.\nMay require you TP_RETINEX_HSLSPACE_LIN;HSL-Linear TP_RETINEX_HSLSPACE_LOG;HSL-Logarithmic TP_RETINEX_ITER;Iterations (Tone-mapping) -TP_RETINEX_ITER_TOOLTIP;Simulate a tone-mapping operator\nHigh values increase the processing time +TP_RETINEX_ITER_TOOLTIP;Simulate a tone-mapping operator.\nHigh values increase the processing time. TP_RETINEX_GRAD;Transmission gradient -TP_RETINEX_GRAD_TOOLTIP;If slider at 0, all iterations are identical\nIf > 0 Variance and Threshold are reduce when iteration increases and conversely +TP_RETINEX_GRAD_TOOLTIP;If slider at 0, all iterations are identical.\nIf > 0 Variance and Threshold are reduced when iterations increase, and conversely. TP_RETINEX_GRADS;Strength gradient -TP_RETINEX_GRADS_TOOLTIP;If slider at 0, all iterations are identical\nIf > 0 Strength is reduce when iteration increases and conversely +TP_RETINEX_GRADS_TOOLTIP;If slider at 0, all iterations are identical.\nIf > 0 Strength is reduced when iterations increase, and conversely. TP_RETINEX_LABEL;Retinex TP_RETINEX_LABSPACE;L*a*b* TP_RETINEX_LOW;Low TP_RETINEX_MAP;Mask method -TP_RETINEX_MAP_METHOD_TOOLTIP;Use the mask generate by Gaussian function above to reduce halos and artifacts\nCurve only: apply a diagonal contrast curve on mask, be aware to artifacts\nGaussian mask : generate and use a gaussian blur of the original mask (quick)\nSharp mask : generate and use a wavelet on the original mask (slow or very very slow) -TP_RETINEX_MAP_NONE;none +TP_RETINEX_MAP_METHOD_TOOLTIP;Use the mask generated by the Gaussian function above to reduce halos and artifacts.\n\nCurve only: apply a diagonal contrast curve on the mask.\nBeware of artifacts!\n\nGaussian mask: generate and use a Gaussian blur of the original mask.\nQuick.\n\nSharp mask: generate and use a wavelet on the original mask.\nSlow. +TP_RETINEX_MAP_NONE;None TP_RETINEX_MAP_CURV;Curve only TP_RETINEX_MAP_GAUS;Gaussian mask TP_RETINEX_MAP_MAPP;Sharp mask (wavelet partial) @@ -1705,7 +1706,7 @@ TP_RETINEX_NEUTRAL_TIP;Reset all sliders and curves to their default values. TP_RETINEX_OFFSET;Brightness TP_RETINEX_SETTINGS;Settings TP_RETINEX_SCALES;Gaussian gradient -TP_RETINEX_SCALES_TOOLTIP;If slider at 0, all iterations are identical\nIf > 0 Scale and Neighboring pixels are reduce when iteration increases and conversely +TP_RETINEX_SCALES_TOOLTIP;If slider at 0, all iterations are identical.\nIf > 0 Scale and Neighboring pixels are reduced when iterations increase, and conversely. TP_RETINEX_SLOPE;Free gamma slope TP_RETINEX_STRENGTH;Strength TP_RETINEX_THRESHOLD;Threshold @@ -1722,9 +1723,9 @@ TP_RETINEX_VIEW;Process (Preview) TP_RETINEX_VIEW_NONE;Standard TP_RETINEX_VIEW_MASK;Mask TP_RETINEX_VIEW_UNSHARP;Unsharp mask -TP_RETINEX_VIEW_TRAN;Transmission (auto) -TP_RETINEX_VIEW_TRAN2;Transmission (fixed) -TP_RETINEX_VIEW_METHOD_TOOLTIP;Standard - normal display\nMask - display mask\nUnsharp mask - display image with high radius unsharp mask\nTransmission (auto - fixed) - displays the file transmission-map , before any action on contrast and brightness\nAttention, this does not correspond to reality, but a shift (or auto) to make it visible +TP_RETINEX_VIEW_TRAN;Transmission - Auto +TP_RETINEX_VIEW_TRAN2;Transmission - Fixed +TP_RETINEX_VIEW_METHOD_TOOLTIP;Standard - Normal display.\nMask - Displays the mask.\nUnsharp mask - Displays the image with a high radius unsharp mask.\nTransmission - Auto/Fixed - Displays the file transmission-map, before any action on contrast and brightness.\n\nAttention: the mask does not correspond to reality, but is amplified to make it more visible. TP_RGBCURVES_BLUE;B TP_RGBCURVES_CHANNEL;Channel TP_RGBCURVES_GREEN;G diff --git a/rtengine/procevents.h b/rtengine/procevents.h index be95686be..558f509c2 100644 --- a/rtengine/procevents.h +++ b/rtengine/procevents.h @@ -452,7 +452,6 @@ enum ProcEvent { EvLslope = 422, EvLhighl = 423, EvLbaselog = 424, -// EvLgrbl = 425, EvRetinexlhcurve = 425, EvOIntent = 426, EvMonitorTransform = 427, diff --git a/rtengine/refreshmap.cc b/rtengine/refreshmap.cc index 607aa1226..b23212aeb 100644 --- a/rtengine/refreshmap.cc +++ b/rtengine/refreshmap.cc @@ -25,7 +25,7 @@ -// Aligned so the first entry starts on line 30 +// Aligned so the first entry starts on line 30. int refreshmap[rtengine::NUMOFEVENTS] = { ALL, // EvPhotoLoaded, ALL, // EvProfileLoaded, @@ -440,32 +440,31 @@ int refreshmap[rtengine::NUMOFEVENTS] = { RETINEX, // EvLstr RETINEX, // EvLscal RETINEX, // EvLvart - DEMOSAIC, // EvLCDCurve + DEMOSAIC, // EvLCDCurve RETINEX, // EvRetinextransmission DEMOSAIC, // EvRetinexEnabled RETINEX, // EvRetinexmedianmap RETINEX, // EvLlimd DEMOSAIC, // Evretinexcolorspace - DEMOSAIC, // EvLCDHCurve + DEMOSAIC, // EvLCDHCurve DEMOSAIC, // Evretinexgamma DEMOSAIC, // EvLgam DEMOSAIC, // EvLslope RETINEX, // EvLhighl DEMOSAIC, // EvLbaselog -// DEMOSAIC, // EvLgrbl - DEMOSAIC, // EvRetinexlhcurve + DEMOSAIC, // EvRetinexlhcurve ALLNORAW, // EvOIntent - MONITORTRANSFORM, // EvMonitorTransform - RETINEX, // EvLiter - RETINEX, // EvLgrad - RETINEX, // EvLgrads - RETINEX, //EvLhighlights - RETINEX, //EvLh_tonalwidth - RETINEX, //EvLshadows - RETINEX, //EvLs_tonalwidth - RETINEX, //EvLradius - RETINEX, //EvmapMethod - DEMOSAIC, //EvRetinexmapcurve - DEMOSAIC //EvviewMethod + MONITORTRANSFORM, // EvMonitorTransform: no history message + RETINEX, // EvLiter + RETINEX, // EvLgrad + RETINEX, // EvLgrads + RETINEX, // EvLhighlights + RETINEX, // EvLh_tonalwidth + RETINEX, // EvLshadows + RETINEX, // EvLs_tonalwidth + RETINEX, // EvLradius + RETINEX, // EvmapMethod + DEMOSAIC, // EvRetinexmapcurve + DEMOSAIC // EvviewMethod };