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

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

View File

@@ -7,7 +7,7 @@
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
*
* RawTherapee is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
@@ -27,98 +27,103 @@
#include "toolpanel.h"
#include "../rtengine/imagedata.h"
class ICMPanelListener {
class ICMPanelListener
{
public:
virtual ~ICMPanelListener() {}
virtual void saveInputICCReference (Glib::ustring fname, bool apply_wb) {}
public:
virtual ~ICMPanelListener() {}
virtual void saveInputICCReference (Glib::ustring fname, bool apply_wb) {}
};
class ICMPanel : public ToolParamBlock, public AdjusterListener, public FoldableToolPanel {
class ICMPanel : public ToolParamBlock, public AdjusterListener, public FoldableToolPanel
{
protected:
Gtk::Frame* dcpFrame;
Adjuster* gampos;
Adjuster* slpos;
bool lastgamfree;
sigc::connection gamcsconn;
//bool freegamma;
bool lastToneCurve;
sigc::connection tcurveconn;
bool lastApplyLookTable;
sigc::connection ltableconn;
bool lastApplyBaselineExposureOffset;
sigc::connection beoconn;
bool lastApplyHueSatMap;
sigc::connection hsmconn;
bool lastBlendCMSMatrix;
bool isBatchMode;
sigc::connection blendcmsconn;
protected:
Gtk::Frame* dcpFrame;
Adjuster* gampos;
Adjuster* slpos;
bool lastgamfree;
sigc::connection gamcsconn;
//bool freegamma;
bool lastToneCurve;
sigc::connection tcurveconn;
bool lastApplyLookTable;
sigc::connection ltableconn;
bool lastApplyBaselineExposureOffset;
sigc::connection beoconn;
bool lastApplyHueSatMap;
sigc::connection hsmconn;
bool lastBlendCMSMatrix;
bool isBatchMode;
sigc::connection blendcmsconn;
private:
Gtk::VBox * iVBox;
private:
Gtk::VBox * iVBox;
Gtk::CheckButton* freegamma;
Gtk::RadioButton* inone;
Gtk::CheckButton* freegamma;
Gtk::RadioButton* inone;
Gtk::RadioButton* iembedded;
Gtk::RadioButton* icamera;
Gtk::RadioButton* icameraICC;
Gtk::RadioButton* ifromfile;
Gtk::Label* dcpIllLabel;
MyComboBoxText* dcpIll;
Gtk::CheckButton* ckbToneCurve;
Gtk::CheckButton* ckbApplyLookTable;
Gtk::CheckButton* ckbApplyBaselineExposureOffset;
Gtk::CheckButton* ckbApplyHueSatMap;
Gtk::CheckButton* ckbBlendCMSMatrix;
MyComboBoxText* wnames;
MyComboBoxText* wgamma;
Gtk::RadioButton* iembedded;
Gtk::RadioButton* icamera;
Gtk::RadioButton* icameraICC;
Gtk::RadioButton* ifromfile;
Gtk::Label* dcpIllLabel;
MyComboBoxText* dcpIll;
Gtk::CheckButton* ckbToneCurve;
Gtk::CheckButton* ckbApplyLookTable;
Gtk::CheckButton* ckbApplyBaselineExposureOffset;
Gtk::CheckButton* ckbApplyHueSatMap;
Gtk::CheckButton* ckbBlendCMSMatrix;
MyComboBoxText* wnames;
MyComboBoxText* wgamma;
MyComboBoxText* onames;
Gtk::RadioButton* ofromdir;
Gtk::RadioButton* ofromfile;
Gtk::RadioButton* iunchanged;
MyFileChooserButton* ipDialog;
std::auto_ptr<FileChooserLastFolderPersister> ipDialogPersister;
Gtk::RadioButton::Group opts;
Gtk::Button* saveRef;
sigc::connection ipc;
Glib::ustring oldip;
ICMPanelListener* icmplistener;
MyComboBoxText* onames;
Gtk::RadioButton* ofromdir;
Gtk::RadioButton* ofromfile;
Gtk::RadioButton* iunchanged;
MyFileChooserButton* ipDialog;
std::auto_ptr<FileChooserLastFolderPersister> ipDialogPersister;
Gtk::RadioButton::Group opts;
Gtk::Button* saveRef;
sigc::connection ipc;
Glib::ustring oldip;
ICMPanelListener* icmplistener;
bool ignoreDcpSignal;
double dcpTemperatures[2];
bool enableLastICCWorkDirChange;
Glib::ustring lastRefFilename;
void updateDCP(int dcpIlluminant, Glib::ustring dcp_name);
public:
ICMPanel ();
bool ignoreDcpSignal;
double dcpTemperatures[2];
bool enableLastICCWorkDirChange;
Glib::ustring lastRefFilename;
void updateDCP(int dcpIlluminant, Glib::ustring dcp_name);
public:
ICMPanel ();
void read (const rtengine::procparams::ProcParams* pp, const ParamsEdited* pedited=NULL);
void write (rtengine::procparams::ProcParams* pp, ParamsEdited* pedited=NULL);
void setBatchMode (bool batchMode);
void setDefaults (const rtengine::procparams::ProcParams* defParams, const ParamsEdited* pedited=NULL);
void adjusterChanged (Adjuster* a, double newval);
void setAdjusterBehavior (bool gammaadd, bool slopeadd);
void wpChanged ();
void opChanged ();
void ipChanged ();
void gpChanged ();
void GamChanged ();
void ipSelectionChanged ();
void blendCMSMatrixChanged();
void dcpIlluminantChanged();
void toneCurveChanged();
void applyLookTableChanged();
void applyBaselineExposureOffsetChanged();
void applyHueSatMapChanged();
void read (const rtengine::procparams::ProcParams* pp, const ParamsEdited* pedited = NULL);
void write (rtengine::procparams::ProcParams* pp, ParamsEdited* pedited = NULL);
void setBatchMode (bool batchMode);
void setDefaults (const rtengine::procparams::ProcParams* defParams, const ParamsEdited* pedited = NULL);
void adjusterChanged (Adjuster* a, double newval);
void setAdjusterBehavior (bool gammaadd, bool slopeadd);
void setRawMeta (bool raw, const rtengine::ImageData* pMeta);
void saveReferencePressed ();
void wpChanged ();
void opChanged ();
void ipChanged ();
void gpChanged ();
void GamChanged ();
void ipSelectionChanged ();
void blendCMSMatrixChanged();
void dcpIlluminantChanged();
void toneCurveChanged();
void applyLookTableChanged();
void applyBaselineExposureOffsetChanged();
void applyHueSatMapChanged();
void setICMPanelListener (ICMPanelListener* ipl) { icmplistener = ipl; }
void setRawMeta (bool raw, const rtengine::ImageData* pMeta);
void saveReferencePressed ();
void setICMPanelListener (ICMPanelListener* ipl)
{
icmplistener = ipl;
}
};
#endif