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

standard member names

parent f65d5601
No related branches found
No related tags found
1 merge request!2320remove inheritance from DataAccessWidget (#838)
...@@ -35,11 +35,11 @@ Fit1DFrame::Fit1DFrame(JobItem* job_item) ...@@ -35,11 +35,11 @@ Fit1DFrame::Fit1DFrame(JobItem* job_item)
, m_diff_canvas(new SpecularPlotCanvas) , m_diff_canvas(new SpecularPlotCanvas)
, m_progress_canvas(new ProgressCanvas) , m_progress_canvas(new ProgressCanvas)
, m_status_label(new PlotStatusLabel(nullptr)) , m_status_label(new PlotStatusLabel(nullptr))
, m_scale_editor(new AxisPanel) , m_axis_panel(new AxisPanel)
, m_reset_view_action(new QAction(this)) , m_reset_view_action(new QAction(this))
{ {
m_scale_editor->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::MinimumExpanding); m_axis_panel->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::MinimumExpanding);
QObject::connect(gActions->toggle_properties_panel, &QAction::triggered, m_scale_editor, QObject::connect(gActions->toggle_properties_panel, &QAction::triggered, m_axis_panel,
&QWidget::setVisible); &QWidget::setVisible);
auto* vlayout = new QVBoxLayout; auto* vlayout = new QVBoxLayout;
...@@ -64,15 +64,15 @@ Fit1DFrame::Fit1DFrame(JobItem* job_item) ...@@ -64,15 +64,15 @@ Fit1DFrame::Fit1DFrame(JobItem* job_item)
hlayout->setContentsMargins(0, 0, 0, 0); hlayout->setContentsMargins(0, 0, 0, 0);
hlayout->setSpacing(0); hlayout->setSpacing(0);
hlayout->addLayout(vlayout); hlayout->addLayout(vlayout);
hlayout->addWidget(m_scale_editor); hlayout->addWidget(m_axis_panel);
m_reset_view_action->setText("Center view"); m_reset_view_action->setText("Center view");
m_reset_view_action->setIcon(QIcon(":/images/camera-metering-center.svg")); m_reset_view_action->setIcon(QIcon(":/images/camera-metering-center.svg"));
m_reset_view_action->setToolTip("Reset View"); m_reset_view_action->setToolTip("Reset View");
connect(m_reset_view_action, &QAction::triggered, this, &Fit1DFrame::onResetViewAction); connect(m_reset_view_action, &QAction::triggered, this, &Fit1DFrame::onResetViewAction);
m_scale_editor->setVisible(false); m_axis_panel->setVisible(false);
connect(m_scale_editor, &DataPropertyWidget::axesRangeResetRequested, this, connect(m_axis_panel, &DataPropertyWidget::axesRangeResetRequested, this,
&Fit1DFrame::onResetViewAction); &Fit1DFrame::onResetViewAction);
ASSERT(job_item); ASSERT(job_item);
...@@ -84,7 +84,7 @@ Fit1DFrame::Fit1DFrame(JobItem* job_item) ...@@ -84,7 +84,7 @@ Fit1DFrame::Fit1DFrame(JobItem* job_item)
m_data_canvas->setData1DItems({simuData1DItem(), realData1DItem()}); m_data_canvas->setData1DItems({simuData1DItem(), realData1DItem()});
m_diff_canvas->setData1DItems({diffData1DItem()}); m_diff_canvas->setData1DItems({diffData1DItem()});
m_progress_canvas->setJobItem(job_item); m_progress_canvas->setJobItem(job_item);
m_scale_editor->setJobOrDatafileItem(job_item); m_axis_panel->setJobOrDatafileItem(job_item);
} }
void Fit1DFrame::onResetViewAction() void Fit1DFrame::onResetViewAction()
......
...@@ -42,7 +42,7 @@ private: ...@@ -42,7 +42,7 @@ private:
SpecularPlotCanvas* m_diff_canvas; SpecularPlotCanvas* m_diff_canvas;
ProgressCanvas* m_progress_canvas; ProgressCanvas* m_progress_canvas;
PlotStatusLabel* m_status_label; PlotStatusLabel* m_status_label;
AxisPanel* m_scale_editor; AxisPanel* m_axis_panel;
QAction* m_reset_view_action; QAction* m_reset_view_action;
}; };
......
...@@ -35,15 +35,15 @@ Fit2DFrame::Fit2DFrame(JobItem* job_item) ...@@ -35,15 +35,15 @@ Fit2DFrame::Fit2DFrame(JobItem* job_item)
, m_diff_canvas(new ColorMapCanvas) , m_diff_canvas(new ColorMapCanvas)
, m_progress_canvas(new ProgressCanvas) , m_progress_canvas(new ProgressCanvas)
, m_status_label(new PlotStatusLabel(nullptr)) , m_status_label(new PlotStatusLabel(nullptr))
, m_scale_editor(new AxesPanel) , m_axes_panel(new AxesPanel)
, m_reset_view_action(new QAction(this)) , m_reset_view_action(new QAction(this))
{ {
auto* vlayout = new QVBoxLayout; auto* vlayout = new QVBoxLayout;
vlayout->setContentsMargins(0, 0, 0, 0); vlayout->setContentsMargins(0, 0, 0, 0);
vlayout->setSpacing(0); vlayout->setSpacing(0);
m_scale_editor->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Minimum); m_axes_panel->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Minimum);
QObject::connect(gActions->toggle_properties_panel, &QAction::triggered, m_scale_editor, QObject::connect(gActions->toggle_properties_panel, &QAction::triggered, m_axes_panel,
&QWidget::setVisible); &QWidget::setVisible);
auto* gridLayout = new QGridLayout; auto* gridLayout = new QGridLayout;
...@@ -66,15 +66,15 @@ Fit2DFrame::Fit2DFrame(JobItem* job_item) ...@@ -66,15 +66,15 @@ Fit2DFrame::Fit2DFrame(JobItem* job_item)
hlayout->setContentsMargins(0, 0, 0, 0); hlayout->setContentsMargins(0, 0, 0, 0);
hlayout->setSpacing(0); hlayout->setSpacing(0);
hlayout->addLayout(vlayout); hlayout->addLayout(vlayout);
hlayout->addWidget(m_scale_editor); hlayout->addWidget(m_axes_panel);
m_reset_view_action->setText("Center view"); m_reset_view_action->setText("Center view");
m_reset_view_action->setIcon(QIcon(":/images/camera-metering-center.svg")); m_reset_view_action->setIcon(QIcon(":/images/camera-metering-center.svg"));
m_reset_view_action->setToolTip("Reset View"); m_reset_view_action->setToolTip("Reset View");
connect(m_reset_view_action, &QAction::triggered, this, &Fit2DFrame::onResetViewAction); connect(m_reset_view_action, &QAction::triggered, this, &Fit2DFrame::onResetViewAction);
m_scale_editor->setVisible(false); m_axes_panel->setVisible(false);
connect(m_scale_editor, &DataPropertyWidget::axesRangeResetRequested, this, connect(m_axes_panel, &DataPropertyWidget::axesRangeResetRequested, this,
&Fit2DFrame::onResetViewAction); &Fit2DFrame::onResetViewAction);
ASSERT(job_item); ASSERT(job_item);
...@@ -89,7 +89,7 @@ Fit2DFrame::Fit2DFrame(JobItem* job_item) ...@@ -89,7 +89,7 @@ Fit2DFrame::Fit2DFrame(JobItem* job_item)
m_diff_canvas->itemToCanvas(diffData2DItem()); m_diff_canvas->itemToCanvas(diffData2DItem());
m_progress_canvas->setJobItem(job_item); m_progress_canvas->setJobItem(job_item);
m_scale_editor->setJobOrDatafileItem(job_item); m_axes_panel->setJobOrDatafileItem(job_item);
} }
void Fit2DFrame::onResetViewAction() void Fit2DFrame::onResetViewAction()
......
...@@ -41,7 +41,7 @@ private: ...@@ -41,7 +41,7 @@ private:
ColorMapCanvas* m_diff_canvas; ColorMapCanvas* m_diff_canvas;
ProgressCanvas* m_progress_canvas; ProgressCanvas* m_progress_canvas;
PlotStatusLabel* m_status_label; PlotStatusLabel* m_status_label;
AxesPanel* m_scale_editor; AxesPanel* m_axes_panel;
QAction* m_reset_view_action; QAction* m_reset_view_action;
}; };
......
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