Skip to content
Snippets Groups Projects
Commit e58ade92 authored by Wuttke, Joachim's avatar Wuttke, Joachim
Browse files

AxesPanel initialize through c'tor

parent c7f774fb
No related branches found
No related tags found
1 merge request!2321rm DataPropertyWidget, axis/axes panels w/o inheritance
......@@ -63,10 +63,9 @@ Fit2DFrame::Fit2DFrame(JobItem* job_item)
hlayout->setSpacing(0);
hlayout->addLayout(vlayout);
auto* axes_panel = new AxesPanel;
auto* axes_panel = new AxesPanel(job_item);
hlayout->addWidget(axes_panel);
axes_panel->setVisible(false);
axes_panel->setJobOrDatafileItem(job_item);
QObject::connect(gActions->toggle_properties_panel, &QAction::triggered, axes_panel,
&QWidget::setVisible);
......
......@@ -34,6 +34,8 @@ Plot2DFrame::Plot2DFrame(Data2DItem* item)
, m_mask_panel(new MaskPanel)
, m_data_item(item)
{
ASSERT(item);
auto* layout = new QHBoxLayout;
setLayout(layout);
layout->setContentsMargins(0, 0, 0, 0);
......@@ -50,10 +52,8 @@ Plot2DFrame::Plot2DFrame(Data2DItem* item)
panels->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Minimum);
panels->setHidden(true);
auto* axes_panel = new AxesPanel;
auto* axes_panel = new AxesPanel(item);
panels->addWidget(axes_panel);
ASSERT(item);
axes_panel->setJobOrDatafileItem(item);
panels->addWidget(m_mask_panel);
......
......@@ -28,13 +28,16 @@
#include <QFormLayout>
#include <QLineEdit>
AxesPanel::AxesPanel()
AxesPanel::AxesPanel(QObject* item)
: m_main_layout(new QFormLayout(this))
, m_data_source(std::make_unique<DataSource>(item))
{
setWindowTitle("Properties");
m_main_layout->setContentsMargins(8, 20, 8, 8);
m_main_layout->setSpacing(5);
createPanelElements();
}
AxesPanel::~AxesPanel() = default;
......@@ -221,12 +224,6 @@ void AxesPanel::createPanelElements()
*/
}
void AxesPanel::setJobOrDatafileItem(QObject* item)
{
m_data_source = std::make_unique<DataSource>(item);
createPanelElements();
}
void AxesPanel::updateItemCoords(DataItem* item)
{
if (!item)
......
......@@ -25,11 +25,9 @@ class DataSource;
class AxesPanel : public QWidget {
public:
AxesPanel();
AxesPanel(QObject* item);
~AxesPanel();
void setJobOrDatafileItem(QObject* item);
private:
void updateItemCoords(DataItem* item);
void updateUIValues();
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment