Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions ApplicationLibCode/ProjectDataModel/RimSimWellInView.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -508,6 +508,8 @@ bool RimSimWellInView::isWellPipeVisible( size_t frameIndex ) const

if ( !showWellPipe() ) return false;

if ( reservoirView->wellCollection()->showOnlyActiveWells() && !simWellData()->isOpen( frameIndex ) ) return false;

if ( reservoirView->intersectionCollection()->hasActiveIntersectionForSimulationWell( this ) ) return true;

if ( reservoirView->wellCollection()->showWellsIntersectingVisibleCells() &&
Expand Down Expand Up @@ -548,6 +550,8 @@ bool RimSimWellInView::isWellSpheresVisible( size_t frameIndex ) const

if ( !showWellSpheres() ) return false;

if ( reservoirView->wellCollection()->showOnlyActiveWells() && !simWellData()->isOpen( frameIndex ) ) return false;

if ( reservoirView->intersectionCollection()->hasActiveIntersectionForSimulationWell( this ) ) return true;

if ( reservoirView->wellCollection()->showWellsIntersectingVisibleCells() && reservoirView->cellFilterCollection()->hasActiveFilters() )
Expand Down Expand Up @@ -586,6 +590,8 @@ bool RimSimWellInView::isWellValvesVisible( size_t frameIndex ) const
if ( !reservoirView->wellCollection()->isActive() ) return false;
if ( !reservoirView->wellCollection()->showValves() ) return false;

if ( reservoirView->wellCollection()->showOnlyActiveWells() && !simWellData()->isOpen( frameIndex ) ) return false;

if ( reservoirView->intersectionCollection()->hasActiveIntersectionForSimulationWell( this ) ) return true;

if ( reservoirView->wellCollection()->showWellsIntersectingVisibleCells() && reservoirView->cellFilterCollection()->hasActiveFilters() )
Expand Down Expand Up @@ -664,6 +670,8 @@ bool RimSimWellInView::isWellDiskVisible( size_t frameIndex ) const

if ( !showWellDisks() ) return false;

if ( reservoirView->wellCollection()->showOnlyActiveWells() && !simWellData()->isOpen( frameIndex ) ) return false;

if ( reservoirView->intersectionCollection()->hasActiveIntersectionForSimulationWell( this ) ) return true;

if ( reservoirView->wellCollection()->showWellsIntersectingVisibleCells() &&
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -144,6 +144,8 @@ RimSimWellInViewCollection::RimSimWellInViewCollection()
// CAF_PDM_InitField(&showWellsIntersectingVisibleCells, "ShowWellsIntersectingVisibleCells", false, "Hide Wells
// Missing Visible Cells");

CAF_PDM_InitField( &m_showOnlyActiveWells, "ShowOnlyActiveWells", false, "Active Wells Only" );

// Appearance
CAF_PDM_InitFieldNoDefault( &m_showWellHead, "ShowWellHeadTristate", "Well Head" );
CAF_PDM_InitFieldNoDefault( &m_showWellLabel, "ShowWellLabelTristate", "Label" );
Expand Down Expand Up @@ -404,7 +406,7 @@ void RimSimWellInViewCollection::fieldChangedByUi( const caf::PdmFieldHandle* ch
}

if ( &isActive == changedField || &m_showWellCells == changedField || &m_showWellCellFence == changedField ||
&wellCellFenceType == changedField || &showWellsIntersectingVisibleCells == changedField )
&wellCellFenceType == changedField || &showWellsIntersectingVisibleCells == changedField || &m_showOnlyActiveWells == changedField )
{
m_reservoirView->scheduleGeometryRegen( VISIBLE_WELL_CELLS );
m_reservoirView->scheduleCreateDisplayModelAndRedraw();
Expand Down Expand Up @@ -611,6 +613,7 @@ void RimSimWellInViewCollection::defineUiOrdering( QString uiConfigName, caf::Pd
if ( !isContourMap )
{
appearanceGroup->add( &showWellsIntersectingVisibleCells );
appearanceGroup->add( &m_showOnlyActiveWells );
}
appearanceGroup->add( &m_showWellLabel );
appearanceGroup->add( &m_showWellHead );
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -125,6 +125,7 @@ class RimSimWellInViewCollection : public caf::PdmObject
bool showWellCells();

bool showWellCommunicationLines() { return m_showWellCommunicationLines(); }
bool showOnlyActiveWells() const { return m_showOnlyActiveWells(); }

caf::PdmField<WellFenceEnum> wellCellFenceType;
caf::PdmField<double> wellCellTransparencyLevel;
Expand Down Expand Up @@ -199,6 +200,7 @@ class RimSimWellInViewCollection : public caf::PdmObject

caf::PdmField<bool> m_showWellValves;
caf::PdmField<bool> m_showWellCommunicationLines;
caf::PdmField<bool> m_showOnlyActiveWells;

// Well Discs
caf::PdmField<caf::AppEnum<WellDiskPropertyType>> m_wellDiskPropertyType;
Expand Down
Loading