Skip to content
Snippets Groups Projects
Commit 799f5e35 authored by t.knopff's avatar t.knopff
Browse files

Make JobItem::T_DATAVIEW private

parent a4319e0b
No related branches found
No related tags found
1 merge request!99Refactor model: JobItem
......@@ -315,6 +315,16 @@ Data1DViewItem* JobItem::dataItemView()
return dynamic_cast<Data1DViewItem*>(getItem(JobItem::T_DATAVIEW));
}
void JobItem::addDataViewItem(Data1DViewItem* data_view)
{
insertItem(-1, data_view, T_DATAVIEW);
}
Data1DViewItem* JobItem::createDataViewItem()
{
return model()->insertItem<Data1DViewItem>(this, -1, T_DATAVIEW);
}
void JobItem::setSampleName(const QString& name)
{
getItem(P_SAMPLE_NAME)->setValue(name);
......
......@@ -50,9 +50,9 @@ private:
static const QString T_INSTRUMENT;
static const QString T_OUTPUT;
static const QString T_REALDATA;
static const QString T_DATAVIEW;
public:
static const QString T_DATAVIEW;
static const QString T_PARAMETER_TREE;
static const QString T_SIMULATION_OPTIONS;
static const QString T_FIT_SUITE;
......@@ -118,6 +118,8 @@ public:
MaterialItemContainer* createMaterialContainer();
Data1DViewItem* dataItemView();
void addDataViewItem(Data1DViewItem* data_view);
Data1DViewItem* createDataViewItem();
void setSampleName(const QString& name);
......
......@@ -65,10 +65,10 @@ void JobModelFunctions::initDataView(JobItem* job_item)
{
ASSERT(job_item && job_item->isValidForFitting());
ASSERT(job_item->instrumentItem() && job_item->instrumentItem()->is<SpecularInstrumentItem>());
ASSERT(!job_item->getItem(JobItem::T_DATAVIEW));
ASSERT(!job_item->dataItemView());
SessionModel* model = job_item->model();
auto view_item = model->insertItem<Data1DViewItem>(job_item, -1, JobItem::T_DATAVIEW);
auto view_item = job_item->createDataViewItem();
auto property_container =
model->insertItem<DataPropertyContainer>(view_item, -1, Data1DViewItem::T_DATA_PROPERTIES);
......
......@@ -196,7 +196,7 @@ void TestView::test_specular_data_widget()
// creating data view
auto data_view = new Data1DViewItem();
job_item->insertItem(-1, data_view, JobItem::T_DATAVIEW);
job_item->addDataViewItem(data_view);
data_view->insertItem(-1, new DataPropertyContainer, Data1DViewItem::T_DATA_PROPERTIES);
auto container = data_view->item<DataPropertyContainer>(Data1DViewItem::T_DATA_PROPERTIES);
container->addItem(job_item->realDataItem()->dataItem());
......
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