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

Re-enabled showmask clarity and sharp-mask

Browse Source
This commit is contained in:
Desmis
2019-06-14 07:28:37 +02:00
parent 941e0bd26c
commit f2666dc464
3 changed files with 30 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

63
rtgui/wavelet.cc
View File

@@ -501,7 +501,7 @@ Wavelet::Wavelet() :
clariBox->pack_start(*mergeL);
clariBox->pack_start(*mergeC);
clariBox->pack_start(*softrad);
// clariBox->pack_start(*showmask);
clariBox->pack_start(*showmask);
// Edge Sharpness
ToolParamBlock* const edgBox = Gtk::manage(new ToolParamBlock());
@@ -3064,46 +3064,6 @@ void Wavelet::avoidToggled()
void Wavelet::showmaskToggled()
{
if (ushamethod->get_active_row_number() == 1 && showmask->get_active()) {
Backmethod->set_active(2);
CLmethod->set_active(2);
Lmethod->set_active(6);
Lmethod->set_sensitive(true);
Dirmethod->set_sensitive(true);
Dirmethod->set_active(3);
expclari->setEnabled(false);
} else if (ushamethod->get_active_row_number() == 0 && showmask->get_active()) {
Backmethod->set_active(0);
CLmethod->set_active(1);
Lmethod->set_active(2);
Dirmethod->set_active(3);
Lmethod->set_sensitive(true);
Dirmethod->set_sensitive(true);
expclari->setEnabled(false);
}
if (ushamethod->get_active_row_number() == 1 && !showmask->get_active()) {
Backmethod->set_active(2);
CLmethod->set_active(2);
Lmethod->set_active(6);
Lmethod->set_sensitive(true);
Dirmethod->set_sensitive(true);
Dirmethod->set_active(3);
expclari->setEnabled(true);
} else if (ushamethod->get_active_row_number() == 0 && !showmask->get_active()) {
Backmethod->set_active(0);
CLmethod->set_active(1);
Lmethod->set_active(2);
Dirmethod->set_active(3);
Lmethod->set_sensitive(true);
Dirmethod->set_sensitive(true);
expclari->setEnabled(true);
}
if (multiImage) {
if (showmask->get_inconsistent()) {
showmask->set_inconsistent(false);
@@ -3306,20 +3266,15 @@ void Wavelet::enableToggled(MyExpander *expander)
event = EvWavenafin;
} else if (expander == expclari) {
if (expclari->getEnabled() == false) {
if (! showmask->get_active()) {
Backmethod->set_active(1);
CLmethod->set_active(3);
Lmethod->set_active(3);
Dirmethod->set_active(3);
Lmethod->set_sensitive(false);
Dirmethod->set_sensitive(false);
CLmethod->set_sensitive(true);
Backmethod->set_sensitive(true);
}
Backmethod->set_active(1);
CLmethod->set_active(3);
Lmethod->set_active(3);
Dirmethod->set_active(3);
Lmethod->set_sensitive(false);
Dirmethod->set_sensitive(false);
CLmethod->set_sensitive(true);
Backmethod->set_sensitive(true);
} else {
if (showmask->get_active()) {
showmask->set_active(false);
}
if (ushamethod->get_active_row_number() == 1) {
Backmethod->set_active(2);