OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2025-01-24 15:26:48 -06:00
Code Issues Packages Projects Releases Wiki Activity

(#672) Avoid deleting and hiding WellLogPlot and Wells folders when they have no children

Browse Source
This commit is contained in:
Jacob Støren 2015-11-30 15:07:54 +01:00
parent 9d9ff798a9
commit 704f4fa42b
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ApplicationCode/ProjectDataModel/RimOilField.cpp
View File

@ -37,6 +37,7 @@ RimOilField::RimOilField(void)
CAF_PDM_InitFieldNoDefault(&wellPathCollection, "WellPathCollection", "Well Paths", ":/WellCollection.png", "", "");
analysisModels = new RimEclipseCaseCollection();
wellPathCollection = new RimWellPathCollection();
}
//--------------------------------------------------------------------------------------------------

9
ApplicationCode/ProjectDataModel/RimProject.cpp
View File

@ -139,7 +139,11 @@ RimProject::~RimProject(void)
//--------------------------------------------------------------------------------------------------
void RimProject::close()
{
if (mainPlotCollection()) delete mainPlotCollection();
if (mainPlotCollection() && mainPlotCollection()->wellLogPlotCollection())
{
mainPlotCollection()->wellLogPlotCollection()->wellLogPlots.deleteAllChildObjects();
}
oilFields.deleteAllChildObjects();
oilFields.push_back(new RimOilField);
@ -722,13 +726,10 @@ void RimProject::defineUiTreeOrdering(caf::PdmUiTreeOrdering& uiTreeOrdering, QS
if (mainPlotCollection)
{
if (mainPlotCollection->wellLogPlotCollection())
{
if (mainPlotCollection->wellLogPlotCollection()->wellLogPlots().size() > 0)
{
uiTreeOrdering.add(mainPlotCollection->wellLogPlotCollection());
}
}
}
uiTreeOrdering.add(scriptCollection());