Added clear method to make sure all objects are destroyed.

p4#: 20828
This commit is contained in:
Magne Sjaastad
2013-03-08 08:36:30 +01:00
parent 0a02805a8f
commit 9605a1eec9
3 changed files with 11 additions and 4 deletions

View File

@@ -65,10 +65,7 @@ RimProject::~RimProject(void)
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
void RimProject::close() void RimProject::close()
{ {
for (size_t i = 0; i < reservoirs.size(); i++) m_gridCollection->clear();
{
m_gridCollection->removeCase(reservoirs[i]->reservoirData());
}
reservoirs.deleteAllChildObjects(); reservoirs.deleteAllChildObjects();
caseGroups.deleteAllChildObjects(); caseGroups.deleteAllChildObjects();

View File

@@ -88,6 +88,14 @@ bool RigGridCollection::isEqual(RigMainGrid* gridA, RigMainGrid* gridB)
return true; return true;
} }
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RigGridCollection::clear()
{
m_caseToGrid.clear();
}
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------

View File

@@ -36,6 +36,8 @@ public:
RigMainGrid* findEqualGrid(RigMainGrid* candidateGrid); RigMainGrid* findEqualGrid(RigMainGrid* candidateGrid);
void clear();
private: private:
static bool isEqual(RigMainGrid* gridA, RigMainGrid* gridB); static bool isEqual(RigMainGrid* gridA, RigMainGrid* gridB);