Formatted all .cc and .h code in rtengine, rtexif and rtgui using astyle
This commit is contained in:
DrSlony
@@ -26,136 +26,156 @@ using namespace rtengine;
|
||||
using namespace rtengine::procparams;
|
||||
|
||||
|
||||
SharpenEdge::SharpenEdge () : FoldableToolPanel(this, "sharpenedge", M("TP_SHARPENEDGE_LABEL"), true, true) {
|
||||
SharpenEdge::SharpenEdge () : FoldableToolPanel(this, "sharpenedge", M("TP_SHARPENEDGE_LABEL"), true, true)
|
||||
{
|
||||
|
||||
passes = Gtk::manage(new Adjuster (M("TP_SHARPENEDGE_PASSES"),1,4,1,2));
|
||||
passes->setAdjusterListener (this);
|
||||
if (passes->delay < 1000) passes->delay = 1000;
|
||||
amount = Gtk::manage(new Adjuster (M("TP_SHARPENEDGE_AMOUNT"),0,100,1,50));
|
||||
amount->setAdjusterListener (this);
|
||||
if (amount->delay < 1000) amount->delay = 1000;
|
||||
passes = Gtk::manage(new Adjuster (M("TP_SHARPENEDGE_PASSES"), 1, 4, 1, 2));
|
||||
passes->setAdjusterListener (this);
|
||||
|
||||
threechannels = Gtk::manage(new Gtk::CheckButton((M("TP_SHARPENEDGE_THREE"))));// L + a + b
|
||||
threechannels->set_active (false);
|
||||
pack_start( *passes, Gtk::PACK_SHRINK, 0);//passes
|
||||
pack_start( *amount, Gtk::PACK_SHRINK, 0);//amount
|
||||
pack_start( *threechannels, Gtk::PACK_SHRINK, 0);//one or 3 channels Lab
|
||||
if (passes->delay < 1000) {
|
||||
passes->delay = 1000;
|
||||
}
|
||||
|
||||
show ();
|
||||
amount = Gtk::manage(new Adjuster (M("TP_SHARPENEDGE_AMOUNT"), 0, 100, 1, 50));
|
||||
amount->setAdjusterListener (this);
|
||||
|
||||
chanthreeconn = threechannels->signal_toggled().connect( sigc::mem_fun(*this, &SharpenEdge::chanthree_toggled) );
|
||||
if (amount->delay < 1000) {
|
||||
amount->delay = 1000;
|
||||
}
|
||||
|
||||
threechannels = Gtk::manage(new Gtk::CheckButton((M("TP_SHARPENEDGE_THREE"))));// L + a + b
|
||||
threechannels->set_active (false);
|
||||
pack_start( *passes, Gtk::PACK_SHRINK, 0);//passes
|
||||
pack_start( *amount, Gtk::PACK_SHRINK, 0);//amount
|
||||
pack_start( *threechannels, Gtk::PACK_SHRINK, 0);//one or 3 channels Lab
|
||||
|
||||
show ();
|
||||
|
||||
chanthreeconn = threechannels->signal_toggled().connect( sigc::mem_fun(*this, &SharpenEdge::chanthree_toggled) );
|
||||
}
|
||||
|
||||
void SharpenEdge::read(const ProcParams* pp, const ParamsEdited* pedited) {
|
||||
disableListener ();
|
||||
void SharpenEdge::read(const ProcParams* pp, const ParamsEdited* pedited)
|
||||
{
|
||||
disableListener ();
|
||||
|
||||
if(pedited ){
|
||||
passes->setEditedState (pedited->sharpenEdge.passes ? Edited : UnEdited);
|
||||
amount->setEditedState (pedited->sharpenEdge.amount ? Edited : UnEdited);
|
||||
set_inconsistent (multiImage && !pedited->sharpenEdge.enabled);
|
||||
threechannels->set_inconsistent (!pedited->sharpenEdge.threechannels);
|
||||
}
|
||||
if(pedited ) {
|
||||
passes->setEditedState (pedited->sharpenEdge.passes ? Edited : UnEdited);
|
||||
amount->setEditedState (pedited->sharpenEdge.amount ? Edited : UnEdited);
|
||||
set_inconsistent (multiImage && !pedited->sharpenEdge.enabled);
|
||||
threechannels->set_inconsistent (!pedited->sharpenEdge.threechannels);
|
||||
}
|
||||
|
||||
setEnabled(pp->sharpenEdge.enabled);
|
||||
setEnabled(pp->sharpenEdge.enabled);
|
||||
|
||||
chanthreeconn.block (true);
|
||||
threechannels->set_active (pp->sharpenEdge.threechannels);
|
||||
chanthreeconn.block (false);
|
||||
lastchanthree = pp->sharpenEdge.threechannels;
|
||||
chanthreeconn.block (true);
|
||||
threechannels->set_active (pp->sharpenEdge.threechannels);
|
||||
chanthreeconn.block (false);
|
||||
lastchanthree = pp->sharpenEdge.threechannels;
|
||||
|
||||
passes->setValue (pp->sharpenEdge.passes);
|
||||
amount->setValue (pp->sharpenEdge.amount);
|
||||
|
||||
enableListener ();
|
||||
passes->setValue (pp->sharpenEdge.passes);
|
||||
amount->setValue (pp->sharpenEdge.amount);
|
||||
|
||||
enableListener ();
|
||||
}
|
||||
|
||||
void SharpenEdge::write( ProcParams* pp, ParamsEdited* pedited) {
|
||||
pp->sharpenEdge.enabled = getEnabled();
|
||||
pp->sharpenEdge.passes = (int)passes->getValue();
|
||||
pp->sharpenEdge.amount = amount->getValue ();
|
||||
pp->sharpenEdge.threechannels = threechannels->get_active ();
|
||||
void SharpenEdge::write( ProcParams* pp, ParamsEdited* pedited)
|
||||
{
|
||||
pp->sharpenEdge.enabled = getEnabled();
|
||||
pp->sharpenEdge.passes = (int)passes->getValue();
|
||||
pp->sharpenEdge.amount = amount->getValue ();
|
||||
pp->sharpenEdge.threechannels = threechannels->get_active ();
|
||||
|
||||
if (pedited) {
|
||||
pedited->sharpenEdge.enabled = !get_inconsistent();
|
||||
pedited->sharpenEdge.passes = passes->getEditedState ();
|
||||
pedited->sharpenEdge.amount = amount->getEditedState ();
|
||||
pedited->sharpenEdge.threechannels = !threechannels->get_inconsistent();
|
||||
}
|
||||
if (pedited) {
|
||||
pedited->sharpenEdge.enabled = !get_inconsistent();
|
||||
pedited->sharpenEdge.passes = passes->getEditedState ();
|
||||
pedited->sharpenEdge.amount = amount->getEditedState ();
|
||||
pedited->sharpenEdge.threechannels = !threechannels->get_inconsistent();
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
void SharpenEdge::enabledChanged () {
|
||||
if (listener) {
|
||||
if (get_inconsistent())
|
||||
listener->panelChanged (EvSharpenEdgeEnabled, M("GENERAL_UNCHANGED"));
|
||||
else if (getEnabled())
|
||||
listener->panelChanged (EvSharpenEdgeEnabled, M("GENERAL_ENABLED"));
|
||||
else
|
||||
listener->panelChanged (EvSharpenEdgeEnabled, M("GENERAL_DISABLED"));
|
||||
}
|
||||
void SharpenEdge::enabledChanged ()
|
||||
{
|
||||
if (listener) {
|
||||
if (get_inconsistent()) {
|
||||
listener->panelChanged (EvSharpenEdgeEnabled, M("GENERAL_UNCHANGED"));
|
||||
} else if (getEnabled()) {
|
||||
listener->panelChanged (EvSharpenEdgeEnabled, M("GENERAL_ENABLED"));
|
||||
} else {
|
||||
listener->panelChanged (EvSharpenEdgeEnabled, M("GENERAL_DISABLED"));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
void SharpenEdge::chanthree_toggled () {
|
||||
void SharpenEdge::chanthree_toggled ()
|
||||
{
|
||||
|
||||
if (batchMode) {
|
||||
if (threechannels->get_inconsistent()) {
|
||||
threechannels->set_inconsistent (false);
|
||||
chanthreeconn.block (true);
|
||||
threechannels->set_active (false);
|
||||
chanthreeconn.block (false);
|
||||
}
|
||||
else if (lastchanthree)
|
||||
threechannels->set_inconsistent (true);
|
||||
if (batchMode) {
|
||||
if (threechannels->get_inconsistent()) {
|
||||
threechannels->set_inconsistent (false);
|
||||
chanthreeconn.block (true);
|
||||
threechannels->set_active (false);
|
||||
chanthreeconn.block (false);
|
||||
} else if (lastchanthree) {
|
||||
threechannels->set_inconsistent (true);
|
||||
}
|
||||
|
||||
lastchanthree = threechannels->get_active ();
|
||||
}
|
||||
lastchanthree = threechannels->get_active ();
|
||||
}
|
||||
|
||||
if (listener && getEnabled()) {
|
||||
if (threechannels->get_active ())
|
||||
listener->panelChanged (EvSharpenEdgeThreechannels, M("GENERAL_ENABLED"));
|
||||
else
|
||||
listener->panelChanged (EvSharpenEdgeThreechannels, M("GENERAL_DISABLED"));
|
||||
}
|
||||
if (listener && getEnabled()) {
|
||||
if (threechannels->get_active ()) {
|
||||
listener->panelChanged (EvSharpenEdgeThreechannels, M("GENERAL_ENABLED"));
|
||||
} else {
|
||||
listener->panelChanged (EvSharpenEdgeThreechannels, M("GENERAL_DISABLED"));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
void SharpenEdge::adjusterChanged (Adjuster* a, double newval) {
|
||||
if (listener && getEnabled()) {
|
||||
Glib::ustring value = a->getTextValue();
|
||||
|
||||
if (a == passes )
|
||||
listener->panelChanged (EvSharpenEdgePasses, value );
|
||||
else if (a == amount)
|
||||
listener->panelChanged (EvSharpenEdgeAmount, value );
|
||||
}
|
||||
void SharpenEdge::adjusterChanged (Adjuster* a, double newval)
|
||||
{
|
||||
if (listener && getEnabled()) {
|
||||
Glib::ustring value = a->getTextValue();
|
||||
|
||||
if (a == passes ) {
|
||||
listener->panelChanged (EvSharpenEdgePasses, value );
|
||||
} else if (a == amount) {
|
||||
listener->panelChanged (EvSharpenEdgeAmount, value );
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
void SharpenEdge::setBatchMode(bool batchMode) {
|
||||
passes->showEditedCB ();
|
||||
amount->showEditedCB ();
|
||||
void SharpenEdge::setBatchMode(bool batchMode)
|
||||
{
|
||||
passes->showEditedCB ();
|
||||
amount->showEditedCB ();
|
||||
}
|
||||
|
||||
void SharpenEdge::setDefaults(const ProcParams* defParams, const ParamsEdited* pedited) {
|
||||
passes->setDefault (defParams->sharpenEdge.passes);
|
||||
amount->setDefault (defParams->sharpenEdge.amount);
|
||||
void SharpenEdge::setDefaults(const ProcParams* defParams, const ParamsEdited* pedited)
|
||||
{
|
||||
passes->setDefault (defParams->sharpenEdge.passes);
|
||||
amount->setDefault (defParams->sharpenEdge.amount);
|
||||
|
||||
if (pedited) {
|
||||
passes->setDefaultEditedState (pedited->sharpenEdge.passes ? Edited : UnEdited);
|
||||
amount->setDefaultEditedState (pedited->sharpenEdge.amount ? Edited : UnEdited);
|
||||
|
||||
} else {
|
||||
passes->setDefaultEditedState (Irrelevant);
|
||||
amount->setDefaultEditedState (Irrelevant);
|
||||
|
||||
}
|
||||
if (pedited) {
|
||||
passes->setDefaultEditedState (pedited->sharpenEdge.passes ? Edited : UnEdited);
|
||||
amount->setDefaultEditedState (pedited->sharpenEdge.amount ? Edited : UnEdited);
|
||||
|
||||
} else {
|
||||
passes->setDefaultEditedState (Irrelevant);
|
||||
amount->setDefaultEditedState (Irrelevant);
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
void SharpenEdge::setAdjusterBehavior (bool amountadd, bool passadd) {
|
||||
amount->setAddMode (amountadd);
|
||||
passes->setAddMode (passadd);
|
||||
void SharpenEdge::setAdjusterBehavior (bool amountadd, bool passadd)
|
||||
{
|
||||
amount->setAddMode (amountadd);
|
||||
passes->setAddMode (passadd);
|
||||
}
|
||||
|
||||
void SharpenEdge::trimValues (ProcParams* pp) {
|
||||
amount->trimValue (pp->sharpenEdge.amount);
|
||||
passes->trimValue (pp->sharpenEdge.passes);
|
||||
void SharpenEdge::trimValues (ProcParams* pp)
|
||||
{
|
||||
amount->trimValue (pp->sharpenEdge.amount);
|
||||
passes->trimValue (pp->sharpenEdge.passes);
|
||||
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user