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

Recallable Custom WB (see issue 928)

Browse Source 
stores CustomWB settings in variables (on adjuster change, wb picker and read) and recall from them when Custom method is selected
This commit is contained in:
michael 2011-08-21 14:29:07 -04:00
parent c57bc0c15f
commit 26b23c453c
2 changed files with 29 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
rtgui/whitebalance.cc
View File

@ -97,6 +97,13 @@ void WhiteBalance::adjusterChanged (Adjuster* a, double newval) {
method->set_active (2); method->set_active (2);
enableListener (); enableListener ();
} }
else { //method->get_active_row_number()==2
//cache custom WB setting to allow its recall
if (a==temp)
custom_temp=(int)a->getValue();
else if (a==green)
custom_green=a->getValue();
}
if (listener) { if (listener) {
if (a==temp) if (a==temp)
@ -133,6 +140,19 @@ void WhiteBalance::optChanged () {
green->setEditedState (UnEdited); green->setEditedState (UnEdited);
} }
} }
else if (opt==2 && wbp) {
// recall custom WB settings
if (custom_temp>0){
temp->setValue (temp->getAddMode() ? 0.0 : custom_temp);
green->setValue (green->getAddMode() ? 0.0 : custom_green);
}
meth = M("TP_WBALANCE_CUSTOM");
if (batchMode) {
temp->setEditedState (Edited);
green->setEditedState (Edited);
}
}
else if (opt==3) { else if (opt==3) {
meth = M("GENERAL_UNCHANGED"); meth = M("GENERAL_UNCHANGED");
temp->setEditedState (UnEdited); temp->setEditedState (UnEdited);
@ -177,6 +197,7 @@ void WhiteBalance::read (const ProcParams* pp, const ParamsEdited* pedited) {
wbp->getCamWB (ctemp, cgreen); wbp->getCamWB (ctemp, cgreen);
temp->setValue (temp->getAddMode() ? 0.0 : (int)ctemp); temp->setValue (temp->getAddMode() ? 0.0 : (int)ctemp);
green->setValue (green->getAddMode() ? 0.0 : cgreen); green->setValue (green->getAddMode() ? 0.0 : cgreen);
cache_customWB ((int)ctemp, cgreen); // this will be used to set initial Custom WB setting
} }
opt = 0; opt = 0;
} }
@ -187,6 +208,7 @@ void WhiteBalance::read (const ProcParams* pp, const ParamsEdited* pedited) {
wbp->getAutoWB (ctemp, cgreen); wbp->getAutoWB (ctemp, cgreen);
temp->setValue (temp->getAddMode() ? 0.0 : (int)ctemp); temp->setValue (temp->getAddMode() ? 0.0 : (int)ctemp);
green->setValue (green->getAddMode() ? 0.0 : cgreen); green->setValue (green->getAddMode() ? 0.0 : cgreen);
cache_customWB ((int)ctemp, cgreen); // this will be used to set initial Custom WB setting
} }
opt = 1; opt = 1;
} }
@ -194,6 +216,8 @@ void WhiteBalance::read (const ProcParams* pp, const ParamsEdited* pedited) {
method->set_active (2); method->set_active (2);
temp->setValue (pp->wb.temperature); temp->setValue (pp->wb.temperature);
green->setValue (pp->wb.green); green->setValue (pp->wb.green);
cache_customWB (pp->wb.temperature, pp->wb.green);
opt = 2; opt = 2;
if (pedited) { if (pedited) {
temp->setEditedState (pedited->wb.temperature ? Edited : UnEdited); temp->setEditedState (pedited->wb.temperature ? Edited : UnEdited);
@ -276,6 +300,8 @@ void WhiteBalance::setWB (int vtemp, double vgreen) {
green->setEditedState (Edited); green->setEditedState (Edited);
enableListener (); enableListener ();
cache_customWB (vtemp,vgreen);
if (listener) if (listener)
listener->panelChanged (EvWBTemp, Glib::ustring::compose("%1, %2", (int)temp->getValue(), Glib::ustring::format (std::setw(4), std::fixed, std::setprecision(3), green->getValue()))); listener->panelChanged (EvWBTemp, Glib::ustring::compose("%1, %2", (int)temp->getValue(), Glib::ustring::format (std::setw(4), std::fixed, std::setprecision(3), green->getValue())));
} }

3
rtgui/whitebalance.h
View File

@ -44,6 +44,9 @@ class WhiteBalance : public Gtk::VBox, public AdjusterListener, public FoldableT
WBProvider *wbp; WBProvider *wbp;
SpotWBListener* wblistener; SpotWBListener* wblistener;
sigc::connection methconn; sigc::connection methconn;
int custom_temp;
double custom_green;
void cache_customWB(int temp, double green){custom_temp = temp; custom_green=green;}; //cache custom WB setting to allow its recall
public: public: