Small changes to Retinex GUI

This commit is contained in:
Desmis 2017-04-26 16:34:42 +02:00
parent 015c3c1886
commit 772a4a60db

View File

@ -271,12 +271,14 @@ Retinex::Retinex () : FoldableToolPanel(this, "retinex", M("TP_RETINEX_LABEL"),
lhshape->setTooltip (M ("TP_RETINEX_CURVEEDITOR_LH_TOOLTIP")); lhshape->setTooltip (M ("TP_RETINEX_CURVEEDITOR_LH_TOOLTIP"));
lhshape->setCurveColorProvider (this, 4); lhshape->setCurveColorProvider (this, 4);
milestones.clear(); milestones.clear();
for (int i = 0; i < 7; i++) { for (int i = 0; i < 7; i++) {
float R, G, B; float R, G, B;
float x = float (i) * (1.0f / 6.0); float x = float (i) * (1.0f / 6.0);
Color::hsv2rgb01 (x, 0.5f, 0.5f, R, G, B); Color::hsv2rgb01 (x, 0.5f, 0.5f, R, G, B);
milestones.push_back ( GradientMilestone (double (x), double (R), double (G), double (B)) ); milestones.push_back ( GradientMilestone (double (x), double (R), double (G), double (B)) );
} }
lhshape->setBottomBarBgGradient (milestones); lhshape->setBottomBarBgGradient (milestones);
curveEditorGH->curveListComplete(); curveEditorGH->curveListComplete();
equalGrid->attach (*curveEditorGH, 0, 2, 1, 1); equalGrid->attach (*curveEditorGH, 0, 2, 1, 1);
@ -386,7 +388,7 @@ Retinex::Retinex () : FoldableToolPanel(this, "retinex", M("TP_RETINEX_LABEL"),
transmissionShape = static_cast<FlatCurveEditor*> (transmissionCurveEditorG->addCurve (CT_Flat, "", nullptr, false, false)); transmissionShape = static_cast<FlatCurveEditor*> (transmissionCurveEditorG->addCurve (CT_Flat, "", nullptr, false, false));
transmissionShape->setIdentityValue (0.); transmissionShape->setIdentityValue (0.);
transmissionShape->setResetCurve (FlatCurveType (defaultCurve.at (0)), defaultCurve); transmissionShape->setResetCurve (FlatCurveType (defaultCurve.at (0)), defaultCurve);
transmissionShape->setBottomBarBgGradient(milestones); // transmissionShape->setBottomBarBgGradient(milestones);
transmissionCurveEditorG->curveListComplete(); transmissionCurveEditorG->curveListComplete();
transmissionCurveEditorG->set_tooltip_markup (M ("TP_RETINEX_TRANSMISSION_TOOLTIP")); transmissionCurveEditorG->set_tooltip_markup (M ("TP_RETINEX_TRANSMISSION_TOOLTIP"));
tranGrid->attach ( *transmissionCurveEditorG, 0, 0, 1, 1); tranGrid->attach ( *transmissionCurveEditorG, 0, 0, 1, 1);
@ -441,7 +443,7 @@ Retinex::Retinex () : FoldableToolPanel(this, "retinex", M("TP_RETINEX_LABEL"),
gaintransmissionShape = static_cast<FlatCurveEditor*> (gaintransmissionCurve->addCurve (CT_Flat, "", nullptr, false, false)); gaintransmissionShape = static_cast<FlatCurveEditor*> (gaintransmissionCurve->addCurve (CT_Flat, "", nullptr, false, false));
gaintransmissionShape->setIdentityValue (0.); gaintransmissionShape->setIdentityValue (0.);
gaintransmissionShape->setResetCurve (FlatCurveType (defaultCurve.at (0)), defaultCurve); gaintransmissionShape->setResetCurve (FlatCurveType (defaultCurve.at (0)), defaultCurve);
gaintransmissionShape->setBottomBarBgGradient(milestones); //gaintransmissionShape->setBottomBarBgGradient(milestones);
gaintransmissionCurve->set_tooltip_markup (M ("TP_RETINEX_GAINTRANSMISSION_TOOLTIP")); gaintransmissionCurve->set_tooltip_markup (M ("TP_RETINEX_GAINTRANSMISSION_TOOLTIP"));
gaintransmissionCurve->curveListComplete(); gaintransmissionCurve->curveListComplete();
@ -1237,7 +1239,7 @@ void Retinex::gammaretinexChanged()
if (gammaretinex->get_active_row_number() == 4) { if (gammaretinex->get_active_row_number() == 4) {
gam->show(); gam->show();
slope->show(); slope->show();
} else /*if(gammaretinex->get_active_row_number() != 4)*/ { } else { /*if(gammaretinex->get_active_row_number() != 4)*/
gam->hide(); gam->hide();
slope->hide(); slope->hide();
} }