Method rename

This commit is contained in:
Jacob Støren
2019-11-26 10:35:45 +01:00
parent 5593fb198c
commit bf8ed71641
4 changed files with 25 additions and 25 deletions

View File

@@ -84,14 +84,14 @@ void RivIntersectionBoxPartMgr::applySingleColorEffect()
//--------------------------------------------------------------------------------------------------
void RivIntersectionBoxPartMgr::updateCellResultColor( size_t timeStepIndex )
{
RivIntersectionResultsColoringTools::updateCellResultColorStatic( timeStepIndex,
true,
m_rimIntersectionBox,
m_intersectionBoxGenerator.p(),
nullptr,
nullptr,
m_intersectionBoxFaces.p(),
m_intersectionBoxFacesTextureCoords.p() );
RivIntersectionResultsColoringTools::calculateIntersectionResultColors( timeStepIndex,
true,
m_rimIntersectionBox,
m_intersectionBoxGenerator.p(),
nullptr,
nullptr,
m_intersectionBoxFaces.p(),
m_intersectionBoxFacesTextureCoords.p() );
}
//--------------------------------------------------------------------------------------------------

View File

@@ -153,14 +153,14 @@ void RivIntersectionPartMgr::updateCellResultColor( size_t
const cvf::ScalarMapper* explicitScalarColorMapper,
const RivTernaryScalarMapper* explicitTernaryColorMapper )
{
RivIntersectionResultsColoringTools::updateCellResultColorStatic( timeStepIndex,
!m_isFlattened,
m_rimCrossSection,
m_crossSectionGenerator.p(),
explicitScalarColorMapper,
explicitTernaryColorMapper,
m_crossSectionFaces.p(),
m_crossSectionFacesTextureCoords.p() );
RivIntersectionResultsColoringTools::calculateIntersectionResultColors( timeStepIndex,
!m_isFlattened,
m_rimCrossSection,
m_crossSectionGenerator.p(),
explicitScalarColorMapper,
explicitTernaryColorMapper,
m_crossSectionFaces.p(),
m_crossSectionFacesTextureCoords.p() );
}
//--------------------------------------------------------------------------------------------------

View File

@@ -48,7 +48,7 @@
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RivIntersectionResultsColoringTools::updateCellResultColorStatic(
void RivIntersectionResultsColoringTools::calculateIntersectionResultColors(
size_t timeStepIndex,
bool useSeparateIntersectionResDefTimeStep,
RimIntersectionHandle* rimIntersectionHandle,

View File

@@ -43,14 +43,14 @@ class ScalarMapper;
class RivIntersectionResultsColoringTools
{
public:
static void updateCellResultColorStatic( size_t timeStepIndex,
bool useSeparateIntersectionResDefTimeStep,
RimIntersectionHandle* rimIntersectionHandle,
const RivIntersectionGeometryGeneratorIF* intersectionGeomGenIF,
const cvf::ScalarMapper* explicitScalarColorMapper,
const RivTernaryScalarMapper* explicitTernaryColorMapper,
cvf::Part* intersectionFacesPart,
cvf::Vec2fArray* intersectionFacesTextureCoords );
static void calculateIntersectionResultColors( size_t timeStepIndex,
bool useSeparateIntersectionResDefTimeStep,
RimIntersectionHandle* rimIntersectionHandle,
const RivIntersectionGeometryGeneratorIF* intersectionGeomGenIF,
const cvf::ScalarMapper* explicitScalarColorMapper,
const RivTernaryScalarMapper* explicitTernaryColorMapper,
cvf::Part* intersectionFacesPart,
cvf::Vec2fArray* intersectionFacesTextureCoords );
private:
static void updateEclipseCellResultColors( const RimEclipseResultDefinition* eclipseResDef,