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

Use same collection type for source cases and statistics cases in RimIdenticalGridCaseGroup

Browse Source 
p4#: 21053
This commit is contained in:
Magne Sjaastad
2013-03-22 11:47:46 +01:00
parent d85b0d4619
commit d1cc482355
9 changed files with 104 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
ApplicationCode/ProjectDataModel/RimUiTreeModelPdm.cpp
View File

@@ -229,8 +229,18 @@ void RimUiTreeModelPdm::deleteReservoir(RimReservoir* reservoir)
removeRows_special(mi.row(), 1, mi.parent());
}
RimProject* proj = RIApplication::instance()->project();
proj->removeCaseFromAllGroups(reservoir);
if (RimIdenticalGridCaseGroup::isStatisticsCaseCollection(caseCollection))
{
RimIdenticalGridCaseGroup* caseGroup = caseCollection->parentCaseGroup();
CVF_ASSERT(caseGroup);
caseGroup->statisticsCaseCollection()->reservoirs.removeChildObject(reservoir);
}
else
{
RimProject* proj = RIApplication::instance()->project();
proj->removeCaseFromAllGroups(reservoir);
}
delete reservoir;
@@ -492,25 +502,32 @@ RimStatisticsCase* RimUiTreeModelPdm::addStatisticalCalculation(const QModelInde
position = itemIndex.row();
collectionIndex = itemIndex.parent();
}
else if (dynamic_cast<RimStatisticsCaseCollection*>(currentItem->dataObject().p()))
else if (dynamic_cast<RimCaseCollection*>(currentItem->dataObject().p()))
{
RimStatisticsCaseCollection* statColl = dynamic_cast<RimStatisticsCaseCollection*>(currentItem->dataObject().p());
RimCaseCollection* statColl = dynamic_cast<RimCaseCollection*>(currentItem->dataObject().p());
caseGroup = statColl->parentCaseGroup();
parentCollectionItem = currentItem;
position = parentCollectionItem->childCount();
collectionIndex = itemIndex;
}
beginInsertRows(collectionIndex, position, position);
if (parentCollectionItem && caseGroup)
{
beginInsertRows(collectionIndex, position, position);
RimStatisticsCase* createdObject = caseGroup->createAndAppendStatisticsCase();
caf::PdmUiTreeItem* childItem = new caf::PdmUiTreeItem(parentCollectionItem, position, createdObject);
RimStatisticsCase* createdObject = caseGroup->createAndAppendStatisticsCase();
caf::PdmUiTreeItem* childItem = new caf::PdmUiTreeItem(parentCollectionItem, position, createdObject);
endInsertRows();
endInsertRows();
insertedModelIndex = index(position, 0, collectionIndex);
insertedModelIndex = index(position, 0, collectionIndex);
return createdObject;
return createdObject;
}
else
{
return NULL;
}
}
//--------------------------------------------------------------------------------------------------