diff --git a/rtengine/procparams.h b/rtengine/procparams.h index 09de24b3c..6c3c37d59 100644 --- a/rtengine/procparams.h +++ b/rtengine/procparams.h @@ -183,9 +183,9 @@ class ToneCurveParams { enum eTCModeId { TC_MODE_STD, // Standard modes, the curve is applied on all component individually + TC_MODE_WEIGHTEDSTD, // Weighted standard mode TC_MODE_FILMLIKE, // Film-like mode, as defined in Adobe's reference code - TC_MODE_SATANDVALBLENDING, // Modify the Saturation and Value channel - TC_MODE_WEIGHTEDSTD // Weighted standard mode + TC_MODE_SATANDVALBLENDING // Modify the Saturation and Value channel }; bool autoexp; diff --git a/rtgui/tonecurve.cc b/rtgui/tonecurve.cc index 636f0dada..4ff47a3d0 100644 --- a/rtgui/tonecurve.cc +++ b/rtgui/tonecurve.cc @@ -93,9 +93,9 @@ ToneCurve::ToneCurve () : Gtk::VBox(), FoldableToolPanel(this) { toneCurveMode = Gtk::manage (new MyComboBoxText ()); toneCurveMode->append_text (M("TP_EXPOSURE_TCMODE_STANDARD")); + toneCurveMode->append_text (M("TP_EXPOSURE_TCMODE_WEIGHTEDSTD")); toneCurveMode->append_text (M("TP_EXPOSURE_TCMODE_FILMLIKE")); toneCurveMode->append_text (M("TP_EXPOSURE_TCMODE_SATANDVALBLENDING")); - toneCurveMode->append_text (M("TP_EXPOSURE_TCMODE_WEIGHTEDSTD")); toneCurveMode->set_active (0); toneCurveMode->set_tooltip_text(M("TP_EXPOSURE_TCMODE_LABEL1")); @@ -117,9 +117,9 @@ ToneCurve::ToneCurve () : Gtk::VBox(), FoldableToolPanel(this) { toneCurveMode2 = Gtk::manage (new MyComboBoxText ()); toneCurveMode2->append_text (M("TP_EXPOSURE_TCMODE_STANDARD")); + toneCurveMode2->append_text (M("TP_EXPOSURE_TCMODE_WEIGHTEDSTD")); toneCurveMode2->append_text (M("TP_EXPOSURE_TCMODE_FILMLIKE")); toneCurveMode2->append_text (M("TP_EXPOSURE_TCMODE_SATANDVALBLENDING")); - toneCurveMode2->append_text (M("TP_EXPOSURE_TCMODE_WEIGHTEDSTD")); toneCurveMode2->set_active (0); toneCurveMode2->set_tooltip_text(M("TP_EXPOSURE_TCMODE_LABEL2")); @@ -231,15 +231,15 @@ void ToneCurve::write (ProcParams* pp, ParamsEdited* pedited) { int tcMode = toneCurveMode->get_active_row_number(); if (tcMode == 0) pp->toneCurve.curveMode = ToneCurveParams::TC_MODE_STD; - else if (tcMode == 1) pp->toneCurve.curveMode = ToneCurveParams::TC_MODE_FILMLIKE; - else if (tcMode == 2) pp->toneCurve.curveMode = ToneCurveParams::TC_MODE_SATANDVALBLENDING; - else if (tcMode == 3) pp->toneCurve.curveMode = ToneCurveParams::TC_MODE_WEIGHTEDSTD; + else if (tcMode == 1) pp->toneCurve.curveMode = ToneCurveParams::TC_MODE_WEIGHTEDSTD; + else if (tcMode == 2) pp->toneCurve.curveMode = ToneCurveParams::TC_MODE_FILMLIKE; + else if (tcMode == 3) pp->toneCurve.curveMode = ToneCurveParams::TC_MODE_SATANDVALBLENDING; tcMode = toneCurveMode2->get_active_row_number(); if (tcMode == 0) pp->toneCurve.curveMode2 = ToneCurveParams::TC_MODE_STD; - else if (tcMode == 1) pp->toneCurve.curveMode2 = ToneCurveParams::TC_MODE_FILMLIKE; - else if (tcMode == 2) pp->toneCurve.curveMode2 = ToneCurveParams::TC_MODE_SATANDVALBLENDING; - else if (tcMode == 3) pp->toneCurve.curveMode2 = ToneCurveParams::TC_MODE_WEIGHTEDSTD; + else if (tcMode == 1) pp->toneCurve.curveMode2 = ToneCurveParams::TC_MODE_WEIGHTEDSTD; + else if (tcMode == 2) pp->toneCurve.curveMode2 = ToneCurveParams::TC_MODE_FILMLIKE; + else if (tcMode == 3) pp->toneCurve.curveMode2 = ToneCurveParams::TC_MODE_SATANDVALBLENDING; if (pedited) {