diff --git a/ApplicationCode/ProjectDataModel/RimEclipseResultCase.cpp b/ApplicationCode/ProjectDataModel/RimEclipseResultCase.cpp index 24eca497e4..19f89e2d44 100644 --- a/ApplicationCode/ProjectDataModel/RimEclipseResultCase.cpp +++ b/ApplicationCode/ProjectDataModel/RimEclipseResultCase.cpp @@ -56,7 +56,6 @@ #include - CAF_PDM_SOURCE_INIT(RimEclipseResultCase, "EclipseCase"); //-------------------------------------------------------------------------------------------------- /// @@ -69,6 +68,10 @@ RimEclipseResultCase::RimEclipseResultCase() CAF_PDM_InitField(&caseFileName, "CaseFileName", QString(), "Case File Name", "", "" ,""); caseFileName.uiCapability()->setUiReadOnly(true); + CAF_PDM_InitFieldNoDefault(&m_unitSystem, "UnitSystem", "Unit System", "", "", ""); + m_unitSystem.registerGetMethod(RiaApplication::instance()->project(), &RimProject::commonUnitSystemForAllCases); + m_unitSystem.uiCapability()->setUiReadOnly(true); + CAF_PDM_InitFieldNoDefault (&m_flowDiagSolutions, "FlowDiagSolutions", "Flow Diagnostics Solutions", "", "", ""); m_flowDiagSolutions.uiCapability()->setUiHidden(true); m_flowDiagSolutions.uiCapability()->setUiTreeHidden(true); @@ -586,6 +589,7 @@ void RimEclipseResultCase::defineUiOrdering(QString uiConfigName, caf::PdmUiOrde uiOrdering.add(&caseUserDescription); uiOrdering.add(&caseId); uiOrdering.add(&caseFileName); + uiOrdering.add(&m_unitSystem); auto group = uiOrdering.addNewGroup("Case Options"); group->add(&activeFormationNames); diff --git a/ApplicationCode/ProjectDataModel/RimEclipseResultCase.h b/ApplicationCode/ProjectDataModel/RimEclipseResultCase.h index 62f2ddfcac..e7b42a3041 100644 --- a/ApplicationCode/ProjectDataModel/RimEclipseResultCase.h +++ b/ApplicationCode/ProjectDataModel/RimEclipseResultCase.h @@ -20,8 +20,12 @@ #pragma once +#include "RiaEclipseUnitTools.h" + #include "RimEclipseCase.h" +#include + class RifReaderInterface; class RigMainGrid; class RimFlowDiagSolution; @@ -85,6 +89,7 @@ private: // Fields: caf::PdmField caseFileName; + caf::PdmProxyValueField m_unitSystem; caf::PdmChildArrayField m_flowDiagSolutions; caf::PdmField m_sourSimFileName; diff --git a/ApplicationCode/ProjectDataModel/RimProject.cpp b/ApplicationCode/ProjectDataModel/RimProject.cpp index fbcb7d6972..54a90fef51 100644 --- a/ApplicationCode/ProjectDataModel/RimProject.cpp +++ b/ApplicationCode/ProjectDataModel/RimProject.cpp @@ -1017,7 +1017,7 @@ std::vector RimProject::allFractureTemplates() const //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -RiaEclipseUnitTools::UnitSystem RimProject::commonUnitSystemForAllCases() const +RiaEclipseUnitTools::UnitSystemType RimProject::commonUnitSystemForAllCases() const { std::vector rimCases; allCases(rimCases); diff --git a/ApplicationCode/ProjectDataModel/RimProject.h b/ApplicationCode/ProjectDataModel/RimProject.h index ea0337d374..dfa5ee0c0c 100644 --- a/ApplicationCode/ProjectDataModel/RimProject.h +++ b/ApplicationCode/ProjectDataModel/RimProject.h @@ -148,7 +148,7 @@ public: std::vector allFractureTemplateCollections() const; std::vector allFractureTemplates() const; - RiaEclipseUnitTools::UnitSystem commonUnitSystemForAllCases() const; + RiaEclipseUnitTools::UnitSystemType commonUnitSystemForAllCases() const; protected: // Overridden methods