Wavelet levels Improvments - issue2702
This commit is contained in:
jdc
@@ -38,12 +38,17 @@ protected:
|
||||
Glib::RefPtr<Gdk::Pixbuf> bgPixbuf;
|
||||
Glib::RefPtr<Gdk::Pixbuf> srPixbuf;
|
||||
|
||||
CurveEditorGroup* CLVcurveEditorG;
|
||||
CurveEditorGroup* CCWcurveEditorG;
|
||||
CurveEditorGroup* curveEditorRES;
|
||||
CurveEditorGroup* curveEditorGAM;
|
||||
Gtk::HSeparator* colorSep;
|
||||
Gtk::HSeparator* separator3;
|
||||
CurveEditorGroup* opaCurveEditorG;
|
||||
FlatCurveEditor* opacityShapeRG;
|
||||
CurveEditorGroup* opacityCurveEditorG;
|
||||
FlatCurveEditor* opacityShapeBY;
|
||||
FlatCurveEditor* hhshape;
|
||||
FlatCurveEditor* Chshape;
|
||||
|
||||
FlatCurveEditor* ccshape;
|
||||
Gtk::CheckButton * display;
|
||||
@@ -52,18 +57,25 @@ protected:
|
||||
Gtk::CheckButton * displaygam;
|
||||
Gtk::CheckButton * displayres;
|
||||
Gtk::CheckButton * median;
|
||||
Gtk::CheckButton * medianlev;
|
||||
Gtk::CheckButton * linkedg;
|
||||
// Gtk::CheckButton * edgreinf;
|
||||
Gtk::CheckButton * lipst;
|
||||
Gtk::CheckButton * avoid;
|
||||
Gtk::ToggleButton * tbresid;
|
||||
Gtk::ToggleButton * tbcontrast;
|
||||
Gtk::ToggleButton * tbgamut;
|
||||
Gtk::ToggleButton * tbchroma;
|
||||
Gtk::ToggleButton * tbtoning;
|
||||
Gtk::ToggleButton * tbnoise;
|
||||
Gtk::ToggleButton * tbdisplay;
|
||||
Gtk::ToggleButton * tbedge;
|
||||
Gtk::CheckButton * cbresid;
|
||||
Gtk::Image* igRes;
|
||||
Gtk::Button * neutralchButton;
|
||||
|
||||
Adjuster* correction[9];
|
||||
Adjuster* correctionch[9];
|
||||
Adjuster* rescon;
|
||||
Adjuster* resconH;
|
||||
Adjuster* reschro;
|
||||
@@ -87,20 +99,38 @@ protected:
|
||||
ThresholdAdjuster* bllev;
|
||||
ThresholdAdjuster* pastlev;
|
||||
ThresholdAdjuster* satlev;
|
||||
ThresholdAdjuster* edgcont;
|
||||
ThresholdAdjuster* level0noise;
|
||||
ThresholdAdjuster* level1noise;
|
||||
ThresholdAdjuster* level2noise;
|
||||
|
||||
Adjuster* threshold;
|
||||
Adjuster* threshold2;
|
||||
Adjuster* edgedetect;
|
||||
Adjuster* edgedetectthr;
|
||||
Adjuster* edgedetectthr2;
|
||||
MyComboBoxText* Lmethod;
|
||||
sigc::connection Lmethodconn;
|
||||
MyComboBoxText* CHmethod;
|
||||
sigc::connection CHmethodconn;
|
||||
MyComboBoxText* CHSLmethod;
|
||||
sigc::connection CHSLmethodconn;
|
||||
MyComboBoxText* EDmethod;
|
||||
sigc::connection EDmethodconn;
|
||||
MyComboBoxText* HSmethod;
|
||||
sigc::connection HSmethodconn;
|
||||
MyComboBoxText* CLmethod;
|
||||
sigc::connection CLmethodconn;
|
||||
MyComboBoxText* Backmethod;
|
||||
sigc::connection Backmethodconn;
|
||||
MyComboBoxText* Tilesmethod;
|
||||
sigc::connection Tilesmethodconn;
|
||||
MyComboBoxText* choicemethod;
|
||||
sigc::connection choicemethodconn;
|
||||
MyComboBoxText* Dirmethod;
|
||||
sigc::connection Dirmethodconn;
|
||||
MyComboBoxText* Medgreinf;
|
||||
sigc::connection MedgreinfConn;
|
||||
Gtk::Frame* settingsFrame;
|
||||
Gtk::Frame* toningFrame;
|
||||
Gtk::Frame* residualFrame;
|
||||
@@ -109,34 +139,53 @@ protected:
|
||||
Gtk::Frame* chromaFrame;
|
||||
Gtk::Frame* controlFrame;
|
||||
Gtk::Frame* edgeFrame;
|
||||
Gtk::Frame* noiseFrame;
|
||||
Gtk::Frame* contrastSHFrame;
|
||||
Gtk::Label* colLabel;
|
||||
Gtk::Label* interLabel;
|
||||
Gtk::Label* wavLabels;
|
||||
Gtk::Label* wavLabelsch;
|
||||
Gtk::Label* hsmethodLabel;
|
||||
Gtk::Label* choiceLabel;
|
||||
Gtk::Label* labmC;
|
||||
Gtk::Label* labmch;
|
||||
Gtk::Label* labmED;
|
||||
Gtk::Label* labmedgr;
|
||||
Gtk::Label* labmednois;
|
||||
Gtk::Expander* expcontrast;
|
||||
Gtk::Expander* expresid;
|
||||
Gtk::Expander* expgamut;
|
||||
Gtk::Expander* expchroma;
|
||||
Gtk::Expander* exptoning;
|
||||
Gtk::Expander* expdisplay;
|
||||
Gtk::Expander* expnoise;
|
||||
Gtk::Expander* expedge;
|
||||
Gtk::HBox* hbresid;
|
||||
Gtk::HBox* tilesizeHBox;
|
||||
Gtk::HBox* previewLevelsHBox;
|
||||
Gtk::HBox* previewBackHBox;
|
||||
Gtk::HBox* previewLDirHBox;
|
||||
Gtk::HBox* hsmethodHBox;
|
||||
Gtk::HBox* choiceHBox;
|
||||
Gtk::HBox* ctboxCH;
|
||||
Gtk::HBox* ctboxED;
|
||||
Gtk::HBox* ctboxch;
|
||||
Gtk::HBox* edbox;
|
||||
Gtk::HBox* ednoisbox;
|
||||
Gtk::HBox* eddebox;
|
||||
Gtk::VBox* settingsVBox;
|
||||
Gtk::VBox* contrastSHVBox;
|
||||
Gtk::Label* tilesizeLabel;
|
||||
Gtk::Label* previewLevelsLabel;
|
||||
Gtk::Label* previewBackLabel;
|
||||
|
||||
sigc::connection expConn, medianConn, avoidConn;
|
||||
sigc::connection expConn, medianConn, avoidConn, medianlevConn, linkedgConn, lipstConn;
|
||||
sigc::connection neutralPressedConn;
|
||||
sigc::connection contrastPlusPressedConn;
|
||||
sigc::connection contrastMinusPressedConn;
|
||||
sigc::connection neutralchPressedConn;
|
||||
|
||||
bool lastdisplay, lastdisplaygam,lastdisplayres,lastdisplaychro, lastdisplaylevel,lastmedian, lastavoid;
|
||||
bool lastdisplay, lastdisplaygam,lastdisplayres,lastdisplaychro, lastdisplaylevel,lastmedian, lastmedianlev, lastlinkedg, lastavoid, lastlipst;
|
||||
int nextnlevel;
|
||||
|
||||
public:
|
||||
@@ -162,11 +211,16 @@ public:
|
||||
void setDefaults (const rtengine::procparams::ProcParams* defParams, const ParamsEdited* pedited=NULL);
|
||||
void setBatchMode (bool batchMode);
|
||||
void adjusterChanged2 (ThresholdAdjuster* a, int newBottomL, int newTopL, int newBottomR, int newTopR);
|
||||
void setAdjusterBehavior (bool multiplieradd, bool thresholdadd, bool threshold2add, bool thresadd, bool chroadd,bool chromaadd, bool contrastadd, bool skinadd, bool reschroadd, bool resconadd, bool resconHadd, bool thradd, bool thrHadd, bool skyadd, bool edgradadd, bool edgvaladd, bool strengthadd);
|
||||
void setAdjusterBehavior (bool multiplieradd, bool thresholdadd, bool threshold2add, bool thresadd, bool chroadd,bool chromaadd, bool contrastadd, bool skinadd, bool reschroadd, bool resconadd, bool resconHadd, bool thradd, bool thrHadd, bool skyadd, bool edgradadd, bool edgvaladd, bool strengthadd, bool edgedetectadd, bool edgedetectthradd, bool edgedetectthr2add);
|
||||
|
||||
void adjusterChanged (Adjuster* a, double newval);
|
||||
void adjusterChanged (ThresholdAdjuster* a, double newBottom, double newTop);
|
||||
|
||||
void enabledChanged ();
|
||||
void medianToggled ();
|
||||
void medianlevToggled ();
|
||||
void linkedgToggled ();
|
||||
void lipstToggled ();
|
||||
void expcontrastTog ();
|
||||
void expresidTog ();
|
||||
void expdisplayTog ();
|
||||
@@ -175,12 +229,18 @@ public:
|
||||
void exptoningTog ();
|
||||
void avoidToggled ();
|
||||
void neutralPressed ();
|
||||
void neutralchPressed ();
|
||||
void contrastPlusPressed ();
|
||||
void contrastMinusPressed ();
|
||||
void LmethodChanged ();
|
||||
void choicemethodChanged ();
|
||||
void CHmethodChanged ();
|
||||
void MedgreinfChanged ();
|
||||
void CHSLmethodChanged ();
|
||||
void EDmethodChanged ();
|
||||
void HSmethodChanged ();
|
||||
void CLmethodChanged ();
|
||||
void BackmethodChanged ();
|
||||
void TilesmethodChanged ();
|
||||
void DirmethodChanged ();
|
||||
virtual void colorForValue (double valX, double valY, enum ColorCaller::ElemType elemType, int callerId, ColorCaller* caller);
|
||||
|
||||
Reference in New Issue
Block a user