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

Formatted all .cc and .h code in rtengine, rtexif and rtgui using astyle

Browse Source
This commit is contained in:
DrSlony
2015-08-11 11:55:03 +02:00
parent effb46c3e1
commit 0e0cfb9b25
452 changed files with 133354 additions and 99460 deletions
Download Patch File Download Diff File Expand all files Collapse all files

220
rtgui/sharpenmicro.cc
View File

@@ -26,137 +26,159 @@ using namespace rtengine;
using namespace rtengine::procparams;
SharpenMicro::SharpenMicro () : FoldableToolPanel(this, "sharpenmicro", M("TP_SHARPENMICRO_LABEL"), true, true) {
SharpenMicro::SharpenMicro () : FoldableToolPanel(this, "sharpenmicro", M("TP_SHARPENMICRO_LABEL"), true, true)
{
setEnabledTooltipMarkup(M("TP_SHARPENING_TOOLTIP"));
setEnabledTooltipMarkup(M("TP_SHARPENING_TOOLTIP"));
amount= Gtk::manage(new Adjuster (M("TP_SHARPENMICRO_AMOUNT"),0,100,1,20));
amount->setAdjusterListener (this);
if (amount->delay < 1000) amount->delay = 1000;
amount->show();
uniformity= Gtk::manage(new Adjuster (M("TP_SHARPENMICRO_UNIFORMITY"),0,100,10,50));
amount = Gtk::manage(new Adjuster (M("TP_SHARPENMICRO_AMOUNT"), 0, 100, 1, 20));
amount->setAdjusterListener (this);
uniformity->setAdjusterListener (this);
if (uniformity->delay < 1000) uniformity->delay = 1000;
uniformity->show();
matrix = Gtk::manage (new Gtk::CheckButton (M("TP_SHARPENMICRO_MATRIX")));
matrix->set_active (true);
pack_start(*matrix, Gtk::PACK_SHRINK, 0);
matrix->show ();
if (amount->delay < 1000) {
amount->delay = 1000;
}
pack_start( *amount, Gtk::PACK_SHRINK, 0);
pack_start( *uniformity, Gtk::PACK_SHRINK, 0);
amount->show();
uniformity = Gtk::manage(new Adjuster (M("TP_SHARPENMICRO_UNIFORMITY"), 0, 100, 10, 50));
show ();
uniformity->setAdjusterListener (this);
matrixconn = matrix->signal_toggled().connect( sigc::mem_fun(*this, &SharpenMicro::matrix_toggled) );
if (uniformity->delay < 1000) {
uniformity->delay = 1000;
}
uniformity->show();
matrix = Gtk::manage (new Gtk::CheckButton (M("TP_SHARPENMICRO_MATRIX")));
matrix->set_active (true);
pack_start(*matrix, Gtk::PACK_SHRINK, 0);
matrix->show ();
pack_start( *amount, Gtk::PACK_SHRINK, 0);
pack_start( *uniformity, Gtk::PACK_SHRINK, 0);
show ();
matrixconn = matrix->signal_toggled().connect( sigc::mem_fun(*this, &SharpenMicro::matrix_toggled) );
}
void SharpenMicro::read(const ProcParams* pp, const ParamsEdited* pedited) {
disableListener ();
void SharpenMicro::read(const ProcParams* pp, const ParamsEdited* pedited)
{
disableListener ();
if(pedited ){
set_inconsistent (multiImage && !pedited->sharpenMicro.enabled);
matrix->set_inconsistent (!pedited->sharpenMicro.matrix);
amount->setEditedState (pedited->sharpenMicro.amount ? Edited : UnEdited);
uniformity->setEditedState (pedited->sharpenMicro.uniformity ? Edited : UnEdited);
}
if(pedited ) {
set_inconsistent (multiImage && !pedited->sharpenMicro.enabled);
matrix->set_inconsistent (!pedited->sharpenMicro.matrix);
amount->setEditedState (pedited->sharpenMicro.amount ? Edited : UnEdited);
uniformity->setEditedState (pedited->sharpenMicro.uniformity ? Edited : UnEdited);
}
setEnabled(pp->sharpenMicro.enabled);
setEnabled(pp->sharpenMicro.enabled);
matrixconn.block (true);
matrix->set_active (pp->sharpenMicro.matrix);
matrixconn.block (false);
lastmatrix = pp->sharpenMicro.matrix;
matrixconn.block (true);
matrix->set_active (pp->sharpenMicro.matrix);
matrixconn.block (false);
lastmatrix = pp->sharpenMicro.matrix;
amount->setValue (pp->sharpenMicro.amount);
uniformity->setValue (pp->sharpenMicro.uniformity);
amount->setValue (pp->sharpenMicro.amount);
uniformity->setValue (pp->sharpenMicro.uniformity);
enableListener ();
enableListener ();
}
void SharpenMicro::write( ProcParams* pp, ParamsEdited* pedited) {
pp->sharpenMicro.enabled = getEnabled();
pp->sharpenMicro.matrix = matrix->get_active ();
pp->sharpenMicro.amount = amount->getValue ();
pp->sharpenMicro.uniformity = uniformity->getValue ();
void SharpenMicro::write( ProcParams* pp, ParamsEdited* pedited)
{
pp->sharpenMicro.enabled = getEnabled();
pp->sharpenMicro.matrix = matrix->get_active ();
pp->sharpenMicro.amount = amount->getValue ();
pp->sharpenMicro.uniformity = uniformity->getValue ();
if (pedited) {
pedited->sharpenMicro.enabled = !get_inconsistent();
pedited->sharpenMicro.matrix = !matrix->get_inconsistent();
pedited->sharpenMicro.amount = amount->getEditedState ();
pedited->sharpenMicro.uniformity = uniformity->getEditedState ();
}
if (pedited) {
pedited->sharpenMicro.enabled = !get_inconsistent();
pedited->sharpenMicro.matrix = !matrix->get_inconsistent();
pedited->sharpenMicro.amount = amount->getEditedState ();
pedited->sharpenMicro.uniformity = uniformity->getEditedState ();
}
}
void SharpenMicro::enabledChanged () {
void SharpenMicro::enabledChanged ()
{
if (listener) {
if (get_inconsistent())
listener->panelChanged (EvSharpenMicroEnabled, M("GENERAL_UNCHANGED"));
else if (getEnabled())
listener->panelChanged (EvSharpenMicroEnabled, M("GENERAL_ENABLED"));
else
listener->panelChanged (EvSharpenMicroEnabled, M("GENERAL_DISABLED"));
}
if (listener) {
if (get_inconsistent()) {
listener->panelChanged (EvSharpenMicroEnabled, M("GENERAL_UNCHANGED"));
} else if (getEnabled()) {
listener->panelChanged (EvSharpenMicroEnabled, M("GENERAL_ENABLED"));
} else {
listener->panelChanged (EvSharpenMicroEnabled, M("GENERAL_DISABLED"));
}
}
}
void SharpenMicro::matrix_toggled () {
if (batchMode) {
if (matrix->get_inconsistent()) {
matrix->set_inconsistent (false);
matrixconn.block (true);
matrix->set_active (false);
matrixconn.block (false);
}
else if (lastmatrix)
matrix->set_inconsistent (true);
void SharpenMicro::matrix_toggled ()
{
if (batchMode) {
if (matrix->get_inconsistent()) {
matrix->set_inconsistent (false);
matrixconn.block (true);
matrix->set_active (false);
matrixconn.block (false);
} else if (lastmatrix) {
matrix->set_inconsistent (true);
}
lastmatrix = matrix->get_active ();
}
lastmatrix = matrix->get_active ();
}
if (listener && getEnabled()) {
if (matrix->get_active ())
listener->panelChanged (EvSharpenMicroMatrix, M("GENERAL_ENABLED"));
else
listener->panelChanged (EvSharpenMicroMatrix, M("GENERAL_DISABLED"));
}
if (listener && getEnabled()) {
if (matrix->get_active ()) {
listener->panelChanged (EvSharpenMicroMatrix, M("GENERAL_ENABLED"));
} else {
listener->panelChanged (EvSharpenMicroMatrix, M("GENERAL_DISABLED"));
}
}
}
void SharpenMicro::adjusterChanged (Adjuster* a, double newval) {
if (listener && getEnabled()) {
Glib::ustring value = a->getTextValue();
if (a == amount)
listener->panelChanged (EvSharpenMicroAmount, value );
else if (a == uniformity)
listener->panelChanged (EvSharpenMicroUniformity, value );
}
void SharpenMicro::adjusterChanged (Adjuster* a, double newval)
{
if (listener && getEnabled()) {
Glib::ustring value = a->getTextValue();
if (a == amount) {
listener->panelChanged (EvSharpenMicroAmount, value );
} else if (a == uniformity) {
listener->panelChanged (EvSharpenMicroUniformity, value );
}
}
}
void SharpenMicro::setBatchMode(bool batchMode) {
amount->showEditedCB ();
uniformity->showEditedCB ();
void SharpenMicro::setBatchMode(bool batchMode)
{
amount->showEditedCB ();
uniformity->showEditedCB ();
}
void SharpenMicro::setDefaults(const ProcParams* defParams, const ParamsEdited* pedited) {
amount->setDefault (defParams->sharpenMicro.amount);
uniformity->setDefault (defParams->sharpenMicro.uniformity);
void SharpenMicro::setDefaults(const ProcParams* defParams, const ParamsEdited* pedited)
{
amount->setDefault (defParams->sharpenMicro.amount);
uniformity->setDefault (defParams->sharpenMicro.uniformity);
if (pedited) {
amount->setDefaultEditedState (pedited->sharpenMicro.amount ? Edited : UnEdited);
uniformity->setDefaultEditedState (pedited->sharpenMicro.uniformity ? Edited : UnEdited);
} else {
amount->setDefaultEditedState (Irrelevant);
uniformity->setDefaultEditedState (Irrelevant);
}
if (pedited) {
amount->setDefaultEditedState (pedited->sharpenMicro.amount ? Edited : UnEdited);
uniformity->setDefaultEditedState (pedited->sharpenMicro.uniformity ? Edited : UnEdited);
} else {
amount->setDefaultEditedState (Irrelevant);
uniformity->setDefaultEditedState (Irrelevant);
}
}
void SharpenMicro::setAdjusterBehavior (bool amountadd, bool uniformityadd ) {
amount->setAddMode (amountadd);
uniformity->setAddMode (uniformityadd);
void SharpenMicro::setAdjusterBehavior (bool amountadd, bool uniformityadd )
{
amount->setAddMode (amountadd);
uniformity->setAddMode (uniformityadd);
}
void SharpenMicro::trimValues (ProcParams* pp) {
amount->trimValue (pp->sharpenMicro.amount);
uniformity->trimValue (pp->sharpenMicro.uniformity);
void SharpenMicro::trimValues (ProcParams* pp)
{
amount->trimValue (pp->sharpenMicro.amount);
uniformity->trimValue (pp->sharpenMicro.uniformity);
}