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

Prepared engine to display the Sharpening Contrast mask

Browse Source
This commit is contained in:
heckflosse
2018-06-10 14:35:12 +02:00
parent 039f68e545
commit 44729edf04
10 changed files with 97 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
rtgui/indclippedpanel.cc
View File

@@ -27,11 +27,20 @@ IndicateClippedPanel::IndicateClippedPanel (ImageArea* ia) : imageArea(ia)
iFon = new RTImage ("previewmodeF-focusScreen-on.png");
iFoff = new RTImage ("previewmodeF-focusScreen-off.png");
// for previewSharpMask, needs to be replaced with different icons
iSon = new RTImage ("previewmodeF-focusScreen-on.png");
iSoff = new RTImage ("previewmodeF-focusScreen-off.png");
previewFocusMask = Gtk::manage (new Gtk::ToggleButton ());
previewFocusMask->set_relief(Gtk::RELIEF_NONE);
previewFocusMask->set_tooltip_markup (M("MAIN_TOOLTIP_PREVIEWFOCUSMASK"));
previewFocusMask->set_image(*iFoff);
previewSharpMask = Gtk::manage (new Gtk::ToggleButton ());
previewSharpMask->set_relief(Gtk::RELIEF_NONE);
previewSharpMask->set_tooltip_markup (M("MAIN_TOOLTIP_PREVIEWSHARPMASK"));
previewSharpMask->set_image(*iSoff);
Glib::ustring tt;
indClippedH = Gtk::manage (new Gtk::ToggleButton ());
@@ -57,13 +66,16 @@ IndicateClippedPanel::IndicateClippedPanel (ImageArea* ia) : imageArea(ia)
}
previewFocusMask->set_active (false);
previewSharpMask->set_active (false);
indClippedH->set_active (options.showClippedHighlights);
indClippedS->set_active (options.showClippedShadows);
pack_start (*previewFocusMask, Gtk::PACK_SHRINK, 0);
pack_start (*previewSharpMask, Gtk::PACK_SHRINK, 0);
pack_start (*indClippedS, Gtk::PACK_SHRINK, 0);
pack_start (*indClippedH, Gtk::PACK_SHRINK, 0);
connSharpMask = previewSharpMask->signal_toggled().connect( sigc::bind(sigc::mem_fun(*this, &IndicateClippedPanel::buttonToggled), previewSharpMask) );
connFocusMask = previewFocusMask->signal_toggled().connect( sigc::bind(sigc::mem_fun(*this, &IndicateClippedPanel::buttonToggled), previewFocusMask) );
connClippedS = indClippedS->signal_toggled().connect( sigc::bind(sigc::mem_fun(*this, &IndicateClippedPanel::buttonToggled), indClippedS) );
connClippedH = indClippedH->signal_toggled().connect( sigc::bind(sigc::mem_fun(*this, &IndicateClippedPanel::buttonToggled), indClippedH) );
@@ -86,27 +98,45 @@ void IndicateClippedPanel::toggleFocusMask ()
previewFocusMask->set_active(!previewFocusMask->get_active());
}
void IndicateClippedPanel::toggleSharpMask ()
{
previewSharpMask->set_active(!previewSharpMask->get_active());
}
void IndicateClippedPanel::buttonToggled (Gtk::ToggleButton* tb)
{
connFocusMask.block(true);
connSharpMask.block(true);
connClippedS.block(true);
connClippedH.block(true);
if (tb != previewFocusMask) {
previewFocusMask->set_active(false);
} else {
if (tb == previewFocusMask) {
if (indClippedS->get_active()) {
indClippedS->set_active(false);
}
if (indClippedH->get_active()) {
indClippedH->set_active(false);
}
previewSharpMask->set_active(false);
} else if (tb == previewSharpMask) {
if (indClippedS->get_active()) {
indClippedS->set_active(false);
}
if (indClippedH->get_active()) {
indClippedH->set_active(false);
}
previewFocusMask->set_active(false);
} else {
previewFocusMask->set_active(false);
previewSharpMask->set_active(false);
}
previewFocusMask->set_image(previewFocusMask->get_active() ? *iFon : *iFoff);
previewSharpMask->set_image(previewSharpMask->get_active() ? *iSon : *iSoff);
connFocusMask.block(false);
connSharpMask.block(false);
connClippedS.block(false);
connClippedH.block(false);
@@ -123,4 +153,6 @@ IndicateClippedPanel::~IndicateClippedPanel ()
{
delete iFon;
delete iFoff;
delete iSon;
delete iSoff;
}