diff --git a/GUI/View/Frame/Plot2DWithProjectionFrame.cpp b/GUI/View/Frame/Plot2DWithProjectionFrame.cpp index 45172c5f711283df8ebbffea3cd8c7bdac4f10ed..66fbb48ec9aa0d8b4a4382196a9b3020ad429d2b 100644 --- a/GUI/View/Frame/Plot2DWithProjectionFrame.cpp +++ b/GUI/View/Frame/Plot2DWithProjectionFrame.cpp @@ -27,7 +27,7 @@ Plot2DWithProjectionFrame::Plot2DWithProjectionFrame(QWidget* parent) : DataAccessWidget(parent) , m_actions(new ProjectionActions(this)) , m_projectionsCanvas(new ProjectionsEditorCanvas) - , m_projectionsWidget(new ProjectedGraphsCanvas) + , m_canvas1D(new ProjectedGraphsCanvas) , m_scaleEditor(new Scale2DEditor(this)) { auto* layout = new QHBoxLayout; @@ -39,7 +39,7 @@ Plot2DWithProjectionFrame::Plot2DWithProjectionFrame(QWidget* parent) layout->addWidget(splitter); splitter->setOrientation(Qt::Vertical); splitter->addWidget(m_projectionsCanvas); - splitter->addWidget(m_projectionsWidget); + splitter->addWidget(m_canvas1D); layout->addWidget(m_scaleEditor); m_scaleEditor->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Minimum); @@ -59,23 +59,23 @@ Plot2DWithProjectionFrame::Plot2DWithProjectionFrame(QWidget* parent) connect(toolbar, &ProjectionToolbar::activityChanged, m_projectionsCanvas, &ProjectionsEditorCanvas::setProjectionsCanvasMode); - connect(toolbar, &ProjectionToolbar::activityChanged, m_projectionsWidget, + connect(toolbar, &ProjectionToolbar::activityChanged, m_canvas1D, &ProjectedGraphsCanvas::onActivityChanged); - connect(m_projectionsWidget, &ProjectedGraphsCanvas::changeActivityRequest, toolbar, + connect(m_canvas1D, &ProjectedGraphsCanvas::changeActivityRequest, toolbar, &ProjectionToolbar::onProjectionTabChange); connect(m_projectionsCanvas, &ProjectionsEditorCanvas::deleteSelectedRequest, m_actions, &ProjectionActions::onDeleteAction); - connect(m_projectionsCanvas, &ProjectionsEditorCanvas::changeProjectionsTabRequest, - m_projectionsWidget, &ProjectedGraphsCanvas::onActivityChanged); + connect(m_projectionsCanvas, &ProjectionsEditorCanvas::changeProjectionsTabRequest, m_canvas1D, + &ProjectedGraphsCanvas::onActivityChanged); // space bar push (request for zoom mode) connect(m_projectionsCanvas, &ProjectionsEditorCanvas::changeActivityRequest, toolbar, &ProjectionToolbar::onChangeActivityRequest); - connect(m_projectionsCanvas, &ProjectionsEditorCanvas::marginsChanged, m_projectionsWidget, + connect(m_projectionsCanvas, &ProjectionsEditorCanvas::marginsChanged, m_canvas1D, &ProjectedGraphsCanvas::onMarginsChanged); toolbar->onChangeActivityRequest(MaskFlags::HORIZONTAL_LINE_MODE); @@ -99,10 +99,10 @@ void Plot2DWithProjectionFrame::updateFrame() // The following line must come before 'm_projectionsCanvas->setContext()'! // It prevents problem with switching between datasets in projection mode. - m_projectionsWidget->disconnectItem(); + m_canvas1D->disconnectItem(); m_projectionsCanvas->updateCanvas(currentData2DItem()); - m_projectionsWidget->setData2DItem(currentData2DItem()); + m_canvas1D->setData2DItem(currentData2DItem()); m_actions->updateProjsActions(currentData2DItem()); } @@ -116,6 +116,6 @@ void Plot2DWithProjectionFrame::showEvent(QShowEvent*) void Plot2DWithProjectionFrame::hideEvent(QHideEvent*) { m_projectionsCanvas->resetCanvas(); - m_projectionsWidget->disconnectItem(); - m_projectionsWidget->setData2DItem(nullptr); + m_canvas1D->disconnectItem(); + m_canvas1D->setData2DItem(nullptr); } diff --git a/GUI/View/Frame/Plot2DWithProjectionFrame.h b/GUI/View/Frame/Plot2DWithProjectionFrame.h index 091d8d8a18486a4a0895f6a76724256bf6ab78a1..9286cc5e80130b83489e953b6549795f651183f9 100644 --- a/GUI/View/Frame/Plot2DWithProjectionFrame.h +++ b/GUI/View/Frame/Plot2DWithProjectionFrame.h @@ -40,7 +40,7 @@ private: ProjectionActions* m_actions; ProjectionsEditorCanvas* m_projectionsCanvas; //! canvas with color map at the top - ProjectedGraphsCanvas* m_projectionsWidget; //! bottom widget to draw projections plot + ProjectedGraphsCanvas* m_canvas1D; //! bottom widget to draw projections plot Scale2DEditor* m_scaleEditor; //! panel at the right with properties };