Wavelet Improvment to GUI Residual

rtdata/languages/default

@@ -2168,6 +2168,7 @@ TP_WAVELET_COMPGAMMA;Compression gamma
 TP_WAVELET_COMPGAMMA_TOOLTIP;Adjusting the gamma of the residual image allows you to equilibrate the data and histogram.
 TP_WAVELET_COMPTM;Tone mapping
 TP_WAVELET_CONTEDIT;'After' contrast curve
+TP_WAVELET_CONTFRAME;Contrast - Compression
 TP_WAVELET_CONTR;Gamut
 TP_WAVELET_CONTRA;Contrast
 TP_WAVELET_CONTRAST_MINUS;Contrast -
@@ -2254,7 +2255,7 @@ TP_WAVELET_NPLOW;Low
 TP_WAVELET_NPNONE;None
 TP_WAVELET_NPTYPE;Neighboring pixels
 TP_WAVELET_NPTYPE_TOOLTIP;This algorithm uses the proximity of a pixel and eight of its neighbors. If less difference, edges are reinforced.
-TP_WAVELET_OLDSH;Old algorithm using negatives values
+TP_WAVELET_OLDSH;Algorithm using negatives values
 TP_WAVELET_OPACITY;Opacity Blue-Yellow
 TP_WAVELET_OPACITYW;Contrast balance d/v-h curve
 TP_WAVELET_OPACITYWL;Final local contrast
@@ -2274,6 +2275,7 @@ TP_WAVELET_RESID;Residual Image
 TP_WAVELET_SAT;Saturated chroma
 TP_WAVELET_SETTINGS;Wavelet Settings
 TP_WAVELET_SHA;Sharp mask
+TP_WAVELET_SHFRAME;Shadows/Highlights
 TP_WAVELET_SHOWMASK;Show wavelet 'mask'
 TP_WAVELET_SIGMA;Sigma
 TP_WAVELET_SIGMA_TOOLTIP;Sigma acts on the relative amplitude of the signal width. The higher it is, the more the effect will be maximum and the more the unsightly effects will appear.\nLow values are recommended for creating tone-mapping in conjonction with usage Shadows/Highlights below

rtgui/wavelet.cc

@@ -151,6 +151,8 @@ Wavelet::Wavelet() :
     chanMixerHLFrame(Gtk::manage(new Gtk::Frame(M("TP_COLORTONING_HIGHLIGHT")))),
     chanMixerMidFrame(Gtk::manage(new Gtk::Frame(M("TP_COLORTONING_MIDTONES")))),
     chanMixerShadowsFrame(Gtk::manage(new Gtk::Frame(M("TP_COLORTONING_SHADOWS")))),
+    shFrame(Gtk::manage(new Gtk::Frame(M("TP_WAVELET_SHFRAME")))),
+    contFrame(Gtk::manage(new Gtk::Frame(M("TP_WAVELET_CONTFRAME")))),
     blurFrame(Gtk::manage(new Gtk::Frame(M("TP_WAVELET_BLURFRAME")))),
     chromaFrame(Gtk::manage(new Gtk::Frame(M("TP_WAVELET_CHROMAFRAME")))),
     wavLabels(Gtk::manage(new Gtk::Label("---", Gtk::ALIGN_CENTER))),
@@ -726,26 +728,33 @@ Wavelet::Wavelet() :
     ToolParamBlock* const resBox = Gtk::manage(new ToolParamBlock());
     oldsh->set_active(true);
     oldshConn = oldsh->signal_toggled().connect(sigc::mem_fun(*this, &Wavelet::oldshToggled));
-    resBox->pack_start(*oldsh);
+
 
     rescon->setAdjusterListener(this);
-    resBox->pack_start(*rescon, Gtk::PACK_SHRINK);
 
-    resBox->pack_start(*thr);
     thr->setAdjusterListener(this);
 
     resconH->setAdjusterListener(this);
-    resBox->pack_start(*resconH, Gtk::PACK_SHRINK);
 
     thrH->setAdjusterListener(this);
-    resBox->pack_start(*thrH, Gtk::PACK_SHRINK);
 
     radius->setAdjusterListener(this);
-    resBox->pack_start(*radius, Gtk::PACK_SHRINK);
+    radius->hide();
+
+    shFrame->set_label_align(0.025, 0.5);
+    ToolParamBlock* const shBox = Gtk::manage(new ToolParamBlock());
+    shBox->pack_start(*oldsh);
+    shBox->pack_start(*rescon, Gtk::PACK_SHRINK);
+    shBox->pack_start(*thr);
+    shBox->pack_start(*resconH, Gtk::PACK_SHRINK);
+    shBox->pack_start(*thrH, Gtk::PACK_SHRINK);
+    shBox->pack_start(*radius, Gtk::PACK_SHRINK);
+    shFrame->add(*shBox);
+    resBox->pack_start(*shFrame);
+
 
     contrast->set_tooltip_text(M("TP_WAVELET_CONTRA_TOOLTIP"));
     contrast->setAdjusterListener(this);
-    resBox->pack_start(*contrast);  //keep the possibility to reinstall
 
     reschro->setAdjusterListener(this);
     resblur->setAdjusterListener(this);
@@ -768,36 +777,42 @@ Wavelet::Wavelet() :
     Gtk::HBox* const ctboxTM = Gtk::manage(new Gtk::HBox());
     ctboxTM->pack_start(*labmTM, Gtk::PACK_SHRINK, 1);
 
-    Gtk::HSeparator* const separatorR0 = Gtk::manage(new  Gtk::HSeparator());
+//    Gtk::HSeparator* const separatorR0 = Gtk::manage(new  Gtk::HSeparator());
-    resBox->pack_start(*separatorR0, Gtk::PACK_SHRINK, 2);
+//    resBox->pack_start(*separatorR0, Gtk::PACK_SHRINK, 2);
 
     TMmethod->append(M("TP_WAVELET_COMPCONT"));
     TMmethod->append(M("TP_WAVELET_COMPTM"));
     TMmethodconn = TMmethod->signal_changed().connect(sigc::mem_fun(*this, &Wavelet::TMmethodChanged));
     ctboxTM->pack_start(*TMmethod);
-    resBox->pack_start(*ctboxTM);
 
     tmrs->set_tooltip_text(M("TP_WAVELET_TMSTRENGTH_TOOLTIP"));
 
-    resBox->pack_start(*tmrs);
     tmrs->setAdjusterListener(this);
 
     gamma->set_tooltip_text(M("TP_WAVELET_COMPGAMMA_TOOLTIP"));
-    resBox->pack_start(*gamma);
     gamma->setAdjusterListener(this);
 
     //edgs->set_tooltip_text(M("TP_WAVELET_TMEDGS_TOOLTIP"));
 
-    resBox->pack_start(*edgs);
     edgs->setAdjusterListener(this);
 
     //scale->set_tooltip_text(M("TP_WAVELET_TMSCALE_TOOLTIP"));
 
-    resBox->pack_start(*scale);
     scale->setAdjusterListener(this);
 
-    Gtk::HSeparator* const separatorR1 = Gtk::manage(new  Gtk::HSeparator());
+    contFrame->set_label_align(0.025, 0.5);
-    resBox->pack_start(*separatorR1, Gtk::PACK_SHRINK, 2);
+    ToolParamBlock* const contBox = Gtk::manage(new ToolParamBlock());
+    contBox->pack_start(*contrast);  //keep the possibility to reinstall
+    contBox->pack_start(*ctboxTM);
+    contBox->pack_start(*tmrs);
+    contBox->pack_start(*gamma);
+    contBox->pack_start(*edgs);
+    contBox->pack_start(*scale);
+    contFrame->add(*contBox);
+    resBox->pack_start(*contFrame);
+
+//    Gtk::HSeparator* const separatorR1 = Gtk::manage(new  Gtk::HSeparator());
+//    resBox->pack_start(*separatorR1, Gtk::PACK_SHRINK, 2);
 
     hueskin2->set_tooltip_markup(M("TP_WAVELET_HUESKY_TOOLTIP"));
     hueskin2->setBgGradient(milestones);
@@ -1577,6 +1592,7 @@ void Wavelet::read(const ProcParams* pp, const ParamsEdited* pedited)
         //BackmethodUpdateUI();
         CLmethodUpdateUI();
         lipstUpdateUI();
+        oldshToggled();
         //TilesmethodUpdateUI();
         //daubcoeffmethodUpdateUI();
         //DirmethodUpdateUI();

rtgui/wavelet.h

@@ -277,6 +277,8 @@ private:
     Gtk::Frame* const chanMixerHLFrame;
     Gtk::Frame* const chanMixerMidFrame;
     Gtk::Frame* const chanMixerShadowsFrame;
+    Gtk::Frame* const shFrame;
+    Gtk::Frame* const contFrame;
     Gtk::Frame* const blurFrame;
     Gtk::Frame* const chromaFrame;