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

remove raw ca correction 'avoid colour shift' from gui, #4777

Browse Source
This commit is contained in:
heckflosse
2018-09-11 23:43:39 +02:00
parent ec2de14d37
commit 2062555e47
2 changed files with 14 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
rtgui/rawcacorrection.cc
View File

@@ -39,7 +39,7 @@ RAWCACorr::RAWCACorr () : FoldableToolPanel(this, "rawcacorrection", M("TP_CHROM
caAutocorrect = Gtk::manage (new CheckBox(M("TP_RAWCACORR_AUTO"), multiImage)); caAutocorrect = Gtk::manage (new CheckBox(M("TP_RAWCACORR_AUTO"), multiImage));
caAutocorrect->setCheckBoxListener (this); caAutocorrect->setCheckBoxListener (this);
caAutoiterations = Gtk::manage(new Adjuster (M("TP_RAWCACORR_AUTOIT"), 1, 10, 1, 2)); caAutoiterations = Gtk::manage(new Adjuster (M("TP_RAWCACORR_AUTOIT"), 1, 5, 1, 2));
caAutoiterations->setAdjusterListener (this); caAutoiterations->setAdjusterListener (this);
if (caAutoiterations->delay < options.adjusterMaxDelay) { if (caAutoiterations->delay < options.adjusterMaxDelay) {
@@ -68,9 +68,9 @@ RAWCACorr::RAWCACorr () : FoldableToolPanel(this, "rawcacorrection", M("TP_CHROM
pack_start( *caRed, Gtk::PACK_SHRINK, 4); pack_start( *caRed, Gtk::PACK_SHRINK, 4);
pack_start( *caBlue, Gtk::PACK_SHRINK, 4); pack_start( *caBlue, Gtk::PACK_SHRINK, 4);
caAvoidcolourshift = Gtk::manage (new CheckBox(M("TP_RAWCACORR_AVOIDCOLORSHIFT"), multiImage)); // caAvoidcolourshift = Gtk::manage (new CheckBox(M("TP_RAWCACORR_AVOIDCOLORSHIFT"), multiImage));
caAvoidcolourshift->setCheckBoxListener (this); // caAvoidcolourshift->setCheckBoxListener (this);
pack_start( *caAvoidcolourshift, Gtk::PACK_SHRINK, 4); // pack_start( *caAvoidcolourshift, Gtk::PACK_SHRINK, 4);
} }
@@ -81,7 +81,7 @@ void RAWCACorr::read(const rtengine::procparams::ProcParams* pp, const ParamsEdi
if(pedited ) { if(pedited ) {
caAutocorrect->setEdited(pedited->raw.ca_autocorrect); caAutocorrect->setEdited(pedited->raw.ca_autocorrect);
caAvoidcolourshift->setEdited(pedited->raw.ca_avoidcolourshift); // caAvoidcolourshift->setEdited(pedited->raw.ca_avoidcolourshift);
caAutoiterations->setEditedState( pedited->raw.caautoiterations ? Edited : UnEdited ); caAutoiterations->setEditedState( pedited->raw.caautoiterations ? Edited : UnEdited );
caRed->setEditedState( pedited->raw.cared ? Edited : UnEdited ); caRed->setEditedState( pedited->raw.cared ? Edited : UnEdited );
caBlue->setEditedState( pedited->raw.cablue ? Edited : UnEdited ); caBlue->setEditedState( pedited->raw.cablue ? Edited : UnEdited );
@@ -93,7 +93,7 @@ void RAWCACorr::read(const rtengine::procparams::ProcParams* pp, const ParamsEdi
caBlue->set_sensitive(!pp->raw.ca_autocorrect); caBlue->set_sensitive(!pp->raw.ca_autocorrect);
caAutocorrect->setValue(pp->raw.ca_autocorrect); caAutocorrect->setValue(pp->raw.ca_autocorrect);
caAvoidcolourshift->setValue(pp->raw.ca_avoidcolourshift); // caAvoidcolourshift->setValue(pp->raw.ca_avoidcolourshift);
caAutoiterations->setValue (pp->raw.caautoiterations); caAutoiterations->setValue (pp->raw.caautoiterations);
caRed->setValue (pp->raw.cared); caRed->setValue (pp->raw.cared);
caBlue->setValue (pp->raw.cablue); caBlue->setValue (pp->raw.cablue);
@@ -104,14 +104,14 @@ void RAWCACorr::read(const rtengine::procparams::ProcParams* pp, const ParamsEdi
void RAWCACorr::write( rtengine::procparams::ProcParams* pp, ParamsEdited* pedited) void RAWCACorr::write( rtengine::procparams::ProcParams* pp, ParamsEdited* pedited)
{ {
pp->raw.ca_autocorrect = caAutocorrect->getLastActive(); pp->raw.ca_autocorrect = caAutocorrect->getLastActive();
pp->raw.ca_avoidcolourshift = caAvoidcolourshift->getLastActive(); // pp->raw.ca_avoidcolourshift = caAvoidcolourshift->getLastActive();
pp->raw.caautoiterations = caAutoiterations->getValue(); pp->raw.caautoiterations = caAutoiterations->getValue();
pp->raw.cared = caRed->getValue(); pp->raw.cared = caRed->getValue();
pp->raw.cablue = caBlue->getValue(); pp->raw.cablue = caBlue->getValue();
if (pedited) { if (pedited) {
pedited->raw.ca_autocorrect = !caAutocorrect->get_inconsistent(); pedited->raw.ca_autocorrect = !caAutocorrect->get_inconsistent();
pedited->raw.ca_avoidcolourshift = !caAvoidcolourshift->get_inconsistent(); // pedited->raw.ca_avoidcolourshift = !caAvoidcolourshift->get_inconsistent();
pedited->raw.caautoiterations = caAutoiterations->getEditedState (); pedited->raw.caautoiterations = caAutoiterations->getEditedState ();
pedited->raw.cared = caRed->getEditedState (); pedited->raw.cared = caRed->getEditedState ();
pedited->raw.cablue = caBlue->getEditedState (); pedited->raw.cablue = caBlue->getEditedState ();
@@ -147,11 +147,12 @@ void RAWCACorr::checkBoxToggled (CheckBox* c, CheckValue newval)
if (listener) { if (listener) {
listener->panelChanged (EvPreProcessAutoCA, caAutocorrect->getLastActive() ? M("GENERAL_ENABLED") : M("GENERAL_DISABLED")); listener->panelChanged (EvPreProcessAutoCA, caAutocorrect->getLastActive() ? M("GENERAL_ENABLED") : M("GENERAL_DISABLED"));
} }
} else if (c == caAvoidcolourshift) {
if (listener) {
listener->panelChanged ((caAutocorrect->getLastActive() || caRed->getValue() != 0 || caBlue->getValue() != 0) ? EvPreProcessCAColourshift : EvPreProcessCAColourshiftHistory, caAvoidcolourshift->getLastActive() ? M("GENERAL_ENABLED") : M("GENERAL_DISABLED"));
}
} }
// else if (c == caAvoidcolourshift) {
// if (listener) {
// listener->panelChanged ((caAutocorrect->getLastActive() || caRed->getValue() != 0 || caBlue->getValue() != 0) ? EvPreProcessCAColourshift : EvPreProcessCAColourshiftHistory, caAvoidcolourshift->getLastActive() ? M("GENERAL_ENABLED") : M("GENERAL_DISABLED"));
// }
// }
} }
void RAWCACorr::setBatchMode(bool batchMode) void RAWCACorr::setBatchMode(bool batchMode)

2
rtgui/rawcacorrection.h
View File

@@ -32,7 +32,7 @@ protected:
Adjuster* caAutoiterations; Adjuster* caAutoiterations;
Adjuster* caRed; Adjuster* caRed;
Adjuster* caBlue; Adjuster* caBlue;
CheckBox* caAvoidcolourshift; // CheckBox* caAvoidcolourshift;
rtengine::ProcEvent EvPreProcessCAAutoiterations; rtengine::ProcEvent EvPreProcessCAAutoiterations;
rtengine::ProcEvent EvPreProcessCAColourshift; rtengine::ProcEvent EvPreProcessCAColourshift;