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

merge with Dev

Browse Source
This commit is contained in:
Desmis
2017-09-25 11:22:24 +02:00
parent eeff965da7 1e775bb9f0
commit 8b7c3ab0a5
7 changed files with 37 additions and 158 deletions
Download Patch File Download Diff File Expand all files Collapse all files

73
rtgui/preferences.cc
View File

@@ -216,6 +216,8 @@ Gtk::Widget* Preferences::getBatchProcPanel ()
appendBehavList (mi, M ("TP_SHARPENING_AMOUNT"), ADDSET_SHARP_AMOUNT, false);
appendBehavList (mi, M ("TP_SHARPENING_RLD_DAMPING"), ADDSET_SHARP_DAMPING, false);
appendBehavList (mi, M ("TP_SHARPENING_RLD_ITERATIONS"), ADDSET_SHARP_ITER, false);
appendBehavList (mi, M ("TP_SHARPENING_EDTOLERANCE"), ADDSET_SHARP_EDGETOL, false);
appendBehavList (mi, M ("TP_SHARPENING_HALOCONTROL"), ADDSET_SHARP_HALOCTRL, false);
mi = behModel->append ();
mi->set_value (behavColumns.label, M ("TP_SHARPENEDGE_LABEL"));
@@ -342,7 +344,6 @@ Gtk::Widget* Preferences::getBatchProcPanel ()
mi = behModel->append ();
mi->set_value (behavColumns.label, M ("TP_WAVELET_LABEL"));
appendBehavList (mi, M ("TP_WAVELET_LEVELS"), ADDSET_WA_THRES, true);
//appendBehavList (mi, M("TP_WAVELET_CONTRAST"), ADDSET_WA, true);
appendBehavList (mi, M ("TP_WAVELET_THRESHOLD"), ADDSET_WA_THRESHOLD, true);
appendBehavList (mi, M ("TP_WAVELET_THRESHOLD2"), ADDSET_WA_THRESHOLD2, true);
appendBehavList (mi, M ("TP_WAVELET_CHRO"), ADDSET_WA_CHRO, true);
@@ -419,22 +420,21 @@ void Preferences::appendBehavList (Gtk::TreeModel::iterator& parent, Glib::ustri
ci->set_value (behavColumns.addsetid, id);
}
void Preferences::behAddSetRadioToggled (const Glib::ustring& path, bool add)
{
Gtk::TreeModel::iterator iter = behModel->get_iter (path);
iter->set_value(behavColumns.badd, add);
iter->set_value(behavColumns.bset, !add);
}
void Preferences::behAddRadioToggled (const Glib::ustring& path)
{
Gtk::TreeModel::iterator iter = behModel->get_iter (path);
//bool set = iter->get_value (behavColumns.bset);
iter->set_value (behavColumns.bset, false);
iter->set_value (behavColumns.badd, true);
behAddSetRadioToggled(path, true);
}
void Preferences::behSetRadioToggled (const Glib::ustring& path)
{
Gtk::TreeModel::iterator iter = behModel->get_iter (path);
//bool add = iter->get_value (behavColumns.badd);
iter->set_value (behavColumns.bset, true);
iter->set_value (behavColumns.badd, false);
behAddSetRadioToggled(path, false);
}
@@ -2064,14 +2064,13 @@ void Preferences::fillPreferences ()
moptions.baBehav.resize (ADDSET_PARAM_NUM);
for (size_t i = 0; i < moptions.baBehav.size(); i++)
for (Gtk::TreeIter sections = behModel->children().begin(); sections != behModel->children().end(); sections++)
for (Gtk::TreeIter adjs = sections->children().begin(); adjs != sections->children().end(); adjs++)
if (adjs->get_value (behavColumns.addsetid) == (int)i) {
adjs->set_value (behavColumns.badd, moptions.baBehav[i] == 1);
adjs->set_value (behavColumns.bset, moptions.baBehav[i] != 1);
break;
}
for (Gtk::TreeIter sections = behModel->children().begin(); sections != behModel->children().end(); ++sections) {
for (Gtk::TreeIter adjs = sections->children().begin(); adjs != sections->children().end(); ++adjs) {
const bool add = moptions.baBehav[adjs->get_value(behavColumns.addsetid)];
adjs->set_value (behavColumns.badd, add);
adjs->set_value (behavColumns.bset, !add);
}
}
addc.block (false);
setc.block (false);
@@ -2581,32 +2580,24 @@ bool Preferences::splashClosed (GdkEventAny* event)
return true;
}
void Preferences::behAddSetAllPressed (bool add)
{
moptions.baBehav.clear();
moptions.baBehav.resize(ADDSET_PARAM_NUM, add);
for (Gtk::TreeIter sections = behModel->children().begin(); sections != behModel->children().end(); ++sections) {
for (Gtk::TreeIter adjs = sections->children().begin(); adjs != sections->children().end(); ++adjs) {
adjs->set_value(behavColumns.badd, add);
adjs->set_value(behavColumns.bset, !add);
}
}
}
void Preferences::behAddAllPressed ()
{
if (moptions.baBehav.size() == ADDSET_PARAM_NUM) {
for (size_t i = 0; i < moptions.baBehav.size(); i++)
for (Gtk::TreeIter sections = behModel->children().begin(); sections != behModel->children().end(); sections++)
for (Gtk::TreeIter adjs = sections->children().begin(); adjs != sections->children().end(); adjs++)
if (adjs->get_value (behavColumns.addsetid) == (int)i) {
adjs->set_value (behavColumns.badd, true);
adjs->set_value (behavColumns.bset, false);
break;
}
}
behAddSetAllPressed(true);
}
void Preferences::behSetAllPressed ()
{
if (moptions.baBehav.size() == ADDSET_PARAM_NUM) {
for (size_t i = 0; i < moptions.baBehav.size(); i++)
for (Gtk::TreeIter sections = behModel->children().begin(); sections != behModel->children().end(); sections++)
for (Gtk::TreeIter adjs = sections->children().begin(); adjs != sections->children().end(); adjs++)
if (adjs->get_value (behavColumns.addsetid) == (int)i) {
adjs->set_value (behavColumns.badd, false);
adjs->set_value (behavColumns.bset, true);
break;
}
}
behAddSetAllPressed(false);
}