liz/rawTherapee
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

merge with dev

Browse Source
This commit is contained in:
Desmis
2020-02-24 11:05:55 +01:00
parent e985a5d288 17767ce0aa
commit 81c6e4635d
178 changed files with 4236 additions and 4545 deletions
Download Patch File Download Diff File Expand all files Collapse all files

104
rtgui/wavelet.h
View File

@@ -20,12 +20,13 @@
#pragma once
#include <gtkmm.h>
#include "adjuster.h"
#include "toolpanel.h"
#include "curvelistener.h"
#include "thresholdadjuster.h"
#include "colorprovider.h"
#include "curvelistener.h"
#include "guiutils.h"
#include "thresholdadjuster.h"
#include "toolpanel.h"
class CurveEditor;
class CurveEditorGroup;
@@ -43,21 +44,22 @@ class Wavelet final :
public FoldableToolPanel
{
public:
Wavelet ();
~Wavelet () override;
Wavelet();
~Wavelet() override;
bool wavComputed_ ();
bool wavComputed_();
void adjusterChanged(Adjuster* a, double newval) override;
void autoOpenCurve () override;
void curveChanged (CurveEditor* ce) override;
void read (const rtengine::procparams::ProcParams* pp, const ParamsEdited* pedited = nullptr) override;
void autoOpenCurve() override;
void curveChanged(CurveEditor* ce) override;
void read(const rtengine::procparams::ProcParams* pp, const ParamsEdited* pedited = nullptr) override;
// void setAdjusterBehavior(bool multiplieradd, bool thresholdadd, bool threshold2add, bool thresadd, bool chroadd, bool chromaadd, bool contrastadd, bool skinadd, bool reschroadd, bool tmrsadd, bool resconadd, bool resconHadd, bool thradd, bool thrHadd, bool skyadd, bool edgradadd, bool edgvaladd, bool strengthadd, bool gammaadd, bool edgedetectadd, bool edgedetectthradd, bool edgedetectthr2add);
void setAdjusterBehavior (bool multiplieradd, bool thresholdadd, bool threshold2add, bool thresadd, bool chroadd, bool chromaadd, bool contrastadd, bool skinadd, bool reschroadd, bool tmrsadd, bool edgsadd, bool scaleadd, bool resconadd, bool resconHadd, bool thradd, bool thrHadd, bool radiusadd, bool skyadd, bool edgradadd, bool edgvaladd, bool strengthadd, bool gammaadd, bool edgedetectadd, bool edgedetectthradd, bool edgedetectthr2add);
void setBatchMode (bool batchMode) override;
void setDefaults (const rtengine::procparams::ProcParams* defParams, const ParamsEdited* pedited = nullptr) override;
void setEditProvider (EditDataProvider *provider) override;
void updateToolState (std::vector<int> &tpOpen);
void write (rtengine::procparams::ProcParams* pp, ParamsEdited* pedited = nullptr) override;
void writeOptions (std::vector<int> &tpOpen);
void setBatchMode(bool batchMode) override;
void setDefaults(const rtengine::procparams::ProcParams* defParams, const ParamsEdited* pedited = nullptr) override;
void setEditProvider(EditDataProvider *provider) override;
void updateToolState(const std::vector<int>& tpOpen);
void write(rtengine::procparams::ProcParams* pp, ParamsEdited* pedited = nullptr) override;
void writeOptions(std::vector<int> &tpOpen);
void adjusterChanged(ThresholdAdjuster* a, double newBottom, double newTop) override;
void adjusterChanged(ThresholdAdjuster* a, double newBottomLeft, double newTopLeft, double newBottomRight, double newTopRight) override;
@@ -78,39 +80,39 @@ private:
rtengine::ProcEvent EvWavradius;
rtengine::ProcEvent EvWavsigma;
void foldAllButMe (GdkEventButton* event, MyExpander *expander);
void foldAllButMe(GdkEventButton* event, MyExpander *expander);
void colorForValue (double valX, double valY, enum ColorCaller::ElemType elemType, int callerId, ColorCaller* caller) override;
void BAmethodChanged ();
void NPmethodChanged ();
void BackmethodChanged ();
void CHSLmethodChanged ();
void CHmethodChanged ();
void CLmethodChanged ();
void DirmethodChanged ();
void EDmethodChanged ();
void HSmethodChanged ();
void LmethodChanged ();
void MedgreinfChanged ();
void TMmethodChanged ();
void TilesmethodChanged ();
void avoidToggled ();
void colorForValue(double valX, double valY, enum ColorCaller::ElemType elemType, int callerId, ColorCaller* caller) override;
void BAmethodChanged();
void NPmethodChanged();
void BackmethodChanged();
void CHSLmethodChanged();
void CHmethodChanged();
void CLmethodChanged();
void DirmethodChanged();
void EDmethodChanged();
void HSmethodChanged();
void LmethodChanged();
void MedgreinfChanged();
void TMmethodChanged();
void TilesmethodChanged();
void avoidToggled();
void showmaskToggled ();
void cbenabToggled ();
void contrastMinusPressed ();
void contrastPlusPressed ();
void daubcoeffmethodChanged ();
void enabledChanged () override;
void linkedgToggled ();
void lipstToggled ();
void medianToggled ();
void medianlevToggled ();
void neutralPressed ();
void neutral_pressed ();
void neutralchPressed ();
void tmrToggled ();
void cbenabToggled();
void contrastMinusPressed();
void contrastPlusPressed();
void daubcoeffmethodChanged();
void enabledChanged() override;
void linkedgToggled();
void lipstToggled();
void medianToggled();
void medianlevToggled();
void neutralPressed();
void neutral_pressed();
void neutralchPressed();
void tmrToggled();
void updatewavLabel ();
void wavChanged (double nlevel) override;
void wavChanged(double nlevel) override;
void ushamethodChanged();
void HSmethodUpdateUI();
@@ -127,13 +129,13 @@ private:
// void MedgreinfUpdateUI();
// void DirmethodUpdateUI();
// void LmethodUpdateUI();
void adjusterUpdateUI (Adjuster* a);
void enabledUpdateUI ();
void medianlevUpdateUI ();
void cbenabUpdateUI ();
void lipstUpdateUI ();
void adjusterUpdateUI(Adjuster* a);
void enabledUpdateUI();
void medianlevUpdateUI();
void cbenabUpdateUI();
void lipstUpdateUI();
void enableToggled(MyExpander *expander);
void enableToggled(MyExpander* expander);
CurveEditorGroup* const curveEditorG;