Local adjustments - Various improvment Log encoding - Basic - Standard - Advanced (#5979)
* First LA log encoding ciecam * Some changes hide show and tooltip * Change label - tooltip * Change max slider shadow * Fixed bad behavior cat02 adaptation in some cases * Another fix Cat02 GUI * LA log encode add ciecam saturation * LA log encoding - added contrast J ciecam * LA Log encode various changes GUI labels tooltips * Change 2 tooltips * Clean code * Save provisory work * Save GUI mask Log * GUI part 2 * Enable basic standard advanced Log encoding * Small change tooltip * Save provisory work mask Log * Another provisory work mask * Enable mask Log encoding * Hide graduatef filter Log - basic * Add brightness colorfulness - advanced * Change labels tooltip Log auto * Clean ciecam local code and comment * Change label and tooltip automatic * Added strenth log encoding * Change strength tooltip Log encoding * Another change label * Change standard advance denoi * Enable maskbackground curve mask
This commit is contained in:
@@ -124,7 +124,7 @@ public:
|
||||
return false;
|
||||
};
|
||||
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 &maskMask) {};
|
||||
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) {};
|
||||
|
||||
// Advice tooltips management function
|
||||
virtual void updateAdviceTooltips(const bool showTooltips) {};
|
||||
@@ -266,7 +266,7 @@ 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 &maskMask) 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) override;
|
||||
|
||||
void updateAdviceTooltips(const bool showTooltips) override;
|
||||
|
||||
@@ -380,7 +380,7 @@ 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 &maskMask) 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) override;
|
||||
|
||||
void updateAdviceTooltips(const bool showTooltips) override;
|
||||
|
||||
@@ -467,7 +467,7 @@ 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 &maskMask) 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) override;
|
||||
|
||||
void updateAdviceTooltips(const bool showTooltips) override;
|
||||
|
||||
@@ -546,7 +546,7 @@ 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 &maskMask) 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) override;
|
||||
|
||||
void updateAdviceTooltips(const bool showTooltips) override;
|
||||
|
||||
@@ -603,7 +603,7 @@ 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 &maskMask) 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) override;
|
||||
|
||||
void updateAdviceTooltips(const bool showTooltips) override;
|
||||
|
||||
@@ -706,7 +706,7 @@ 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 &maskMask) 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) override;
|
||||
|
||||
void updateAdviceTooltips(const bool showTooltips) override;
|
||||
|
||||
@@ -790,7 +790,7 @@ 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 &maskMask) 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) override;
|
||||
|
||||
void updateAdviceTooltips(const bool showTooltips) override;
|
||||
|
||||
@@ -882,7 +882,7 @@ 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 &maskMask) 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) override;
|
||||
|
||||
void updateAdviceTooltips(const bool showTooltips) override;
|
||||
|
||||
@@ -942,7 +942,7 @@ 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 &maskMask) 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) override;
|
||||
|
||||
void updateAdviceTooltips(const bool showTooltips) override;
|
||||
|
||||
@@ -1064,7 +1064,7 @@ 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 &maskMask) 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) override;
|
||||
|
||||
void updateAdviceTooltips(const bool showTooltips) override;
|
||||
|
||||
@@ -1155,7 +1155,7 @@ 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 &maskMask) 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) override;
|
||||
|
||||
void updateAdviceTooltips(const bool showTooltips) override;
|
||||
|
||||
@@ -1190,6 +1190,7 @@ class LocallabLog:
|
||||
public LocallabTool
|
||||
{
|
||||
private:
|
||||
Adjuster* const repar;
|
||||
Gtk::CheckButton* const ciecam;
|
||||
Gtk::ToggleButton* const autocompute;
|
||||
Gtk::Frame* const logPFrame;
|
||||
@@ -1200,29 +1201,59 @@ private:
|
||||
Gtk::CheckButton* const Autogray;
|
||||
Adjuster* const sourceGray;
|
||||
Adjuster* const sourceabs;
|
||||
MyComboBoxText* const sursour;
|
||||
Gtk::HBox* const surHBox;
|
||||
Gtk::Frame* const log1Frame;
|
||||
Gtk::Frame* const log2Frame;
|
||||
Adjuster* const targetGray;
|
||||
Adjuster* const detail;
|
||||
Adjuster* const catad;
|
||||
Adjuster* const lightl;
|
||||
Adjuster* const lightq;
|
||||
Adjuster* const contl;
|
||||
Adjuster* const contq;
|
||||
Adjuster* const colorfl;
|
||||
Adjuster* const saturl;
|
||||
MyExpander* const expL;
|
||||
CurveEditorGroup* const CurveEditorL;
|
||||
DiagonalCurveEditor* const LshapeL;
|
||||
Adjuster* const targabs;
|
||||
MyComboBoxText* const surround;
|
||||
Gtk::HBox* const surrHBox;
|
||||
|
||||
Adjuster* const baselog;
|
||||
Adjuster* const sensilog;
|
||||
Gtk::Frame* const gradlogFrame;
|
||||
Adjuster* const strlog;
|
||||
Adjuster* const anglog;
|
||||
MyExpander* const expmaskL;
|
||||
MyComboBoxText* const showmaskLMethod;
|
||||
Gtk::CheckButton* const enaLMask;
|
||||
CurveEditorGroup* const maskCurveEditorL;
|
||||
FlatCurveEditor* const CCmaskshapeL;
|
||||
FlatCurveEditor* const LLmaskshapeL;
|
||||
FlatCurveEditor* const HHmaskshapeL;
|
||||
Adjuster* const blendmaskL;
|
||||
Adjuster* const radmaskL;
|
||||
Adjuster* const chromaskL;
|
||||
CurveEditorGroup* const mask2CurveEditorL;
|
||||
DiagonalCurveEditor* const LmaskshapeL;
|
||||
|
||||
sigc::connection autoconn, ciecamconn, fullimageConn, AutograyConn;
|
||||
sigc::connection surroundconn;
|
||||
|
||||
sigc::connection surroundconn, sursourconn;
|
||||
sigc::connection showmaskLMethodConn, enaLMaskConn;
|
||||
public:
|
||||
LocallabLog();
|
||||
~LocallabLog();
|
||||
|
||||
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) override;
|
||||
|
||||
void updateAdviceTooltips(const bool showTooltips) override;
|
||||
void surroundChanged();
|
||||
void sursourChanged();
|
||||
void setDefaultExpanderVisibility() override;
|
||||
|
||||
void disableListener() override;
|
||||
void enableListener() override;
|
||||
@@ -1230,16 +1261,24 @@ public:
|
||||
void write(rtengine::procparams::ProcParams* pp, ParamsEdited* pedited = nullptr) override;
|
||||
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 updateAutocompute(const float blackev, const float whiteev, const float sourceg, const float sourceab, const float targetg);
|
||||
|
||||
private:
|
||||
void enabledChanged() override;
|
||||
void convertParamToNormal() override;
|
||||
void convertParamToSimple() override;
|
||||
void updateGUIToMode(const modeType new_type) override;
|
||||
void complexityModeChanged();
|
||||
|
||||
void autocomputeToggled();
|
||||
void fullimageChanged();
|
||||
void AutograyChanged();
|
||||
void ciecamChanged();
|
||||
void showmaskLMethodChanged();
|
||||
void enaLMaskChanged();
|
||||
void updateMaskBackground(const double normChromar, const double normLumar, const double normHuer) override;
|
||||
|
||||
void updateLogGUI();
|
||||
void updateLogGUI2();
|
||||
@@ -1296,7 +1335,7 @@ 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 &maskMask) 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) override;
|
||||
|
||||
void updateAdviceTooltips(const bool showTooltips) override;
|
||||
|
||||
|
Reference in New Issue
Block a user