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

Fixed the top levels of the new tree

Browse Source 
Including Scripts and Well Paths
This commit is contained in:
Jacob Støren
2015-08-11 15:22:49 +02:00
parent 0e50a0bac5
commit 3d599542f4
3 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
ApplicationCode/ProjectDataModel/RimProject.cpp
View File

@@ -609,12 +609,12 @@ void RimProject::actionsBasedOnSelection(std::vector<QAction*>& actions)
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
void RimProject::defineUiTreeOrdering(caf::PdmUiTreeOrdering& uiTreeOrdering, QString uiConfigName /*= ""*/) void RimProject::defineUiTreeOrdering(caf::PdmUiTreeOrdering& uiTreeOrdering, QString uiConfigName /*= ""*/)
{ {
RimOilField* field = activeOilField(); RimOilField* oilField = activeOilField();
if (field) if (oilField)
{ {
if (field->analysisModels()) uiTreeOrdering.add(field->analysisModels()); if (oilField->analysisModels()) uiTreeOrdering.add(oilField->analysisModels());
if (field->geoMechModels()) uiTreeOrdering.add(&(field->geoMechModels)); if (oilField->geoMechModels()) uiTreeOrdering.add(oilField->geoMechModels());
if (field->wellPathCollection()) uiTreeOrdering.add(&(field->wellPathCollection()->wellPaths)); if (oilField->wellPathCollection()) uiTreeOrdering.add(oilField->wellPathCollection());
} }
uiTreeOrdering.add(&scriptCollection); uiTreeOrdering.add(&scriptCollection);

2
ApplicationCode/ProjectDataModel/RimScriptCollection.cpp
View File

@@ -40,7 +40,9 @@ RimScriptCollection::RimScriptCollection()
CAF_PDM_InitFieldNoDefault(&directory, "ScriptDirectory", "Dir", "", "", ""); CAF_PDM_InitFieldNoDefault(&directory, "ScriptDirectory", "Dir", "", "", "");
CAF_PDM_InitFieldNoDefault(&calcScripts, "CalcScripts", "", "", "", ""); CAF_PDM_InitFieldNoDefault(&calcScripts, "CalcScripts", "", "", "", "");
calcScripts.uiCapability()->setUiHidden(true);
CAF_PDM_InitFieldNoDefault(&subDirectories, "SubDirectories", "", "", "", ""); CAF_PDM_InitFieldNoDefault(&subDirectories, "SubDirectories", "", "", "", "");
subDirectories.uiCapability()->setUiHidden(true);
directory.uiCapability()->setUiEditorTypeName(caf::PdmUiFilePathEditor::uiEditorTypeName()); directory.uiCapability()->setUiEditorTypeName(caf::PdmUiFilePathEditor::uiEditorTypeName());
} }

1
ApplicationCode/ProjectDataModel/RimWellPathCollection.cpp
View File

@@ -74,6 +74,7 @@ RimWellPathCollection::RimWellPathCollection()
CAF_PDM_InitField(&wellPathClipZDistance, "WellPathClipZDistance", 100, "Well path clipping depth distance", "", "", ""); CAF_PDM_InitField(&wellPathClipZDistance, "WellPathClipZDistance", 100, "Well path clipping depth distance", "", "", "");
CAF_PDM_InitFieldNoDefault(&wellPaths, "WellPaths", "Well Paths", "", "", ""); CAF_PDM_InitFieldNoDefault(&wellPaths, "WellPaths", "Well Paths", "", "", "");
wellPaths.uiCapability()->setUiHidden(true);
m_wellPathCollectionPartManager = new RivWellPathCollectionPartMgr(this); m_wellPathCollectionPartManager = new RivWellPathCollectionPartMgr(this);
m_project = NULL; m_project = NULL;