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

(attempt to ) solving issue #3759

Browse Source
This commit is contained in:
Hombre
2017-03-13 21:41:01 +01:00
parent 0578010fce
commit 3660ed5f95
1 changed files with 17 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
rtgui/wavelet.cc
View File

@@ -172,8 +172,7 @@ Wavelet::Wavelet() :
enableFinalConn = expfinal->signal_enabled_toggled().connect ( sigc::bind( sigc::mem_fun(this, &Wavelet::enableToggled), expfinal) ); enableFinalConn = expfinal->signal_enabled_toggled().connect ( sigc::bind( sigc::mem_fun(this, &Wavelet::enableToggled), expfinal) );
// Wavelet Settings // Wavelet Settings
Gtk::VBox* const settingsVBox = Gtk::manage(new Gtk::VBox()); ToolParamBlock* const settingsBox = Gtk::manage (new ToolParamBlock());
settingsVBox->set_spacing(2);
strength->setAdjusterListener (this); strength->setAdjusterListener (this);
@@ -247,16 +246,16 @@ Wavelet::Wavelet() :
levdirSubHBox->pack_start(*Lmethod); levdirSubHBox->pack_start(*Lmethod);
levdirSubHBox->pack_start(*Dirmethod, Gtk::PACK_EXPAND_WIDGET, 2); // same, but 2 not 4? levdirSubHBox->pack_start(*Dirmethod, Gtk::PACK_EXPAND_WIDGET, 2); // same, but 2 not 4?
settingsVBox->pack_start(*strength); settingsBox->pack_start(*strength);
settingsVBox->pack_start(*thres); settingsBox->pack_start(*thres);
settingsVBox->pack_start(*tilesizeHBox); settingsBox->pack_start(*tilesizeHBox);
settingsVBox->pack_start(*daubcoeffHBox); settingsBox->pack_start(*daubcoeffHBox);
settingsVBox->pack_start(*backgroundHBox); settingsBox->pack_start(*backgroundHBox);
settingsVBox->pack_start(*levdirMainHBox); settingsBox->pack_start(*levdirMainHBox);
settingsVBox->pack_start(*levdirSubHBox); settingsBox->pack_start(*levdirSubHBox);
// Contrast // Contrast
Gtk::VBox* const levBox = Gtk::manage (new ToolParamBlock()); ToolParamBlock* 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 +334,7 @@ Wavelet::Wavelet() :
levBox->pack_start(*contrastSHFrame); levBox->pack_start(*contrastSHFrame);
// Chromaticity // Chromaticity
Gtk::VBox* const chBox = Gtk::manage (new ToolParamBlock()); ToolParamBlock* 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 +404,7 @@ Wavelet::Wavelet() :
} }
// Toning // Toning
Gtk::VBox* const tonBox = Gtk::manage (new ToolParamBlock()); ToolParamBlock* const tonBox = Gtk::manage (new ToolParamBlock());
opaCurveEditorG->setCurveListener (this); opaCurveEditorG->setCurveListener (this);
@@ -434,7 +433,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* const noiseBox = Gtk::manage (new ToolParamBlock()); ToolParamBlock* 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 +457,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* const edgBox = Gtk::manage (new ToolParamBlock()); ToolParamBlock* const edgBox = Gtk::manage (new ToolParamBlock());
edgval->setAdjusterListener(this); edgval->setAdjusterListener(this);
edgBox->pack_start(*edgval); edgBox->pack_start(*edgval);
@@ -571,7 +570,7 @@ Wavelet::Wavelet() :
edgBox->pack_start(*ctboxES); edgBox->pack_start(*ctboxES);
// Gamut // Gamut
Gtk::VBox* const conBox = Gtk::manage (new ToolParamBlock()); ToolParamBlock* 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) );
@@ -621,7 +620,7 @@ Wavelet::Wavelet() :
conBox->pack_start(*avoid); conBox->pack_start(*avoid);
// Residual Image // Residual Image
Gtk::VBox* const resBox = Gtk::manage (new ToolParamBlock()); ToolParamBlock* 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);
@@ -822,7 +821,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* const finalBox = Gtk::manage (new ToolParamBlock()); ToolParamBlock* const finalBox = Gtk::manage (new ToolParamBlock());
finalBox->pack_start (*ctboxBA); finalBox->pack_start (*ctboxBA);
finalBox->pack_start(*balance); finalBox->pack_start(*balance);
@@ -839,7 +838,7 @@ Wavelet::Wavelet() :
//----------------------------- //-----------------------------
expsettings->add(*settingsVBox); expsettings->add(*settingsBox);
expsettings->setLevel(2); expsettings->setLevel(2);
pack_start (*expsettings); pack_start (*expsettings);