Local adjustments tools used globally - Laspotmain (#6928)
* First step LA globally * fixed several GUI bad behavior * better behavior shows additional settings * Improve transition in main * First step hide-show invers and scope * Hide show invers and scope step2 * hide show others inverse and scope * Try to improve * Change windows.yml and appimage.yml * In Preference set choice for default Spot Method * Optimization call idle_register * forgotten delete mainfp * Re-enable sliders scope in colorlight - shadows - vibrance - move setting checkbox others settings * Fixed bad behavior hide - show * Optimize behavior * Bad behavior scope when changing method * Clean and comment code * disable preview mask and modif for cbdl and retinex * Fixed preview deltaE mask and modif log encode - exposure - new button preview color and light * Button preview deltaE - exposure * Button preview SH * Button preview Vibrance * Improce code using mask * Fixed several bad behavior - preview TM and Contrast * Preview log button * Preview Ciecam button * Preview common mask button * Disable Preview button in settings when not used in tools * Change call to controspotpanel in improcoordinator * Change Local adjustments title to Selective Editing * Change default value spotmethod in option * Missing cddl in preview settings * Change parameter setting spot type * put selective editing tab just after exposure tab * Disable preview ΔE button when another is enabled Only one button should be active at any given time. * Deactivate preview ΔE buttons when switching spots * Change tooltip Spot method * Change selective editing position * Remove duplicate line in language default * Remove appimage.yml windows.yml --------- Co-authored-by: Lawrence Lee <45837045+Lawrence37@users.noreply.github.com>
This commit is contained in:
Desmis
GitHub
@@ -55,6 +55,15 @@ protected:
|
||||
Normal = 1,
|
||||
Simple = 2
|
||||
};
|
||||
rtengine::ProcEvent Evlocallabpreviewcol;
|
||||
rtengine::ProcEvent Evlocallabpreviewexe;
|
||||
rtengine::ProcEvent Evlocallabpreviewsh;
|
||||
rtengine::ProcEvent Evlocallabpreviewvib;
|
||||
rtengine::ProcEvent Evlocallabpreviewtm;
|
||||
rtengine::ProcEvent Evlocallabpreviewlc;
|
||||
rtengine::ProcEvent Evlocallabpreviewlog;
|
||||
rtengine::ProcEvent Evlocallabpreviewcie;
|
||||
rtengine::ProcEvent Evlocallabpreviewmas;
|
||||
rtengine::ProcEvent Evlocallabnormcie;
|
||||
rtengine::ProcEvent Evlocallabstrumaskcie;
|
||||
rtengine::ProcEvent EvLocallabtoolcie;
|
||||
@@ -186,6 +195,9 @@ public:
|
||||
virtual void resetMaskView() {};
|
||||
virtual void getMaskView(int &colorMask, int &colorMaskinv, int &expMask, int &expMaskinv, int &shMask, int &shMaskinv, int &vibMask, int &softMask, int &blMask, int &tmMask, int &retiMask, int &sharMask, int &lcMask, int &cbMask, int &logMask, int &maskMask, int &cieMask) {};
|
||||
|
||||
virtual Gtk::ToggleButton *getPreviewDeltaEButton() const;
|
||||
virtual sigc::connection *getPreviewDeltaEButtonConnection();
|
||||
|
||||
// Advice tooltips management function
|
||||
virtual void updateAdviceTooltips(const bool showTooltips) {};
|
||||
|
||||
@@ -248,6 +260,8 @@ private:
|
||||
MyComboBoxText* const gridMethod;
|
||||
Adjuster* const strengthgrid;
|
||||
Adjuster* const sensi;
|
||||
Gtk::ToggleButton* const previewcol;
|
||||
|
||||
Adjuster* const structcol;
|
||||
Adjuster* const blurcolde;
|
||||
Adjuster* const softradiuscol;
|
||||
@@ -326,18 +340,20 @@ private:
|
||||
FlatCurveEditor* const LLmaskcolshapewav;
|
||||
ThresholdAdjuster* const csThresholdcol;
|
||||
|
||||
sigc::connection curvactivConn, gridMethodConn, inversConn, qualitycurveMethodConn, toneMethodConn, specialConn, merMethodConn, mergecolMethodConn, showmaskcolMethodConn, showmaskcolMethodConninv, enaColorMaskConn, toolcolConn, fftColorMaskConn;
|
||||
sigc::connection curvactivConn, previewcolConn, gridMethodConn, inversConn, qualitycurveMethodConn, toneMethodConn, specialConn, merMethodConn, mergecolMethodConn, showmaskcolMethodConn, showmaskcolMethodConninv, enaColorMaskConn, toolcolConn, fftColorMaskConn;
|
||||
|
||||
public:
|
||||
LocallabColor();
|
||||
~LocallabColor();
|
||||
|
||||
void setListener(ToolPanelListener* tpl) override;
|
||||
|
||||
bool isMaskViewActive() override;
|
||||
void resetMaskView() override;
|
||||
void getMaskView(int &colorMask, int &colorMaskinv, int &expMask, int &expMaskinv, int &shMask, int &shMaskinv, int &vibMask, int &softMask, int &blMask, int &tmMask, int &retiMask, int &sharMask, int &lcMask, int &cbMask, int &logMask, int &maskMask, int &cieMask) override;
|
||||
|
||||
Gtk::ToggleButton *getPreviewDeltaEButton() const override;
|
||||
sigc::connection *getPreviewDeltaEButtonConnection() override;
|
||||
|
||||
void updateAdviceTooltips(const bool showTooltips) override;
|
||||
|
||||
void setDefaultExpanderVisibility() override;
|
||||
@@ -354,6 +370,9 @@ public:
|
||||
void adjusterChanged(ThresholdAdjuster* a, int newBottomLeft, int newTopLeft, int newBottomRight, int newTopRight) override {}; // Not used
|
||||
void adjusterChanged2(ThresholdAdjuster* a, int newBottomL, int newTopL, int newBottomR, int newTopR) override;
|
||||
void curveChanged(CurveEditor* ce) override;
|
||||
void updateguicolor(int spottype);
|
||||
void updateguiscopecolor(int scope);
|
||||
void previewcolChanged();
|
||||
|
||||
private:
|
||||
void enabledChanged() override;
|
||||
@@ -362,7 +381,6 @@ private:
|
||||
void updateGUIToMode(const modeType new_type) override;
|
||||
|
||||
void updateMaskBackground(const double normChromar, const double normLumar, const double normHuer, const double normHuerjz) override;
|
||||
|
||||
void curvactivChanged();
|
||||
void gridMethodChanged();
|
||||
void inversChanged();
|
||||
@@ -376,7 +394,6 @@ private:
|
||||
void enaColorMaskChanged();
|
||||
void toolcolChanged();
|
||||
void fftColorMaskChanged();
|
||||
|
||||
void updateColorGUI1();
|
||||
void updateColorGUI2();
|
||||
void updateColorGUI3();
|
||||
@@ -409,6 +426,8 @@ private:
|
||||
Adjuster* const fatanchor;
|
||||
Adjuster* const gamex;
|
||||
Adjuster* const sensiex;
|
||||
Gtk::ToggleButton* const previewexe;
|
||||
|
||||
Adjuster* const structexp;
|
||||
Adjuster* const blurexpde;
|
||||
MyExpander* const exptoolexp;
|
||||
@@ -456,7 +475,7 @@ private:
|
||||
DiagonalCurveEditor* const Lmaskexpshape;
|
||||
rtengine::ProcEvent Evlocallabtmosatur;
|
||||
|
||||
sigc::connection expMethodConn, exnoiseMethodConn, inversexConn, normConn, fatsaturConn, showmaskexpMethodConn, showmaskexpMethodConninv, enaExpMaskConn, enaExpMaskaftConn;
|
||||
sigc::connection expMethodConn, exnoiseMethodConn, previewexeConn, inversexConn, normConn, fatsaturConn, showmaskexpMethodConn, showmaskexpMethodConninv, enaExpMaskConn, enaExpMaskaftConn;
|
||||
|
||||
public:
|
||||
LocallabExposure();
|
||||
@@ -466,6 +485,9 @@ public:
|
||||
void resetMaskView() override;
|
||||
void getMaskView(int &colorMask, int &colorMaskinv, int &expMask, int &expMaskinv, int &shMask, int &shMaskinv, int &vibMask, int &softMask, int &blMask, int &tmMask, int &retiMask, int &sharMask, int &lcMask, int &cbMask, int &logMask, int &maskMask, int &cieMask) override;
|
||||
|
||||
Gtk::ToggleButton *getPreviewDeltaEButton() const override;
|
||||
sigc::connection *getPreviewDeltaEButtonConnection() override;
|
||||
|
||||
void updateAdviceTooltips(const bool showTooltips) override;
|
||||
|
||||
void setDefaultExpanderVisibility() override;
|
||||
@@ -476,6 +498,8 @@ public:
|
||||
void setDefaults(const rtengine::procparams::ProcParams* defParams, const ParamsEdited* pedited = nullptr) override;
|
||||
void adjusterChanged(Adjuster* a, double newval) override;
|
||||
void curveChanged(CurveEditor* ce) override;
|
||||
void updateguiexpos(int spottype);
|
||||
void previewexeChanged();
|
||||
|
||||
private:
|
||||
void enabledChanged() override;
|
||||
@@ -519,6 +543,8 @@ private:
|
||||
Adjuster* const s_tonalwidth;
|
||||
Adjuster* const sh_radius;
|
||||
Adjuster* const sensihs;
|
||||
Gtk::ToggleButton* const previewsh;
|
||||
|
||||
Adjuster* const blurSHde;
|
||||
MyExpander* const exprecovs;
|
||||
Gtk::Label* const maskusables;
|
||||
@@ -556,7 +582,7 @@ private:
|
||||
|
||||
rtengine::ProcEvent EvlocallabTePivot;
|
||||
|
||||
sigc::connection shMethodConn, inversshConn, showmaskSHMethodConn, showmaskSHMethodConninv, enaSHMaskConn;
|
||||
sigc::connection shMethodConn, previewshConn, inversshConn, showmaskSHMethodConn, showmaskSHMethodConninv, enaSHMaskConn;
|
||||
|
||||
public:
|
||||
LocallabShadow();
|
||||
@@ -566,8 +592,13 @@ public:
|
||||
void resetMaskView() override;
|
||||
void getMaskView(int &colorMask, int &colorMaskinv, int &expMask, int &expMaskinv, int &shMask, int &shMaskinv, int &vibMask, int &softMask, int &blMask, int &tmMask, int &retiMask, int &sharMask, int &lcMask, int &cbMask, int &logMask, int &maskMask, int &cieMask) override;
|
||||
|
||||
void updateAdviceTooltips(const bool showTooltips) override;
|
||||
Gtk::ToggleButton *getPreviewDeltaEButton() const override;
|
||||
sigc::connection *getPreviewDeltaEButtonConnection() override;
|
||||
|
||||
void updateAdviceTooltips(const bool showTooltips) override;
|
||||
void updateguishad(int spottype);
|
||||
void updateguiscopesahd(int scope);
|
||||
|
||||
void setDefaultExpanderVisibility() override;
|
||||
void disableListener() override;
|
||||
void enableListener() override;
|
||||
@@ -576,6 +607,7 @@ public:
|
||||
void setDefaults(const rtengine::procparams::ProcParams* defParams, const ParamsEdited* pedited = nullptr) override;
|
||||
void adjusterChanged(Adjuster* a, double newval) override;
|
||||
void curveChanged(CurveEditor* ce) override;
|
||||
void previewshChanged();
|
||||
|
||||
private:
|
||||
void enabledChanged() override;
|
||||
@@ -613,6 +645,8 @@ private:
|
||||
Gtk::CheckButton* const avoidColorShift;
|
||||
Gtk::CheckButton* const pastSatTog;
|
||||
Adjuster* const sensiv;
|
||||
Gtk::ToggleButton* const previewvib;
|
||||
|
||||
CurveEditorGroup* const curveEditorGG;
|
||||
DiagonalCurveEditor* const skinTonesCurve;
|
||||
MyExpander* const exprecovv;
|
||||
@@ -643,7 +677,7 @@ private:
|
||||
CurveEditorGroup* const mask2vibCurveEditorG;
|
||||
DiagonalCurveEditor* const Lmaskvibshape;
|
||||
|
||||
sigc::connection pskinsConn, ashiftConn, pastsattogConn, showmaskvibMethodConn, enavibMaskConn;
|
||||
sigc::connection pskinsConn, previewvibConn, ashiftConn, pastsattogConn, showmaskvibMethodConn, enavibMaskConn;
|
||||
|
||||
public:
|
||||
LocallabVibrance();
|
||||
@@ -653,7 +687,12 @@ public:
|
||||
void resetMaskView() override;
|
||||
void getMaskView(int &colorMask, int &colorMaskinv, int &expMask, int &expMaskinv, int &shMask, int &shMaskinv, int &vibMask, int &softMask, int &blMask, int &tmMask, int &retiMask, int &sharMask, int &lcMask, int &cbMask, int &logMask, int &maskMask, int &cieMask) override;
|
||||
|
||||
Gtk::ToggleButton *getPreviewDeltaEButton() const override;
|
||||
sigc::connection *getPreviewDeltaEButtonConnection() override;
|
||||
|
||||
void updateAdviceTooltips(const bool showTooltips) override;
|
||||
void updateguivib(int spottype);
|
||||
void updateguiscopevib(int scope);
|
||||
|
||||
void setDefaultExpanderVisibility() override;
|
||||
void disableListener() override;
|
||||
@@ -670,6 +709,7 @@ public:
|
||||
void adjusterChanged2(ThresholdAdjuster* a, int newBottomL, int newTopL, int newBottomR, int newTopR) override {}; // Not used
|
||||
std::vector<double> getCurvePoints(ThresholdSelector* tAdjuster) const override;
|
||||
void curveChanged(CurveEditor* ce) override;
|
||||
void previewvibChanged();
|
||||
|
||||
private:
|
||||
void enabledChanged() override;
|
||||
@@ -712,6 +752,7 @@ public:
|
||||
void getMaskView(int &colorMask, int &colorMaskinv, int &expMask, int &expMaskinv, int &shMask, int &shMaskinv, int &vibMask, int &softMask, int &blMask, int &tmMask, int &retiMask, int &sharMask, int &lcMask, int &cbMask, int &logMask, int &maskMask, int &cieMask) override;
|
||||
|
||||
void updateAdviceTooltips(const bool showTooltips) override;
|
||||
void updateguisoft(int spottype);
|
||||
|
||||
void disableListener() override;
|
||||
void enableListener() override;
|
||||
@@ -765,6 +806,7 @@ private:
|
||||
Adjuster* const lowthres;
|
||||
Adjuster* const higthres;
|
||||
Adjuster* const sensibn;
|
||||
|
||||
MyComboBoxText* const blurMethod;
|
||||
Gtk::CheckButton* const invbl;
|
||||
MyComboBoxText* const chroMethod;
|
||||
@@ -827,6 +869,7 @@ private:
|
||||
Adjuster* const nlgam;
|
||||
Adjuster* const bilateral;
|
||||
Adjuster* const sensiden;
|
||||
|
||||
Adjuster* const reparden;
|
||||
Gtk::Button* neutral;
|
||||
MyExpander* const expmaskbl;
|
||||
@@ -863,13 +906,13 @@ public:
|
||||
~LocallabBlur();
|
||||
void updatedenlc(const double highres, const double nres, const double highres46, const double nres46, const double Lhighres, const double Lnres, const double Lhighres46, const double Lnres46);
|
||||
|
||||
|
||||
bool isMaskViewActive() override;
|
||||
void resetMaskView() override;
|
||||
void getMaskView(int &colorMask, int &colorMaskinv, int &expMask, int &expMaskinv, int &shMask, int &shMaskinv, int &vibMask, int &softMask, int &blMask, int &tmMask, int &retiMask, int &sharMask, int &lcMask, int &cbMask, int &logMask, int &maskMask, int &cieMask) override;
|
||||
|
||||
void updateAdviceTooltips(const bool showTooltips) override;
|
||||
void neutral_pressed();
|
||||
void updateguiblur(int spottype);
|
||||
|
||||
void setDefaultExpanderVisibility() override;
|
||||
void disableListener() override;
|
||||
@@ -931,6 +974,8 @@ private:
|
||||
Adjuster* const rewei;
|
||||
Adjuster* const softradiustm;
|
||||
Adjuster* const sensitm;
|
||||
Gtk::ToggleButton* const previewtm;
|
||||
|
||||
MyExpander* const exprecovt;
|
||||
Gtk::Label* const maskusablet;
|
||||
Gtk::Label* const maskunusablet;
|
||||
@@ -955,7 +1000,7 @@ private:
|
||||
CurveEditorGroup* const mask2tmCurveEditorG;
|
||||
DiagonalCurveEditor* const Lmasktmshape;
|
||||
|
||||
sigc::connection equiltmConn, showmasktmMethodConn, enatmMaskConn, enatmMaskaftConn;
|
||||
sigc::connection equiltmConn, previewtmConn, showmasktmMethodConn, enatmMaskConn, enatmMaskaftConn;
|
||||
|
||||
public:
|
||||
LocallabTone();
|
||||
@@ -965,8 +1010,12 @@ public:
|
||||
void resetMaskView() override;
|
||||
void getMaskView(int &colorMask, int &colorMaskinv, int &expMask, int &expMaskinv, int &shMask, int &shMaskinv, int &vibMask, int &softMask, int &blMask, int &tmMask, int &retiMask, int &sharMask, int &lcMask, int &cbMask, int &logMask, int &maskMask, int &cieMask) override;
|
||||
|
||||
void updateAdviceTooltips(const bool showTooltips) override;
|
||||
Gtk::ToggleButton *getPreviewDeltaEButton() const override;
|
||||
sigc::connection *getPreviewDeltaEButtonConnection() override;
|
||||
|
||||
void updateAdviceTooltips(const bool showTooltips) override;
|
||||
void updateguitone(int spottype);
|
||||
void previewtmChanged();
|
||||
void setDefaultExpanderVisibility() override;
|
||||
void disableListener() override;
|
||||
void enableListener() override;
|
||||
@@ -1062,6 +1111,7 @@ public:
|
||||
~LocallabRetinex();
|
||||
|
||||
void updateMinMax(const double cdma, const double cdmin, const double mini, const double maxi, const double Tmean, const double Tsigma, const double Tmin, const double Tmax);
|
||||
void updateguireti(int spottype);
|
||||
|
||||
bool isMaskViewActive() override;
|
||||
void resetMaskView() override;
|
||||
@@ -1128,6 +1178,7 @@ public:
|
||||
void getMaskView(int &colorMask, int &colorMaskinv, int &expMask, int &expMaskinv, int &shMask, int &shMaskinv, int &vibMask, int &softMask, int &blMask, int &tmMask, int &retiMask, int &sharMask, int &lcMask, int &cbMask, int &logMask, int &maskMask, int &cieMask) override;
|
||||
|
||||
void updateAdviceTooltips(const bool showTooltips) override;
|
||||
void updateguisharp(int spottype);
|
||||
|
||||
void disableListener() override;
|
||||
void enableListener() override;
|
||||
@@ -1176,6 +1227,8 @@ private:
|
||||
Adjuster* const residgam;
|
||||
Adjuster* const residslop;
|
||||
Adjuster* const sensilc;
|
||||
Gtk::ToggleButton* const previewlc;
|
||||
|
||||
Adjuster* const reparw;
|
||||
Gtk::Frame* const clariFrame;
|
||||
Adjuster* const clarilres;
|
||||
@@ -1251,7 +1304,7 @@ private:
|
||||
CurveEditorGroup* const mask2lcCurveEditorG;
|
||||
DiagonalCurveEditor* const Lmasklcshape;
|
||||
|
||||
sigc::connection localcontMethodConn, origlcConn, wavgradlConn, wavedgConn, localedgMethodConn, waveshowConn, localneiMethodConn, wavblurConn, blurlcConn, wavcontConn, wavcompreConn, wavcompConn, fftwlcConn, showmasklcMethodConn, enalcMaskConn;
|
||||
sigc::connection localcontMethodConn, previewlcConn, origlcConn, wavgradlConn, wavedgConn, localedgMethodConn, waveshowConn, localneiMethodConn, wavblurConn, blurlcConn, wavcontConn, wavcompreConn, wavcompConn, fftwlcConn, showmasklcMethodConn, enalcMaskConn;
|
||||
|
||||
public:
|
||||
LocallabContrast();
|
||||
@@ -1261,8 +1314,11 @@ public:
|
||||
void resetMaskView() override;
|
||||
void getMaskView(int &colorMask, int &colorMaskinv, int &expMask, int &expMaskinv, int &shMask, int &shMaskinv, int &vibMask, int &softMask, int &blMask, int &tmMask, int &retiMask, int &sharMask, int &lcMask, int &cbMask, int &logMask, int &maskMask, int &cieMask) override;
|
||||
|
||||
void updateAdviceTooltips(const bool showTooltips) override;
|
||||
Gtk::ToggleButton *getPreviewDeltaEButton() const override;
|
||||
sigc::connection *getPreviewDeltaEButtonConnection() override;
|
||||
|
||||
void updateAdviceTooltips(const bool showTooltips) override;
|
||||
void updateguicont(int spottype);
|
||||
void setDefaultExpanderVisibility() override;
|
||||
void disableListener() override;
|
||||
void enableListener() override;
|
||||
@@ -1277,6 +1333,7 @@ public:
|
||||
void adjusterChanged(ThresholdAdjuster* a, int newBottomLeft, int newTopLeft, int newBottomRight, int newTopRight) override {}; // Not used
|
||||
void adjusterChanged2(ThresholdAdjuster* a, int newBottomL, int newTopL, int newBottomR, int newTopR) override;
|
||||
void curveChanged(CurveEditor* ce) override;
|
||||
void previewlcChanged();
|
||||
|
||||
private:
|
||||
void enabledChanged() override;
|
||||
@@ -1361,6 +1418,7 @@ public:
|
||||
void getMaskView(int &colorMask, int &colorMaskinv, int &expMask, int &expMaskinv, int &shMask, int &shMaskinv, int &vibMask, int &softMask, int &blMask, int &tmMask, int &retiMask, int &sharMask, int &lcMask, int &cbMask, int &logMask, int &maskMask, int &cieMask) override;
|
||||
|
||||
void updateAdviceTooltips(const bool showTooltips) override;
|
||||
void updateguicbdl(int spottype);
|
||||
|
||||
void setDefaultExpanderVisibility() override;
|
||||
void disableListener() override;
|
||||
@@ -1443,6 +1501,8 @@ private:
|
||||
Adjuster* const decayl;
|
||||
|
||||
Adjuster* const sensilog;
|
||||
Gtk::ToggleButton* const previewlog;
|
||||
|
||||
Gtk::Frame* const gradlogFrame;
|
||||
Adjuster* const strlog;
|
||||
Adjuster* const anglog;
|
||||
@@ -1461,7 +1521,7 @@ private:
|
||||
|
||||
sigc::connection autoconn, ciecamconn, fullimageConn, AutograyConn;
|
||||
sigc::connection surroundconn, sursourconn, satlogconn;
|
||||
sigc::connection showmaskLMethodConn, enaLMaskConn;
|
||||
sigc::connection showmaskLMethodConn, enaLMaskConn, previewlogConn;
|
||||
public:
|
||||
LocallabLog();
|
||||
~LocallabLog();
|
||||
@@ -1469,6 +1529,11 @@ public:
|
||||
bool isMaskViewActive() override;
|
||||
void resetMaskView() override;
|
||||
void getMaskView(int &colorMask, int &colorMaskinv, int &expMask, int &expMaskinv, int &shMask, int &shMaskinv, int &vibMask, int &softMask, int &blMask, int &tmMask, int &retiMask, int &sharMask, int &lcMask, int &cbMask, int &logMask, int &maskMask, int &cieMask) override;
|
||||
void updateguilog(int spottype);
|
||||
void previewlogChanged();
|
||||
|
||||
Gtk::ToggleButton *getPreviewDeltaEButton() const override;
|
||||
sigc::connection *getPreviewDeltaEButtonConnection() override;
|
||||
|
||||
void updateAdviceTooltips(const bool showTooltips) override;
|
||||
void surroundChanged();
|
||||
@@ -1514,6 +1579,8 @@ class LocallabMask:
|
||||
{
|
||||
private:
|
||||
Adjuster* const sensimask;
|
||||
Gtk::ToggleButton* const previewmas;
|
||||
|
||||
Adjuster* const blendmask;
|
||||
Adjuster* const blendmaskab;
|
||||
Adjuster* const softradiusmask;
|
||||
@@ -1548,7 +1615,7 @@ private:
|
||||
Adjuster* const str_mask;
|
||||
Adjuster* const ang_mask;
|
||||
|
||||
sigc::connection showmask_MethodConn, enamaskConn, toolmaskConn, fftmaskConn;
|
||||
sigc::connection showmask_MethodConn, previewmasConn, enamaskConn, toolmaskConn, fftmaskConn;
|
||||
|
||||
public:
|
||||
LocallabMask();
|
||||
@@ -1558,7 +1625,12 @@ public:
|
||||
void resetMaskView() override;
|
||||
void getMaskView(int &colorMask, int &colorMaskinv, int &expMask, int &expMaskinv, int &shMask, int &shMaskinv, int &vibMask, int &softMask, int &blMask, int &tmMask, int &retiMask, int &sharMask, int &lcMask, int &cbMask, int &logMask, int &maskMask, int &cieMask) override;
|
||||
|
||||
Gtk::ToggleButton *getPreviewDeltaEButton() const override;
|
||||
sigc::connection *getPreviewDeltaEButtonConnection() override;
|
||||
|
||||
void updateAdviceTooltips(const bool showTooltips) override;
|
||||
void updateguimask(int spottype);
|
||||
void previewmasChanged();
|
||||
|
||||
void disableListener() override;
|
||||
void enableListener() override;
|
||||
@@ -1601,6 +1673,8 @@ class Locallabcie:
|
||||
{
|
||||
private:
|
||||
Adjuster* const sensicie;
|
||||
Gtk::ToggleButton* const previewcie;
|
||||
|
||||
Adjuster* const reparcie;
|
||||
Gtk::CheckButton* const jabcie;
|
||||
MyComboBoxText* const modecam;
|
||||
@@ -1838,6 +1912,7 @@ private:
|
||||
int nextcomprciecount = 0;
|
||||
|
||||
sigc::connection AutograycieConn, primMethodconn, illMethodconn, smoothciemetconn, catMethodconn, forcejzConn, forcebwConn, qtojConn, showmaskcieMethodConn, enacieMaskConn, enacieMaskallConn, jabcieConn, sursourcieconn, surroundcieconn, modecieconn, modecamconn, comprcieautoconn, normcieconn, logcieconn, satcieconn, logcieqconn,smoothcieconn, smoothcieybconn,smoothcielumconn, logjzconn, sigjzconn, sigqconn, chjzcieconn, toneMethodcieConn, toneMethodcieConn2, toolcieConn, bwevMethodConn, fftcieMaskConn, gamutcieconn, bwcieconn, expprecamconn, sigcieconn;
|
||||
sigc::connection previewcieConn, sigmoidqjcieconn;
|
||||
public:
|
||||
Locallabcie();
|
||||
~Locallabcie();
|
||||
@@ -1848,9 +1923,13 @@ public:
|
||||
void resetMaskView() override;
|
||||
void getMaskView(int &colorMask, int &colorMaskinv, int &expMask, int &expMaskinv, int &shMask, int &shMaskinv, int &vibMask, int &softMask, int &blMask, int &tmMask, int &retiMask, int &sharMask, int &lcMask, int &cbMask, int &logMask, int &maskMask, int &cieMask) override;
|
||||
|
||||
Gtk::ToggleButton *getPreviewDeltaEButton() const override;
|
||||
sigc::connection *getPreviewDeltaEButtonConnection() override;
|
||||
|
||||
void updateAdviceTooltips(const bool showTooltips) override;
|
||||
void setDefaultExpanderVisibility() override;
|
||||
|
||||
void updateguicie(int spottype);
|
||||
void previewcieChanged();
|
||||
void disableListener() override;
|
||||
void enableListener() override;
|
||||
void read(const rtengine::procparams::ProcParams* pp, const ParamsEdited* pedited = nullptr) override;
|
||||
|
||||
Reference in New Issue
Block a user