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 Fix wrong use of explicit scalar mappers for intersections

Browse Source 
Only 2d intersection view is supposed to use them
This commit is contained in:
Jacob Støren
2019-11-25 15:33:42 +01:00
parent baedf02ba9
commit 7aec88de3c
7 changed files with 12 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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

5
ApplicationCode/ModelVisualization/Intersections/RivIntersectionPartMgr.h
View File

@@ -68,8 +68,8 @@ public:
void applySingleColorEffect();
void updateCellResultColor( size_t timeStepIndex,
const cvf::ScalarMapper* scalarColorMapper,
const RivTernaryScalarMapper* ternaryColorMapper );
const cvf::ScalarMapper* explicitScalarColorMapper,
const RivTernaryScalarMapper* explicitTernaryColorMapper );
void appendNativeCrossSectionFacesToModel( cvf::ModelBasicList* model, cvf::Transform* scaleTransform );
void appendMeshLinePartsToModel( cvf::ModelBasicList* model, cvf::Transform* scaleTransform );
@@ -113,4 +113,3 @@ private:
bool m_isFlattened;
};