Skip to content
GitLab
Menu
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
mlz
BornAgain
Commits
c6a70734
Commit
c6a70734
authored
Jun 08, 2022
by
Mikhail Svechnikov
Browse files
add diffDataItem to JobItem
parent
18aca57d
Changes
2
Hide whitespace changes
Inline
Side-by-side
GUI/Model/Job/JobItem.cpp
View file @
c6a70734
...
...
@@ -59,6 +59,7 @@ JobItem::JobItem()
addProperty
(
P_PRESENTATION_TYPE
,
QVariant
::
Type
::
Invalid
);
registerTag
(
T_OUTPUT
,
1
,
1
,
{
IntensityDataItem
::
M_TYPE
,
SpecularDataItem
::
M_TYPE
});
registerTag
(
T_DIFF
,
1
,
1
,
{
IntensityDataItem
::
M_TYPE
,
SpecularDataItem
::
M_TYPE
});
registerTag
(
T_REALDATA
,
1
,
1
,
{
RealDataItem
::
M_TYPE
});
registerTag
(
T_DATAVIEW
,
1
,
1
,
{
Data1DViewItem
::
M_TYPE
});
...
...
@@ -100,7 +101,7 @@ IntensityDataItem* JobItem::intensityDataItem()
DataItem
*
JobItem
::
dataItem
()
{
return
dynamic_cast
<
DataItem
*>
(
getItem
(
T_OUTPUT
));
return
dynamic_cast
<
DataItem
*>
(
intensityDataItem
(
));
}
JobStatus
JobItem
::
getStatus
()
const
...
...
@@ -302,14 +303,14 @@ RealDataItem* JobItem::createRealDataItem()
return
model
()
->
insertItem
<
RealDataItem
>
(
this
,
-
1
,
T_REALDATA
);
}
Data
1DView
Item
*
JobItem
::
dataItem
View
()
DataItem
*
JobItem
::
d
iffD
ataItem
()
{
return
dynamic_cast
<
Data
1DView
Item
*>
(
getItem
(
JobItem
::
T_DATAVIEW
));
return
dynamic_cast
<
DataItem
*>
(
getItem
(
T_DIFF
));
}
void
JobItem
::
addDataViewItem
(
Data1DViewItem
*
data_view
)
Data1DViewItem
*
JobItem
::
dataItemView
(
)
{
insertChild
(
-
1
,
data_view
,
T_DATAVIEW
);
return
dynamic_cast
<
Data1DViewItem
*>
(
getItem
(
JobItem
::
T_DATAVIEW
)
)
;
}
Data1DViewItem
*
JobItem
::
createDataViewItem
()
...
...
GUI/Model/Job/JobItem.h
View file @
c6a70734
...
...
@@ -54,6 +54,7 @@ private:
static
constexpr
auto
P_PRESENTATION_TYPE
{
"Presentation type"
};
static
constexpr
auto
T_MATERIAL_CONTAINER
{
"Material container tag"
};
static
constexpr
auto
T_OUTPUT
{
"Output tag"
};
static
constexpr
auto
T_DIFF
{
"Diff tag"
};
static
constexpr
auto
T_REALDATA
{
"Real Data tag"
};
static
constexpr
auto
T_DATAVIEW
{
"Data View tag"
};
static
constexpr
auto
T_FIT_SUITE
{
"Fit suite tag"
};
...
...
@@ -127,8 +128,8 @@ public:
RealDataItem
*
copyRealDataIntoJob
(
const
RealDataItem
*
real_data
);
RealDataItem
*
createRealDataItem
();
DataItem
*
diffDataItem
();
Data1DViewItem
*
dataItemView
();
void
addDataViewItem
(
Data1DViewItem
*
data_view
);
Data1DViewItem
*
createDataViewItem
();
QString
sampleName
()
const
;
...
...
@@ -172,6 +173,7 @@ T* JobItem::setDataType()
{
static_assert
(
std
::
is_base_of
<
DataItem
,
T
>::
value
,
"Class must be derived from DataItem"
);
model
()
->
insertItem
<
T
>
(
this
,
-
1
,
T_DIFF
);
return
model
()
->
insertItem
<
T
>
(
this
,
-
1
,
T_OUTPUT
);
}
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment