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

JobModel: reduce topItems usage

parent dd484760
Branches
Tags
1 merge request!1062GUI: JobModel is refactored
...@@ -113,7 +113,7 @@ QVector<SessionItem*> JobModel::nonXMLItems() const ...@@ -113,7 +113,7 @@ QVector<SessionItem*> JobModel::nonXMLItems() const
{ {
QVector<SessionItem*> result; QVector<SessionItem*> result;
for (auto* jobItem : topItems<JobItem>()) { for (auto* jobItem : jobItems()) {
if (auto* dataItem = jobItem->simulatedDataItem()) if (auto* dataItem = jobItem->simulatedDataItem())
result.push_back(dataItem); result.push_back(dataItem);
......
...@@ -30,7 +30,7 @@ QVector<SessionItem*> RealModel::nonXMLItems() const ...@@ -30,7 +30,7 @@ QVector<SessionItem*> RealModel::nonXMLItems() const
{ {
QVector<SessionItem*> result; QVector<SessionItem*> result;
for (auto* realData : topItems<RealItem>()) { for (auto* realData : realItems()) {
if (auto* intensityItem = realData->dataItem()) if (auto* intensityItem = realData->dataItem())
result.push_back(intensityItem); result.push_back(intensityItem);
if (auto* native_data_item = realData->nativeData()) if (auto* native_data_item = realData->nativeData())
...@@ -86,12 +86,24 @@ QVector<RealItem*> RealModel::realItems(int rank) const ...@@ -86,12 +86,24 @@ QVector<RealItem*> RealModel::realItems(int rank) const
QVector<RealItem*> RealModel::realItems1D() const QVector<RealItem*> RealModel::realItems1D() const
{ {
return topItems<RealItem>([](const RealItem& item) { return item.isSpecularData(); }); QVector<RealItem*> vec_1d;
for(auto* item : realItems())
if(item->isSpecularData())
vec_1d.push_back(item);
return vec_1d;
} }
QVector<RealItem*> RealModel::realItems2D() const QVector<RealItem*> RealModel::realItems2D() const
{ {
return topItems<RealItem>([](const RealItem& item) { return !item.isSpecularData(); }); QVector<RealItem*> vec_2d;
for(auto* item : realItems())
if(item->isIntensityData())
vec_2d.push_back(item);
return vec_2d;
} }
void RealModel::remove(RealItem* item) void RealModel::remove(RealItem* item)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment