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

#1755 Move porosity model enum to separate file

Browse Source
This commit is contained in:
Magne Sjaastad
2017-08-11 10:25:33 +02:00
parent 56afc497b3
commit c4aa625d33
52 changed files with 334 additions and 285 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
ApplicationCode/ProjectDataModel/RimEclipseResultDefinition.h
View File

@@ -21,6 +21,7 @@
#pragma once
#include "RiaDefines.h"
#include "RiaPorosityModel.h"
#include "RigFlowDiagResultAddress.h"
@@ -65,8 +66,8 @@ public:
RiaDefines::ResultCatType resultType() const { return m_resultType(); }
void setResultType(RiaDefines::ResultCatType val);
RiaDefines::PorosityModelType porosityModel() const { return m_porosityModel(); }
void setPorosityModel(RiaDefines::PorosityModelType val);
RiaPorosityModel::PorosityModelType porosityModel() const { return m_porosityModel(); }
void setPorosityModel(RiaPorosityModel::PorosityModelType val);
QString resultVariable() const { return m_resultVariable(); }
virtual void setResultVariable(const QString& val);
@@ -107,7 +108,7 @@ protected:
protected:
caf::PdmField< caf::AppEnum< RiaDefines::ResultCatType > > m_resultType;
caf::PdmField< caf::AppEnum< RiaDefines::PorosityModelType > > m_porosityModel;
caf::PdmField< caf::AppEnum< RiaPorosityModel::PorosityModelType > > m_porosityModel;
caf::PdmField<QString> m_resultVariable;
caf::PdmPtrField<RimFlowDiagSolution*> m_flowSolution;
@@ -120,7 +121,7 @@ protected:
// User interface only fields, to support "filtering"-like behaviour etc.
caf::PdmField< caf::AppEnum< RiaDefines::ResultCatType > > m_resultTypeUiField;
caf::PdmField< caf::AppEnum< RiaDefines::PorosityModelType > > m_porosityModelUiField;
caf::PdmField< caf::AppEnum< RiaPorosityModel::PorosityModelType > > m_porosityModelUiField;
caf::PdmField<QString> m_resultVariableUiField;
caf::PdmField< caf::AppEnum< FlowTracerSelectionType > > m_flowTracerSelectionMode;