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

Suppress 'addset_locallab' meaningless

Browse Source
This commit is contained in:
Desmis 2017-03-17 11:11:19 +01:00
parent 9a3f2d0d8a
commit 0464babf36
7 changed files with 106 additions and 130 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
rtgui/addsetids.h
View File

@ -115,19 +115,6 @@ enum {
ADDSET_RETI_VART, ADDSET_RETI_VART,
ADDSET_RETI_GAM, ADDSET_RETI_GAM,
ADDSET_RETI_SLO, ADDSET_RETI_SLO,
ADDSET_LOCALLAB_DEGREE,
ADDSET_LOCALLAB_LOCY,
ADDSET_LOCALLAB_LOCX,
ADDSET_LOCALLAB_LOCYT,
ADDSET_LOCALLAB_LOCXL,
ADDSET_LOCALLAB_CENTER,
ADDSET_LOCALLAB_LIGHTNESS,
ADDSET_LOCALLAB_CONTRAST,
ADDSET_LOCALLAB_CHROMA,
ADDSET_LOCALLAB_RADIUS,
ADDSET_LOCALLAB_TRANSIT,
ADDSET_LOCALLAB_STRENGTH,
ADDSET_LOCALLAB_SENSI,
ADDSET_WB_TEMPBIAS, ADDSET_WB_TEMPBIAS,
ADDSET_PARAM_NUM // THIS IS USED AS A DELIMITER!! ADDSET_PARAM_NUM // THIS IS USED AS A DELIMITER!!

5
rtgui/batchtoolpanelcoord.cc
View File

@ -200,7 +200,7 @@ void BatchToolPanelCoordinator::initSession ()
distortion->setAdjusterBehavior (options.baBehav[ADDSET_DIST_AMOUNT]); distortion->setAdjusterBehavior (options.baBehav[ADDSET_DIST_AMOUNT]);
perspective->setAdjusterBehavior (options.baBehav[ADDSET_PERSPECTIVE]); perspective->setAdjusterBehavior (options.baBehav[ADDSET_PERSPECTIVE]);
gradient->setAdjusterBehavior (options.baBehav[ADDSET_GRADIENT_DEGREE], options.baBehav[ADDSET_GRADIENT_FEATHER], options.baBehav[ADDSET_GRADIENT_STRENGTH], options.baBehav[ADDSET_GRADIENT_CENTER]); gradient->setAdjusterBehavior (options.baBehav[ADDSET_GRADIENT_DEGREE], options.baBehav[ADDSET_GRADIENT_FEATHER], options.baBehav[ADDSET_GRADIENT_STRENGTH], options.baBehav[ADDSET_GRADIENT_CENTER]);
locallab->setAdjusterBehavior (options.baBehav[ADDSET_LOCALLAB_DEGREE], options.baBehav[ADDSET_LOCALLAB_LOCY], options.baBehav[ADDSET_LOCALLAB_LOCX], options.baBehav[ADDSET_LOCALLAB_LOCYT], options.baBehav[ADDSET_LOCALLAB_LOCXL], options.baBehav[ADDSET_LOCALLAB_CENTER], options.baBehav[ADDSET_LOCALLAB_LIGHTNESS], options.baBehav[ADDSET_LOCALLAB_CONTRAST], options.baBehav[ADDSET_LOCALLAB_CHROMA], options.baBehav[ADDSET_LOCALLAB_SENSI], options.baBehav[ADDSET_LOCALLAB_RADIUS], options.baBehav[ADDSET_LOCALLAB_STRENGTH], options.baBehav[ADDSET_LOCALLAB_TRANSIT]); // locallab->setAdjusterBehavior (options.baBehav[ADDSET_LOCALLAB_DEGREE], options.baBehav[ADDSET_LOCALLAB_LOCY], options.baBehav[ADDSET_LOCALLAB_LOCX], options.baBehav[ADDSET_LOCALLAB_LOCYT], options.baBehav[ADDSET_LOCALLAB_LOCXL], options.baBehav[ADDSET_LOCALLAB_CENTER], options.baBehav[ADDSET_LOCALLAB_LIGHTNESS], options.baBehav[ADDSET_LOCALLAB_CONTRAST], options.baBehav[ADDSET_LOCALLAB_CHROMA], options.baBehav[ADDSET_LOCALLAB_SENSI], options.baBehav[ADDSET_LOCALLAB_RADIUS], options.baBehav[ADDSET_LOCALLAB_STRENGTH], options.baBehav[ADDSET_LOCALLAB_TRANSIT]);
pcvignette->setAdjusterBehavior (options.baBehav[ADDSET_PCVIGNETTE_STRENGTH], options.baBehav[ADDSET_PCVIGNETTE_FEATHER], options.baBehav[ADDSET_PCVIGNETTE_ROUNDNESS]); pcvignette->setAdjusterBehavior (options.baBehav[ADDSET_PCVIGNETTE_STRENGTH], options.baBehav[ADDSET_PCVIGNETTE_FEATHER], options.baBehav[ADDSET_PCVIGNETTE_ROUNDNESS]);
cacorrection->setAdjusterBehavior (options.baBehav[ADDSET_CA]); cacorrection->setAdjusterBehavior (options.baBehav[ADDSET_CA]);
sharpening->setAdjusterBehavior (options.baBehav[ADDSET_SHARP_AMOUNT]); sharpening->setAdjusterBehavior (options.baBehav[ADDSET_SHARP_AMOUNT]);
@ -460,6 +460,7 @@ void BatchToolPanelCoordinator::initSession ()
pparams.gradient.centerY = 0; pparams.gradient.centerY = 0;
} }
/*
if (options.baBehav[ADDSET_LOCALLAB_DEGREE]) { if (options.baBehav[ADDSET_LOCALLAB_DEGREE]) {
pparams.locallab.degree = 0; pparams.locallab.degree = 0;
} }
@ -515,7 +516,7 @@ void BatchToolPanelCoordinator::initSession ()
if (options.baBehav[ADDSET_LOCALLAB_TRANSIT]) { if (options.baBehav[ADDSET_LOCALLAB_TRANSIT]) {
pparams.locallab.transit = 0; pparams.locallab.transit = 0;
} }
*/
if (options.baBehav[ADDSET_PCVIGNETTE_STRENGTH]) { if (options.baBehav[ADDSET_PCVIGNETTE_STRENGTH]) {
pparams.pcvignette.strength = 0; pparams.pcvignette.strength = 0;
} }

13
rtgui/options.cc
View File

@ -615,19 +615,6 @@ void Options::setDefaults ()
0, // ADDSET_RETI_VART 0, // ADDSET_RETI_VART
0, // ADDSET_RETI_GAM 0, // ADDSET_RETI_GAM
0, // ADDSET_RETI_SLO 0, // ADDSET_RETI_SLO
0, // ADDSET_LOCALLAB_DEGREE
0, // ADDSET_LOCALLAB_LOCY
0, // ADDSET_LOCALLAB_LOCX
0, // ADDSET_LOCALLAB_LOCYY
0, // ADDSET_LOCALLAB_LOCXL
0, // ADDSET_LOCALLAB_CENTER
0, // ADDSET_LOCALLAB_LIGHTNESS
0, // ADDSET_LOCALLAB_CONTRAST
0, // ADDSET_LOCALLAB_CHROMA
0, // ADDSET_LOCALLAB_RADIUS
0, // ADDSET_LOCALLAB_TRANSIT
0, // ADDSET_LOCALLAB_STRENGTH
0, // ADDSET_LOCALLAB_SENSI
0, // ADDSET_WB_TEMPBIAS 0, // ADDSET_WB_TEMPBIAS
}; };

2
rtgui/paramsedited.cc
View File

@ -2212,7 +2212,7 @@ void ParamsEdited::combine (rtengine::procparams::ProcParams& toEdit, const rten
} }
if (locallab.degree) { if (locallab.degree) {
toEdit.locallab.degree = dontforceSet && options.baBehav[ADDSET_LOCALLAB_DEGREE] ? toEdit.locallab.degree + mods.locallab.degree : mods.locallab.degree; toEdit.locallab.degree = mods.locallab.degree; //dontforceSet && options.baBehav[ADDSET_LOCALLAB_DEGREE] ? toEdit.locallab.degree + mods.locallab.degree : mods.locallab.degree;
} }
if (locallab.locY) { if (locallab.locY) {

15
rtgui/partialpastedlg.cc
View File

@ -55,7 +55,7 @@ PartialPasteDlg::PartialPasteDlg (const Glib::ustring &title, Gtk::Window* paren
pcvignette = Gtk::manage (new Gtk::CheckButton (M ("PARTIALPASTE_PCVIGNETTE"))); pcvignette = Gtk::manage (new Gtk::CheckButton (M ("PARTIALPASTE_PCVIGNETTE")));
gradient = Gtk::manage (new Gtk::CheckButton (M ("PARTIALPASTE_GRADIENT"))); gradient = Gtk::manage (new Gtk::CheckButton (M ("PARTIALPASTE_GRADIENT")));
labcurve = Gtk::manage (new Gtk::CheckButton (M ("PARTIALPASTE_LABCURVE"))); labcurve = Gtk::manage (new Gtk::CheckButton (M ("PARTIALPASTE_LABCURVE")));
locallab = Gtk::manage (new Gtk::CheckButton (M ("PARTIALPASTE_LOCALLAB"))); // locallab = Gtk::manage (new Gtk::CheckButton (M ("PARTIALPASTE_LOCALLAB")));
colorappearance = Gtk::manage (new Gtk::CheckButton (M ("PARTIALPASTE_COLORAPP"))); colorappearance = Gtk::manage (new Gtk::CheckButton (M ("PARTIALPASTE_COLORAPP")));
// options in detail: // options in detail:
@ -147,7 +147,7 @@ PartialPasteDlg::PartialPasteDlg (const Glib::ustring &title, Gtk::Window* paren
vboxes[0]->pack_start (*pcvignette, Gtk::PACK_SHRINK, 2); vboxes[0]->pack_start (*pcvignette, Gtk::PACK_SHRINK, 2);
vboxes[0]->pack_start (*gradient, Gtk::PACK_SHRINK, 2); vboxes[0]->pack_start (*gradient, Gtk::PACK_SHRINK, 2);
vboxes[0]->pack_start (*labcurve, Gtk::PACK_SHRINK, 2); vboxes[0]->pack_start (*labcurve, Gtk::PACK_SHRINK, 2);
vboxes[0]->pack_start (*locallab, Gtk::PACK_SHRINK, 2); // vboxes[0]->pack_start (*locallab, Gtk::PACK_SHRINK, 2);
vboxes[0]->pack_start (*colorappearance, Gtk::PACK_SHRINK, 2); vboxes[0]->pack_start (*colorappearance, Gtk::PACK_SHRINK, 2);
//DETAIL //DETAIL
@ -302,7 +302,7 @@ PartialPasteDlg::PartialPasteDlg (const Glib::ustring &title, Gtk::Window* paren
pcvignetteConn = pcvignette->signal_toggled().connect (sigc::bind (sigc::mem_fun (*basic, &Gtk::CheckButton::set_inconsistent), true)); pcvignetteConn = pcvignette->signal_toggled().connect (sigc::bind (sigc::mem_fun (*basic, &Gtk::CheckButton::set_inconsistent), true));
gradientConn = gradient->signal_toggled().connect (sigc::bind (sigc::mem_fun (*basic, &Gtk::CheckButton::set_inconsistent), true)); gradientConn = gradient->signal_toggled().connect (sigc::bind (sigc::mem_fun (*basic, &Gtk::CheckButton::set_inconsistent), true));
labcurveConn = labcurve->signal_toggled().connect (sigc::bind (sigc::mem_fun (*basic, &Gtk::CheckButton::set_inconsistent), true)); labcurveConn = labcurve->signal_toggled().connect (sigc::bind (sigc::mem_fun (*basic, &Gtk::CheckButton::set_inconsistent), true));
locallabConn = locallab->signal_toggled().connect (sigc::bind (sigc::mem_fun (*basic, &Gtk::CheckButton::set_inconsistent), true)); // locallabConn = locallab->signal_toggled().connect (sigc::bind (sigc::mem_fun (*basic, &Gtk::CheckButton::set_inconsistent), true));
colorappearanceConn = colorappearance->signal_toggled().connect (sigc::bind (sigc::mem_fun (*basic, &Gtk::CheckButton::set_inconsistent), true)); colorappearanceConn = colorappearance->signal_toggled().connect (sigc::bind (sigc::mem_fun (*basic, &Gtk::CheckButton::set_inconsistent), true));
sharpenConn = sharpen->signal_toggled().connect (sigc::bind (sigc::mem_fun (*detail, &Gtk::CheckButton::set_inconsistent), true)); sharpenConn = sharpen->signal_toggled().connect (sigc::bind (sigc::mem_fun (*detail, &Gtk::CheckButton::set_inconsistent), true));
@ -506,7 +506,7 @@ void PartialPasteDlg::basicToggled ()
gradientConn.block (true); gradientConn.block (true);
labcurveConn.block (true); labcurveConn.block (true);
colorappearanceConn.block (true); colorappearanceConn.block (true);
locallabConn.block (true); // locallabConn.block (true);
retinexConn.block (true); retinexConn.block (true);
basic->set_inconsistent (false); basic->set_inconsistent (false);
@ -520,7 +520,7 @@ void PartialPasteDlg::basicToggled ()
retinex->set_active (basic->get_active ()); retinex->set_active (basic->get_active ());
labcurve->set_active (basic->get_active ()); labcurve->set_active (basic->get_active ());
colorappearance->set_active (basic->get_active ()); colorappearance->set_active (basic->get_active ());
locallab->set_active (basic->get_active ()); // locallab->set_active (basic->get_active ());
wbConn.block (false); wbConn.block (false);
exposureConn.block (false); exposureConn.block (false);
@ -531,7 +531,7 @@ void PartialPasteDlg::basicToggled ()
retinexConn.block (false); retinexConn.block (false);
labcurveConn.block (false); labcurveConn.block (false);
locallabConn.block (false); // locallabConn.block (false);
colorappearanceConn.block (false); colorappearanceConn.block (false);
} }
@ -724,10 +724,11 @@ void PartialPasteDlg::applyPaste (rtengine::procparams::ProcParams* dstPP, Param
filterPE.gradient = falsePE.gradient; filterPE.gradient = falsePE.gradient;
} }
/*
if (!locallab->get_active ()) { if (!locallab->get_active ()) {
filterPE.locallab = falsePE.locallab; filterPE.locallab = falsePE.locallab;
} }
*/
if (!labcurve->get_active ()) { if (!labcurve->get_active ()) {
filterPE.labCurve = falsePE.labCurve; filterPE.labCurve = falsePE.labCurve;
} }

4
rtgui/partialpastedlg.h
View File

@ -51,7 +51,7 @@ public:
Gtk::CheckButton* gradient; Gtk::CheckButton* gradient;
Gtk::CheckButton* labcurve; Gtk::CheckButton* labcurve;
Gtk::CheckButton* colorappearance; Gtk::CheckButton* colorappearance;
Gtk::CheckButton* locallab; // Gtk::CheckButton* locallab;
// options in detail: // options in detail:
Gtk::CheckButton* sharpen; Gtk::CheckButton* sharpen;
@ -123,7 +123,7 @@ public:
sigc::connection everythingConn, basicConn, detailConn, colorConn, lensConn, compositionConn, metaConn, rawConn, wavConn; sigc::connection everythingConn, basicConn, detailConn, colorConn, lensConn, compositionConn, metaConn, rawConn, wavConn;
sigc::connection wbConn, exposureConn, shConn, pcvignetteConn, gradientConn, labcurveConn, colorappearanceConn, locallabConn; sigc::connection wbConn, exposureConn, shConn, pcvignetteConn, gradientConn, labcurveConn, colorappearanceConn; // locallabConn;
sigc::connection sharpenConn, gradsharpenConn, microcontrastConn, impdenConn, dirpyrdenConn, defringeConn, epdConn, dirpyreqConn, waveletConn, retinexConn; sigc::connection sharpenConn, gradsharpenConn, microcontrastConn, impdenConn, dirpyrdenConn, defringeConn, epdConn, dirpyreqConn, waveletConn, retinexConn;
sigc::connection vibranceConn, chmixerConn, hsveqConn, rgbcurvesConn, chmixerbwConn, colortoningConn, filmSimulationConn; sigc::connection vibranceConn, chmixerConn, hsveqConn, rgbcurvesConn, chmixerbwConn, colortoningConn, filmSimulationConn;
sigc::connection distortionConn, cacorrConn, vignettingConn, lcpConn; sigc::connection distortionConn, cacorrConn, vignettingConn, lcpConn;

4
rtgui/preferences.cc
View File

@ -214,7 +214,7 @@ Gtk::Widget* Preferences::getBatchProcPanel ()
appendBehavList (mi, M ("TP_SHARPENING_AMOUNT"), ADDSET_SHARP_AMOUNT, false); appendBehavList (mi, M ("TP_SHARPENING_AMOUNT"), ADDSET_SHARP_AMOUNT, false);
mi = behModel->append (); mi = behModel->append ();
/*
mi->set_value (behavColumns.label, M ("TP_LOCALLAB_LABEL")); mi->set_value (behavColumns.label, M ("TP_LOCALLAB_LABEL"));
// appendBehavList (mi, M("TP_LOCALLAB_DEGREE"), ADDSET_LOCALLAB_DEGREE, false); // appendBehavList (mi, M("TP_LOCALLAB_DEGREE"), ADDSET_LOCALLAB_DEGREE, false);
appendBehavList (mi, M ("TP_LOCAL_HEIGHT"), ADDSET_LOCALLAB_LOCY, false); appendBehavList (mi, M ("TP_LOCAL_HEIGHT"), ADDSET_LOCALLAB_LOCY, false);
@ -229,7 +229,7 @@ Gtk::Widget* Preferences::getBatchProcPanel ()
appendBehavList (mi, M ("TP_LOCALLAB_RADIUS"), ADDSET_LOCALLAB_RADIUS, false); appendBehavList (mi, M ("TP_LOCALLAB_RADIUS"), ADDSET_LOCALLAB_RADIUS, false);
appendBehavList (mi, M ("TP_LOCALLAB_STRENGTH"), ADDSET_LOCALLAB_STRENGTH, false); appendBehavList (mi, M ("TP_LOCALLAB_STRENGTH"), ADDSET_LOCALLAB_STRENGTH, false);
appendBehavList (mi, M ("TP_LOCALLAB_TRANSIT"), ADDSET_LOCALLAB_TRANSIT, false); appendBehavList (mi, M ("TP_LOCALLAB_TRANSIT"), ADDSET_LOCALLAB_TRANSIT, false);
*/
mi = behModel->append (); mi = behModel->append ();