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

Re-introduced firstAnchestorOfType

Browse Source
This commit is contained in:
Jacob Støren
2015-08-12 11:36:49 +02:00
parent f8518037fe
commit 369797b3d8
3 changed files with 4 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
ApplicationCode/ProjectDataModel/RimFault.cpp
View File

@@ -70,8 +70,7 @@ void RimFault::fieldChangedByUi(const caf::PdmFieldHandle* changedField, const Q
{ {
RimEclipseView* reservoirView = NULL; RimEclipseView* reservoirView = NULL;
// MODTODO fix usage of firstAncestorOfType this->firstAncestorOfType(reservoirView);
//this->firstAncestorOfType(reservoirView);
if (reservoirView) if (reservoirView)
{ {

5
ApplicationCode/ProjectDataModel/RimReservoirCellResultsStorage.cpp
View File

@@ -1527,11 +1527,8 @@ double RimReservoirCellResultsStorage::darchysValue()
double darchy = 0.008527; // (ECLIPSE 100) (METRIC) double darchy = 0.008527; // (ECLIPSE 100) (METRIC)
// MODTODO Fix usage of firstAncestorOfType
return darchy;
RimEclipseCase* rimCase = NULL; RimEclipseCase* rimCase = NULL;
//this->firstAncestorOfType(rimCase); this->firstAncestorOfType(rimCase);
if (rimCase && rimCase->reservoirData()) if (rimCase && rimCase->reservoirData())
{ {

7
ApplicationCode/ProjectDataModel/RimUiTreeModelPdm.cpp
View File

@@ -206,9 +206,7 @@ void RimUiTreeModelPdm::deleteReservoirViews(const std::vector<caf::PdmUiItem*>&
RimView* reservoirView = dynamic_cast<RimView*>(treeSelection[sIdx]); RimView* reservoirView = dynamic_cast<RimView*>(treeSelection[sIdx]);
ownerCases.insert(reservoirView->ownerCase()); ownerCases.insert(reservoirView->ownerCase());
// MODTODO how to hanle this?? reservoirView->parentField()->removeChildObject(reservoirView);
//reservoirView->removeFromParentFields();
delete reservoirView; delete reservoirView;
} }
@@ -235,8 +233,7 @@ void RimUiTreeModelPdm::deleteGeoMechCases(const std::vector<caf::PdmUiItem*>& t
allParents.insert(geomCase->parentField()->ownerObject()); allParents.insert(geomCase->parentField()->ownerObject());
// MODTODO how to handle this? geomCase->parentField()->removeChildObject(geomCase);
//geomCase->removeFromParentFields();
delete geomCase; delete geomCase;
} }