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

#254 Show fault colors in combination with cell edge colors

Browse Source
This commit is contained in:
Magne Sjaastad
2016-08-01 17:16:55 +02:00
parent 6749d2ed37
commit 5090eddf44
3 changed files with 23 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
ApplicationCode/ModelVisualization/RivCellEdgeGeometryUtils.cpp
View File

@@ -51,6 +51,7 @@ void RivCellEdgeGeometryUtils::addCellEdgeResultsToDrawableGeo(
const cvf::StructGridQuadToCellFaceMapper* quadToCellFaceMapper, const cvf::StructGridQuadToCellFaceMapper* quadToCellFaceMapper,
cvf::DrawableGeo* geo, cvf::DrawableGeo* geo,
size_t gridIndex, size_t gridIndex,
bool useDefaultValueForHugeVals,
float opacityLevel) float opacityLevel)
{ {
RigCaseData* eclipseCase = cellResultColors->reservoirView()->eclipseCase()->reservoirData(); RigCaseData* eclipseCase = cellResultColors->reservoirView()->eclipseCase()->reservoirData();
@@ -117,9 +118,13 @@ void RivCellEdgeGeometryUtils::addCellEdgeResultsToDrawableGeo(
{ {
float cellColorTextureCoord = 0.5f; // If no results exists, the texture will have a special color float cellColorTextureCoord = 0.5f; // If no results exists, the texture will have a special color
if (useDefaultValueForHugeVals || scalarValue != HUGE_VAL)
{
if (scalarValue != HUGE_VAL) if (scalarValue != HUGE_VAL)
{ {
cellColorTextureCoord = cellResultScalarMapper->mapToTextureCoord(scalarValue)[0]; cellColorTextureCoord = cellResultScalarMapper->mapToTextureCoord(scalarValue)[0];
}
// If we are dealing with wellcells, the default is transparent. // If we are dealing with wellcells, the default is transparent.
// we need to make cells opaque if there are no wellpipe through them. // we need to make cells opaque if there are no wellpipe through them.
if (opacityLevel < 1.0f) if (opacityLevel < 1.0f)

1
ApplicationCode/ModelVisualization/RivCellEdgeGeometryUtils.h
View File

@@ -44,6 +44,7 @@ public:
const cvf::StructGridQuadToCellFaceMapper* quadToCellFaceMapper, const cvf::StructGridQuadToCellFaceMapper* quadToCellFaceMapper,
cvf::DrawableGeo* geo, cvf::DrawableGeo* geo,
size_t gridIndex, size_t gridIndex,
bool useDefaultValueForHugeVals,
float opacityLevel); float opacityLevel);
static void addTernaryCellEdgeResultsToDrawableGeo(size_t timeStepIndex, static void addTernaryCellEdgeResultsToDrawableGeo(size_t timeStepIndex,

15
ApplicationCode/ModelVisualization/RivScalarMapperUtils.cpp
View File

@@ -90,12 +90,23 @@ cvf::ref<cvf::Effect> RivScalarMapperUtils::createCellEdgeEffect(cvf::DrawableGe
} }
else else
{ {
RivCellEdgeGeometryUtils::addCellEdgeResultsToDrawableGeo(timeStepIndex, cellResultColors, cellEdgeResultColors, bool useDefaultValueForHugeVals = false;
quadToCellFaceMapper, dg, gridIndex, opacityLevel); if (!cellResultColors->hasResult())
{
useDefaultValueForHugeVals = true;
}
RivCellEdgeGeometryUtils::addCellEdgeResultsToDrawableGeo(timeStepIndex, cellResultColors, cellEdgeResultColors,
quadToCellFaceMapper, dg, gridIndex, useDefaultValueForHugeVals, opacityLevel);
if (cellResultColors->hasResult())
{
// If no scalar mapper is set for the effect, a default color is used to fill the texture
// This is what we want when the fault colors should be visible in combination with cell edge
cvf::ScalarMapper* cellScalarMapper = cellResultColors->legendConfig()->scalarMapper(); cvf::ScalarMapper* cellScalarMapper = cellResultColors->legendConfig()->scalarMapper();
cellFaceEffectGen.setScalarMapper(cellScalarMapper); cellFaceEffectGen.setScalarMapper(cellScalarMapper);
} }
}
cellFaceEffectGen.setOpacityLevel(opacityLevel); cellFaceEffectGen.setOpacityLevel(opacityLevel);
cellFaceEffectGen.setDefaultCellColor(defaultColor); cellFaceEffectGen.setDefaultCellColor(defaultColor);