diff --git a/ApplicationCode/ProjectDataModel/Rim3dOverlayInfoConfig.cpp b/ApplicationCode/ProjectDataModel/Rim3dOverlayInfoConfig.cpp index 56ecc89550..458a091220 100644 --- a/ApplicationCode/ProjectDataModel/Rim3dOverlayInfoConfig.cpp +++ b/ApplicationCode/ProjectDataModel/Rim3dOverlayInfoConfig.cpp @@ -48,7 +48,7 @@ CAF_PDM_SOURCE_INIT(Rim3dOverlayInfoConfig, "View3dOverlayInfoConfig"); //-------------------------------------------------------------------------------------------------- Rim3dOverlayInfoConfig::Rim3dOverlayInfoConfig() { - CAF_PDM_InitObject("Overlay 3D info", ":/InfoBox16x16.png", "", ""); + CAF_PDM_InitObject("Info Box", ":/InfoBox16x16.png", "", ""); CAF_PDM_InitField(&active, "Active", true, "Active", "", "", ""); active.uiCapability()->setUiHidden(true); diff --git a/ApplicationCode/ProjectDataModel/RimEclipseCase.cpp b/ApplicationCode/ProjectDataModel/RimEclipseCase.cpp index ffcc386333..5d2c2580cd 100644 --- a/ApplicationCode/ProjectDataModel/RimEclipseCase.cpp +++ b/ApplicationCode/ProjectDataModel/RimEclipseCase.cpp @@ -53,9 +53,8 @@ CAF_PDM_ABSTRACT_SOURCE_INIT(RimEclipseCase, "RimReservoir"); //-------------------------------------------------------------------------------------------------- RimEclipseCase::RimEclipseCase() { - - CAF_PDM_InitFieldNoDefault(&reservoirViews, "ReservoirViews", "", "", "", ""); + reservoirViews.uiCapability()->setUiHidden(true); CAF_PDM_InitFieldNoDefault(&m_matrixModelResults, "MatrixModelResults", "", "", "", ""); m_matrixModelResults.uiCapability()->setUiHidden(true); @@ -74,7 +73,12 @@ RimEclipseCase::RimEclipseCase() caseName.uiCapability()->setUiHidden(true); m_matrixModelResults = new RimReservoirCellResultsStorage; + m_matrixModelResults.uiCapability()->setUiHidden(true); + m_matrixModelResults.uiCapability()->setUiChildrenHidden(true); + m_fractureModelResults = new RimReservoirCellResultsStorage; + m_fractureModelResults.uiCapability()->setUiHidden(true); + m_fractureModelResults.uiCapability()->setUiChildrenHidden(true); this->setReservoirData( NULL ); } diff --git a/ApplicationCode/ProjectDataModel/RimEclipseCaseCollection.cpp b/ApplicationCode/ProjectDataModel/RimEclipseCaseCollection.cpp index faefd53074..94ba839b9b 100644 --- a/ApplicationCode/ProjectDataModel/RimEclipseCaseCollection.cpp +++ b/ApplicationCode/ProjectDataModel/RimEclipseCaseCollection.cpp @@ -39,6 +39,8 @@ RimEclipseCaseCollection::RimEclipseCaseCollection(void) CAF_PDM_InitObject("Grid Models", ":/Cases16x16.png", "", ""); CAF_PDM_InitFieldNoDefault(&cases, "Reservoirs", "", "", "", ""); + cases.uiCapability()->setUiHidden(true); + CAF_PDM_InitFieldNoDefault(&caseGroups, "CaseGroups", "", "", "", ""); m_gridCollection = new RigGridManager; diff --git a/ApplicationCode/ProjectDataModel/RimProject.cpp b/ApplicationCode/ProjectDataModel/RimProject.cpp index 13b8783d62..c73c6fc6bc 100644 --- a/ApplicationCode/ProjectDataModel/RimProject.cpp +++ b/ApplicationCode/ProjectDataModel/RimProject.cpp @@ -93,6 +93,8 @@ RimProject::RimProject(void) oilFields.push_back(new RimOilField); initScriptDirectories(); + + this->setUiHidden(true); } //-------------------------------------------------------------------------------------------------- @@ -603,8 +605,8 @@ void RimProject::defineUiTreeOrdering(caf::PdmUiTreeOrdering& uiTreeOrdering, QS RimOilField* field = activeOilField(); if (field) { - if (field->analysisModels()) uiTreeOrdering.add(&(field->analysisModels()->cases)); - if (field->geoMechModels()) uiTreeOrdering.add(&(field->geoMechModels()->cases)); + if (field->analysisModels()) uiTreeOrdering.add(field->analysisModels()); + if (field->geoMechModels()) uiTreeOrdering.add(&(field->geoMechModels)); if (field->wellPathCollection()) uiTreeOrdering.add(&(field->wellPathCollection()->wellPaths)); } diff --git a/ApplicationCode/ProjectDataModel/RimView.cpp b/ApplicationCode/ProjectDataModel/RimView.cpp index cabc08748c..c62bf32c72 100644 --- a/ApplicationCode/ProjectDataModel/RimView.cpp +++ b/ApplicationCode/ProjectDataModel/RimView.cpp @@ -82,6 +82,7 @@ RimView::RimView(void) CAF_PDM_InitFieldNoDefault(&overlayInfoConfig, "OverlayInfoConfig", "Info Box", "", "", ""); overlayInfoConfig = new Rim3dOverlayInfoConfig(); overlayInfoConfig->setReservoirView(this); + overlayInfoConfig.uiCapability()->setUiHidden(true); caf::AppEnum defaultMeshType = NO_MESH; if (preferences->defaultGridLines) defaultMeshType = FULL_MESH;