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

Black and White Clean code issue2010

Browse Source
This commit is contained in:
jdc
2013-11-16 18:33:15 +01:00
parent 17959c1310
commit 7a80d235d5
69 changed files with 194 additions and 195 deletions
Download Patch File Download Diff File Expand all files Collapse all files

109
rtgui/chmixerbw.cc
View File

@@ -30,11 +30,11 @@ using namespace rtengine::procparams;
ChMixerbw::ChMixerbw (): Gtk::VBox(), FoldableToolPanel(this) {
CurveListener::setMulti(true);
set_border_width(4);
enabledLm = Gtk::manage (new Gtk::CheckButton (M("TP_BWMIX_ENABLED_LM")));
enabledLm->set_active (false);
enabled = Gtk::manage (new Gtk::CheckButton (M("GENERAL_ENABLED")));
enabled->set_active (false);
pack_start(*enabledLm, Gtk::PACK_SHRINK, 0);
enabledLm->show ();
pack_start(*enabled, Gtk::PACK_SHRINK, 0);
enabled->show ();
Gtk::HBox* metHBox = Gtk::manage (new Gtk::HBox ());
metHBox->set_border_width (0);
@@ -94,13 +94,13 @@ ChMixerbw::ChMixerbw (): Gtk::VBox(), FoldableToolPanel(this) {
hsep1->show ();
pack_start (*hsep1);
enabled = Gtk::manage (new Gtk::CheckButton (M("TP_BWMIX_ENABLED")));
enabledcc = Gtk::manage (new Gtk::CheckButton (M("TP_BWMIX_CC_ENABLED")));
enabled->set_active (true);
enabled->set_tooltip_markup (M("TP_BWMIX_TOOLTIP"));
enabledcc->set_active (true);
enabledcc->set_tooltip_markup (M("TP_BWMIX_CC_TOOLTIP"));
pack_start(*enabled, Gtk::PACK_SHRINK, 0);
enabled->show ();
pack_start(*enabledcc, Gtk::PACK_SHRINK, 0);
enabledcc->show ();
abox = Gtk::manage (new Gtk::HBox ());
abox->set_border_width (2);
@@ -316,9 +316,9 @@ ChMixerbw::ChMixerbw (): Gtk::VBox(), FoldableToolPanel(this) {
bwbluegam->show();
pack_start( *bwbluegam, Gtk::PACK_SHRINK, 0);
enaLmconn = enabledLm->signal_toggled().connect( sigc::mem_fun(*this, &ChMixerbw::enabledLm_toggled) );
enaconn = enabled->signal_toggled().connect( sigc::mem_fun(*this, &ChMixerbw::enabled_toggled) );
enaccconn = enabledcc->signal_toggled().connect( sigc::mem_fun(*this, &ChMixerbw::enabledcc_toggled) );
filconn = fil->signal_changed().connect ( sigc::mem_fun(*this, &ChMixerbw::filChanged) );
setconn = set->signal_changed().connect ( sigc::mem_fun(*this, &ChMixerbw::setChanged) );
metconn = met->signal_changed().connect ( sigc::mem_fun(*this, &ChMixerbw::metChanged) );
@@ -492,8 +492,8 @@ void ChMixerbw::read (const ProcParams* pp, const ParamsEdited* pedited) {
shape->setUnChanged (!pedited->chmixerbw.curve);
shape2->setUnChanged (!pedited->chmixerbw.curve2);
autoch->set_inconsistent (!pedited->chmixerbw.autoc);
enabledLm->set_inconsistent (!pedited->chmixerbw.enabledLm);
enabled->set_inconsistent (!pedited->chmixerbw.enabled);
enabledcc->set_inconsistent (!pedited->chmixerbw.enabledcc);
bwred->setEditedState (pedited->chmixerbw.bwred ? Edited : UnEdited);
bwgreen->setEditedState (pedited->chmixerbw.bwgreen ? Edited : UnEdited);
bwblue->setEditedState (pedited->chmixerbw.bwblue ? Edited : UnEdited);
@@ -513,14 +513,14 @@ void ChMixerbw::read (const ProcParams* pp, const ParamsEdited* pedited) {
}
}
autoconn.block (false);
enaccconn.block (true);
enabledcc->set_active (pp->chmixerbw.enabledcc);
enaccconn.block (false);
lastEnabledcc = pp->chmixerbw.enabledcc;
enaconn.block (true);
enabled->set_active (pp->chmixerbw.enabled);
enaconn.block (false);
lastEnabled = pp->chmixerbw.enabled;
enaLmconn.block (true);
enabledLm->set_active (pp->chmixerbw.enabledLm);
enaLmconn.block (false);
lastEnabledLm = pp->chmixerbw.enabledLm;
bwred->setValue (pp->chmixerbw.bwred);
bwgreen->setValue (pp->chmixerbw.bwgreen);
bwblue->setValue (pp->chmixerbw.bwblue);
@@ -541,8 +541,8 @@ void ChMixerbw::read (const ProcParams* pp, const ParamsEdited* pedited) {
}
void ChMixerbw::write (ProcParams* pp, ParamsEdited* pedited) {
pp->chmixerbw.enabledcc = enabledcc->get_active ();
pp->chmixerbw.enabled = enabled->get_active ();
pp->chmixerbw.enabledLm = enabledLm->get_active ();
pp->chmixerbw.autoc = autoch->get_active();
pp->chmixerbw.bwred = bwred->getValue ();
pp->chmixerbw.bwgreen = bwgreen->getValue ();
@@ -571,10 +571,10 @@ void ChMixerbw::write (ProcParams* pp, ParamsEdited* pedited) {
if (pedited) {
pedited->chmixerbw.vcurve = !vshape->isUnChanged ();
pedited->chmixerbw.enabledLm = !enabledLm->get_inconsistent();
pedited->chmixerbw.enabled = !enabled->get_inconsistent();
pedited->chmixerbw.curve = !shape->isUnChanged ();
pedited->chmixerbw.autoc = !autoch->get_inconsistent();
pedited->chmixerbw.enabled = !enabled->get_inconsistent();
pedited->chmixerbw.enabledcc = !enabledcc->get_inconsistent();
pedited->chmixerbw.bwred = bwred->getEditedState ();
pedited->chmixerbw.bwgreen = bwgreen->getEditedState ();
pedited->chmixerbw.bwblue = bwblue->getEditedState ();
@@ -743,7 +743,7 @@ void ChMixerbw::setChanged () {
rglabel->show();
gglabel->show();
bglabel->show();
enabled->hide();
enabledcc->hide();
fil->set_sensitive (true);
}
@@ -774,7 +774,7 @@ void ChMixerbw::setChanged () {
rglabel->show();
gglabel->show();
bglabel->show();
enabled->show();
enabledcc->show();
fil->set_sensitive (true);
}
@@ -809,19 +809,19 @@ void ChMixerbw::setChanged () {
clabel->hide();
mlabel->hide();
plabel->hide();
enabled->hide();
enabledcc->hide();
fil->set_sensitive (true);
}
if (listener && (multiImage||enabledLm->get_active())) {
if (listener && (multiImage||enabled->get_active())) {
listener->panelChanged (EvBWset, set->get_active_text ());
}
}
void ChMixerbw::filChanged () {
if (listener && (multiImage||enabledLm->get_active())) {
if (listener && (multiImage||enabled->get_active())) {
listener->panelChanged (EvBWfil, fil->get_active_text ());
}
}
@@ -830,8 +830,7 @@ void ChMixerbw::metChanged () {
if(met->get_active_row_number()==3) {
set->show();
setLabel->show();
//enabled->show();
enabledLm->show();
enabled->show();
curveEditorG->hide();
curveEditorGBW->show();
curveEditorGBW2->show();
@@ -854,7 +853,7 @@ void ChMixerbw::metChanged () {
bwgreengam->show();
bwbluegam->show();
Gamlabel->show();
enabled->hide();
enabledcc->hide();
}
if(set->get_active_row_number()==12 || set->get_active_row_number()==13) {
bworan->show();
@@ -867,7 +866,7 @@ void ChMixerbw::metChanged () {
clabel->show();
mlabel->show();
plabel->show();
enabled->show();
enabledcc->show();
}
}
@@ -881,8 +880,8 @@ void ChMixerbw::metChanged () {
setLabel->hide();
fil->hide();
filLabel->hide();
enabled->hide();
enabledLm->show();
enabledcc->hide();
enabled->show();
bwred->hide();
bwgreen->hide();
bwblue->hide();
@@ -923,8 +922,8 @@ void ChMixerbw::metChanged () {
setLabel->hide();
fil->hide();
filLabel->hide();
enabled->hide();
enabledLm->show();
enabledcc->hide();
enabled->show();
curveEditorG->hide();
bwred->hide();
bwgreen->hide();
@@ -950,8 +949,8 @@ void ChMixerbw::metChanged () {
setLabel->hide();
fil->hide();
filLabel->hide();
enabled->hide();
enabledLm->show();
enabledcc->hide();
enabled->show();
curveEditorG->hide();
bwred->hide();
bwgreen->hide();
@@ -979,24 +978,24 @@ void ChMixerbw::metChanged () {
curveEditorGBW->hide();
curveEditorGBW2->hide();
}
if (listener && (multiImage||enabledLm->get_active())) {
if (listener && (multiImage||enabled->get_active())) {
listener->panelChanged (EvBWmet, met->get_active_text ());
}
}
void ChMixerbw::enabledLm_toggled () {
void ChMixerbw::enabled_toggled () {
if (batchMode) {
if (enabledLm->get_inconsistent()) {
enabledLm->set_inconsistent (false);
enaLmconn.block (true);
enabledLm->set_active (false);
enaLmconn.block (false);
if (enabled->get_inconsistent()) {
enabled->set_inconsistent (false);
enaconn.block (true);
enabled->set_active (false);
enaconn.block (false);
}
else if (lastEnabledLm)
enabledLm->set_inconsistent (true);
else if (lastEnabled)
enabled->set_inconsistent (true);
lastEnabledLm = enabledLm->get_active ();
lastEnabled = enabled->get_active ();
}
if (listener) {
@@ -1035,23 +1034,23 @@ void ChMixerbw::neutral_pressed () {
}
void ChMixerbw::enabled_toggled () {
void ChMixerbw::enabledcc_toggled () {
if (batchMode) {
if (enabled->get_inconsistent()) {
enabled->set_inconsistent (false);
enaconn.block (true);
enabled->set_active (false);
enaconn.block (false);
if (enabledcc->get_inconsistent()) {
enabledcc->set_inconsistent (false);
enaccconn.block (true);
enabledcc->set_active (false);
enaccconn.block (false);
}
else if (lastEnabled)
enabled->set_inconsistent (true);
else if (lastEnabledcc)
enabledcc->set_inconsistent (true);
lastEnabled = enabled->get_active ();
lastEnabledcc = enabledcc->get_active ();
}
if (listener) {
if (enabled->get_active ()){
if (enabledcc->get_active ()){
listener->panelChanged (EvBWChmixEnabled, M("GENERAL_ENABLED"));
}
else {
@@ -1188,7 +1187,7 @@ void ChMixerbw::adjusterChanged (Adjuster* a, double newval) {
autoch->set_inconsistent (false);
}
if (listener && (multiImage||enabledLm->get_active())) {
if (listener && (multiImage||enabled->get_active())) {
Glib::ustring value = a->getTextValue();
if (a == bwred)
listener->panelChanged (EvBWred, value );

14
rtgui/chmixerbw.h
View File

@@ -74,13 +74,13 @@ class ChMixerbw : public Gtk::VBox, public AdjusterListener, public FoldableTool
Gtk::Label* filLabel;
Gtk::Image *imgIcon[11];
Gtk::CheckButton* enabledLm;
bool lastEnabledLm;
sigc::connection enaLmconn;
Gtk::CheckButton* enabled;
bool lastEnabled, lastAuto;
sigc::connection enaconn,tcmodeconn,tcmodeconn2, autoconn, neutralconn;
bool lastEnabled;
sigc::connection enaconn;
Gtk::CheckButton* enabledcc;
bool lastEnabledcc, lastAuto;
sigc::connection enaccconn,tcmodeconn,tcmodeconn2, autoconn, neutralconn;
MyComboBoxText* toneCurveBW;
MyComboBoxText* toneCurveBW2;
@@ -107,8 +107,8 @@ class ChMixerbw : public Gtk::VBox, public AdjusterListener, public FoldableTool
void adjusterChanged (Adjuster* a, double newval);
void setAdjusterBehavior (bool bwadd, bool bwgadd, bool bwfadd);
void trimValues (rtengine::procparams::ProcParams* pp);
void enabledcc_toggled ();
void enabled_toggled ();
void enabledLm_toggled ();
void metChanged ();
void filChanged ();
void setChanged ();

6
rtgui/paramsedited.cc
View File

@@ -216,8 +216,8 @@ void ParamsEdited::set (bool v) {
chmixer.blue[0] = v;
chmixer.blue[1] = v;
chmixer.blue[2] = v;
chmixerbw.enabledcc = v;
chmixerbw.enabled = v;
chmixerbw.enabledLm = v;
chmixerbw.bwred = v;
chmixerbw.bwgreen = v;
chmixerbw.bwblue = v;
@@ -497,8 +497,8 @@ void ParamsEdited::initFrom (const std::vector<rtengine::procparams::ProcParams>
chmixer.blue[0] = chmixer.blue[0] && p.chmixer.blue[0] == other.chmixer.blue[0];
chmixer.blue[1] = chmixer.blue[1] && p.chmixer.blue[1] == other.chmixer.blue[1];
chmixer.blue[2] = chmixer.blue[2] && p.chmixer.blue[2] == other.chmixer.blue[2];
chmixerbw.enabledcc = chmixerbw.enabledcc && p.chmixerbw.enabledcc == other.chmixerbw.enabledcc;
chmixerbw.enabled = chmixerbw.enabled && p.chmixerbw.enabled == other.chmixerbw.enabled;
chmixerbw.enabledLm = chmixerbw.enabledLm && p.chmixerbw.enabledLm == other.chmixerbw.enabledLm;
chmixerbw.bwred = chmixerbw.bwred && p.chmixerbw.bwred == other.chmixerbw.bwred;
chmixerbw.bwgreen = chmixerbw.bwgreen && p.chmixerbw.bwgreen == other.chmixerbw.bwgreen;
chmixerbw.bwblue = chmixerbw.bwblue && p.chmixerbw.bwblue == other.chmixerbw.bwblue;
@@ -633,8 +633,8 @@ void ParamsEdited::combine (rtengine::procparams::ProcParams& toEdit, const rten
if (chmixer.green[i]) toEdit.chmixer.green[i] = dontforceSet && options.baBehav[ADDSET_CHMIXER] ? toEdit.chmixer.green[i] + mods.chmixer.green[i] : mods.chmixer.green[i];
if (chmixer.blue[i]) toEdit.chmixer.blue[i] = dontforceSet && options.baBehav[ADDSET_CHMIXER] ? toEdit.chmixer.blue[i] + mods.chmixer.blue[i] : mods.chmixer.blue[i];
}
if (chmixerbw.enabledcc) toEdit.chmixerbw.enabledcc = mods.chmixerbw.enabledcc;
if (chmixerbw.enabled) toEdit.chmixerbw.enabled = mods.chmixerbw.enabled;
if (chmixerbw.enabledLm) toEdit.chmixerbw.enabledLm = mods.chmixerbw.enabledLm;
if (chmixerbw.bwgreen) toEdit.chmixerbw.bwgreen = dontforceSet && options.baBehav[ADDSET_CHMIXER_BW] ? toEdit.chmixerbw.bwgreen + mods.chmixerbw.bwgreen : mods.chmixerbw.bwgreen;
if (chmixerbw.bwred) toEdit.chmixerbw.bwred = dontforceSet && options.baBehav[ADDSET_CHMIXER_BW] ? toEdit.chmixerbw.bwred + mods.chmixerbw.bwred : mods.chmixerbw.bwred;
if (chmixerbw.bwblue) toEdit.chmixerbw.bwblue = dontforceSet && options.baBehav[ADDSET_CHMIXER_BW] ? toEdit.chmixerbw.bwblue + mods.chmixerbw.bwblue : mods.chmixerbw.bwblue;

2
rtgui/paramsedited.h
View File

@@ -354,8 +354,8 @@ class ChannelMixerParamsEdited {
class ChannelMixerbwParamsEdited {
public:
bool enabledcc;
bool enabled;
bool enabledLm;
bool bwred;
bool bwgreen;
bool bwblue;