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

Display unit system in property editor for case

Browse Source
This commit is contained in:
Bjørn Erik Jensen 2018-10-09 12:23:44 +02:00
parent a2dcf4609e
commit 1aa969f036
4 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ApplicationCode/ProjectDataModel/RimEclipseResultCase.cpp
View File

@ -56,7 +56,6 @@
#include <fstream> #include <fstream>
CAF_PDM_SOURCE_INIT(RimEclipseResultCase, "EclipseCase"); CAF_PDM_SOURCE_INIT(RimEclipseResultCase, "EclipseCase");
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
@ -69,6 +68,10 @@ RimEclipseResultCase::RimEclipseResultCase()
CAF_PDM_InitField(&caseFileName, "CaseFileName", QString(), "Case File Name", "", "" ,""); CAF_PDM_InitField(&caseFileName, "CaseFileName", QString(), "Case File Name", "", "" ,"");
caseFileName.uiCapability()->setUiReadOnly(true); 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", "", "", ""); CAF_PDM_InitFieldNoDefault (&m_flowDiagSolutions, "FlowDiagSolutions", "Flow Diagnostics Solutions", "", "", "");
m_flowDiagSolutions.uiCapability()->setUiHidden(true); m_flowDiagSolutions.uiCapability()->setUiHidden(true);
m_flowDiagSolutions.uiCapability()->setUiTreeHidden(true); m_flowDiagSolutions.uiCapability()->setUiTreeHidden(true);
@ -586,6 +589,7 @@ void RimEclipseResultCase::defineUiOrdering(QString uiConfigName, caf::PdmUiOrde
uiOrdering.add(&caseUserDescription); uiOrdering.add(&caseUserDescription);
uiOrdering.add(&caseId); uiOrdering.add(&caseId);
uiOrdering.add(&caseFileName); uiOrdering.add(&caseFileName);
uiOrdering.add(&m_unitSystem);
auto group = uiOrdering.addNewGroup("Case Options"); auto group = uiOrdering.addNewGroup("Case Options");
group->add(&activeFormationNames); group->add(&activeFormationNames);

5
ApplicationCode/ProjectDataModel/RimEclipseResultCase.h
View File

@ -20,8 +20,12 @@
#pragma once #pragma once
#include "RiaEclipseUnitTools.h"
#include "RimEclipseCase.h" #include "RimEclipseCase.h"
#include <cafPdmProxyValueField.h>
class RifReaderInterface; class RifReaderInterface;
class RigMainGrid; class RigMainGrid;
class RimFlowDiagSolution; class RimFlowDiagSolution;
@ -85,6 +89,7 @@ private:
// Fields: // Fields:
caf::PdmField<QString> caseFileName; caf::PdmField<QString> caseFileName;
caf::PdmProxyValueField<RiaEclipseUnitTools::UnitSystemType> m_unitSystem;
caf::PdmChildArrayField<RimFlowDiagSolution*> m_flowDiagSolutions; caf::PdmChildArrayField<RimFlowDiagSolution*> m_flowDiagSolutions;
caf::PdmField<QString> m_sourSimFileName; caf::PdmField<QString> m_sourSimFileName;

2
ApplicationCode/ProjectDataModel/RimProject.cpp
View File

@ -1017,7 +1017,7 @@ std::vector<RimFractureTemplate*> RimProject::allFractureTemplates() const
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
RiaEclipseUnitTools::UnitSystem RimProject::commonUnitSystemForAllCases() const RiaEclipseUnitTools::UnitSystemType RimProject::commonUnitSystemForAllCases() const
{ {
std::vector<RimCase*> rimCases; std::vector<RimCase*> rimCases;
allCases(rimCases); allCases(rimCases);

2
ApplicationCode/ProjectDataModel/RimProject.h
View File

@ -148,7 +148,7 @@ public:
std::vector<RimFractureTemplateCollection*> allFractureTemplateCollections() const; std::vector<RimFractureTemplateCollection*> allFractureTemplateCollections() const;
std::vector<RimFractureTemplate*> allFractureTemplates() const; std::vector<RimFractureTemplate*> allFractureTemplates() const;
RiaEclipseUnitTools::UnitSystem commonUnitSystemForAllCases() const; RiaEclipseUnitTools::UnitSystemType commonUnitSystemForAllCases() const;
protected: protected:
// Overridden methods // Overridden methods