Formatted all .cc and .h code in rtengine, rtexif and rtgui using astyle
This commit is contained in:
DrSlony
@@ -32,146 +32,160 @@ RAWCACorr::RAWCACorr () : FoldableToolPanel(this, "rawcacorrection", M("TP_CHROM
|
||||
Gtk::Image* icablueL = Gtk::manage (new RTImage ("ajd-ca-blue1.png"));
|
||||
Gtk::Image* icablueR = Gtk::manage (new RTImage ("ajd-ca-blue2.png"));
|
||||
|
||||
caAutocorrect = Gtk::manage(new Gtk::CheckButton((M("TP_RAWCACORR_AUTO"))));
|
||||
caRed = Gtk::manage(new Adjuster (M("TP_RAWCACORR_CARED"),-4.0,4.0,0.1,0,icaredL,icaredR));
|
||||
caRed->setAdjusterListener (this);
|
||||
if (caRed->delay < 1000) caRed->delay = 1000;
|
||||
caRed->show();
|
||||
caBlue = Gtk::manage(new Adjuster (M("TP_RAWCACORR_CABLUE"),-4.0,4.0,0.1,0,icablueL,icablueR));
|
||||
caBlue->setAdjusterListener (this);
|
||||
if (caBlue->delay < 1000) caBlue->delay = 1000;
|
||||
caBlue->show();
|
||||
caAutocorrect = Gtk::manage(new Gtk::CheckButton((M("TP_RAWCACORR_AUTO"))));
|
||||
caRed = Gtk::manage(new Adjuster (M("TP_RAWCACORR_CARED"), -4.0, 4.0, 0.1, 0, icaredL, icaredR));
|
||||
caRed->setAdjusterListener (this);
|
||||
|
||||
pack_start( *caAutocorrect, Gtk::PACK_SHRINK, 4);
|
||||
pack_start( *caRed, Gtk::PACK_SHRINK, 4);
|
||||
pack_start( *caBlue, Gtk::PACK_SHRINK, 4);
|
||||
if (caRed->delay < 1000) {
|
||||
caRed->delay = 1000;
|
||||
}
|
||||
|
||||
caacsconn = caAutocorrect->signal_toggled().connect ( sigc::mem_fun(*this, &RAWCACorr::caCorrectionChanged), true);
|
||||
caRed->show();
|
||||
caBlue = Gtk::manage(new Adjuster (M("TP_RAWCACORR_CABLUE"), -4.0, 4.0, 0.1, 0, icablueL, icablueR));
|
||||
caBlue->setAdjusterListener (this);
|
||||
|
||||
if (caBlue->delay < 1000) {
|
||||
caBlue->delay = 1000;
|
||||
}
|
||||
|
||||
caBlue->show();
|
||||
|
||||
pack_start( *caAutocorrect, Gtk::PACK_SHRINK, 4);
|
||||
pack_start( *caRed, Gtk::PACK_SHRINK, 4);
|
||||
pack_start( *caBlue, Gtk::PACK_SHRINK, 4);
|
||||
|
||||
caacsconn = caAutocorrect->signal_toggled().connect ( sigc::mem_fun(*this, &RAWCACorr::caCorrectionChanged), true);
|
||||
}
|
||||
|
||||
void RAWCACorr::read(const rtengine::procparams::ProcParams* pp, const ParamsEdited* pedited)
|
||||
{
|
||||
disableListener ();
|
||||
caacsconn.block (true);
|
||||
disableListener ();
|
||||
caacsconn.block (true);
|
||||
|
||||
if(pedited ){
|
||||
caAutocorrect->set_inconsistent(!pedited->raw.caCorrection);
|
||||
caRed->setEditedState( pedited->raw.caRed ? Edited : UnEdited );
|
||||
caBlue->setEditedState( pedited->raw.caBlue ? Edited : UnEdited );
|
||||
}
|
||||
if(pedited ) {
|
||||
caAutocorrect->set_inconsistent(!pedited->raw.caCorrection);
|
||||
caRed->setEditedState( pedited->raw.caRed ? Edited : UnEdited );
|
||||
caBlue->setEditedState( pedited->raw.caBlue ? Edited : UnEdited );
|
||||
}
|
||||
|
||||
lastCA = pp->raw.ca_autocorrect;
|
||||
lastCA = pp->raw.ca_autocorrect;
|
||||
|
||||
// disable Red and Blue sliders when caAutocorrect is enabled
|
||||
caRed->set_sensitive(!pp->raw.ca_autocorrect);
|
||||
caBlue->set_sensitive(!pp->raw.ca_autocorrect);
|
||||
// disable Red and Blue sliders when caAutocorrect is enabled
|
||||
caRed->set_sensitive(!pp->raw.ca_autocorrect);
|
||||
caBlue->set_sensitive(!pp->raw.ca_autocorrect);
|
||||
|
||||
caAutocorrect->set_active(pp->raw.ca_autocorrect);
|
||||
caRed->setValue (pp->raw.cared);
|
||||
caBlue->setValue (pp->raw.cablue);
|
||||
caAutocorrect->set_active(pp->raw.ca_autocorrect);
|
||||
caRed->setValue (pp->raw.cared);
|
||||
caBlue->setValue (pp->raw.cablue);
|
||||
|
||||
caacsconn.block (false);
|
||||
enableListener ();
|
||||
caacsconn.block (false);
|
||||
enableListener ();
|
||||
}
|
||||
|
||||
void RAWCACorr::write( rtengine::procparams::ProcParams* pp, ParamsEdited* pedited)
|
||||
{
|
||||
pp->raw.ca_autocorrect = caAutocorrect->get_active();
|
||||
pp->raw.cared = caRed->getValue();
|
||||
pp->raw.cablue = caBlue->getValue();
|
||||
pp->raw.ca_autocorrect = caAutocorrect->get_active();
|
||||
pp->raw.cared = caRed->getValue();
|
||||
pp->raw.cablue = caBlue->getValue();
|
||||
|
||||
if (pedited) {
|
||||
pedited->raw.caCorrection = !caAutocorrect->get_inconsistent();
|
||||
pedited->raw.caRed = caRed->getEditedState ();
|
||||
pedited->raw.caBlue = caBlue->getEditedState ();
|
||||
}
|
||||
if (pedited) {
|
||||
pedited->raw.caCorrection = !caAutocorrect->get_inconsistent();
|
||||
pedited->raw.caRed = caRed->getEditedState ();
|
||||
pedited->raw.caBlue = caBlue->getEditedState ();
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
void RAWCACorr::adjusterChanged (Adjuster* a, double newval)
|
||||
{
|
||||
if (listener) {
|
||||
if (listener) {
|
||||
|
||||
Glib::ustring value = a->getTextValue();
|
||||
Glib::ustring value = a->getTextValue();
|
||||
|
||||
if (a == caRed)
|
||||
listener->panelChanged (EvPreProcessCARed, value );
|
||||
else if (a == caBlue)
|
||||
listener->panelChanged (EvPreProcessCABlue, value );
|
||||
}
|
||||
if (a == caRed) {
|
||||
listener->panelChanged (EvPreProcessCARed, value );
|
||||
} else if (a == caBlue) {
|
||||
listener->panelChanged (EvPreProcessCABlue, value );
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
void RAWCACorr::setBatchMode(bool batchMode)
|
||||
{
|
||||
ToolPanel::setBatchMode (batchMode);
|
||||
caRed->showEditedCB ();
|
||||
caBlue->showEditedCB ();
|
||||
ToolPanel::setBatchMode (batchMode);
|
||||
caRed->showEditedCB ();
|
||||
caBlue->showEditedCB ();
|
||||
}
|
||||
|
||||
void RAWCACorr::setDefaults(const rtengine::procparams::ProcParams* defParams, const ParamsEdited* pedited)
|
||||
{
|
||||
caRed->setDefault( defParams->raw.cared);
|
||||
caBlue->setDefault( defParams->raw.cablue);
|
||||
caRed->setDefault( defParams->raw.cared);
|
||||
caBlue->setDefault( defParams->raw.cablue);
|
||||
|
||||
if (pedited) {
|
||||
caRed->setDefaultEditedState( pedited->raw.caRed ? Edited : UnEdited);
|
||||
caBlue->setDefaultEditedState( pedited->raw.caBlue ? Edited : UnEdited);
|
||||
} else {
|
||||
caRed->setDefaultEditedState( Irrelevant );
|
||||
caBlue->setDefaultEditedState( Irrelevant );
|
||||
}
|
||||
if (pedited) {
|
||||
caRed->setDefaultEditedState( pedited->raw.caRed ? Edited : UnEdited);
|
||||
caBlue->setDefaultEditedState( pedited->raw.caBlue ? Edited : UnEdited);
|
||||
} else {
|
||||
caRed->setDefaultEditedState( Irrelevant );
|
||||
caBlue->setDefaultEditedState( Irrelevant );
|
||||
}
|
||||
}
|
||||
|
||||
void RAWCACorr::caCorrectionChanged()
|
||||
{
|
||||
if (batchMode) {
|
||||
if (caAutocorrect->get_inconsistent()) {
|
||||
caAutocorrect->set_inconsistent (false);
|
||||
caacsconn.block (true);
|
||||
caAutocorrect->set_inconsistent (false);
|
||||
caacsconn.block (true);
|
||||
caAutocorrect->set_active (false);
|
||||
caacsconn.block (false);
|
||||
} else if (lastCA) {
|
||||
caAutocorrect->set_inconsistent (true);
|
||||
}
|
||||
else if (lastCA)
|
||||
caAutocorrect->set_inconsistent (true);
|
||||
|
||||
lastCA = caAutocorrect->get_active ();
|
||||
|
||||
}
|
||||
|
||||
/*else {
|
||||
// For non batch mode, we disable the red and blue slider if caAutocorrect is true
|
||||
if (caAutocorrect->get_active ()) {
|
||||
caRed->set_sensitive(false);
|
||||
caBlue->set_sensitive(false);
|
||||
}
|
||||
else {
|
||||
caRed->set_sensitive(true);
|
||||
caBlue->set_sensitive(true);
|
||||
}
|
||||
// For non batch mode, we disable the red and blue slider if caAutocorrect is true
|
||||
if (caAutocorrect->get_active ()) {
|
||||
caRed->set_sensitive(false);
|
||||
caBlue->set_sensitive(false);
|
||||
}
|
||||
else {
|
||||
caRed->set_sensitive(true);
|
||||
caBlue->set_sensitive(true);
|
||||
}
|
||||
}*/
|
||||
|
||||
// disable Red and Blue sliders when caAutocorrect is enabled
|
||||
caRed->set_sensitive(!caAutocorrect->get_active ());
|
||||
caBlue->set_sensitive(!caAutocorrect->get_active ());
|
||||
if (caAutocorrect->get_active ()){
|
||||
// set caRed and caBlue to 0 as RawImageSource::CA_correct_RT uses this as
|
||||
// a condition for auto-CA correction. Alternative would be to change
|
||||
// RawImageSource::CA_correct_RT and pass it ca_autocorrect value
|
||||
caRed->setValue(0);
|
||||
caBlue->setValue(0);
|
||||
}
|
||||
caRed->set_sensitive(!caAutocorrect->get_active ());
|
||||
caBlue->set_sensitive(!caAutocorrect->get_active ());
|
||||
|
||||
if (listener)
|
||||
listener->panelChanged (EvPreProcessAutoCA, caAutocorrect->get_active()?M("GENERAL_ENABLED"):M("GENERAL_DISABLED"));
|
||||
if (caAutocorrect->get_active ()) {
|
||||
// set caRed and caBlue to 0 as RawImageSource::CA_correct_RT uses this as
|
||||
// a condition for auto-CA correction. Alternative would be to change
|
||||
// RawImageSource::CA_correct_RT and pass it ca_autocorrect value
|
||||
caRed->setValue(0);
|
||||
caBlue->setValue(0);
|
||||
}
|
||||
|
||||
if (listener) {
|
||||
listener->panelChanged (EvPreProcessAutoCA, caAutocorrect->get_active() ? M("GENERAL_ENABLED") : M("GENERAL_DISABLED"));
|
||||
}
|
||||
}
|
||||
|
||||
void RAWCACorr::setAdjusterBehavior (bool caadd) {
|
||||
void RAWCACorr::setAdjusterBehavior (bool caadd)
|
||||
{
|
||||
|
||||
caRed->setAddMode(caadd);
|
||||
caBlue->setAddMode(caadd);
|
||||
caRed->setAddMode(caadd);
|
||||
caBlue->setAddMode(caadd);
|
||||
}
|
||||
|
||||
void RAWCACorr::trimValues (rtengine::procparams::ProcParams* pp) {
|
||||
void RAWCACorr::trimValues (rtengine::procparams::ProcParams* pp)
|
||||
{
|
||||
|
||||
caRed->trimValue(pp->raw.cared);
|
||||
caBlue->trimValue(pp->raw.cablue);
|
||||
caRed->trimValue(pp->raw.cared);
|
||||
caBlue->trimValue(pp->raw.cablue);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user