From a85ebe738e905e99d70d5b6c98d6a66c70a3940c Mon Sep 17 00:00:00 2001
From: "Joachim Wuttke (h)" <j.wuttke@fz-juelich.de>
Date: Thu, 23 Nov 2023 11:23:57 +0100
Subject: [PATCH] replace 'm_propertyPanel' by 'm_scaleEditor'
---
GUI/View/Frame/Plot2DWithProjectionFrame.cpp | 12 ++++++------
GUI/View/Frame/Plot2DWithProjectionFrame.h | 2 +-
2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/GUI/View/Frame/Plot2DWithProjectionFrame.cpp b/GUI/View/Frame/Plot2DWithProjectionFrame.cpp
index 80c578e92c2..668a0dd2e44 100644
--- a/GUI/View/Frame/Plot2DWithProjectionFrame.cpp
+++ b/GUI/View/Frame/Plot2DWithProjectionFrame.cpp
@@ -30,7 +30,7 @@ Plot2DWithProjectionFrame::Plot2DWithProjectionFrame(QWidget* parent)
, m_toolbar(new ProjectionsToolpanel(m_editorActions))
, m_projectionsCanvas(new ProjectionsEditorCanvas)
, m_projectionsWidget(new ProjectionsWidget)
- , m_propertyPanel(new Scale2DEditor(this))
+ , m_scaleEditor(new Scale2DEditor(this))
{
auto* layout = new QHBoxLayout;
setLayout(layout);
@@ -43,9 +43,9 @@ Plot2DWithProjectionFrame::Plot2DWithProjectionFrame(QWidget* parent)
splitter->addWidget(m_projectionsCanvas);
splitter->addWidget(m_projectionsWidget);
- layout->addWidget(m_propertyPanel);
- m_propertyPanel->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Minimum);
- m_propertyPanel->setHidden(true);
+ layout->addWidget(m_scaleEditor);
+ m_scaleEditor->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Minimum);
+ m_scaleEditor->setHidden(true);
m_toolbar->setOrientation(Qt::Vertical);
m_toolbar->setStyleSheet("QToolBar{border-left:1px solid rgb(180,180,180);}");
@@ -57,7 +57,7 @@ Plot2DWithProjectionFrame::Plot2DWithProjectionFrame(QWidget* parent)
void Plot2DWithProjectionFrame::setJobOrDatafileItem(QObject* item)
{
setBaseItem(item);
- m_propertyPanel->setJobOrDatafileItem(item);
+ m_scaleEditor->setJobOrDatafileItem(item);
setContextPW();
}
@@ -101,7 +101,7 @@ void Plot2DWithProjectionFrame::setup_connections()
// tool panel request is propagated from editorActions to this MaskEditor
connect(m_editorActions, &ProjectionActions::propertyPanelRequest,
- [this]() { m_propertyPanel->setHidden(!m_propertyPanel->isHidden()); });
+ [this]() { m_scaleEditor->setHidden(!m_scaleEditor->isHidden()); });
// selection/drawing activity is propagated from Toolbar to graphics scene
connect(m_toolbar, &ProjectionsToolpanel::activityChanged, m_projectionsCanvas,
diff --git a/GUI/View/Frame/Plot2DWithProjectionFrame.h b/GUI/View/Frame/Plot2DWithProjectionFrame.h
index 7a8b935f9b4..5184fd1904a 100644
--- a/GUI/View/Frame/Plot2DWithProjectionFrame.h
+++ b/GUI/View/Frame/Plot2DWithProjectionFrame.h
@@ -44,7 +44,7 @@ private:
ProjectionsToolpanel* m_toolbar; //! main tool bar with buttons at the right
ProjectionsEditorCanvas* m_projectionsCanvas; //! canvas with color map at the top
ProjectionsWidget* m_projectionsWidget; //! bottom widget to draw projections plot
- Scale2DEditor* m_propertyPanel; //! panel at the right with properties
+ Scale2DEditor* m_scaleEditor; //! panel at the right with properties
};
#endif // BORNAGAIN_GUI_VIEW_FRAME_PLOT2DWITHPROJECTIONFRAME_H
--
GitLab