diff --git a/rtengine/procparams.cc b/rtengine/procparams.cc index 1655c5eb5..148fc2906 100644 --- a/rtengine/procparams.cc +++ b/rtengine/procparams.cc @@ -123,10 +123,6 @@ RetinexParams::RetinexParams () void RetinexParams::getDefaulttransmissionCurve(std::vector &curve) { - /* double v[8] = { 0.0, 0.50, 0.35, 0.35, - 1.0, 0.50, 0.35, 0.35, - }; - */ double v[12] = { 0.00, 0.25, 0.35, 0.35, 0.60, 0.90, 0.35, 0.35, 1.00, 0.50, 0.35, 0.35, @@ -141,40 +137,6 @@ void RetinexParams::getDefaulttransmissionCurve(std::vector &curve) } } -void RetinexParams::getDefaultCDCurve(std::vector &curve) -{ - double v[4] = { 0., 0., - // 0.25, 0.25, - // 0.5, 0.5, - // 0.75, 0.75, - 1., 1., - }; - - curve.resize(5); - curve.at(0) = double(DCT_NURBS); - - for (size_t i = 1; i < curve.size(); ++i) { - curve.at(i) = v[i - 1]; - } -} - -void RetinexParams::getDefaultCDHCurve(std::vector &curve) -{ - double v[4] = { 0.00, 0.00, - // 0.5, 0.5, - 1.0, 1.0, - }; - - curve.resize(5); - curve.at(0) = double(DCT_NURBS); - - for (size_t i = 1; i < curve.size(); ++i) { - curve.at(i) = v[i - 1]; - } -} - - - void RetinexParams::setDefaults() { enabled = false; @@ -185,13 +147,14 @@ void RetinexParams::setDefaults() offs = 0; vart = 125; limd = 8; - getDefaulttransmissionCurve(transmissionCurve); - getDefaultCDCurve(cdcurve); - getDefaultCDHCurve(cdHcurve); retinexMethod = "high"; retinexcolorspace = "Lab"; medianmap = true; - + cdcurve.clear(); + cdcurve.push_back(DCT_Linear); + cdHcurve.clear(); + cdHcurve.push_back(DCT_Linear); + getDefaulttransmissionCurve(transmissionCurve); } void RetinexParams::getCurves(RetinextransmissionCurve &transmissionCurveLUT) const diff --git a/rtengine/procparams.h b/rtengine/procparams.h index 91dfbf7bc..08060dcec 100644 --- a/rtengine/procparams.h +++ b/rtengine/procparams.h @@ -287,9 +287,6 @@ public: void getCurves(RetinextransmissionCurve &transmissionCurveLUT) const; static void getDefaulttransmissionCurve(std::vector &curve); - static void getDefaultCDCurve(std::vector &curve); - static void getDefaultCDHCurve(std::vector &curve); - }; diff --git a/rtgui/retinex.cc b/rtgui/retinex.cc index b1c290e14..76cb24675 100644 --- a/rtgui/retinex.cc +++ b/rtgui/retinex.cc @@ -53,11 +53,10 @@ Retinex::Retinex () : FoldableToolPanel(this, "retinex", M("TP_RETINEX_LABEL"), retinexVBox->pack_start(*dhbox); std::vector defaultCurve; + // Histogram equalizer Lab curve curveEditorGD = new CurveEditorGroup (options.lastRetinexDir, M("TP_RETINEX_CONTEDIT_LAB")); curveEditorGD->setCurveListener (this); - rtengine::RetinexParams::getDefaultCDCurve(defaultCurve); cdshape = static_cast(curveEditorGD->addCurve(CT_Diagonal, M("TP_RETINEX_CURVEEDITOR_CD"))); - cdshape->setResetCurve(DiagonalCurveType(defaultCurve.at(0)), defaultCurve); cdshape->setTooltip(M("TP_RETINEX_CURVEEDITOR_CD_TOOLTIP")); std::vector milestones22; @@ -68,11 +67,10 @@ Retinex::Retinex () : FoldableToolPanel(this, "retinex", M("TP_RETINEX_LABEL"), curveEditorGD->curveListComplete(); + // Histogram equalizer HSL curve curveEditorGDH = new CurveEditorGroup (options.lastRetinexDir, M("TP_RETINEX_CONTEDIT_HSL")); curveEditorGDH->setCurveListener (this); - rtengine::RetinexParams::getDefaultCDHCurve(defaultCurve); cdshapeH = static_cast(curveEditorGDH->addCurve(CT_Diagonal, M("TP_RETINEX_CURVEEDITOR_CD"))); - cdshapeH->setResetCurve(DiagonalCurveType(defaultCurve.at(0)), defaultCurve); cdshapeH->setTooltip(M("TP_RETINEX_CURVEEDITOR_CD_TOOLTIP")); std::vector milestones22H; @@ -84,6 +82,7 @@ Retinex::Retinex () : FoldableToolPanel(this, "retinex", M("TP_RETINEX_LABEL"), curveEditorGDH->curveListComplete(); + // Transmission map curve transmissionCurveEditorG = new CurveEditorGroup (options.lastRetinexDir, M("TP_RETINEX_TRANSMISSION")); transmissionCurveEditorG->setCurveListener (this);