liz/rawTherapee
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Re-constify wavelet.cc (#3556)

Browse Source
This commit is contained in:
Flössie
2016-12-27 20:20:19 +01:00
parent e4f6319d1b
commit d5b4f5bdb4
1 changed files with 8 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
rtgui/wavelet.cc
View File

@@ -256,7 +256,7 @@ Wavelet::Wavelet() :
settingsVBox->pack_start(*levdirSubHBox); settingsVBox->pack_start(*levdirSubHBox);
// Contrast // Contrast
Gtk::VBox * levBox = Gtk::manage (new ToolParamBlock()); Gtk::VBox* const levBox = Gtk::manage (new ToolParamBlock());
Gtk::HBox* const buttonBox = Gtk::manage (new Gtk::HBox(true, 10)); Gtk::HBox* const buttonBox = Gtk::manage (new Gtk::HBox(true, 10));
levBox->pack_start(*buttonBox, Gtk::PACK_SHRINK, 2); levBox->pack_start(*buttonBox, Gtk::PACK_SHRINK, 2);
@@ -335,7 +335,7 @@ Wavelet::Wavelet() :
levBox->pack_start(*contrastSHFrame); levBox->pack_start(*contrastSHFrame);
// Chromaticity // Chromaticity
Gtk::VBox * chBox = Gtk::manage (new ToolParamBlock()); Gtk::VBox* const chBox = Gtk::manage (new ToolParamBlock());
Gtk::Label* const labmch = Gtk::manage(new Gtk::Label(M("TP_WAVELET_CHTYPE") + ":")); Gtk::Label* const labmch = Gtk::manage(new Gtk::Label(M("TP_WAVELET_CHTYPE") + ":"));
Gtk::HBox* const ctboxch = Gtk::manage(new Gtk::HBox()); Gtk::HBox* const ctboxch = Gtk::manage(new Gtk::HBox());
@@ -405,7 +405,7 @@ Wavelet::Wavelet() :
} }
// Toning // Toning
Gtk::VBox * tonBox = Gtk::manage (new ToolParamBlock()); Gtk::VBox* const tonBox = Gtk::manage (new ToolParamBlock());
opaCurveEditorG->setCurveListener (this); opaCurveEditorG->setCurveListener (this);
@@ -434,7 +434,7 @@ Wavelet::Wavelet() :
tonBox->pack_start( *opacityCurveEditorG, Gtk::PACK_SHRINK, 2); tonBox->pack_start( *opacityCurveEditorG, Gtk::PACK_SHRINK, 2);
// Denoise and Refine // Denoise and Refine
Gtk::VBox * noiseBox = Gtk::manage (new ToolParamBlock()); Gtk::VBox* const noiseBox = Gtk::manage (new ToolParamBlock());
linkedg->set_active (true); linkedg->set_active (true);
linkedgConn = linkedg->signal_toggled().connect( sigc::mem_fun(*this, &Wavelet::linkedgToggled) ); linkedgConn = linkedg->signal_toggled().connect( sigc::mem_fun(*this, &Wavelet::linkedgToggled) );
@@ -458,7 +458,7 @@ Wavelet::Wavelet() :
noiseBox->pack_start( *level3noise, Gtk::PACK_SHRINK, 0); noiseBox->pack_start( *level3noise, Gtk::PACK_SHRINK, 0);
// Edge Sharpness // Edge Sharpness
Gtk::VBox * edgBox = Gtk::manage (new ToolParamBlock()); Gtk::VBox* const edgBox = Gtk::manage (new ToolParamBlock());
edgval->setAdjusterListener(this); edgval->setAdjusterListener(this);
edgBox->pack_start(*edgval); edgBox->pack_start(*edgval);
@@ -536,11 +536,9 @@ Wavelet::Wavelet() :
edgedetectthr->set_tooltip_text (M("TP_WAVELET_EDGEDETECTTHR_TOOLTIP")); edgedetectthr->set_tooltip_text (M("TP_WAVELET_EDGEDETECTTHR_TOOLTIP"));
edgBox->pack_start(*edgedetectthr); edgBox->pack_start(*edgedetectthr);
edgedetectthr2->setAdjusterListener (this); edgedetectthr2->setAdjusterListener (this);
edgBox->pack_start(*edgedetectthr2); edgBox->pack_start(*edgedetectthr2);
edgBox->pack_start(*separatoredge, Gtk::PACK_SHRINK, 2); edgBox->pack_start(*separatoredge, Gtk::PACK_SHRINK, 2);
lipst->set_active (true); lipst->set_active (true);
@@ -551,11 +549,9 @@ Wavelet::Wavelet() :
edgesensi->setAdjusterListener (this); edgesensi->setAdjusterListener (this);
edgBox->pack_start(*edgesensi); edgBox->pack_start(*edgesensi);
edgeampli->setAdjusterListener (this); edgeampli->setAdjusterListener (this);
edgBox->pack_start(*edgeampli); edgBox->pack_start(*edgeampli);
Gtk::VBox* const ctboxES = Gtk::manage (new Gtk::VBox()); Gtk::VBox* const ctboxES = Gtk::manage (new Gtk::VBox());
ctboxES->set_spacing(2); ctboxES->set_spacing(2);
@@ -575,7 +571,7 @@ Wavelet::Wavelet() :
edgBox->pack_start(*ctboxES); edgBox->pack_start(*ctboxES);
// Gamut // Gamut
Gtk::VBox * conBox = Gtk::manage (new ToolParamBlock()); Gtk::VBox* const conBox = Gtk::manage (new ToolParamBlock());
median->set_active (true); median->set_active (true);
medianConn = median->signal_toggled().connect( sigc::mem_fun(*this, &Wavelet::medianToggled) ); medianConn = median->signal_toggled().connect( sigc::mem_fun(*this, &Wavelet::medianToggled) );
@@ -625,7 +621,7 @@ Wavelet::Wavelet() :
conBox->pack_start(*avoid); conBox->pack_start(*avoid);
// Residual Image // Residual Image
Gtk::VBox * resBox = Gtk::manage (new ToolParamBlock()); Gtk::VBox* const resBox = Gtk::manage (new ToolParamBlock());
rescon->setAdjusterListener (this); rescon->setAdjusterListener (this);
resBox->pack_start(*rescon, Gtk::PACK_SHRINK); resBox->pack_start(*rescon, Gtk::PACK_SHRINK);
@@ -826,7 +822,7 @@ Wavelet::Wavelet() :
tmr->set_tooltip_text (M("TP_WAVELET_BALCHRO_TOOLTIP")); tmr->set_tooltip_text (M("TP_WAVELET_BALCHRO_TOOLTIP"));
tmrConn = tmr->signal_toggled().connect( sigc::mem_fun(*this, &Wavelet::tmrToggled) ); tmrConn = tmr->signal_toggled().connect( sigc::mem_fun(*this, &Wavelet::tmrToggled) );
Gtk::VBox * finalBox = Gtk::manage (new ToolParamBlock()); Gtk::VBox* const finalBox = Gtk::manage (new ToolParamBlock());
finalBox->pack_start (*ctboxBA); finalBox->pack_start (*ctboxBA);
finalBox->pack_start(*balance); finalBox->pack_start(*balance);