From a2c6715a0eff24e97f9905f0e1a6d27050d0f564 Mon Sep 17 00:00:00 2001 From: Pandagrapher Date: Wed, 27 May 2020 09:50:30 +0200 Subject: [PATCH 1/3] Remove compilation warnings in Locallab GUI --- rtgui/controlspotpanel.h | 2 +- rtgui/locallabtools.h | 24 ++++++++++++------------ 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/rtgui/controlspotpanel.h b/rtgui/controlspotpanel.h index 17253e76e..ebd94e603 100644 --- a/rtgui/controlspotpanel.h +++ b/rtgui/controlspotpanel.h @@ -198,7 +198,7 @@ public: * @param defParams ProcParams containing default values to set to the adjusters * @param pedited ParamsEdited containing default state values to set to the adjusters (not used because batch mode is deactivated for Locallab) */ - void setDefaults(const rtengine::procparams::ProcParams* defParams, const ParamsEdited* pedited = nullptr); + void setDefaults(const rtengine::procparams::ProcParams* defParams, const ParamsEdited* pedited = nullptr) override; /** * Enable or disable the interactions with panel widgets * diff --git a/rtgui/locallabtools.h b/rtgui/locallabtools.h index f15d2995b..84bcce816 100644 --- a/rtgui/locallabtools.h +++ b/rtgui/locallabtools.h @@ -140,11 +140,11 @@ public: virtual void setDefaultExpanderVisibility() {}; virtual void disableListener(); virtual void enableListener(); - virtual void read(const rtengine::procparams::ProcParams* pp, const ParamsEdited* pedited = nullptr) {}; - virtual void write(rtengine::procparams::ProcParams* pp, ParamsEdited* pedited = nullptr) {}; - virtual void setDefaults(const rtengine::procparams::ProcParams* defParams, const ParamsEdited* pedited = nullptr) {}; - virtual void adjusterChanged(Adjuster* a, double newval) {}; - virtual void curveChanged(CurveEditor* ce) {}; + void read(const rtengine::procparams::ProcParams* pp, const ParamsEdited* pedited = nullptr) override {}; + 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 {}; protected: // To be implemented @@ -1173,17 +1173,17 @@ public: LocallabLog(); void updateAdviceTooltips(const bool showTooltips) override; - void disableListener(); - void enableListener(); - void read(const rtengine::procparams::ProcParams* pp, const ParamsEdited* pedited = nullptr); - void write(rtengine::procparams::ProcParams* pp, ParamsEdited* pedited = nullptr); - void setDefaults(const rtengine::procparams::ProcParams* defParams, const ParamsEdited* pedited = nullptr); - void adjusterChanged(Adjuster* a, double newval); + void disableListener() override; + void enableListener() override; + void read(const rtengine::procparams::ProcParams* pp, const ParamsEdited* pedited = nullptr) override; + 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 updateAutocompute(const float blackev, const float whiteev, const float sourceg, const float targetg); private: - void enabledChanged(); + void enabledChanged() override; void autocomputeToggled(); void fullimageChanged(); From 96891cf8cd05199ff11bafb5fd13b8fe198c50dd Mon Sep 17 00:00:00 2001 From: Pandagrapher Date: Wed, 27 May 2020 10:09:48 +0200 Subject: [PATCH 2/3] Activate Locallab tools by default for newly added ones --- rtengine/refreshmap.cc | 2 +- rtgui/locallabtools.cc | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/rtengine/refreshmap.cc b/rtengine/refreshmap.cc index 79f5f0e7d..dc630387f 100644 --- a/rtengine/refreshmap.cc +++ b/rtengine/refreshmap.cc @@ -662,7 +662,7 @@ int refreshmap[rtengine::NUMOFEVENTS] = { LUMINANCECURVE, // EvLocallabsensihs LUMINANCECURVE, // Evlocallabradmaskcol LUMINANCECURVE, // Evlocallabradmaskexp - M_VOID, // EvlocallabToolAdded + LUMINANCECURVE, // EvlocallabToolAdded LUMINANCECURVE, // EvlocallabCCmaskSHshape LUMINANCECURVE, // EvlocallabLLmaskSHshape LUMINANCECURVE, // EvlocallabHHmaskSHshape diff --git a/rtgui/locallabtools.cc b/rtgui/locallabtools.cc index 2fcc0a780..e9a1d00e0 100644 --- a/rtgui/locallabtools.cc +++ b/rtgui/locallabtools.cc @@ -186,6 +186,11 @@ void LocallabTool::addLocallabTool(bool raiseEvent) // Raise event if required if (raiseEvent) { // Note: Event is only raised when a tool is added by user + // By default, activate newly added tool + enaExpConn.block(true); + exp->setEnabled(true); + enaExpConn.block(false); + if (needMode) { // Set complexity mode according to chosen default one complexityConn.block(true); From 3b5295fa7621a21c62cc70792e72edfc769df935 Mon Sep 17 00:00:00 2001 From: Pandagrapher Date: Wed, 27 May 2020 10:15:45 +0200 Subject: [PATCH 3/3] Update Locallab preview deltaE GUI --- rtgui/controlspotpanel.cc | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/rtgui/controlspotpanel.cc b/rtgui/controlspotpanel.cc index 24782f4ca..6d89e9cbf 100644 --- a/rtgui/controlspotpanel.cc +++ b/rtgui/controlspotpanel.cc @@ -355,10 +355,8 @@ ControlSpotPanel::ControlSpotPanel(): artifBox->pack_start(*iter_); artifBox->pack_start(*balan_); artifBox->pack_start(*balanh_); - Gtk::HBox* const prevBox = Gtk::manage(new Gtk::HBox()); - prevBox->pack_start(*colorde_); - prevBox->pack_start(*preview_, Gtk::PACK_SHRINK, 4); - artifBox->pack_start(*prevBox); + artifBox->pack_start(*colorde_); + artifBox->pack_start(*preview_); artifBox->pack_start(*colorscope_); artifFrame->add(*artifBox); pack_start(*artifFrame);