Made adding of objects more robust

p4#: 21009
This commit is contained in:
Magne Sjaastad
2013-03-20 15:11:27 +01:00
parent 1a113b83d3
commit 53d7d62759
2 changed files with 19 additions and 4 deletions

View File

@@ -567,22 +567,26 @@ void RimUiTreeModelPdm::addObjects(const QModelIndex& itemIndex, caf::PdmObjectG
else if (dynamic_cast<RimCaseCollection*>(currentItem->dataObject().p()))
{
caseCollection = dynamic_cast<RimCaseCollection*>(currentItem->dataObject().p());
CVF_ASSERT(caseCollection);
gridCaseGroup = caseCollection->parentCaseGroup();
}
else if (dynamic_cast<RimReservoir*>(currentItem->dataObject().p()))
{
RimReservoir* rimReservoir = dynamic_cast<RimReservoir*>(currentItem->dataObject().p());
CVF_ASSERT(rimReservoir);
caseCollection = rimReservoir->parentCaseCollection();
gridCaseGroup = caseCollection->parentCaseGroup();
if (caseCollection)
{
gridCaseGroup = caseCollection->parentCaseGroup();
}
}
else
{
return;
}
CVF_ASSERT(caseCollection);
CVF_ASSERT(gridCaseGroup);
if (gridCaseGroup)
{
std::vector<caf::PdmPointer<RimResultReservoir> > typedObjects;