diff --git a/rtdata/languages/Francais b/rtdata/languages/Francais index 53f9e6d35..7231d103d 100644 --- a/rtdata/languages/Francais +++ b/rtdata/languages/Francais @@ -156,10 +156,13 @@ HISTORY_MSG_108;Seuil de compr. des hautes lumières HISTORY_MSG_109;Redim. - boîte englobante HISTORY_MSG_10;Compression des ombres HISTORY_MSG_110;Redim. s'applique à -HISTORY_MSG_111;Champ Uniforme - Fichier -HISTORY_MSG_112;Champ Uniforme - Auto sélection -HISTORY_MSG_113;Champ Uniforme - Rayon -HISTORY_MSG_114;Champ Uniforme - Type de floutage +HISTORY_MSG_111;Éviter l'écrêtage couleur +HISTORY_MSG_112;Limiteur de saturation +HISTORY_MSG_113;Limite de saturation +HISTORY_MSG_114;Champ Uniforme - Fichier +HISTORY_MSG_115;Champ Uniforme - Auto sélection +HISTORY_MSG_116;Champ Uniforme - Rayon +HISTORY_MSG_117;Champ Uniforme - Type de floutage HISTORY_MSG_11;Courbe tonale HISTORY_MSG_12;Exposition auto HISTORY_MSG_13;Rognage de l'exposition @@ -717,10 +720,13 @@ TP_ICM_SAVEREFERENCE;Utiliser l'image comme profil de référence TP_ICM_WORKINGPROFILE;Profil de Travail TP_IMPULSEDENOISE_LABEL;Réduction du bruit d'impulsion TP_IMPULSEDENOISE_THRESH;Seuil +TP_LABCURVE_AVOIDCOLORCLIP;Éviter l'écrêtage couleur TP_LABCURVE_BRIGHTNESS;Luminosité TP_LABCURVE_CONTRAST;Contraste TP_LABCURVE_CURVEEDITOR;Courbe de luminance +TP_LABCURVE_ENABLESATLIMITER;Activer le limiteur de saturation TP_LABCURVE_LABEL;Courbes Lab +TP_LABCURVE_SATLIMIT;Limite de saturation TP_LABCURVE_SATURATION;Saturation TP_LENSGEOM_AUTOCROP;Recadrage auto TP_LENSGEOM_FILL;Remplir diff --git a/rtdata/languages/default b/rtdata/languages/default index 0fdae6ef7..a16d0057c 100644 --- a/rtdata/languages/default +++ b/rtdata/languages/default @@ -166,10 +166,13 @@ HISTORY_MSG_108;Highlight Compr. Threshold HISTORY_MSG_109;Resize bounding box HISTORY_MSG_10;Shadow Compression HISTORY_MSG_110;Resizing applies to -HISTORY_MSG_111;Flat Field File -HISTORY_MSG_112;Flat Field Auto Select -HISTORY_MSG_113;Flat Field Blur Radius -HISTORY_MSG_114;Flat Field Blur Type +HISTORY_MSG_111;Avoid Color Clipping +HISTORY_MSG_112;Saturation Limiter +HISTORY_MSG_113;Saturation Limit +HISTORY_MSG_114;Flat Field File +HISTORY_MSG_115;Flat Field Auto Select +HISTORY_MSG_116;Flat Field Blur Radius +HISTORY_MSG_117;Flat Field Blur Type HISTORY_MSG_11;Tone Curve HISTORY_MSG_12;Auto Exposure HISTORY_MSG_13;Exposure Clipping diff --git a/rtengine/procevents.h b/rtengine/procevents.h index 73a279ab4..3ac59d3ec 100644 --- a/rtengine/procevents.h +++ b/rtengine/procevents.h @@ -130,11 +130,11 @@ enum ProcEvent { EvDefringeRadius=105, EvDefringeThreshold=106, EvHLComprThreshold=107, - EvLAvoidClip=108, - EvLSatLimiter=109, - EvLSatLimit=110, - EvResizeBoundingBox=111, - EvResizeAppliesTo=112, + EvResizeBoundingBox=108, + EvResizeAppliesTo=109, + EvLAvoidClip=110, + EvLSatLimiter=111, + EvLSatLimit=112, EvFlatFieldFile=113, EvFlatFieldAutoSelect=114, EvFlatFieldBlurRadius=115, diff --git a/rtengine/procparams.cc b/rtengine/procparams.cc index 5b6122b58..bf7a46f75 100644 --- a/rtengine/procparams.cc +++ b/rtengine/procparams.cc @@ -968,13 +968,13 @@ bool ProcParams::operator== (const ProcParams& other) { && hlrecovery.enabled == other.hlrecovery.enabled && hlrecovery.method == other.hlrecovery.method && resize.scale == other.resize.scale - && resize.appliesTo == other.resize.appliesTo + && resize.appliesTo == other.resize.appliesTo && resize.method == other.resize.method && resize.dataspec == other.resize.dataspec && resize.width == other.resize.width && resize.height == other.resize.height && raw.dark_frame == other.raw.dark_frame - && raw.df_autoselect == other.raw.df_autoselect + && raw.df_autoselect == other.raw.df_autoselect && raw.ff_file == other.raw.ff_file && raw.ff_AutoSelect == other.raw.ff_AutoSelect && raw.ff_BlurRadius == other.raw.ff_BlurRadius diff --git a/rtengine/refreshmap.cc b/rtengine/refreshmap.cc index d1c6b4c11..0371228b4 100644 --- a/rtengine/refreshmap.cc +++ b/rtengine/refreshmap.cc @@ -128,11 +128,11 @@ DEFRINGE, // EvDefringeEnabled, DEFRINGE, // EvDefringeRadius, DEFRINGE, // EvDefringeThreshold, RGBCURVE, // EvHLComprThreshold, +RESIZE, // EvResizeBoundingBox +RESIZE, // EvResizeAppliesTo LUMINANCECURVE, // EvCBAvoidClip, LUMINANCECURVE, // EvCBSatLimiter, LUMINANCECURVE, // EvCBSatLimit, -RESIZE, // EvResizeBoundingBox -RESIZE, // EvResizeAppliesTo FLATFIELD, // EvFlatFieldFile, FLATFIELD, // EvFlatFieldAutoSelect, FLATFIELD, // EvFlatFieldBlurRadius, diff --git a/rtgui/labcurve.cc b/rtgui/labcurve.cc index 891d948c9..c0c4f9c6a 100644 --- a/rtgui/labcurve.cc +++ b/rtgui/labcurve.cc @@ -270,6 +270,8 @@ void LCurve::adjusterChanged (Adjuster* a, double newval) { Glib::ustring costr; if (a==brightness) costr = Glib::ustring::format (std::setw(3), std::fixed, std::setprecision(2), a->getValue()); + else if (a==saturationlimiter) + costr = Glib::ustring::format (std::setw(3), std::fixed, std::setprecision(1), a->getValue()); else costr = Glib::ustring::format ((int)a->getValue()); @@ -280,7 +282,7 @@ void LCurve::adjusterChanged (Adjuster* a, double newval) { else if (a==saturation) listener->panelChanged (EvLSaturation, costr); else if (a==saturationlimiter) - listener->panelChanged (EvLSatLimiter, costr); + listener->panelChanged (EvLSatLimit, costr); } //attempt to hide unused channels