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

std member var name

parent 48afea27
No related branches found
No related tags found
1 merge request!2321rm DataPropertyWidget, axis/axes panels w/o inheritance
......@@ -24,28 +24,28 @@
SpecularFrame::SpecularFrame(Data1DItem* item)
: m_specular_canvas(new SpecularDataCanvas)
, m_scale_editor(new AxisPanel)
, m_axis_panel(new AxisPanel)
// , m_data_item(item)
{
setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
m_scale_editor->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::MinimumExpanding);
QObject::connect(gActions->toggle_properties_panel, &QAction::triggered, m_scale_editor,
m_axis_panel->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::MinimumExpanding);
QObject::connect(gActions->toggle_properties_panel, &QAction::triggered, m_axis_panel,
&QWidget::setVisible);
auto* hlayout = new QHBoxLayout(this);
hlayout->setContentsMargins(0, 0, 0, 0);
hlayout->setSpacing(0);
hlayout->addWidget(m_specular_canvas);
hlayout->addWidget(m_scale_editor);
hlayout->addWidget(m_axis_panel);
connect(m_specular_canvas, &SpecularDataCanvas::customContextMenuRequested, this,
&SpecularFrame::onContextMenuRequest);
m_scale_editor->setVisible(false);
m_axis_panel->setVisible(false);
ASSERT(item);
m_specular_canvas->setDataItem(item);
m_scale_editor->setJobOrDatafileItem(item);
m_axis_panel->setJobOrDatafileItem(item);
}
void SpecularFrame::onContextMenuRequest(const QPoint& point)
......
......@@ -31,7 +31,7 @@ private slots:
private:
SpecularDataCanvas* m_specular_canvas;
AxisPanel* m_scale_editor;
AxisPanel* m_axis_panel;
// const Data1DItem* m_data_item;
};
......
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