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

Improve GUI final Touchup

Browse Source
This commit is contained in:
Desmis 2020-04-14 16:20:15 +02:00
parent ad207e003c
commit feb2c7c77f
3 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
rtdata/languages/default
View File

@ -2209,6 +2209,7 @@ TP_WAVELET_DAUB6;D6 - standard plus
TP_WAVELET_DAUB10;D10 - medium TP_WAVELET_DAUB10;D10 - medium
TP_WAVELET_DAUB14;D14 - high 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_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_DONE;Vertical
TP_WAVELET_DTHR;Diagonal TP_WAVELET_DTHR;Diagonal
TP_WAVELET_DTWO;Horizontal TP_WAVELET_DTWO;Horizontal

24
rtgui/wavelet.cc
View File

@ -166,6 +166,7 @@ Wavelet::Wavelet() :
chromaFrame(Gtk::manage(new Gtk::Frame(M("TP_WAVELET_CHROMAFRAME")))), chromaFrame(Gtk::manage(new Gtk::Frame(M("TP_WAVELET_CHROMAFRAME")))),
chroFrame(Gtk::manage(new Gtk::Frame(M("TP_WAVELET_CHROFRAME")))), chroFrame(Gtk::manage(new Gtk::Frame(M("TP_WAVELET_CHROFRAME")))),
fincFrame(Gtk::manage(new Gtk::Frame(M("TP_WAVELET_FINCFRAME")))), 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))), wavLabels(Gtk::manage(new Gtk::Label("---", Gtk::ALIGN_CENTER))),
labmC(Gtk::manage(new Gtk::Label(M("TP_WAVELET_CTYPE") + ":"))), labmC(Gtk::manage(new Gtk::Label(M("TP_WAVELET_CTYPE") + ":"))),
labmNP(Gtk::manage(new Gtk::Label(M("TP_WAVELET_NPTYPE") + ":"))), labmNP(Gtk::manage(new Gtk::Label(M("TP_WAVELET_NPTYPE") + ":"))),
@ -1034,20 +1035,18 @@ Wavelet::Wavelet() :
fincBox->pack_start(*sigmafin); fincBox->pack_start(*sigmafin);
fincFrame->add(*fincBox); 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()); 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(*fincFrame);
finalBox->pack_start(*curveEditorG, Gtk::PACK_SHRINK, 4); finalBox->pack_start(*curveEditorG, Gtk::PACK_SHRINK, 4);
finalBox->pack_start(*softradend); finalBox->pack_start(*softradend);
@ -2568,15 +2567,18 @@ void Wavelet::BAmethodUpdateUI()
balance->hide(); balance->hide();
opacityCurveEditorW->hide(); opacityCurveEditorW->hide();
iter->hide(); iter->hide();
tmr->hide();
} else if (BAmethod->get_active_row_number() == 1) { //sli } else if (BAmethod->get_active_row_number() == 1) { //sli
opacityCurveEditorW->hide(); opacityCurveEditorW->hide();
balance->show(); balance->show();
iter->show(); iter->show();
tmr->show();
} else if (BAmethod->get_active_row_number() == 2) { //CU } else if (BAmethod->get_active_row_number() == 2) { //CU
opacityCurveEditorW->show(); opacityCurveEditorW->show();
balance->hide(); balance->hide();
iter->show(); iter->show();
tmr->show();
} }
} }
} }

1
rtgui/wavelet.h
View File

@ -301,6 +301,7 @@ private:
Gtk::Frame* const chromaFrame; Gtk::Frame* const chromaFrame;
Gtk::Frame* const chroFrame; Gtk::Frame* const chroFrame;
Gtk::Frame* const fincFrame; Gtk::Frame* const fincFrame;
Gtk::Frame* const dirFrame;
Gtk::Label* const wavLabels; Gtk::Label* const wavLabels;
Gtk::Label* const labmC; Gtk::Label* const labmC;