diff --git a/GUI/View/Canvas/ProjectionsEditorCanvas.cpp b/GUI/View/Canvas/ProjectionsEditorCanvas.cpp index a777919ecce3fd615c2591a6a0a060f68cd45555..c9c568d4050de006d30383b8dd2395dc9509ca72 100644 --- a/GUI/View/Canvas/ProjectionsEditorCanvas.cpp +++ b/GUI/View/Canvas/ProjectionsEditorCanvas.cpp @@ -30,7 +30,7 @@ ProjectionsEditorCanvas::ProjectionsEditorCanvas() : m_scene(new MaskGraphicsScene) , m_view(new MaskGraphicsView(m_scene)) , m_status_label(new PlotStatusLabel(nullptr, this)) - , m_currentActivity(MaskFlags::HORIZONTAL_LINE_MODE) + , m_current_activity(MaskFlags::HORIZONTAL_LINE_MODE) { setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding); @@ -48,10 +48,10 @@ ProjectionsEditorCanvas::ProjectionsEditorCanvas() // automatically switch to the appropriate projection tab connect(m_scene, &MaskGraphicsScene::lineItemMoved, [this](LineItem* sender) { if (dynamic_cast<HorizontalLineItem*>(sender) - && (m_currentActivity != MaskFlags::VERTICAL_LINE_MODE)) + && (m_current_activity != MaskFlags::VERTICAL_LINE_MODE)) emit changeProjectionsTabRequest(MaskFlags::HORIZONTAL_LINE_MODE); if (dynamic_cast<VerticalLineItem*>(sender) - && (m_currentActivity != MaskFlags::HORIZONTAL_LINE_MODE)) + && (m_current_activity != MaskFlags::HORIZONTAL_LINE_MODE)) emit changeProjectionsTabRequest(MaskFlags::VERTICAL_LINE_MODE); }); } @@ -91,7 +91,7 @@ void ProjectionsEditorCanvas::updateCanvas(Data2DItem* data_item) m_status_label->setPlot(cm); onLeavingColorMap(); - m_scene->onActivityChanged(m_currentActivity); + m_scene->onActivityChanged(m_current_activity); } void ProjectionsEditorCanvas::resetCanvas() @@ -115,9 +115,9 @@ void ProjectionsEditorCanvas::onEnteringColorMap() if (m_live_projection) return; - if (m_currentActivity == MaskFlags::HORIZONTAL_LINE_MODE) + if (m_current_activity == MaskFlags::HORIZONTAL_LINE_MODE) m_live_projection = std::make_unique<HorizontalLineItem>(); - else if (m_currentActivity == MaskFlags::VERTICAL_LINE_MODE) + else if (m_current_activity == MaskFlags::VERTICAL_LINE_MODE) m_live_projection = std::make_unique<VerticalLineItem>(); if (m_live_projection) { @@ -138,9 +138,9 @@ void ProjectionsEditorCanvas::onLeavingColorMap() void ProjectionsEditorCanvas::onPositionChanged(double x, double y) { if (m_live_projection) { - if (m_currentActivity == MaskFlags::HORIZONTAL_LINE_MODE) + if (m_current_activity == MaskFlags::HORIZONTAL_LINE_MODE) dynamic_cast<HorizontalLineItem*>(m_live_projection.get())->setPos(y); - else if (m_currentActivity == MaskFlags::VERTICAL_LINE_MODE) + else if (m_current_activity == MaskFlags::VERTICAL_LINE_MODE) dynamic_cast<VerticalLineItem*>(m_live_projection.get())->setPos(x); } } @@ -154,7 +154,7 @@ void ProjectionsEditorCanvas::onResetViewRequest() void ProjectionsEditorCanvas::setProjectionsCanvasMode(MaskFlags::MaskMode mask_mode) { - m_currentActivity = mask_mode; + m_current_activity = mask_mode; m_scene->onActivityChanged(mask_mode); onLeavingColorMap(); } diff --git a/GUI/View/Canvas/ProjectionsEditorCanvas.h b/GUI/View/Canvas/ProjectionsEditorCanvas.h index 530e3be76a1e08f412c6a9d5b988cf35f2ed46de..ccb64cb361bcb43259e8db26df030d34d0ba4b54 100644 --- a/GUI/View/Canvas/ProjectionsEditorCanvas.h +++ b/GUI/View/Canvas/ProjectionsEditorCanvas.h @@ -62,7 +62,7 @@ private: PlotStatusLabel* m_status_label; Data2DItem* m_data_item; std::unique_ptr<LineItem> m_live_projection; //!< temporary, matching mouse move - MaskFlags::MaskMode m_currentActivity; + MaskFlags::MaskMode m_current_activity; }; #endif // BORNAGAIN_GUI_VIEW_CANVAS_PROJECTIONSEDITORCANVAS_H