replace 'm_projectionsCanvas' by 'm_canvas2D'

GUI/View/Frame/Plot2DWithProjectionFrame.cpp

@@ -26,7 +26,7 @@
 Plot2DWithProjectionFrame::Plot2DWithProjectionFrame(QWidget* parent)
     : DataAccessWidget(parent)
     , m_actions(new ProjectionActions(this))
-    , m_projectionsCanvas(new ProjectionsEditorCanvas)
+    , m_canvas2D(new ProjectionsEditorCanvas)
     , m_canvas1D(new ProjectedGraphsCanvas)
     , m_scaleEditor(new Scale2DEditor(this))
 {
@@ -38,7 +38,7 @@ Plot2DWithProjectionFrame::Plot2DWithProjectionFrame(QWidget* parent)
     auto* splitter = new QSplitter;
     layout->addWidget(splitter);
     splitter->setOrientation(Qt::Vertical);
-    splitter->addWidget(m_projectionsCanvas);
+    splitter->addWidget(m_canvas2D);
     splitter->addWidget(m_canvas1D);
 
     layout->addWidget(m_scaleEditor);
@@ -50,13 +50,13 @@ Plot2DWithProjectionFrame::Plot2DWithProjectionFrame(QWidget* parent)
 
     //... Connections
 
-    connect(m_actions, &ProjectionActions::resetViewRequest, m_projectionsCanvas,
+    connect(m_actions, &ProjectionActions::resetViewRequest, m_canvas2D,
             &ProjectionsEditorCanvas::onResetViewRequest);
 
     connect(m_actions, &ProjectionActions::propertyPanelRequest,
             [this] { m_scaleEditor->setHidden(!m_scaleEditor->isHidden()); });
 
-    connect(toolbar, &ProjectionToolbar::activityChanged, m_projectionsCanvas,
+    connect(toolbar, &ProjectionToolbar::activityChanged, m_canvas2D,
             &ProjectionsEditorCanvas::setProjectionsCanvasMode);
 
     connect(toolbar, &ProjectionToolbar::activityChanged, m_canvas1D,
@@ -65,17 +65,17 @@ Plot2DWithProjectionFrame::Plot2DWithProjectionFrame(QWidget* parent)
     connect(m_canvas1D, &ProjectedGraphsCanvas::changeActivityRequest, toolbar,
             &ProjectionToolbar::onProjectionTabChange);
 
-    connect(m_projectionsCanvas, &ProjectionsEditorCanvas::deleteSelectedRequest, m_actions,
+    connect(m_canvas2D, &ProjectionsEditorCanvas::deleteSelectedRequest, m_actions,
             &ProjectionActions::onDeleteAction);
 
-    connect(m_projectionsCanvas, &ProjectionsEditorCanvas::changeProjectionsTabRequest, m_canvas1D,
+    connect(m_canvas2D, &ProjectionsEditorCanvas::changeProjectionsTabRequest, m_canvas1D,
             &ProjectedGraphsCanvas::onActivityChanged);
 
     // space bar push (request for zoom mode)
-    connect(m_projectionsCanvas, &ProjectionsEditorCanvas::changeActivityRequest, toolbar,
+    connect(m_canvas2D, &ProjectionsEditorCanvas::changeActivityRequest, toolbar,
             &ProjectionToolbar::onChangeActivityRequest);
 
-    connect(m_projectionsCanvas, &ProjectionsEditorCanvas::marginsChanged, m_canvas1D,
+    connect(m_canvas2D, &ProjectionsEditorCanvas::marginsChanged, m_canvas1D,
             &ProjectedGraphsCanvas::onMarginsChanged);
 
     toolbar->onChangeActivityRequest(MaskFlags::HORIZONTAL_LINE_MODE);
@@ -97,11 +97,11 @@ void Plot2DWithProjectionFrame::updateFrame()
 {
     ASSERT(currentData2DItem());
 
-    // The following line must come before 'm_projectionsCanvas->setContext()'!
+    // The following line must come before 'm_canvas2D->setContext()'!
     // It prevents problem with switching between datasets in projection mode.
     m_canvas1D->disconnectItem();
 
-    m_projectionsCanvas->updateCanvas(currentData2DItem());
+    m_canvas2D->updateCanvas(currentData2DItem());
     m_canvas1D->setData2DItem(currentData2DItem());
 
     m_actions->updateProjsActions(currentData2DItem());
@@ -115,7 +115,7 @@ void Plot2DWithProjectionFrame::showEvent(QShowEvent*)
 
 void Plot2DWithProjectionFrame::hideEvent(QHideEvent*)
 {
-    m_projectionsCanvas->resetCanvas();
+    m_canvas2D->resetCanvas();
     m_canvas1D->disconnectItem();
     m_canvas1D->setData2DItem(nullptr);
 }

GUI/View/Frame/Plot2DWithProjectionFrame.h

@@ -39,9 +39,9 @@ private:
     void hideEvent(QHideEvent*) override;
 
     ProjectionActions* m_actions;
-    ProjectionsEditorCanvas* m_projectionsCanvas; //! canvas with color map at the top
-    ProjectedGraphsCanvas* m_canvas1D;            //! bottom widget to draw projections plot
-    Scale2DEditor* m_scaleEditor;                 //! panel at the right with properties
+    ProjectionsEditorCanvas* m_canvas2D; //! canvas with color map at the top
+    ProjectedGraphsCanvas* m_canvas1D;   //! bottom widget to draw projections plot
+    Scale2DEditor* m_scaleEditor;        //! panel at the right with properties
 };
 
 #endif // BORNAGAIN_GUI_VIEW_FRAME_PLOT2DWITHPROJECTIONFRAME_H