#2436 Separated Hide grid cells mode as a separate value. Make sure that all the possible drawstyles works as expected, both for 2D intersection view and 3D views.

This commit is contained in:
Jacob Støren
2018-04-04 22:34:41 +02:00
parent 97c2ebd955
commit f7bfe8d003
14 changed files with 243 additions and 203 deletions

View File

@@ -528,14 +528,14 @@ void RivIntersectionPartMgr::generatePartGeometry()
part->setSourceInfo(si.p());
part->updateBoundingBox();
part->setEnableMask(faultBit);
part->setEnableMask(intersectionCellFaceBit);
part->setPriority(RivPartPriority::PartType::Intersection);
m_crossSectionFaces = part;
}
}
// Mesh geometry
// Cell Mesh geometry
{
cvf::ref<cvf::DrawableGeo> geoMesh = m_crossSectionGenerator->createMeshDrawable();
if (geoMesh.notNull())
@@ -550,14 +550,14 @@ void RivIntersectionPartMgr::generatePartGeometry()
part->setDrawable(geoMesh.p());
part->updateBoundingBox();
part->setEnableMask(meshFaultBit);
part->setEnableMask(intersectionCellMeshBit);
part->setPriority(RivPartPriority::PartType::MeshLines);
m_crossSectionGridLines = part;
}
}
// Mesh geometry
// Fault Mesh geometry
{
cvf::ref<cvf::DrawableGeo> geoMesh = m_crossSectionGenerator->createFaultMeshDrawable();
if (geoMesh.notNull())
@@ -572,7 +572,7 @@ void RivIntersectionPartMgr::generatePartGeometry()
part->setDrawable(geoMesh.p());
part->updateBoundingBox();
part->setEnableMask(meshFaultBit);
part->setEnableMask(intersectionFaultMeshBit);
part->setPriority(RivPartPriority::PartType::FaultMeshLines);
m_crossSectionFaultGridLines = part;