Merge master into gtk3
This commit is contained in:
@@ -36,8 +36,6 @@ DirPyrDenoise::DirPyrDenoise () : FoldableToolPanel(this, "dirpyrdenoise", M("TP
|
||||
nextred = 0.;
|
||||
nextblue = 0.;
|
||||
|
||||
setEnabledTooltipMarkup(M("TP_DIRPYRDENOISE_ENABLED_TOOLTIP"));
|
||||
|
||||
std::vector<double> defaultCurve;
|
||||
|
||||
Gtk::Frame* lumaFrame = Gtk::manage (new Gtk::Frame (M("TP_DIRPYRDENOISE_LUMAFR")) );
|
||||
@@ -65,7 +63,7 @@ DirPyrDenoise::DirPyrDenoise () : FoldableToolPanel(this, "dirpyrdenoise", M("TP
|
||||
//curveEditorG = new CurveEditorGroup (options.lastLabCurvesDir);
|
||||
NoiscurveEditorG->setCurveListener (this);
|
||||
rtengine::DirPyrDenoiseParams::getDefaultNoisCurve(defaultCurve);
|
||||
lshape = static_cast<FlatCurveEditor*>(NoiscurveEditorG->addCurve(CT_Flat, "", NULL, false));
|
||||
lshape = static_cast<FlatCurveEditor*>(NoiscurveEditorG->addCurve(CT_Flat, "", nullptr, false));
|
||||
lshape->setIdentityValue(0.);
|
||||
lshape->setResetCurve(FlatCurveType(defaultCurve.at(0)), defaultCurve);
|
||||
|
||||
@@ -153,7 +151,7 @@ DirPyrDenoise::DirPyrDenoise () : FoldableToolPanel(this, "dirpyrdenoise", M("TP
|
||||
CCcurveEditorG = new CurveEditorGroup (options.lastDenoiseCurvesDir, M("TP_DIRPYRDENOISE_CCCURVE"));
|
||||
CCcurveEditorG->setCurveListener (this);
|
||||
rtengine::DirPyrDenoiseParams::getDefaultCCCurve(defaultCurve);
|
||||
ccshape = static_cast<FlatCurveEditor*>(CCcurveEditorG->addCurve(CT_Flat, "", NULL, false));
|
||||
ccshape = static_cast<FlatCurveEditor*>(CCcurveEditorG->addCurve(CT_Flat, "", nullptr, false));
|
||||
ccshape->setIdentityValue(0.);
|
||||
ccshape->setResetCurve(FlatCurveType(defaultCurve.at(0)), defaultCurve);
|
||||
|
||||
@@ -194,7 +192,6 @@ DirPyrDenoise::DirPyrDenoise () : FoldableToolPanel(this, "dirpyrdenoise", M("TP
|
||||
|
||||
median = Gtk::manage (new Gtk::CheckButton (M("TP_DIRPYRDENOISE_MED") + ":"));
|
||||
median->set_active (true);
|
||||
median->set_tooltip_text (M("TP_DIRPYRDENOISE_MED_TOOLTIP"));
|
||||
medianFrame->set_label_widget(*median);
|
||||
|
||||
|
||||
|
Reference in New Issue
Block a user