Skip to content
Snippets Groups Projects
Commit db48fc77 authored by Mikhail Svechnikov's avatar Mikhail Svechnikov Committed by Mikhail Svechnikov
Browse files

setJobOrRealItem : test new system

parent 8966e2bd
No related branches found
No related tags found
1 merge request!975GUI: migration from SessionItemWidget, part 1
...@@ -77,7 +77,7 @@ SpecularDataImportWidget::SpecularDataImportWidget(QWidget* parent) ...@@ -77,7 +77,7 @@ SpecularDataImportWidget::SpecularDataImportWidget(QWidget* parent)
void SpecularDataImportWidget::setItem(SessionItem* real_DataItem) void SpecularDataImportWidget::setItem(SessionItem* real_DataItem)
{ {
// SessionItemWidget::setItem(real_DataItem); SessionItemWidget::setItem(real_DataItem);
setJobOrRealItem(dynamic_cast<RealDataItem*>(real_DataItem)); setJobOrRealItem(dynamic_cast<RealDataItem*>(real_DataItem));
} }
......
...@@ -75,7 +75,7 @@ FitComparisonWidget1D::FitComparisonWidget1D(QWidget* parent) ...@@ -75,7 +75,7 @@ FitComparisonWidget1D::FitComparisonWidget1D(QWidget* parent)
void FitComparisonWidget1D::setItem(SessionItem* job_item) void FitComparisonWidget1D::setItem(SessionItem* job_item)
{ {
// SessionItemWidget::setItem(job_item); SessionItemWidget::setItem(job_item);
setJobOrRealItem(dynamic_cast<JobItem*>(job_item)); setJobOrRealItem(dynamic_cast<JobItem*>(job_item));
} }
...@@ -90,7 +90,7 @@ void FitComparisonWidget1D::setJobOrRealItem(JobRealBase* job_item) ...@@ -90,7 +90,7 @@ void FitComparisonWidget1D::setJobOrRealItem(JobRealBase* job_item)
m_data_canvas->setJobOrRealItem(job_item); m_data_canvas->setJobOrRealItem(job_item);
m_diff_canvas->setJobOrRealItem(job_item); m_diff_canvas->setJobOrRealItem(job_item);
m_fitFlowWidget->setItem(jobItem()->fitSuiteItem()); m_fitFlowWidget->setItem(jobItem()->fitSuiteItem());
// m_propertyWidget->setItem(job_Item); m_propertyWidget->setJobOrRealItem(job_item);
} }
QList<QAction*> FitComparisonWidget1D::actionList() QList<QAction*> FitComparisonWidget1D::actionList()
......
...@@ -43,7 +43,7 @@ SpecularDataCanvas::SpecularDataCanvas(QWidget* parent) ...@@ -43,7 +43,7 @@ SpecularDataCanvas::SpecularDataCanvas(QWidget* parent)
void SpecularDataCanvas::setJobOrRealItem(JobRealBase* job_or_real_Item) void SpecularDataCanvas::setJobOrRealItem(JobRealBase* job_or_real_Item)
{ {
DataAccessWidget::setJobOrRealItem(job_or_real_Item); DataAccessWidget::setJobOrRealItem(job_or_real_Item);
// m_plot_canvas->setDataItems(job_or_real_Item); m_plot_canvas->setJobOrRealItem(job_or_real_Item);
} }
QSize SpecularDataCanvas::sizeHint() const QSize SpecularDataCanvas::sizeHint() const
......
...@@ -46,7 +46,7 @@ SpecularDataWidget::SpecularDataWidget(QWidget* parent) ...@@ -46,7 +46,7 @@ SpecularDataWidget::SpecularDataWidget(QWidget* parent)
void SpecularDataWidget::setItem(SessionItem* job_or_real_Item) void SpecularDataWidget::setItem(SessionItem* job_or_real_Item)
{ {
// SessionItemWidget::setItem(job_or_real_Item); SessionItemWidget::setItem(job_or_real_Item);
if(dynamic_cast<JobItem*>(job_or_real_Item)) if(dynamic_cast<JobItem*>(job_or_real_Item))
setJobOrRealItem(dynamic_cast<JobItem*>(job_or_real_Item)); setJobOrRealItem(dynamic_cast<JobItem*>(job_or_real_Item));
else else
...@@ -55,8 +55,9 @@ void SpecularDataWidget::setItem(SessionItem* job_or_real_Item) ...@@ -55,8 +55,9 @@ void SpecularDataWidget::setItem(SessionItem* job_or_real_Item)
void SpecularDataWidget::setJobOrRealItem(JobRealBase* job_or_real_Item) void SpecularDataWidget::setJobOrRealItem(JobRealBase* job_or_real_Item)
{ {
// m_propertyWidget->setItem(job_or_real_Item); DataAccessWidget::setJobOrRealItem(job_or_real_Item);
// m_specular_canvas->setDataItems({simuSpecDataItem()}); m_propertyWidget->setJobOrRealItem(job_or_real_Item);
m_specular_canvas->setJobOrRealItem(job_or_real_Item);
} }
QList<QAction*> SpecularDataWidget::actionList() QList<QAction*> SpecularDataWidget::actionList()
......
...@@ -41,7 +41,7 @@ SpecularPlotCanvas::SpecularPlotCanvas(QWidget* parent) ...@@ -41,7 +41,7 @@ SpecularPlotCanvas::SpecularPlotCanvas(QWidget* parent)
void SpecularPlotCanvas::setJobOrRealItem(JobRealBase* job_or_real_Item) void SpecularPlotCanvas::setJobOrRealItem(JobRealBase* job_or_real_Item)
{ {
DataAccessWidget::setJobOrRealItem(job_or_real_Item); DataAccessWidget::setJobOrRealItem(job_or_real_Item);
// m_plot->setDataItems(dataItems); m_plot->setJobOrRealItem(job_or_real_Item);
} }
SpecularPlot* SpecularPlotCanvas::specularPlot() SpecularPlot* SpecularPlotCanvas::specularPlot()
......
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