From 1fd7e2045da49e3b79ede5804b3e7ad2655bc629 Mon Sep 17 00:00:00 2001 From: Desmis Date: Thu, 10 Jan 2019 13:07:52 +0100 Subject: [PATCH] Fixed another bug in reset curves mask --- rtengine/procparams.cc | 3 +-- rtgui/locallab.cc | 8 +++++--- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/rtengine/procparams.cc b/rtengine/procparams.cc index c886477c0..a0873c767 100644 --- a/rtengine/procparams.cc +++ b/rtengine/procparams.cc @@ -2369,8 +2369,7 @@ LocallabParams::LocallabSpot::LocallabSpot() : LHcurve{(double)FCT_MinMaxCPoints, 0.0, 0.50, 0.35, 0.35, 0.166, 0.50, 0.35, 0.35, 0.333, 0.50, 0.35, 0.35, 0.50, 0.50, 0.35, 0.35, 0.666, 0.50, 0.35, 0.35, 0.833, 0.50, 0.35, 0.35}, HHcurve{(double)FCT_MinMaxCPoints, 0.0, 0.50, 0.35, 0.35, 0.166, 0.50, 0.35, 0.35, 0.333, 0.50, 0.35, 0.35, 0.50, 0.50, 0.35, 0.35, 0.666, 0.50, 0.35, 0.35, 0.833, 0.50, 0.35, 0.35}, CCmaskcurve{(double)FCT_MinMaxCPoints, 0., 1., 0.35, 0.35, 1., 1., 0.35, 0.35}, - LLmaskcurve{(double)FCT_MinMaxCPoints, 0., 1., 0.35, 0.35, 1., 1., 0.35, 0.35}, - + LLmaskcurve{(double)FCT_MinMaxCPoints, 0.166, 1., 0.35, 0.35, 0.82, 1., 0.35, 0.35}, invers(false), // Exposure expexpose(false), diff --git a/rtgui/locallab.cc b/rtgui/locallab.cc index c28e2f935..ff997e2a5 100644 --- a/rtgui/locallab.cc +++ b/rtgui/locallab.cc @@ -298,9 +298,10 @@ Locallab::Locallab(): LLmaskshape = static_cast(maskCurveEditorG->addCurve(CT_Flat, "L(L)", nullptr, false, false)); LLmaskshape->setIdentityValue(0.); - LLmaskshape->setResetCurve(FlatCurveType(defSpot.CCmaskcurve.at(0)), defSpot.CCmaskcurve); + LLmaskshape->setResetCurve(FlatCurveType(defSpot.LLmaskcurve.at(0)), defSpot.LLmaskcurve); LLmaskshape->setTooltip(M("TP_LOCALLAB_CURVEEDITOR_CC_TOOLTIP")); - LLmaskshape->setBottomBarBgGradient(mllshape); + // LLmaskshape->setBottomBarBgGradient(mllshape); + maskCurveEditorG->curveListComplete(); @@ -384,10 +385,11 @@ Locallab::Locallab(): CCmaskexpshape->setResetCurve(FlatCurveType(defSpot.CCmaskexpcurve.at(0)), defSpot.CCmaskexpcurve); CCmaskexpshape->setTooltip(M("TP_LOCALLAB_CURVEEDITOR_CC_TOOLTIP")); CCmaskexpshape->setBottomBarColorProvider(this, 7); + const ColorToningParams default_params; LLmaskexpshape = static_cast(maskexpCurveEditorG->addCurve(CT_Flat, "L(L)", nullptr, false, false)); LLmaskexpshape->setIdentityValue(0.); - LLmaskexpshape->setResetCurve(FlatCurveType(defSpot.CCmaskexpcurve.at(0)), defSpot.CCmaskexpcurve); + LLmaskexpshape->setResetCurve(FlatCurveType(defSpot.LLmaskexpcurve.at(0)), defSpot.LLmaskexpcurve); LLmaskexpshape->setTooltip(M("TP_LOCALLAB_CURVEEDITOR_CC_TOOLTIP")); LLmaskexpshape->setBottomBarBgGradient(mllshape);