Merge pull request #5731 from Pandagrapher/newlocallab

Fixes warnings in Locallab GUI during clang10 compilation
This commit is contained in:
Desmis
2020-04-24 20:07:02 +02:00
committed by GitHub
2 changed files with 150 additions and 150 deletions

View File

@@ -130,19 +130,19 @@ public:
Locallab(); Locallab();
// FoldableToolPanel management functions // FoldableToolPanel management functions
void read(const rtengine::procparams::ProcParams* pp, const ParamsEdited* pedited = nullptr); void read(const rtengine::procparams::ProcParams* pp, const ParamsEdited* pedited = nullptr) override;
void write(rtengine::procparams::ProcParams* pp, ParamsEdited* pedited = nullptr); void write(rtengine::procparams::ProcParams* pp, ParamsEdited* pedited = nullptr) override;
void setDefaults(const rtengine::procparams::ProcParams* defParams, const ParamsEdited* pedited = nullptr); void setDefaults(const rtengine::procparams::ProcParams* defParams, const ParamsEdited* pedited = nullptr) override;
void setListener(ToolPanelListener* tpl); void setListener(ToolPanelListener* tpl) override;
// Locallab Retinex tool min/man management function // Locallab Retinex tool min/man management function
void minmaxChanged(const std::vector<locallabRetiMinMax> &minmax, int selspot); void minmaxChanged(const std::vector<locallabRetiMinMax> &minmax, int selspot) override;
// Locallab Log Encoding autocompute function // Locallab Log Encoding autocompute function
void logencodChanged(const float blackev, const float whiteev, const float sourceg, const float targetg); void logencodChanged(const float blackev, const float whiteev, const float sourceg, const float targetg) override;
// Locallab tools mask background management function // Locallab tools mask background management function
void refChanged(const std::vector<locallabRef> &ref, int selspot); void refChanged(const std::vector<locallabRef> &ref, int selspot) override;
// Mask visibility management functions // Mask visibility management functions
struct llMaskVisibility { struct llMaskVisibility {
@@ -169,15 +169,15 @@ public:
void resetshowPressed(); void resetshowPressed();
// EditProvider management function // EditProvider management function
void setEditProvider(EditDataProvider* provider); void setEditProvider(EditDataProvider* provider) override;
void subscribe(); void subscribe();
void unsubscribe(); void unsubscribe();
// FoldableToolPanel event function // FoldableToolPanel event function
void enabledChanged(); void enabledChanged() override;
// Curve management function // Curve management function
void autoOpenCurve(); void autoOpenCurve() override;
// Locallab tools expanders management functions // Locallab tools expanders management functions
void foldAllButOne(LocallabTool* except); void foldAllButOne(LocallabTool* except);
@@ -193,11 +193,11 @@ private:
void setParamEditable(bool cond); void setParamEditable(bool cond);
// LocallabToolListener function // LocallabToolListener function
void resetOtherMaskView(LocallabTool* current); void resetOtherMaskView(LocallabTool* current) override;
void toolRemoved(LocallabTool* current); void toolRemoved(LocallabTool* current) override;
// LocallabToolListListener function // LocallabToolListListener function
void locallabToolToAdd(const Glib::ustring &toolname); void locallabToolToAdd(const Glib::ustring &toolname) override;
}; };
#endif #endif

View File

@@ -233,29 +233,29 @@ public:
LocallabColor(); LocallabColor();
~LocallabColor(); ~LocallabColor();
void setListener(ToolPanelListener* tpl); void setListener(ToolPanelListener* tpl) override;
void resetMaskView(); 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) 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) override;
void setDefaultExpanderVisibility(); void setDefaultExpanderVisibility() override;
void disableListener(); void disableListener() override;
void enableListener(); void enableListener() override;
void read(const rtengine::procparams::ProcParams* pp, const ParamsEdited* pedited = nullptr); void read(const rtengine::procparams::ProcParams* pp, const ParamsEdited* pedited = nullptr) override;
void write(rtengine::procparams::ProcParams* pp, ParamsEdited* pedited = nullptr); void write(rtengine::procparams::ProcParams* pp, ParamsEdited* pedited = nullptr) override;
void setDefaults(const rtengine::procparams::ProcParams* defParams, const ParamsEdited* pedited = nullptr); void setDefaults(const rtengine::procparams::ProcParams* defParams, const ParamsEdited* pedited = nullptr) override;
void adjusterChanged(Adjuster* a, double newval); void adjusterChanged(Adjuster* a, double newval) override;
void adjusterChanged(ThresholdAdjuster* a, double newBottom, double newTop) {}; // Not used void adjusterChanged(ThresholdAdjuster* a, double newBottom, double newTop) override {}; // Not used
void adjusterChanged(ThresholdAdjuster* a, double newBottomLeft, double newTopLeft, double newBottomRight, double newTopRight) {}; // Not used void adjusterChanged(ThresholdAdjuster* a, double newBottomLeft, double newTopLeft, double newBottomRight, double newTopRight) override {}; // Not used
void adjusterChanged(ThresholdAdjuster* a, int newBottom, int newTop) {}; // Not used void adjusterChanged(ThresholdAdjuster* a, int newBottom, int newTop) override {}; // Not used
void adjusterChanged(ThresholdAdjuster* a, int newBottomLeft, int newTopLeft, int newBottomRight, int newTopRight) {}; // Not used 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); void adjusterChanged2(ThresholdAdjuster* a, int newBottomL, int newTopL, int newBottomR, int newTopR) override;
void curveChanged(CurveEditor* ce); void curveChanged(CurveEditor* ce) override;
private: private:
void enabledChanged(); void enabledChanged() override;
void updateMaskBackground(const double normChromar, const double normLumar, const double normHuer); void updateMaskBackground(const double normChromar, const double normLumar, const double normHuer) override;
void curvactivChanged(); void curvactivChanged();
void gridMethodChanged(); void gridMethodChanged();
@@ -341,22 +341,22 @@ public:
LocallabExposure(); LocallabExposure();
~LocallabExposure(); ~LocallabExposure();
void resetMaskView(); 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) 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) override;
void setDefaultExpanderVisibility(); void setDefaultExpanderVisibility() override;
void disableListener(); void disableListener() override;
void enableListener(); void enableListener() override;
void read(const rtengine::procparams::ProcParams* pp, const ParamsEdited* pedited = nullptr); void read(const rtengine::procparams::ProcParams* pp, const ParamsEdited* pedited = nullptr) override;
void write(rtengine::procparams::ProcParams* pp, ParamsEdited* pedited = nullptr); void write(rtengine::procparams::ProcParams* pp, ParamsEdited* pedited = nullptr) override;
void setDefaults(const rtengine::procparams::ProcParams* defParams, const ParamsEdited* pedited = nullptr); void setDefaults(const rtengine::procparams::ProcParams* defParams, const ParamsEdited* pedited = nullptr) override;
void adjusterChanged(Adjuster* a, double newval); void adjusterChanged(Adjuster* a, double newval) override;
void curveChanged(CurveEditor* ce); void curveChanged(CurveEditor* ce) override;
private: private:
void enabledChanged(); void enabledChanged() override;
void updateMaskBackground(const double normChromar, const double normLumar, const double normHuer); void updateMaskBackground(const double normChromar, const double normLumar, const double normHuer) override;
void expMethodChanged(); void expMethodChanged();
void exnoiseMethodChanged(); void exnoiseMethodChanged();
@@ -421,22 +421,22 @@ public:
LocallabShadow(); LocallabShadow();
~LocallabShadow(); ~LocallabShadow();
void resetMaskView(); 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) 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) override;
void setDefaultExpanderVisibility(); void setDefaultExpanderVisibility() override;
void disableListener(); void disableListener() override;
void enableListener(); void enableListener() override;
void read(const rtengine::procparams::ProcParams* pp, const ParamsEdited* pedited = nullptr); void read(const rtengine::procparams::ProcParams* pp, const ParamsEdited* pedited = nullptr) override;
void write(rtengine::procparams::ProcParams* pp, ParamsEdited* pedited = nullptr); void write(rtengine::procparams::ProcParams* pp, ParamsEdited* pedited = nullptr) override;
void setDefaults(const rtengine::procparams::ProcParams* defParams, const ParamsEdited* pedited = nullptr); void setDefaults(const rtengine::procparams::ProcParams* defParams, const ParamsEdited* pedited = nullptr) override;
void adjusterChanged(Adjuster* a, double newval); void adjusterChanged(Adjuster* a, double newval) override;
void curveChanged(CurveEditor* ce); void curveChanged(CurveEditor* ce) override;
private: private:
void enabledChanged(); void enabledChanged() override;
void updateMaskBackground(const double normChromar, const double normLumar, const double normHuer); void updateMaskBackground(const double normChromar, const double normLumar, const double normHuer) override;
void shMethodChanged(); void shMethodChanged();
void inversshChanged(); void inversshChanged();
@@ -494,28 +494,28 @@ public:
LocallabVibrance(); LocallabVibrance();
~LocallabVibrance(); ~LocallabVibrance();
void resetMaskView(); 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) 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) override;
void setDefaultExpanderVisibility(); void setDefaultExpanderVisibility() override;
void disableListener(); void disableListener() override;
void enableListener(); void enableListener() override;
void read(const rtengine::procparams::ProcParams* pp, const ParamsEdited* pedited = nullptr); void read(const rtengine::procparams::ProcParams* pp, const ParamsEdited* pedited = nullptr) override;
void write(rtengine::procparams::ProcParams* pp, ParamsEdited* pedited = nullptr); void write(rtengine::procparams::ProcParams* pp, ParamsEdited* pedited = nullptr) override;
void setDefaults(const rtengine::procparams::ProcParams* defParams, const ParamsEdited* pedited = nullptr); void setDefaults(const rtengine::procparams::ProcParams* defParams, const ParamsEdited* pedited = nullptr) override;
void adjusterChanged(Adjuster* a, double newval); void adjusterChanged(Adjuster* a, double newval) override;
void adjusterChanged(ThresholdAdjuster* a, double newBottom, double newTop) {}; // Not used void adjusterChanged(ThresholdAdjuster* a, double newBottom, double newTop) override {}; // Not used
void adjusterChanged(ThresholdAdjuster* a, double newBottomLeft, double newTopLeft, double newBottomRight, double newTopRight) {}; // Not used void adjusterChanged(ThresholdAdjuster* a, double newBottomLeft, double newTopLeft, double newBottomRight, double newTopRight) override {}; // Not used
void adjusterChanged(ThresholdAdjuster* a, int newBottom, int newTop); void adjusterChanged(ThresholdAdjuster* a, int newBottom, int newTop) override;
void adjusterChanged(ThresholdAdjuster* a, int newBottomLeft, int newTopLeft, int newBottomRight, int newTopRight) {}; // Not used 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) {}; // Not used void adjusterChanged2(ThresholdAdjuster* a, int newBottomL, int newTopL, int newBottomR, int newTopR) override {}; // Not used
std::vector<double> getCurvePoints(ThresholdSelector* tAdjuster) const; std::vector<double> getCurvePoints(ThresholdSelector* tAdjuster) const override;
void curveChanged(CurveEditor* ce); void curveChanged(CurveEditor* ce) override;
private: private:
void enabledChanged(); void enabledChanged() override;
void updateMaskBackground(const double normChromar, const double normLumar, const double normHuer); void updateMaskBackground(const double normChromar, const double normLumar, const double normHuer) override;
void protectskins_toggled(); void protectskins_toggled();
void avoidcolorshift_toggled(); void avoidcolorshift_toggled();
@@ -545,18 +545,18 @@ private:
public: public:
LocallabSoft(); LocallabSoft();
void resetMaskView(); 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) 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) override;
void disableListener(); void disableListener() override;
void enableListener(); void enableListener() override;
void read(const rtengine::procparams::ProcParams* pp, const ParamsEdited* pedited = nullptr); void read(const rtengine::procparams::ProcParams* pp, const ParamsEdited* pedited = nullptr) override;
void write(rtengine::procparams::ProcParams* pp, ParamsEdited* pedited = nullptr); void write(rtengine::procparams::ProcParams* pp, ParamsEdited* pedited = nullptr) override;
void setDefaults(const rtengine::procparams::ProcParams* defParams, const ParamsEdited* pedited = nullptr); void setDefaults(const rtengine::procparams::ProcParams* defParams, const ParamsEdited* pedited = nullptr) override;
void adjusterChanged(Adjuster* a, double newval); void adjusterChanged(Adjuster* a, double newval) override;
private: private:
void enabledChanged(); void enabledChanged() override;
void softMethodChanged(); void softMethodChanged();
void showmasksoftMethodChanged(); void showmasksoftMethodChanged();
@@ -635,27 +635,27 @@ public:
LocallabBlur(); LocallabBlur();
~LocallabBlur(); ~LocallabBlur();
void resetMaskView(); 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) 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) override;
void setDefaultExpanderVisibility(); void setDefaultExpanderVisibility() override;
void disableListener(); void disableListener() override;
void enableListener(); void enableListener() override;
void read(const rtengine::procparams::ProcParams* pp, const ParamsEdited* pedited = nullptr); void read(const rtengine::procparams::ProcParams* pp, const ParamsEdited* pedited = nullptr) override;
void write(rtengine::procparams::ProcParams* pp, ParamsEdited* pedited = nullptr); void write(rtengine::procparams::ProcParams* pp, ParamsEdited* pedited = nullptr) override;
void setDefaults(const rtengine::procparams::ProcParams* defParams, const ParamsEdited* pedited = nullptr); void setDefaults(const rtengine::procparams::ProcParams* defParams, const ParamsEdited* pedited = nullptr) override;
void adjusterChanged(Adjuster* a, double newval); void adjusterChanged(Adjuster* a, double newval) override;
void adjusterChanged(ThresholdAdjuster* a, double newBottom, double newTop) {}; // Not used void adjusterChanged(ThresholdAdjuster* a, double newBottom, double newTop) override {}; // Not used
void adjusterChanged(ThresholdAdjuster* a, double newBottomLeft, double newTopLeft, double newBottomRight, double newTopRight) {}; // Not used void adjusterChanged(ThresholdAdjuster* a, double newBottomLeft, double newTopLeft, double newBottomRight, double newTopRight) override {}; // Not used
void adjusterChanged(ThresholdAdjuster* a, int newBottom, int newTop) {}; // Not used void adjusterChanged(ThresholdAdjuster* a, int newBottom, int newTop) override {}; // Not used
void adjusterChanged(ThresholdAdjuster* a, int newBottomLeft, int newTopLeft, int newBottomRight, int newTopRight) {}; // Not used 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); void adjusterChanged2(ThresholdAdjuster* a, int newBottomL, int newTopL, int newBottomR, int newTopR) override;
void curveChanged(CurveEditor* ce); void curveChanged(CurveEditor* ce) override;
private: private:
void enabledChanged(); void enabledChanged() override;
void updateMaskBackground(const double normChromar, const double normLumar, const double normHuer); void updateMaskBackground(const double normChromar, const double normLumar, const double normHuer) override;
void blMethodChanged(); void blMethodChanged();
void fftwblChanged(); void fftwblChanged();
@@ -710,22 +710,22 @@ public:
LocallabTone(); LocallabTone();
~LocallabTone(); ~LocallabTone();
void resetMaskView(); 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) 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) override;
void setDefaultExpanderVisibility(); void setDefaultExpanderVisibility() override;
void disableListener(); void disableListener() override;
void enableListener(); void enableListener() override;
void read(const rtengine::procparams::ProcParams* pp, const ParamsEdited* pedited = nullptr); void read(const rtengine::procparams::ProcParams* pp, const ParamsEdited* pedited = nullptr) override;
void write(rtengine::procparams::ProcParams* pp, ParamsEdited* pedited = nullptr); void write(rtengine::procparams::ProcParams* pp, ParamsEdited* pedited = nullptr) override;
void setDefaults(const rtengine::procparams::ProcParams* defParams, const ParamsEdited* pedited = nullptr); void setDefaults(const rtengine::procparams::ProcParams* defParams, const ParamsEdited* pedited = nullptr) override;
void adjusterChanged(Adjuster* a, double newval); void adjusterChanged(Adjuster* a, double newval) override;
void curveChanged(CurveEditor* ce); void curveChanged(CurveEditor* ce) override;
private: private:
void enabledChanged(); void enabledChanged() override;
void updateMaskBackground(const double normChromar, const double normLumar, const double normHuer); void updateMaskBackground(const double normChromar, const double normLumar, const double normHuer) override;
void equiltmChanged(); void equiltmChanged();
void showmasktmMethodChanged(); void showmasktmMethodChanged();
@@ -798,22 +798,22 @@ public:
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 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 resetMaskView(); 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) 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) override;
void setDefaultExpanderVisibility(); void setDefaultExpanderVisibility() override;
void disableListener(); void disableListener() override;
void enableListener(); void enableListener() override;
void read(const rtengine::procparams::ProcParams* pp, const ParamsEdited* pedited = nullptr); void read(const rtengine::procparams::ProcParams* pp, const ParamsEdited* pedited = nullptr) override;
void write(rtengine::procparams::ProcParams* pp, ParamsEdited* pedited = nullptr); void write(rtengine::procparams::ProcParams* pp, ParamsEdited* pedited = nullptr) override;
void setDefaults(const rtengine::procparams::ProcParams* defParams, const ParamsEdited* pedited = nullptr); void setDefaults(const rtengine::procparams::ProcParams* defParams, const ParamsEdited* pedited = nullptr) override;
void adjusterChanged(Adjuster* a, double newval); void adjusterChanged(Adjuster* a, double newval) override;
void curveChanged(CurveEditor* ce); void curveChanged(CurveEditor* ce) override;
private: private:
void enabledChanged(); void enabledChanged() override;
void updateMaskBackground(const double normChromar, const double normLumar, const double normHuer); void updateMaskBackground(const double normChromar, const double normLumar, const double normHuer) override;
void lumonlyChanged(); void lumonlyChanged();
void loglinChanged(); void loglinChanged();
@@ -852,18 +852,18 @@ private:
public: public:
LocallabSharp(); LocallabSharp();
void resetMaskView(); 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) 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) override;
void disableListener(); void disableListener() override;
void enableListener(); void enableListener() override;
void read(const rtengine::procparams::ProcParams* pp, const ParamsEdited* pedited = nullptr); void read(const rtengine::procparams::ProcParams* pp, const ParamsEdited* pedited = nullptr) override;
void write(rtengine::procparams::ProcParams* pp, ParamsEdited* pedited = nullptr); void write(rtengine::procparams::ProcParams* pp, ParamsEdited* pedited = nullptr) override;
void setDefaults(const rtengine::procparams::ProcParams* defParams, const ParamsEdited* pedited = nullptr); void setDefaults(const rtengine::procparams::ProcParams* defParams, const ParamsEdited* pedited = nullptr) override;
void adjusterChanged(Adjuster* a, double newval); void adjusterChanged(Adjuster* a, double newval) override;
private: private:
void enabledChanged(); void enabledChanged() override;
void inversshaChanged(); void inversshaChanged();
void showmasksharMethodChanged(); void showmasksharMethodChanged();
@@ -968,27 +968,27 @@ public:
LocallabContrast(); LocallabContrast();
~LocallabContrast(); ~LocallabContrast();
void resetMaskView(); 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) 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) override;
void setDefaultExpanderVisibility(); void setDefaultExpanderVisibility() override;
void disableListener(); void disableListener() override;
void enableListener(); void enableListener() override;
void read(const rtengine::procparams::ProcParams* pp, const ParamsEdited* pedited = nullptr); void read(const rtengine::procparams::ProcParams* pp, const ParamsEdited* pedited = nullptr) override;
void write(rtengine::procparams::ProcParams* pp, ParamsEdited* pedited = nullptr); void write(rtengine::procparams::ProcParams* pp, ParamsEdited* pedited = nullptr) override;
void setDefaults(const rtengine::procparams::ProcParams* defParams, const ParamsEdited* pedited = nullptr); void setDefaults(const rtengine::procparams::ProcParams* defParams, const ParamsEdited* pedited = nullptr) override;
void adjusterChanged(Adjuster* a, double newval); void adjusterChanged(Adjuster* a, double newval) override;
void adjusterChanged(ThresholdAdjuster* a, double newBottom, double newTop) {}; // Not used void adjusterChanged(ThresholdAdjuster* a, double newBottom, double newTop) override {}; // Not used
void adjusterChanged(ThresholdAdjuster* a, double newBottomLeft, double newTopLeft, double newBottomRight, double newTopRight) {}; // Not used void adjusterChanged(ThresholdAdjuster* a, double newBottomLeft, double newTopLeft, double newBottomRight, double newTopRight) override {}; // Not used
void adjusterChanged(ThresholdAdjuster* a, int newBottom, int newTop) {}; // Not used void adjusterChanged(ThresholdAdjuster* a, int newBottom, int newTop) override {}; // Not used
void adjusterChanged(ThresholdAdjuster* a, int newBottomLeft, int newTopLeft, int newBottomRight, int newTopRight) {}; // Not used 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); void adjusterChanged2(ThresholdAdjuster* a, int newBottomL, int newTopL, int newBottomR, int newTopR) override;
void curveChanged(CurveEditor* ce); void curveChanged(CurveEditor* ce) override;
private: private:
void enabledChanged(); void enabledChanged() override;
void updateMaskBackground(const double normChromar, const double normLumar, const double normHuer); void updateMaskBackground(const double normChromar, const double normLumar, const double normHuer) override;
void localcontMethodChanged(); void localcontMethodChanged();
void origlcChanged(); void origlcChanged();
@@ -1054,22 +1054,22 @@ public:
LocallabCBDL(); LocallabCBDL();
~LocallabCBDL(); ~LocallabCBDL();
void resetMaskView(); 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) 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) override;
void setDefaultExpanderVisibility(); void setDefaultExpanderVisibility() override;
void disableListener(); void disableListener() override;
void enableListener(); void enableListener() override;
void read(const rtengine::procparams::ProcParams* pp, const ParamsEdited* pedited = nullptr); void read(const rtengine::procparams::ProcParams* pp, const ParamsEdited* pedited = nullptr) override;
void write(rtengine::procparams::ProcParams* pp, ParamsEdited* pedited = nullptr); void write(rtengine::procparams::ProcParams* pp, ParamsEdited* pedited = nullptr) override;
void setDefaults(const rtengine::procparams::ProcParams* defParams, const ParamsEdited* pedited = nullptr); void setDefaults(const rtengine::procparams::ProcParams* defParams, const ParamsEdited* pedited = nullptr) override;
void adjusterChanged(Adjuster* a, double newval); void adjusterChanged(Adjuster* a, double newval) override;
void curveChanged(CurveEditor* ce); void curveChanged(CurveEditor* ce) override;
private: private:
void enabledChanged(); void enabledChanged() override;
void updateMaskBackground(const double normChromar, const double normLumar, const double normHuer); void updateMaskBackground(const double normChromar, const double normLumar, const double normHuer) override;
void showmaskcbMethodChanged(); void showmaskcbMethodChanged();
void enacbMaskChanged(); void enacbMaskChanged();