From 57ae1953721dfa1af86bb8c9a74e6b9b5f56b3ec Mon Sep 17 00:00:00 2001 From: Rebecca Cox Date: Tue, 9 Jan 2018 09:50:00 +0100 Subject: [PATCH] #2349 Elm Props: Create list of imported files in Geomech Case prop pan --- ApplicationCode/ProjectDataModel/RimGeoMechCase.cpp | 11 +++++++---- ApplicationCode/ProjectDataModel/RimGeoMechCase.h | 1 + 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/ApplicationCode/ProjectDataModel/RimGeoMechCase.cpp b/ApplicationCode/ProjectDataModel/RimGeoMechCase.cpp index 2032fe6ab1..14a69e2c5f 100644 --- a/ApplicationCode/ProjectDataModel/RimGeoMechCase.cpp +++ b/ApplicationCode/ProjectDataModel/RimGeoMechCase.cpp @@ -60,6 +60,7 @@ RimGeoMechCase::RimGeoMechCase(void) CAF_PDM_InitField(&m_cohesion, "CaseCohesion", 10.0, "Cohesion", "", "Used to calculate the SE:SFI result", ""); CAF_PDM_InitField(&m_frictionAngleDeg, "FrctionAngleDeg", 30.0, "Friction Angle [Deg]", "", "Used to calculate the SE:SFI result", ""); + CAF_PDM_InitFieldNoDefault(&m_elementPropertyFileNames, "ElementPropertyFileNames", "Element Property Files", "", "", ""); } //-------------------------------------------------------------------------------------------------- @@ -470,10 +471,12 @@ void RimGeoMechCase::defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering& uiOrdering.add(&caseId); uiOrdering.add(&m_caseFileName); - auto group = uiOrdering.addNewGroup("Case Options"); - group->add(&activeFormationNames); - group->add(&m_cohesion); - group->add(&m_frictionAngleDeg); + caf::PdmUiGroup* caseGroup = uiOrdering.addNewGroup("Case Options"); + caseGroup->add(&activeFormationNames); + caseGroup->add(&m_cohesion); + caseGroup->add(&m_frictionAngleDeg); + caf::PdmUiGroup* elmPropGroup = uiOrdering.addNewGroup("Element Properties"); + elmPropGroup->add(&m_elementPropertyFileNames); } diff --git a/ApplicationCode/ProjectDataModel/RimGeoMechCase.h b/ApplicationCode/ProjectDataModel/RimGeoMechCase.h index b16f458535..a0ec1ca691 100644 --- a/ApplicationCode/ProjectDataModel/RimGeoMechCase.h +++ b/ApplicationCode/ProjectDataModel/RimGeoMechCase.h @@ -89,4 +89,5 @@ private: caf::PdmField m_caseFileName; caf::PdmField m_cohesion; caf::PdmField m_frictionAngleDeg; + caf::PdmField > m_elementPropertyFileNames; };