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

added on/off switches for Channel Mixer, HSV Equalizer and RGB Curves

Browse Source
This commit is contained in:
Alberto Griggio
2017-12-09 23:54:27 +01:00
parent 6a9e6729fd
commit 11ca61e3e2
15 changed files with 144 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
rtgui/chmixer.cc
View File

@@ -22,7 +22,7 @@
using namespace rtengine;
using namespace rtengine::procparams;
ChMixer::ChMixer (): FoldableToolPanel(this, "chmixer", M("TP_CHMIXER_LABEL"))
ChMixer::ChMixer (): FoldableToolPanel(this, "chmixer", M("TP_CHMIXER_LABEL"), false, true)
{
imgIcon[0] = Gtk::manage (new RTImage ("Chanmixer-RR.png"));
@@ -99,12 +99,16 @@ void ChMixer::read (const ProcParams* pp, const ParamsEdited* pedited)
disableListener ();
if (pedited)
setEnabled(pp->chmixer.enabled);
if (pedited) {
for (int i = 0; i < 3; i++) {
red[i]->setEditedState (pedited->chmixer.red[i] ? Edited : UnEdited);
green[i]->setEditedState (pedited->chmixer.green[i] ? Edited : UnEdited);
blue[i]->setEditedState (pedited->chmixer.blue[i] ? Edited : UnEdited);
}
set_inconsistent(multiImage && !pedited->chmixer.enabled);
}
for (int i = 0; i < 3; i++) {
red[i]->setValue (pp->chmixer.red[i]);
@@ -123,13 +127,16 @@ void ChMixer::write (ProcParams* pp, ParamsEdited* pedited)
pp->chmixer.green[i] = (int) green[i]->getValue ();
pp->chmixer.blue[i] = (int) blue[i]->getValue ();
}
pp->chmixer.enabled = getEnabled();
if (pedited)
if (pedited) {
for (int i = 0; i < 3; i++) {
pedited->chmixer.red[i] = red[i]->getEditedState ();
pedited->chmixer.green[i] = green[i]->getEditedState ();
pedited->chmixer.blue[i] = blue[i]->getEditedState ();
}
pedited->chmixer.enabled = !get_inconsistent();
}
}
void ChMixer::setDefaults (const ProcParams* defParams, const ParamsEdited* pedited)
@@ -158,7 +165,7 @@ void ChMixer::setDefaults (const ProcParams* defParams, const ParamsEdited* pedi
void ChMixer::adjusterChanged (Adjuster* a, double newval)
{
if (listener) {
if (listener && getEnabled()) {
Glib::ustring descr = Glib::ustring::compose ("R=%1,%2,%3\nG=%4,%5,%6\nB=%7,%8,%9",
(int)red[0]->getValue(), (int)red[1]->getValue(), (int)red[2]->getValue(),
(int)green[0]->getValue(), (int)green[1]->getValue(), (int)green[2]->getValue(),
@@ -167,6 +174,21 @@ void ChMixer::adjusterChanged (Adjuster* a, double newval)
}
}
void ChMixer::enabledChanged()
{
if (listener) {
if (get_inconsistent()) {
listener->panelChanged(EvChMixer, M("GENERAL_UNCHANGED"));
} else if (getEnabled()) {
listener->panelChanged(EvChMixer, M("GENERAL_ENABLED"));
} else {
listener->panelChanged(EvChMixer, M("GENERAL_DISABLED"));
}
}
}
void ChMixer::setBatchMode (bool batchMode)
{