diff --git a/GUI/View/Frame/MaskEditingFrame.cpp b/GUI/View/Frame/MaskEditingFrame.cpp index 77181cf14ec49c904df603f371374f1a7a3838f2..31ad10bb1508f5ab75a08d111eb5d33927d299a3 100644 --- a/GUI/View/Frame/MaskEditingFrame.cpp +++ b/GUI/View/Frame/MaskEditingFrame.cpp @@ -28,7 +28,7 @@ MaskEditingFrame::MaskEditingFrame(QWidget* parent) : DataAccessWidget(parent) , m_actions(new MaskEditorActions(this)) , m_panel(new MaskPanel) - , m_canvas(new MaskEditorCanvas) + , m_canvas2D(new MaskEditorCanvas) { auto* layout = new QHBoxLayout; setLayout(layout); @@ -38,7 +38,7 @@ MaskEditingFrame::MaskEditingFrame(QWidget* parent) auto* splitter = new QSplitter; layout->addWidget(splitter); splitter->setOrientation(Qt::Horizontal); - splitter->addWidget(m_canvas); + splitter->addWidget(m_canvas2D); splitter->addWidget(m_panel); splitter->setCollapsible(1, true); @@ -49,32 +49,32 @@ MaskEditingFrame::MaskEditingFrame(QWidget* parent) //... Connections - connect(m_actions, &MaskEditorActions::resetViewRequest, m_canvas, + connect(m_actions, &MaskEditorActions::resetViewRequest, m_canvas2D, &MaskEditorCanvas::onResetViewRequest); connect(m_actions, &MaskEditorActions::propertyPanelRequest, [this] { m_panel->setPanelHidden(!m_panel->isHidden()); }); - connect(m_actions, &MaskEditorActions::savePlotRequest, m_canvas, + connect(m_actions, &MaskEditorActions::savePlotRequest, m_canvas2D, &MaskEditorCanvas::onSavePlotRequest); - connect(toolbar, &MaskToolbar::activityChanged, m_canvas->getScene(), + connect(toolbar, &MaskToolbar::activityChanged, m_canvas2D->getScene(), &MaskGraphicsScene::onActivityChanged); - connect(toolbar, &MaskToolbar::maskValueChanged, m_canvas->getScene(), + connect(toolbar, &MaskToolbar::maskValueChanged, m_canvas2D->getScene(), &MaskGraphicsScene::onMaskValueChanged); - connect(toolbar, &MaskToolbar::presentationChange, m_canvas, + connect(toolbar, &MaskToolbar::presentationChange, m_canvas2D, &MaskEditorCanvas::onPresentationChange); // space bar push (request for zoom mode) - connect(m_canvas, &MaskEditorCanvas::changeActivityRequest, toolbar, + connect(m_canvas2D, &MaskEditorCanvas::changeActivityRequest, toolbar, &MaskToolbar::onChangeActivityRequest); - connect(m_canvas, &MaskEditorCanvas::deleteSelectedRequest, m_actions, + connect(m_canvas2D, &MaskEditorCanvas::deleteSelectedRequest, m_actions, &MaskEditorActions::onDeleteMaskAction); - connect(m_canvas->getScene(), &MaskGraphicsScene::itemContextMenuRequest, m_actions, + connect(m_canvas2D->getScene(), &MaskGraphicsScene::itemContextMenuRequest, m_actions, &MaskEditorActions::onItemContextMenuRequest); connect(m_panel, &MaskPanel::itemContextMenuRequest, m_actions, @@ -103,7 +103,7 @@ void MaskEditingFrame::updateFrame() m_panel->updateMaskPanel(mask_list_model); - m_canvas->updateCanvas(currentData2DItem(), m_panel->selectionModel()); + m_canvas2D->updateCanvas(currentData2DItem(), m_panel->selectionModel()); m_actions->setModels(mask_list_model, m_panel->selectionModel()); @@ -119,5 +119,5 @@ void MaskEditingFrame::showEvent(QShowEvent*) void MaskEditingFrame::hideEvent(QHideEvent*) { m_panel->resetMaskPanel(); - m_canvas->resetCanvas(); + m_canvas2D->resetCanvas(); } diff --git a/GUI/View/Frame/MaskEditingFrame.h b/GUI/View/Frame/MaskEditingFrame.h index b4112de9047e524a7dad56c19b8b02b6f5bfa9f8..ca22139161d32fce6e1a4a112091d4bc61ca13c3 100644 --- a/GUI/View/Frame/MaskEditingFrame.h +++ b/GUI/View/Frame/MaskEditingFrame.h @@ -39,7 +39,7 @@ private: MaskEditorActions* m_actions; MaskPanel* m_panel; - MaskEditorCanvas* m_canvas; + MaskEditorCanvas* m_canvas2D; }; #endif // BORNAGAIN_GUI_VIEW_FRAME_MASKEDITINGFRAME_H