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

Mesh/Surface style is now made independent so it is possible to show the mesh lines without the surface geometry.

Browse Source 
A new mesh style "Faults only" is also added making it possible to show the mesh lines on the faults only
p4#: 19289
This commit is contained in:
Jacob Støren 2012-10-24 11:23:40 +02:00
parent 54dc3a5d37
commit 6a4f15368c
2 changed files with 14 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
ApplicationCode/ProjectDataModel/RimReservoirView.cpp
View File

@ -49,8 +49,9 @@ namespace caf {
template<> template<>
void caf::AppEnum< RimReservoirView::MeshModeType >::setUp() void caf::AppEnum< RimReservoirView::MeshModeType >::setUp()
{ {
addItem(RimReservoirView::FULL_MESH, "FULL_MESH", "All"); addItem(RimReservoirView::FULL_MESH, "FULL_MESH", "All");
addItem(RimReservoirView::NO_MESH, "NO_MESH", "None"); addItem(RimReservoirView::FAULTS_MESH, "FAULTS_MESH", "Faults only");
addItem(RimReservoirView::NO_MESH, "NO_MESH", "None");
setDefault(RimReservoirView::FULL_MESH); setDefault(RimReservoirView::FULL_MESH);
} }
@ -58,7 +59,7 @@ template<>
void caf::AppEnum< RimReservoirView::SurfaceModeType >::setUp() void caf::AppEnum< RimReservoirView::SurfaceModeType >::setUp()
{ {
addItem(RimReservoirView::SURFACE, "SURFACE", "All"); addItem(RimReservoirView::SURFACE, "SURFACE", "All");
addItem(RimReservoirView::FAULTS, "FAULTS", "Faults"); addItem(RimReservoirView::FAULTS, "FAULTS", "Faults only");
addItem(RimReservoirView::NO_SURFACE, "NO_SURFACE", "None"); addItem(RimReservoirView::NO_SURFACE, "NO_SURFACE", "None");
setDefault(RimReservoirView::SURFACE); setDefault(RimReservoirView::SURFACE);
} }
@ -881,35 +882,27 @@ void RimReservoirView::appendCellResultInfo(size_t gridIndex, size_t cellIndex,
void RimReservoirView::updateDisplayModelVisibility() void RimReservoirView::updateDisplayModelVisibility()
{ {
if (m_viewer.isNull()) return; if (m_viewer.isNull()) return;
bool surfaceVisible = false; unsigned int mask = 0;
bool faultVisible = false;
if (surfaceMode == SURFACE) if (surfaceMode == SURFACE)
{ {
surfaceVisible = true; mask |= surfaceBit;
faultVisible = true; mask |= faultBit;
} }
else if (surfaceMode == FAULTS) else if (surfaceMode == FAULTS)
{ {
faultVisible = true; mask |= faultBit;
} }
unsigned int mask = 0;
if (meshMode == FULL_MESH) if (meshMode == FULL_MESH)
{ {
if (surfaceVisible) mask |= meshSurfaceBit; mask |= meshSurfaceBit;
if (faultVisible) mask |= meshFaultBit; mask |= meshFaultBit;
} }
else if (meshMode == FAULTS_MESH)
if (surfaceVisible)
{ {
mask |= surfaceBit; mask |= meshFaultBit;
}
if (faultVisible)
{
mask |= faultBit;
} }
m_viewer->setEnableMask(mask); m_viewer->setEnableMask(mask);

1
ApplicationCode/ProjectDataModel/RimReservoirView.h
View File

@ -73,6 +73,7 @@ public:
enum MeshModeType enum MeshModeType
{ {
FULL_MESH, FULL_MESH,
FAULTS_MESH,
NO_MESH NO_MESH
}; };