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

Bugfix - getting correct pointer for parent case group

Browse Source 
Getting the parent field's owner object instead of the owner of this.
Removed some out-commented TODO code/comments.
This commit is contained in:
Pål Hagen 2015-08-05 14:55:16 +02:00
parent 90762d0f0f
commit f45c50fb43
3 changed files with 1 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
ApplicationCode/ProjectDataModel/RimCaseCollection.cpp
View File

@ -49,19 +49,7 @@ RimCaseCollection::~RimCaseCollection()
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
RimIdenticalGridCaseGroup* RimCaseCollection::parentCaseGroup() RimIdenticalGridCaseGroup* RimCaseCollection::parentCaseGroup()
{ {
// MODTODO Remove return dynamic_cast<RimIdenticalGridCaseGroup*>(this->parentField()->ownerObject());
/*
std::vector<RimIdenticalGridCaseGroup*> parentObjects;
this->parentObjectsOfType(parentObjects);
if (parentObjects.size() > 0)
{
return parentObjects[0];
}
*/
RimIdenticalGridCaseGroup* parentObject = dynamic_cast<RimIdenticalGridCaseGroup*>(this->owner());
return parentObject;
} }
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------

11
ApplicationCode/ProjectDataModel/RimEclipseCase.cpp
View File

@ -299,17 +299,6 @@ void RimEclipseCase::computeCachedData()
RimCaseCollection* RimEclipseCase::parentCaseCollection() RimCaseCollection* RimEclipseCase::parentCaseCollection()
{ {
return dynamic_cast<RimCaseCollection*>(this->parentField()->ownerObject()); return dynamic_cast<RimCaseCollection*>(this->parentField()->ownerObject());
/*
std::vector<RimCaseCollection*> parentObjects;
this->parentObjectsOfType(parentObjects);
if (parentObjects.size() > 0)
{
return parentObjects[0];
}
return NULL;
*/
} }
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------

13
ApplicationCode/ProjectDataModel/RimEclipseStatisticsCase.cpp
View File

@ -162,19 +162,6 @@ bool RimEclipseStatisticsCase::openEclipseGridFile()
RimCaseCollection* RimEclipseStatisticsCase::parentStatisticsCaseCollection() RimCaseCollection* RimEclipseStatisticsCase::parentStatisticsCaseCollection()
{ {
return dynamic_cast<RimCaseCollection*>(this->parentField()->ownerObject()); return dynamic_cast<RimCaseCollection*>(this->parentField()->ownerObject());
// MODTODO Remove
/*
std::vector<RimCaseCollection*> parentObjects;
this->parentObjectsOfType(parentObjects);
if (parentObjects.size() > 0)
{
return parentObjects[0];
}
return NULL;
*/
} }
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------