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

Merge pull request #5776 from Pandagrapher/newlocallab2

Browse Source 
Some more GUI improvements for Locallab
This commit is contained in:
Desmis 2020-05-27 10:43:26 +02:00 committed by GitHub
commit c803a83886
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 21 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
rtengine/refreshmap.cc
View File

@ -662,7 +662,7 @@ int refreshmap[rtengine::NUMOFEVENTS] = {
LUMINANCECURVE, // EvLocallabsensihs LUMINANCECURVE, // EvLocallabsensihs
LUMINANCECURVE, // Evlocallabradmaskcol LUMINANCECURVE, // Evlocallabradmaskcol
LUMINANCECURVE, // Evlocallabradmaskexp LUMINANCECURVE, // Evlocallabradmaskexp
M_VOID, // EvlocallabToolAdded LUMINANCECURVE, // EvlocallabToolAdded
LUMINANCECURVE, // EvlocallabCCmaskSHshape LUMINANCECURVE, // EvlocallabCCmaskSHshape
LUMINANCECURVE, // EvlocallabLLmaskSHshape LUMINANCECURVE, // EvlocallabLLmaskSHshape
LUMINANCECURVE, // EvlocallabHHmaskSHshape LUMINANCECURVE, // EvlocallabHHmaskSHshape

6
rtgui/controlspotpanel.cc
View File

@ -355,10 +355,8 @@ ControlSpotPanel::ControlSpotPanel():
artifBox->pack_start(*iter_); artifBox->pack_start(*iter_);
artifBox->pack_start(*balan_); artifBox->pack_start(*balan_);
artifBox->pack_start(*balanh_); artifBox->pack_start(*balanh_);
Gtk::HBox* const prevBox = Gtk::manage(new Gtk::HBox()); artifBox->pack_start(*colorde_);
prevBox->pack_start(*colorde_); artifBox->pack_start(*preview_);
prevBox->pack_start(*preview_, Gtk::PACK_SHRINK, 4);
artifBox->pack_start(*prevBox);
artifBox->pack_start(*colorscope_); artifBox->pack_start(*colorscope_);
artifFrame->add(*artifBox); artifFrame->add(*artifBox);
pack_start(*artifFrame); pack_start(*artifFrame);

2
rtgui/controlspotpanel.h
View File

@ -198,7 +198,7 @@ public:
* @param defParams ProcParams containing default values to set to the adjusters * @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) * @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 * Enable or disable the interactions with panel widgets
* *

5
rtgui/locallabtools.cc
View File

@ -186,6 +186,11 @@ void LocallabTool::addLocallabTool(bool raiseEvent)
// Raise event if required // Raise event if required
if (raiseEvent) { // Note: Event is only raised when a tool is added by user 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) { if (needMode) {
// Set complexity mode according to chosen default one // Set complexity mode according to chosen default one
complexityConn.block(true); complexityConn.block(true);

24
rtgui/locallabtools.h
View File

@ -140,11 +140,11 @@ public:
virtual void setDefaultExpanderVisibility() {}; virtual void setDefaultExpanderVisibility() {};
virtual void disableListener(); virtual void disableListener();
virtual void enableListener(); virtual void enableListener();
virtual void read(const rtengine::procparams::ProcParams* pp, const ParamsEdited* pedited = nullptr) {}; void read(const rtengine::procparams::ProcParams* pp, const ParamsEdited* pedited = nullptr) override {};
virtual void write(rtengine::procparams::ProcParams* pp, ParamsEdited* pedited = nullptr) {}; void write(rtengine::procparams::ProcParams* pp, ParamsEdited* pedited = nullptr) override {};
virtual void setDefaults(const rtengine::procparams::ProcParams* defParams, const ParamsEdited* pedited = nullptr) {}; void setDefaults(const rtengine::procparams::ProcParams* defParams, const ParamsEdited* pedited = nullptr) override {};
virtual void adjusterChanged(Adjuster* a, double newval) {}; void adjusterChanged(Adjuster* a, double newval) override {};
virtual void curveChanged(CurveEditor* ce) {}; void curveChanged(CurveEditor* ce) override {};
protected: protected:
// To be implemented // To be implemented
@ -1173,17 +1173,17 @@ public:
LocallabLog(); LocallabLog();
void updateAdviceTooltips(const bool showTooltips) override; void updateAdviceTooltips(const bool showTooltips) 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 updateAutocompute(const float blackev, const float whiteev, const float sourceg, const float targetg); void updateAutocompute(const float blackev, const float whiteev, const float sourceg, const float targetg);
private: private:
void enabledChanged(); void enabledChanged() override;
void autocomputeToggled(); void autocomputeToggled();
void fullimageChanged(); void fullimageChanged();