diff --git a/rtdata/languages/default b/rtdata/languages/default index 8d4472f04..10fb47e89 100644 --- a/rtdata/languages/default +++ b/rtdata/languages/default @@ -2209,6 +2209,7 @@ TP_WAVELET_DAUB6;D6 - standard plus TP_WAVELET_DAUB10;D10 - medium TP_WAVELET_DAUB14;D14 - high TP_WAVELET_DAUB_TOOLTIP;Changes Daubechies coefficients:\nD4 = Standard,\nD14 = Often best performance, 10% more time-intensive.\n\nAffects edge detection as well as the general quality of the firsts levels. However the quality is not strictly related to this coefficient and can vary with images and uses. +TP_WAVELET_DIRFRAME;Directional contrast TP_WAVELET_DONE;Vertical TP_WAVELET_DTHR;Diagonal TP_WAVELET_DTWO;Horizontal diff --git a/rtgui/wavelet.cc b/rtgui/wavelet.cc index d84277693..1649b0afe 100644 --- a/rtgui/wavelet.cc +++ b/rtgui/wavelet.cc @@ -166,6 +166,7 @@ Wavelet::Wavelet() : chromaFrame(Gtk::manage(new Gtk::Frame(M("TP_WAVELET_CHROMAFRAME")))), chroFrame(Gtk::manage(new Gtk::Frame(M("TP_WAVELET_CHROFRAME")))), fincFrame(Gtk::manage(new Gtk::Frame(M("TP_WAVELET_FINCFRAME")))), + dirFrame(Gtk::manage(new Gtk::Frame(M("TP_WAVELET_DIRFRAME")))), wavLabels(Gtk::manage(new Gtk::Label("---", Gtk::ALIGN_CENTER))), labmC(Gtk::manage(new Gtk::Label(M("TP_WAVELET_CTYPE") + ":"))), labmNP(Gtk::manage(new Gtk::Label(M("TP_WAVELET_NPTYPE") + ":"))), @@ -1034,20 +1035,18 @@ Wavelet::Wavelet() : fincBox->pack_start(*sigmafin); fincFrame->add(*fincBox); + dirFrame->set_label_align(0.025, 0.5); + ToolParamBlock* const dirBox = Gtk::manage(new ToolParamBlock()); + dirBox->pack_start(*ctboxBA); + dirBox->pack_start(*balance); + dirBox->pack_start(*opacityCurveEditorW, Gtk::PACK_SHRINK, 2); + dirBox->pack_start(*iter); + dirBox->pack_start(*tmr); + dirFrame->add(*dirBox); ToolParamBlock* const finalBox = Gtk::manage(new ToolParamBlock()); + finalBox->pack_start(*dirFrame); - finalBox->pack_start(*ctboxBA); - finalBox->pack_start(*balance); - - finalBox->pack_start(*opacityCurveEditorW, Gtk::PACK_SHRINK, 2); - - finalBox->pack_start(*iter); - - finalBox->pack_start(*tmr); -// finalBox->pack_start(*separatorbalend, Gtk::PACK_SHRINK, 2); -// finalBox->pack_start(*opacityCurveEditorWL, Gtk::PACK_SHRINK, 2); -// finalBox->pack_start(*sigmafin); finalBox->pack_start(*fincFrame); finalBox->pack_start(*curveEditorG, Gtk::PACK_SHRINK, 4); finalBox->pack_start(*softradend); @@ -2568,15 +2567,18 @@ void Wavelet::BAmethodUpdateUI() balance->hide(); opacityCurveEditorW->hide(); iter->hide(); + tmr->hide(); } else if (BAmethod->get_active_row_number() == 1) { //sli opacityCurveEditorW->hide(); balance->show(); iter->show(); + tmr->show(); } else if (BAmethod->get_active_row_number() == 2) { //CU opacityCurveEditorW->show(); balance->hide(); iter->show(); + tmr->show(); } } } diff --git a/rtgui/wavelet.h b/rtgui/wavelet.h index 4a4947b2a..644d8f6b9 100644 --- a/rtgui/wavelet.h +++ b/rtgui/wavelet.h @@ -301,6 +301,7 @@ private: Gtk::Frame* const chromaFrame; Gtk::Frame* const chroFrame; Gtk::Frame* const fincFrame; + Gtk::Frame* const dirFrame; Gtk::Label* const wavLabels; Gtk::Label* const labmC;