Collapse all tools on first start (fixes #4776)

I had to remove the `isVisible` check in `MyExpander::set_expanded()`
because it would trigger in Wavelet and Retinex for unknown reasons.

One inner expander in CIECAM isn't covered by the tool states, and the
way they are distributed to Wavelet and Retinex won't allow for further
tool states in those tools. We should consider to move the tool states
for sub-tools (like Wavelet, Retinex, and CIECAM) to seperate keys in
the `options` file.
This commit is contained in:
Flössie
2020-02-12 09:04:55 +01:00
parent 40018b1e9a
commit 1c0033f798
6 changed files with 133 additions and 107 deletions

View File

@@ -104,32 +104,32 @@ protected:
sigc::connection medianmapConn;
public:
Retinex ();
~Retinex () override;
Retinex();
~Retinex() override;
void read (const rtengine::procparams::ProcParams* pp, const ParamsEdited* pedited = nullptr) override;
void write (rtengine::procparams::ProcParams* pp, ParamsEdited* pedited = nullptr) override;
void setBatchMode (bool batchMode) override;
void setDefaults (const rtengine::procparams::ProcParams* defParams, const ParamsEdited* pedited = nullptr) override;
void trimValues (rtengine::procparams::ProcParams* pp) override;
void adjusterChanged (Adjuster* a, double newval) override;
void autoOpenCurve () override;
void medianmapChanged ();
void minmaxChanged (double cdma, double cdmin, double mini, double maxi, double Tmean, double Tsigma, double Tmin, double Tmax) override;
void updateLabel ();
void updateTrans ();
void neutral_pressed ();
void read(const rtengine::procparams::ProcParams* pp, const ParamsEdited* pedited = nullptr) override;
void write(rtengine::procparams::ProcParams* pp, ParamsEdited* pedited = nullptr) override;
void setBatchMode(bool batchMode) override;
void setDefaults(const rtengine::procparams::ProcParams* defParams, const ParamsEdited* pedited = nullptr) override;
void trimValues(rtengine::procparams::ProcParams* pp) override;
void adjusterChanged(Adjuster* a, double newval) override;
void autoOpenCurve() override;
void medianmapChanged();
void minmaxChanged(double cdma, double cdmin, double mini, double maxi, double Tmean, double Tsigma, double Tmin, double Tmax) override;
void updateLabel();
void updateTrans();
void neutral_pressed();
void enabledChanged () override;
void curveChanged (CurveEditor* ce) override;
void enabledChanged() override;
void curveChanged(CurveEditor* ce) override;
void retinexMethodChanged();
void mapMethodChanged();
void viewMethodChanged();
void retinexColorSpaceChanged();
void gammaretinexChanged();
void ColorSpaceUpdateUI();
void writeOptions (std::vector<int> &tpOpen);
void updateToolState (std::vector<int> &tpOpen);
void writeOptions(std::vector<int> &tpOpen);
void updateToolState(const std::vector<int>& tpOpen);
void setAdjusterBehavior (bool strAdd, bool neighAdd, bool limdAdd, bool offsAdd, bool vartAdd, bool gamAdd, bool slopeAdd);
void updateCurveBackgroundHistogram(
const LUTu& histToneCurve,
@@ -144,9 +144,8 @@ public:
const LUTu& histLRETI
);
void colorForValue (double valX, double valY, enum ColorCaller::ElemType elemType, int callerId, ColorCaller* caller) override;
void colorForValue(double valX, double valY, enum ColorCaller::ElemType elemType, int callerId, ColorCaller* caller) override;
private:
void foldAllButMe (GdkEventButton* event, MyExpander *expander);
void foldAllButMe(GdkEventButton* event, MyExpander *expander);
};