diff --git a/rtengine/improccoordinator.cc b/rtengine/improccoordinator.cc index 354b363ae..a51e5f77c 100644 --- a/rtengine/improccoordinator.cc +++ b/rtengine/improccoordinator.cc @@ -922,6 +922,8 @@ void ImProcCoordinator::updatePreviewImage(int todo, bool panningRelatedChange) CurveFactory::complexCurvelocal(ecomp, black / 65535., hlcompr, hlcomprthresh, shcompr, br, cont, lumar, hltonecurveloc, shtonecurveloc, tonecurveloc, lightCurveloc, avg, sca); + + // Locallab mask curve references are only shown for selected spot if (sp == params->locallab.selspot) { if (locallListener) { locallListener->refChanged(huer, lumar, chromar); diff --git a/rtgui/curveeditor.cc b/rtgui/curveeditor.cc index 795378d7c..1cfaabffa 100644 --- a/rtgui/curveeditor.cc +++ b/rtgui/curveeditor.cc @@ -247,7 +247,7 @@ CurveEditor::CurveEditor (Glib::ustring text, CurveEditorGroup* ceGroup, CurveEd { bgHistValid = false; - locallabRef = 0.0; + locallabRef = 0.0; remoteDrag = false; selected = DCT_Linear; bottomBarCP = nullptr; @@ -330,11 +330,10 @@ void CurveEditor::updateLocallabBackground(double ref) // Copy Locallab reference value in the curve editor cache locallabRef = ref; - // Then call the curve editor group to eventually update the histogram + // Then call the curve editor group to eventually update the histogram subGroup->updateLocallabBackground(this); } - // Open up the curve if it has modifications and it's not already opened // Returns: true if curve was non linear and opened bool CurveEditor::openIfNonlinear() diff --git a/rtgui/locallab.cc b/rtgui/locallab.cc index 60cbac456..030984ae4 100644 --- a/rtgui/locallab.cc +++ b/rtgui/locallab.cc @@ -232,7 +232,6 @@ Locallab::Locallab(): defparams(nullptr), defpedited(nullptr), pe(nullptr) - { ToolVBox* const panel = Gtk::manage(new ToolVBox()); diff --git a/rtgui/locallab.h b/rtgui/locallab.h index 347604e40..75772cdb8 100644 --- a/rtgui/locallab.h +++ b/rtgui/locallab.h @@ -261,8 +261,6 @@ private: Gtk::Button* const lumaneutralButton; Gtk::Button* const lumacontrastPlusButton; sigc::connection lumacontrastMinusPressedConn, lumaneutralPressedConn, lumacontrastPlusPressedConn; -// Gtk::Label* transLabels; -// Gtk::Label* transLabels2; Gtk::Frame* maskcolFrame; Gtk::Frame* maskexpFrame; Gtk::Frame* maskSHFrame; diff --git a/rtgui/myflatcurve.cc b/rtgui/myflatcurve.cc index dd2478da9..4629d7936 100644 --- a/rtgui/myflatcurve.cc +++ b/rtgui/myflatcurve.cc @@ -165,7 +165,7 @@ void MyFlatCurve::draw () Gdk::RGBA c; -// Draw Locallab reference value in the background + // Draw Locallab reference value in the background if (locallabRef > 0.0) { cr->set_line_width(1.0); cr->move_to(double(graphX + 1), double(graphY - 1)); @@ -178,6 +178,7 @@ void MyFlatCurve::draw () cr->fill(); cr->stroke(); } + cr->set_line_width (1.0); // draw f(x)=0.5 line diff --git a/rtgui/myflatcurve.h b/rtgui/myflatcurve.h index da7d8905f..b24126068 100644 --- a/rtgui/myflatcurve.h +++ b/rtgui/myflatcurve.h @@ -140,6 +140,7 @@ public: void setPos(double pos, int chanIdx) override; void stopNumericalAdjustment() override; + void updateLocallabBackground(double ref); };