Improve const-ness somewhat on some results color related methods

This commit is contained in:
Jacob Støren 2019-11-20 10:28:35 +01:00
parent 6e96570995
commit c79de08c40
8 changed files with 23 additions and 23 deletions

View File

@ -39,8 +39,8 @@
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RivTernaryTextureCoordsCreator::RivTernaryTextureCoordsCreator( RimEclipseResultDefinition* cellResultColors,
RimTernaryLegendConfig* ternaryLegendConfig,
RivTernaryTextureCoordsCreator::RivTernaryTextureCoordsCreator( const RimEclipseResultDefinition* cellResultColors,
RimTernaryLegendConfig* ternaryLegendConfig,
RimSimWellInViewCollection* simWellInViewCollection,
size_t timeStepIndex,
size_t gridIndex,
@ -92,9 +92,9 @@ RivTernaryTextureCoordsCreator::RivTernaryTextureCoordsCreator( RimEclipseResult
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RivTernaryTextureCoordsCreator::RivTernaryTextureCoordsCreator( RimEclipseResultDefinition* cellResultColors,
const RivTernaryScalarMapper* ternaryColorMapper,
size_t timeStepIndex )
RivTernaryTextureCoordsCreator::RivTernaryTextureCoordsCreator( const RimEclipseResultDefinition* cellResultColors,
const RivTernaryScalarMapper* ternaryColorMapper,
size_t timeStepIndex )
: m_quadMapper( nullptr )
{
RigEclipseCaseData* eclipseCase = cellResultColors->eclipseCase()->eclipseCaseData();

View File

@ -40,16 +40,16 @@ class StructGridQuadToCellFaceMapper;
class RivTernaryTextureCoordsCreator
{
public:
RivTernaryTextureCoordsCreator( RimEclipseResultDefinition* cellResultColors,
RivTernaryTextureCoordsCreator( const RimEclipseResultDefinition* cellResultColors,
RimTernaryLegendConfig* ternaryLegendConfig,
RimSimWellInViewCollection* simWellInViewCollection,
size_t timeStepIndex,
size_t gridIndex,
const cvf::StructGridQuadToCellFaceMapper* quadMapper );
RivTernaryTextureCoordsCreator( RimEclipseResultDefinition* cellResultColors,
const RivTernaryScalarMapper* ternaryColorMapper,
size_t timeStepIndex );
RivTernaryTextureCoordsCreator( const RimEclipseResultDefinition* cellResultColors,
const RivTernaryScalarMapper* ternaryColorMapper,
size_t timeStepIndex );
void createTextureCoords( cvf::Vec2fArray* quadTextureCoords );
void createTextureCoords( cvf::Vec2fArray* triTextureCoords, const std::vector<size_t>& triangleToCellIdx );

View File

@ -225,7 +225,7 @@ void RimEclipseResultDefinition::setEclipseCase( RimEclipseCase* eclipseCase )
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RimEclipseCase* RimEclipseResultDefinition::eclipseCase()
RimEclipseCase* RimEclipseResultDefinition::eclipseCase() const
{
return m_eclipseCase;
}
@ -1230,7 +1230,7 @@ void RimEclipseResultDefinition::setResultVariable( const QString& val )
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RimFlowDiagSolution* RimEclipseResultDefinition::flowDiagSolution()
RimFlowDiagSolution* RimEclipseResultDefinition::flowDiagSolution() const
{
return m_flowSolution();
}

View File

@ -75,7 +75,7 @@ public:
void simpleCopy( const RimEclipseResultDefinition* other );
void setEclipseCase( RimEclipseCase* eclipseCase );
RimEclipseCase* eclipseCase();
RimEclipseCase* eclipseCase() const;
RiaDefines::ResultCatType resultType() const
{
@ -94,7 +94,7 @@ public:
virtual void setResultVariable( const QString& val );
void setFlowSolution( RimFlowDiagSolution* flowSol );
RimFlowDiagSolution* flowDiagSolution();
RimFlowDiagSolution* flowDiagSolution() const;
RigFlowDiagResultAddress flowDiagResAddress() const;
void setFlowDiagTracerSelectionType( FlowTracerSelectionType selectionType );

View File

@ -576,7 +576,7 @@ QString RimGeoMechResultDefinition::diffResultUiShortName() const
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RigGeoMechCaseData* RimGeoMechResultDefinition::ownerCaseData()
RigGeoMechCaseData* RimGeoMechResultDefinition::ownerCaseData() const
{
return m_geomCase->geoMechData();
}

View File

@ -47,7 +47,7 @@ public:
void setGeoMechCase( RimGeoMechCase* geomCase );
RigGeoMechCaseData* ownerCaseData();
RigGeoMechCaseData* ownerCaseData() const;
bool hasResult();
void loadResult();
void setAddWellPathDerivedResults( bool addWellPathDerivedResults );

View File

@ -40,10 +40,10 @@
///
//--------------------------------------------------------------------------------------------------
cvf::ref<RigResultAccessor>
RigResultAccessorFactory::createFromResultDefinition( const RigEclipseCaseData* eclipseCase,
size_t gridIndex,
size_t timeStepIndex,
RimEclipseResultDefinition* resultDefinition )
RigResultAccessorFactory::createFromResultDefinition( const RigEclipseCaseData* eclipseCase,
size_t gridIndex,
size_t timeStepIndex,
const RimEclipseResultDefinition* resultDefinition )
{
if ( resultDefinition->isFlowDiagOrInjectionFlooding() )
{

View File

@ -33,10 +33,10 @@ class RigEclipseResultAddress;
class RigResultAccessorFactory
{
public:
static cvf::ref<RigResultAccessor> createFromResultDefinition( const RigEclipseCaseData* eclipseCase,
size_t gridIndex,
size_t timeStepIndex,
RimEclipseResultDefinition* resultDefinition );
static cvf::ref<RigResultAccessor> createFromResultDefinition( const RigEclipseCaseData* eclipseCase,
size_t gridIndex,
size_t timeStepIndex,
const RimEclipseResultDefinition* resultDefinition );
static cvf::ref<RigResultAccessor> createFromResultAddress( const RigEclipseCaseData* eclipseCase,
size_t gridIndex,