(#384) Fixed Script tree in the new project tree

This commit is contained in:
Jacob Støren 2015-08-20 15:48:37 +02:00
parent f174615098
commit a6c59f4160
2 changed files with 5 additions and 2 deletions

View File

@ -71,6 +71,7 @@ RimProject::RimProject(void)
oilFields.uiCapability()->setUiHidden(true);
CAF_PDM_InitFieldNoDefault(&scriptCollection, "ScriptCollection", "Scripts", ":/Default.png", "", "");
scriptCollection.uiCapability()->setUiHidden(true);
CAF_PDM_InitFieldNoDefault(&treeViewState, "TreeViewState", "", "", "", "");
treeViewState.uiCapability()->setUiHidden(true);
@ -97,6 +98,8 @@ RimProject::RimProject(void)
scriptCollection = new RimScriptCollection();
scriptCollection->directory.uiCapability()->setUiHidden(true);
scriptCollection->uiCapability()->setUiName("Scripts");
scriptCollection->uiCapability()->setUiIcon(QIcon(":/Default.png"));
// For now, create a default first oilfield that contains the rest of the project
oilFields.push_back(new RimOilField);
@ -790,7 +793,7 @@ void RimProject::defineUiTreeOrdering(caf::PdmUiTreeOrdering& uiTreeOrdering, QS
if (oilField->wellPathCollection()) uiTreeOrdering.add(oilField->wellPathCollection());
}
uiTreeOrdering.add(&scriptCollection);
uiTreeOrdering.add(scriptCollection());
uiTreeOrdering.setForgetRemainingFields(true);
}

View File

@ -44,7 +44,7 @@ public:
virtual ~RimScriptCollection();
public: // Pdm Fields
caf::PdmField<QString> directory;
caf::PdmField<QString> directory;
caf::PdmChildArrayField<RimCalcScript*> calcScripts;
caf::PdmChildArrayField<RimScriptCollection*> subDirectories;