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

#5019 2D Intersection views based on separate intersection results now respects the animation toolbar

Browse Source
This commit is contained in:
Jacob Støren 2019-11-25 13:02:35 +01:00
parent eed9f6abad
commit 4bafefa225
4 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ApplicationCode/ModelVisualization/Intersections/RivIntersectionBoxPartMgr.cpp
View File

@ -85,6 +85,7 @@ void RivIntersectionBoxPartMgr::applySingleColorEffect()
void RivIntersectionBoxPartMgr::updateCellResultColor( size_t timeStepIndex ) void RivIntersectionBoxPartMgr::updateCellResultColor( size_t timeStepIndex )
{ {
RivIntersectionResultsColoringTools::updateCellResultColorStatic( timeStepIndex, RivIntersectionResultsColoringTools::updateCellResultColorStatic( timeStepIndex,
true,
m_rimIntersectionBox, m_rimIntersectionBox,
m_intersectionBoxGenerator.p(), m_intersectionBoxGenerator.p(),
nullptr, nullptr,

1
ApplicationCode/ModelVisualization/Intersections/RivIntersectionPartMgr.cpp
View File

@ -154,6 +154,7 @@ void RivIntersectionPartMgr::updateCellResultColor( size_t
const RivTernaryScalarMapper* ternaryColorMapper ) const RivTernaryScalarMapper* ternaryColorMapper )
{ {
RivIntersectionResultsColoringTools::updateCellResultColorStatic( timeStepIndex, RivIntersectionResultsColoringTools::updateCellResultColorStatic( timeStepIndex,
!m_isFlattened,
m_rimCrossSection, m_rimCrossSection,
m_crossSectionGenerator.p(), m_crossSectionGenerator.p(),
scalarColorMapper, scalarColorMapper,

4
ApplicationCode/ModelVisualization/Intersections/RivIntersectionResultsColoringTools.cpp
View File

@ -50,6 +50,7 @@
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
void RivIntersectionResultsColoringTools::updateCellResultColorStatic( void RivIntersectionResultsColoringTools::updateCellResultColorStatic(
size_t timeStepIndex, size_t timeStepIndex,
bool useSeparateIntersectionResDefTimeStep,
RimIntersectionHandle* rimIntersectionHandle, RimIntersectionHandle* rimIntersectionHandle,
const RivIntersectionGeometryGeneratorIF* intersectionGeomGenIF, const RivIntersectionGeometryGeneratorIF* intersectionGeomGenIF,
const cvf::ScalarMapper* explicitScalarColorMapper, const cvf::ScalarMapper* explicitScalarColorMapper,
@ -87,8 +88,11 @@ void RivIntersectionResultsColoringTools::updateCellResultColorStatic(
if ( !scalarColorMapper ) scalarColorMapper = sepResDef->regularLegendConfig()->scalarMapper(); if ( !scalarColorMapper ) scalarColorMapper = sepResDef->regularLegendConfig()->scalarMapper();
if ( !ternaryColorMapper ) ternaryColorMapper = sepResDef->ternaryLegendConfig()->scalarMapper(); if ( !ternaryColorMapper ) ternaryColorMapper = sepResDef->ternaryLegendConfig()->scalarMapper();
if ( useSeparateIntersectionResDefTimeStep )
{
timeStepIndex = sepResDef->timeStep(); timeStepIndex = sepResDef->timeStep();
} }
}
// Ordinary result // Ordinary result

1
ApplicationCode/ModelVisualization/Intersections/RivIntersectionResultsColoringTools.h
View File

@ -44,6 +44,7 @@ class RivIntersectionResultsColoringTools
{ {
public: public:
static void updateCellResultColorStatic( size_t timeStepIndex, static void updateCellResultColorStatic( size_t timeStepIndex,
bool useSeparateIntersectionResDefTimeStep,
RimIntersectionHandle* rimIntersectionHandle, RimIntersectionHandle* rimIntersectionHandle,
const RivIntersectionGeometryGeneratorIF* intersectionGeomGenIF, const RivIntersectionGeometryGeneratorIF* intersectionGeomGenIF,
const cvf::ScalarMapper* explicitScalarColorMapper, const cvf::ScalarMapper* explicitScalarColorMapper,