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

#8115 3D View : Add checkbox for Cell Result

Browse Source
This commit is contained in:
Magne Sjaastad 2021-10-06 12:25:20 +02:00
parent 63ff8ec58b
commit 0e620c8408
2 changed files with 32 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
ApplicationLibCode/ProjectDataModel/RimEclipseResultDefinition.cpp
View File

@ -257,6 +257,14 @@ RimEclipseCase* RimEclipseResultDefinition::eclipseCase() const
return m_eclipseCase; return m_eclipseCase;
} }
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RiaDefines::ResultCatType RimEclipseResultDefinition::resultType() const
{
return m_resultType();
}
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
@ -878,6 +886,7 @@ QList<caf::PdmOptionItemInfo>
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
RigEclipseResultAddress RimEclipseResultDefinition::eclipseResultAddress() const RigEclipseResultAddress RimEclipseResultDefinition::eclipseResultAddress() const
{ {
if ( !isChecked() ) return RigEclipseResultAddress();
if ( isFlowDiagOrInjectionFlooding() ) return RigEclipseResultAddress(); if ( isFlowDiagOrInjectionFlooding() ) return RigEclipseResultAddress();
const RigCaseCellResultsData* gridCellResults = this->currentGridCellResults(); const RigCaseCellResultsData* gridCellResults = this->currentGridCellResults();
@ -1317,6 +1326,14 @@ void RimEclipseResultDefinition::setResultType( RiaDefines::ResultCatType val )
m_resultTypeUiField = val; m_resultTypeUiField = val;
} }
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RiaDefines::PorosityModelType RimEclipseResultDefinition::porosityModel() const
{
return m_porosityModel();
}
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
@ -1326,6 +1343,16 @@ void RimEclipseResultDefinition::setPorosityModel( RiaDefines::PorosityModelType
m_porosityModelUiField = val; m_porosityModelUiField = val;
} }
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
QString RimEclipseResultDefinition::resultVariable() const
{
if ( !isChecked() ) return RiaResultNames::undefinedResultName();
return m_resultVariable();
}
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------

9
ApplicationLibCode/ProjectDataModel/RimEclipseResultDefinition.h
View File

@ -24,6 +24,7 @@
#include "RiaPorosityModel.h" #include "RiaPorosityModel.h"
#include "RigFlowDiagResultAddress.h" #include "RigFlowDiagResultAddress.h"
#include "RimCheckableObject.h"
#include "RimFlowDiagSolution.h" #include "RimFlowDiagSolution.h"
#include "cafAppEnum.h" #include "cafAppEnum.h"
@ -48,7 +49,7 @@ class RimTernaryLegendConfig;
/// ///
/// ///
//================================================================================================== //==================================================================================================
class RimEclipseResultDefinition : public caf::PdmObject class RimEclipseResultDefinition : public RimCheckableObject
{ {
CAF_PDM_HEADER_INIT; CAF_PDM_HEADER_INIT;
@ -79,11 +80,11 @@ public:
void setEclipseCase( RimEclipseCase* eclipseCase ); void setEclipseCase( RimEclipseCase* eclipseCase );
RimEclipseCase* eclipseCase() const; RimEclipseCase* eclipseCase() const;
RiaDefines::ResultCatType resultType() const { return m_resultType(); } RiaDefines::ResultCatType resultType() const;
void setResultType( RiaDefines::ResultCatType val ); void setResultType( RiaDefines::ResultCatType val );
RiaDefines::PorosityModelType porosityModel() const { return m_porosityModel(); } RiaDefines::PorosityModelType porosityModel() const;
void setPorosityModel( RiaDefines::PorosityModelType val ); void setPorosityModel( RiaDefines::PorosityModelType val );
QString resultVariable() const { return m_resultVariable(); } QString resultVariable() const;
virtual void setResultVariable( const QString& val ); virtual void setResultVariable( const QString& val );
RiaDefines::PhaseType resultPhaseType() const; RiaDefines::PhaseType resultPhaseType() const;