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_GAM,
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_PARAM_NUM // THIS IS USED AS A DELIMITER!!

45
rtgui/batchtoolpanelcoord.cc
View File

@ -25,7 +25,7 @@
using namespace rtengine::procparams;
BatchToolPanelCoordinator::BatchToolPanelCoordinator (FilePanel* parent) : ToolPanelCoordinator(), somethingChanged(false), parent(parent)
BatchToolPanelCoordinator::BatchToolPanelCoordinator (FilePanel* parent) : ToolPanelCoordinator(), somethingChanged (false), parent (parent)
{
blockedUpdate = false;
@ -147,7 +147,7 @@ void BatchToolPanelCoordinator::initSession ()
if (selected.size() == 1) {
for (size_t i = 0; i < toolPanels.size(); i++) {
toolPanels.at(i)->setMultiImage(false);
toolPanels.at (i)->setMultiImage (false);
}
toneCurve->setAdjusterBehavior (false, false, false, false, false, false, false, false);
@ -171,7 +171,7 @@ void BatchToolPanelCoordinator::initSession ()
chmixer->setAdjusterBehavior (false);
blackwhite->setAdjusterBehavior (false, false);
colortoning->setAdjusterBehavior (false, false, false, false, false);
filmSimulation->setAdjusterBehavior(false);
filmSimulation->setAdjusterBehavior (false);
retinex->setAdjusterBehavior (false, false, false, false, false, false, false, false);
shadowshighlights->setAdjusterBehavior (false, false, false);
@ -180,14 +180,14 @@ void BatchToolPanelCoordinator::initSession ()
dirpyrdenoise->setAdjusterBehavior (false, false, false, false, false, false, false);
bayerpreprocess->setAdjusterBehavior (false, false);
rawcacorrection->setAdjusterBehavior (false);
flatfield->setAdjusterBehavior(false);
flatfield->setAdjusterBehavior (false);
rawexposure->setAdjusterBehavior (false, false);
bayerrawexposure->setAdjusterBehavior (false);
xtransrawexposure->setAdjusterBehavior (false);
} else {
for (size_t i = 0; i < toolPanels.size(); i++) {
toolPanels.at(i)->setMultiImage(true);
toolPanels.at (i)->setMultiImage (true);
}
toneCurve->setAdjusterBehavior (options.baBehav[ADDSET_TC_EXPCOMP], options.baBehav[ADDSET_TC_HLCOMPAMOUNT], options.baBehav[ADDSET_TC_HLCOMPTHRESH], options.baBehav[ADDSET_TC_BRIGHTNESS], options.baBehav[ADDSET_TC_BLACKLEVEL], options.baBehav[ADDSET_TC_SHCOMP], options.baBehav[ADDSET_TC_CONTRAST], options.baBehav[ADDSET_TC_SATURATION]);
@ -200,7 +200,7 @@ void BatchToolPanelCoordinator::initSession ()
distortion->setAdjusterBehavior (options.baBehav[ADDSET_DIST_AMOUNT]);
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]);
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]);
cacorrection->setAdjusterBehavior (options.baBehav[ADDSET_CA]);
sharpening->setAdjusterBehavior (options.baBehav[ADDSET_SHARP_AMOUNT]);
@ -209,7 +209,7 @@ void BatchToolPanelCoordinator::initSession ()
icm->setAdjusterBehavior (options.baBehav[ADDSET_FREE_OUPUT_GAMMA], options.baBehav[ADDSET_FREE_OUTPUT_SLOPE]);
// colortoning->setAdjusterBehavior (options.baBehav[ADDSET_COLORTONING_SPLIT], options.baBehav[ADDSET_COLORTONING_SATTHRESHOLD], options.baBehav[ADDSET_COLORTONING_SATOPACITY], options.baBehav[ADDSET_COLORTONING_STRPROTECT], options.baBehav[ADDSET_COLORTONING_BALANCE]);
colortoning->setAdjusterBehavior (options.baBehav[ADDSET_COLORTONING_SPLIT], options.baBehav[ADDSET_COLORTONING_SATTHRESHOLD], options.baBehav[ADDSET_COLORTONING_SATOPACITY], options.baBehav[ADDSET_COLORTONING_STRENGTH], options.baBehav[ADDSET_COLORTONING_BALANCE]);
filmSimulation->setAdjusterBehavior(options.baBehav[ADDSET_FILMSIMULATION_STRENGTH]);
filmSimulation->setAdjusterBehavior (options.baBehav[ADDSET_FILMSIMULATION_STRENGTH]);
retinex->setAdjusterBehavior (options.baBehav[ADDSET_RETI_STR], options.baBehav[ADDSET_RETI_NEIGH], options.baBehav[ADDSET_RETI_LIMD], options.baBehav[ADDSET_RETI_GAIN], options.baBehav[ADDSET_RETI_OFFS], options.baBehav[ADDSET_RETI_VART], options.baBehav[ADDSET_RETI_GAM], options.baBehav[ADDSET_RETI_SLO]);
chmixer->setAdjusterBehavior (options.baBehav[ADDSET_CHMIXER] );
@ -220,7 +220,7 @@ void BatchToolPanelCoordinator::initSession ()
dirpyrdenoise->setAdjusterBehavior (options.baBehav[ADDSET_DIRPYRDN_LUMA], options.baBehav[ADDSET_DIRPYRDN_LUMDET], options.baBehav[ADDSET_DIRPYRDN_CHROMA], options.baBehav[ADDSET_DIRPYRDN_CHROMARED], options.baBehav[ADDSET_DIRPYRDN_CHROMABLUE], options.baBehav[ADDSET_DIRPYRDN_GAMMA], options.baBehav[ADDSET_DIRPYRDN_PASSES]);
bayerpreprocess->setAdjusterBehavior (options.baBehav[ADDSET_PREPROCESS_LINEDENOISE], options.baBehav[ADDSET_PREPROCESS_GREENEQUIL]);
rawcacorrection->setAdjusterBehavior (options.baBehav[ADDSET_RAWCACORR]);
flatfield->setAdjusterBehavior(options.baBehav[ADDSET_RAWFFCLIPCONTROL]);
flatfield->setAdjusterBehavior (options.baBehav[ADDSET_RAWFFCLIPCONTROL]);
rawexposure->setAdjusterBehavior (options.baBehav[ADDSET_RAWEXPOS_LINEAR], options.baBehav[ADDSET_RAWEXPOS_PRESER]);
bayerrawexposure->setAdjusterBehavior (options.baBehav[ADDSET_RAWEXPOS_BLACKS]);
xtransrawexposure->setAdjusterBehavior (options.baBehav[ADDSET_RAWEXPOS_BLACKS]);
@ -460,6 +460,7 @@ void BatchToolPanelCoordinator::initSession ()
pparams.gradient.centerY = 0;
}
/*
if (options.baBehav[ADDSET_LOCALLAB_DEGREE]) {
pparams.locallab.degree = 0;
}
@ -515,7 +516,7 @@ void BatchToolPanelCoordinator::initSession ()
if (options.baBehav[ADDSET_LOCALLAB_TRANSIT]) {
pparams.locallab.transit = 0;
}
*/
if (options.baBehav[ADDSET_PCVIGNETTE_STRENGTH]) {
pparams.pcvignette.strength = 0;
}
@ -742,7 +743,7 @@ void BatchToolPanelCoordinator::initSession ()
for (size_t i = 0; i < paramcListeners.size(); i++)
// send this initial state to the History
{
paramcListeners[i]->procParamsChanged (&pparams, rtengine::EvPhotoLoaded, M("BATCH_PROCESSING"), &pparamsEdited);
paramcListeners[i]->procParamsChanged (&pparams, rtengine::EvPhotoLoaded, M ("BATCH_PROCESSING"), &pparamsEdited);
}
}
}
@ -768,7 +769,7 @@ void BatchToolPanelCoordinator::panelChanged (rtengine::ProcEvent event, const G
if (selected.size() == 1) {
// Compensate rotation on flip
if (event == rtengine::EvCTHFlip || event == rtengine::EvCTVFlip) {
if (fabs(pparams.rotate.degree) > 0.001) {
if (fabs (pparams.rotate.degree) > 0.001) {
pparams.rotate.degree *= -1;
rotate->read (&pparams);
}
@ -776,7 +777,7 @@ void BatchToolPanelCoordinator::panelChanged (rtengine::ProcEvent event, const G
int w, h;
selected[0]->getFinalSize (selected[0]->getProcParams (), w, h);
crop->setDimensions(w, h);
crop->setDimensions (w, h);
// Some transformations change the crop and resize parameter for convenience.
if (event == rtengine::EvCTHFlip) {
@ -798,7 +799,7 @@ void BatchToolPanelCoordinator::panelChanged (rtengine::ProcEvent event, const G
// Compensate rotation on flip
if (event == rtengine::EvCTHFlip || event == rtengine::EvCTVFlip) {
for (size_t i = 0; i < selected.size(); i++) {
if (fabs(initialPP[i].rotate.degree) > 0.001) {
if (fabs (initialPP[i].rotate.degree) > 0.001) {
initialPP[i].rotate.degree *= -1.0;
pparamsEdited.rotate.degree = false;
@ -840,22 +841,22 @@ void BatchToolPanelCoordinator::panelChanged (rtengine::ProcEvent event, const G
int rotation = (360 + newDeg - oldDeg) % 360;
ProcParams pptemp = selected[i]->getProcParams(); // Get actual procparams
if((pptemp.coarse.hflip != pptemp.coarse.vflip) && ((rotation % 180) == 90)) {
if ((pptemp.coarse.hflip != pptemp.coarse.vflip) && ((rotation % 180) == 90)) {
rotation = (rotation + 180) % 360;
}
switch (rotation) {
case 90:
std::swap(crop.x, crop.y);
std::swap(crop.w, crop.h);
std::swap (crop.x, crop.y);
std::swap (crop.w, crop.h);
crop.x = h - crop.x - crop.w;
break;
case 270:
std::swap(crop.x, crop.y);
std::swap(crop.w, crop.h);
std::swap (crop.x, crop.y);
std::swap (crop.w, crop.h);
crop.y = w - crop.y - crop.h;
break;
@ -950,13 +951,13 @@ void BatchToolPanelCoordinator::procParamsChanged (Thumbnail* thm, int whoChange
}
}
void BatchToolPanelCoordinator::beginBatchPParamsChange(int numberOfEntries)
void BatchToolPanelCoordinator::beginBatchPParamsChange (int numberOfEntries)
{
blockedUpdate = true;
if (numberOfEntries > 50) { // Arbitrary amount
parent->set_sensitive(false);
parent->set_sensitive (false);
}
}
@ -967,7 +968,7 @@ void BatchToolPanelCoordinator::endBatchPParamsChange()
closeSession (false);
initSession ();
blockedUpdate = false;
parent->set_sensitive(true);
parent->set_sensitive (true);
}
/*
@ -984,7 +985,7 @@ void BatchToolPanelCoordinator::profileChange (const rtengine::procparams::Part
return;
}
pparams = *(nparams->pparams);
pparams = * (nparams->pparams);
if (paramsEdited) {
pparamsEdited = *paramsEdited;

13
rtgui/options.cc
View File

@ -615,19 +615,6 @@ void Options::setDefaults ()
0, // ADDSET_RETI_VART
0, // ADDSET_RETI_GAM
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
};

2
rtgui/paramsedited.cc
View File

@ -2212,7 +2212,7 @@ void ParamsEdited::combine (rtengine::procparams::ProcParams& toEdit, const rten
}
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) {

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")));
gradient = Gtk::manage (new Gtk::CheckButton (M ("PARTIALPASTE_GRADIENT")));
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")));
// 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 (*gradient, 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);
//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));
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));
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));
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);
labcurveConn.block (true);
colorappearanceConn.block (true);
locallabConn.block (true);
// locallabConn.block (true);
retinexConn.block (true);
basic->set_inconsistent (false);
@ -520,7 +520,7 @@ void PartialPasteDlg::basicToggled ()
retinex->set_active (basic->get_active ());
labcurve->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);
exposureConn.block (false);
@ -531,7 +531,7 @@ void PartialPasteDlg::basicToggled ()
retinexConn.block (false);
labcurveConn.block (false);
locallabConn.block (false);
// locallabConn.block (false);
colorappearanceConn.block (false);
}
@ -724,10 +724,11 @@ void PartialPasteDlg::applyPaste (rtengine::procparams::ProcParams* dstPP, Param
filterPE.gradient = falsePE.gradient;
}
/*
if (!locallab->get_active ()) {
filterPE.locallab = falsePE.locallab;
}
*/
if (!labcurve->get_active ()) {
filterPE.labCurve = falsePE.labCurve;
}

4
rtgui/partialpastedlg.h
View File

@ -51,7 +51,7 @@ public:
Gtk::CheckButton* gradient;
Gtk::CheckButton* labcurve;
Gtk::CheckButton* colorappearance;
Gtk::CheckButton* locallab;
// Gtk::CheckButton* locallab;
// options in detail:
Gtk::CheckButton* sharpen;
@ -123,7 +123,7 @@ public:
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 vibranceConn, chmixerConn, hsveqConn, rgbcurvesConn, chmixerbwConn, colortoningConn, filmSimulationConn;
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);
mi = behModel->append ();
/*
mi->set_value (behavColumns.label, M ("TP_LOCALLAB_LABEL"));
// appendBehavList (mi, M("TP_LOCALLAB_DEGREE"), ADDSET_LOCALLAB_DEGREE, 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_STRENGTH"), ADDSET_LOCALLAB_STRENGTH, false);
appendBehavList (mi, M ("TP_LOCALLAB_TRANSIT"), ADDSET_LOCALLAB_TRANSIT, false);
*/
mi = behModel->append ();