OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2025-02-25 18:55:39 -06:00
Code Issues Packages Projects Releases Wiki Activity

#1059 System : Use PdmOptionItemInfo constructor for PdmObjects

Browse Source
This commit is contained in:
Magne Sjaastad
2017-01-05 07:53:14 +01:00
parent ebddaa31e6
commit a9984c4bd5
12 changed files with 109 additions and 110 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
ApplicationCode/ProjectDataModel/RimViewController.cpp
View File

@@ -109,31 +109,29 @@ QList<caf::PdmOptionItemInfo> RimViewController::calculateValueOptions(const caf
views.push_back(this->managedView());
}
RimViewLinker* linkedViews = NULL;
this->firstAncestorOrThisOfType(linkedViews);
RimViewLinker* viewLinker = nullptr;
this->firstAncestorOrThisOfType(viewLinker);
CVF_ASSERT(viewLinker);
for (size_t i = 0; i< views.size(); i++)
for (RimView* view : views)
{
if (views[i] != linkedViews->masterView())
if (view != viewLinker->masterView())
{
RimCase* rimCase = NULL;
views[i]->firstAncestorOrThisOfType(rimCase);
RimCase* rimCase = nullptr;
view->firstAncestorOrThisOfType(rimCase);
QIcon icon;
if (rimCase)
{
icon = rimCase->uiCapability()->uiIcon();
}
optionList.push_back(caf::PdmOptionItemInfo(RimViewLinker::displayNameForView(views[i]),
QVariant::fromValue(caf::PdmPointer<caf::PdmObjectHandle>(views[i])),
false,
icon));
optionList.push_back(caf::PdmOptionItemInfo(RimViewLinker::displayNameForView(view), view, false, icon));
}
}
if (optionList.size() > 0)
{
optionList.push_front(caf::PdmOptionItemInfo("None", QVariant::fromValue(caf::PdmPointer<caf::PdmObjectHandle>(NULL))));
optionList.push_front(caf::PdmOptionItemInfo("None", nullptr));
}
}