#1025 Only showing cell center sphere if well is visible

This commit is contained in:
astridkbjorke 2016-12-08 09:03:09 +01:00
parent 374b44060d
commit 916ab51df4
2 changed files with 9 additions and 1 deletions

View File

@ -64,9 +64,12 @@ void RivReservoirWellSpheresPartMgr::appendDynamicGeometryPartsToModel(cvf::Mode
{ {
if (!m_reservoirView->wellCollection()->showCellCenterSpheres) return; if (!m_reservoirView->wellCollection()->showCellCenterSpheres) return;
if (m_reservoirView->wellCollection()->wellPipeVisibility() == RimEclipseWellCollection::PIPES_FORCE_ALL_OFF) return;
if (!m_reservoirView->wellCollection()->isActive()) return;
if (m_reservoirView->wellCollection()->wells.size() != m_wellSpheresPartMgrs.size()) if (m_reservoirView->wellCollection()->wells.size() != m_wellSpheresPartMgrs.size())
{ {
for (RimEclipseWell* rimWell : m_reservoirView->wellCollection()->wells()) for (RimEclipseWell* rimWell : m_reservoirView->wellCollection()->wells())
{ {
RivWellSpheresPartMgr* wppmgr = new RivWellSpheresPartMgr(m_reservoirView, rimWell); RivWellSpheresPartMgr* wppmgr = new RivWellSpheresPartMgr(m_reservoirView, rimWell);
@ -76,8 +79,11 @@ void RivReservoirWellSpheresPartMgr::appendDynamicGeometryPartsToModel(cvf::Mode
} }
for (size_t i = 0; i < m_wellSpheresPartMgrs.size(); i++) for (size_t i = 0; i < m_wellSpheresPartMgrs.size(); i++)
{
if (m_reservoirView->wellCollection()->wells[i]->showWell())
{ {
m_wellSpheresPartMgrs.at(i)->appendDynamicGeometryPartsToModel(model, frameIndex); m_wellSpheresPartMgrs.at(i)->appendDynamicGeometryPartsToModel(model, frameIndex);
} }
}
} }

View File

@ -295,6 +295,8 @@ void RimEclipseWellCollection::defineUiOrdering(QString uiConfigName, caf::PdmUi
wellPipe->add(&wellPipeVisibility); wellPipe->add(&wellPipeVisibility);
wellPipe->add(&pipeRadiusScaleFactor); wellPipe->add(&pipeRadiusScaleFactor);
//TODO: Add Well sphere group
caf::PdmUiGroup* advancedGroup = uiOrdering.addNewGroup("Advanced"); caf::PdmUiGroup* advancedGroup = uiOrdering.addNewGroup("Advanced");
advancedGroup->add(&wellCellTransparencyLevel); advancedGroup->add(&wellCellTransparencyLevel);
advancedGroup->add(&isAutoDetectingBranches); advancedGroup->add(&isAutoDetectingBranches);