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

Rename crossSection to intersection in general code

Browse Source
This commit is contained in:
Jacob Støren
2019-11-26 12:30:44 +01:00
parent 54c96581f1
commit 0e14c63f07
43 changed files with 165 additions and 165 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ApplicationCode/ProjectDataModel/Rim2dIntersectionView.cpp
View File

@@ -544,7 +544,7 @@ void Rim2dIntersectionView::onCreateDisplayModel()
m_intersectionVizModel->removeAllParts();
m_flatIntersectionPartMgr->appendNativeCrossSectionFacesToModel( m_intersectionVizModel.p(), scaleTransform() );
m_flatIntersectionPartMgr->appendNativeIntersectionFacesToModel( m_intersectionVizModel.p(), scaleTransform() );
m_flatIntersectionPartMgr->appendMeshLinePartsToModel( m_intersectionVizModel.p(), scaleTransform() );
m_flatIntersectionPartMgr->appendPolylinePartsToModel( *this, m_intersectionVizModel.p(), scaleTransform() );

4
ApplicationCode/ProjectDataModel/Rim3dView.cpp
View File

@@ -138,8 +138,8 @@ Rim3dView::Rim3dView( void )
CAF_PDM_InitFieldNoDefault( &m_comparisonView, "ComparisonView", "Comparison View", "", "", "" );
m_crossSectionVizModel = new cvf::ModelBasicList;
m_crossSectionVizModel->setName( "CrossSectionModel" );
m_intersectionVizModel = new cvf::ModelBasicList;
m_intersectionVizModel->setName( "CrossSectionModel" );
m_highlightVizModel = new cvf::ModelBasicList;
m_highlightVizModel->setName( "HighlightModel" );

2
ApplicationCode/ProjectDataModel/Rim3dView.h
View File

@@ -248,7 +248,7 @@ protected:
// 3D display model data
cvf::ref<cvf::ModelBasicList> m_wellPathPipeVizModel;
cvf::ref<cvf::ModelBasicList> m_crossSectionVizModel;
cvf::ref<cvf::ModelBasicList> m_intersectionVizModel;
cvf::ref<RivWellPathsPartMgr> m_wellPathsPartManager;
private:

2
ApplicationCode/ProjectDataModel/RimEclipseCase.cpp
View File

@@ -523,7 +523,7 @@ void RimEclipseCase::updateFormationNamesData()
view->scheduleGeometryRegen( PROPERTY_FILTERED );
view->scheduleCreateDisplayModelAndRedraw();
eclView->crossSectionCollection()->scheduleCreateDisplayModelAndRedraw2dIntersectionViews();
eclView->intersectionCollection()->scheduleCreateDisplayModelAndRedraw2dIntersectionViews();
}
}
}

4
ApplicationCode/ProjectDataModel/RimEclipseResultDefinition.cpp
View File

@@ -554,7 +554,7 @@ void RimEclipseResultDefinition::loadDataAndUpdate()
viewLinker->updateCellResult();
}
RimGridView* eclView = dynamic_cast<RimGridView*>( view );
if ( eclView ) eclView->crossSectionCollection()->scheduleCreateDisplayModelAndRedraw2dIntersectionViews();
if ( eclView ) eclView->intersectionCollection()->scheduleCreateDisplayModelAndRedraw2dIntersectionViews();
}
}
@@ -564,7 +564,7 @@ void RimEclipseResultDefinition::loadDataAndUpdate()
{
if ( view ) view->scheduleCreateDisplayModelAndRedraw();
RimGridView* gridView = dynamic_cast<RimGridView*>( view );
if ( gridView ) gridView->crossSectionCollection()->scheduleCreateDisplayModelAndRedraw2dIntersectionViews();
if ( gridView ) gridView->intersectionCollection()->scheduleCreateDisplayModelAndRedraw2dIntersectionViews();
}
RimCellEdgeColors* cellEdgeColors = nullptr;

2
ApplicationCode/ProjectDataModel/RimEclipseStatisticsCase.cpp
View File

@@ -742,7 +742,7 @@ void RimEclipseStatisticsCase::updateConnectedEditorsAndReservoirViews()
// (from Octave) a full display model rebuild is required
reservoirViews[i]->hasUserRequestedAnimation = true;
reservoirViews[i]->scheduleCreateDisplayModelAndRedraw();
reservoirViews[i]->crossSectionCollection()->scheduleCreateDisplayModelAndRedraw2dIntersectionViews();
reservoirViews[i]->intersectionCollection()->scheduleCreateDisplayModelAndRedraw2dIntersectionViews();
}
}

18
ApplicationCode/ProjectDataModel/RimEclipseView.cpp
View File

@@ -529,12 +529,12 @@ void RimEclipseView::onCreateDisplayModel()
// Cross sections
m_crossSectionVizModel->removeAllParts();
m_crossSectionCollection->rebuildGeometry();
m_crossSectionCollection->appendPartsToModel( *this,
m_crossSectionVizModel.p(),
m_intersectionVizModel->removeAllParts();
m_intersectionCollection->rebuildGeometry();
m_intersectionCollection->appendPartsToModel( *this,
m_intersectionVizModel.p(),
m_reservoirGridPartManager->scaleTransform() );
nativeOrOverrideViewer()->addStaticModelOnce( m_crossSectionVizModel.p(), isUsingOverrideViewer() );
nativeOrOverrideViewer()->addStaticModelOnce( m_intersectionVizModel.p(), isUsingOverrideViewer() );
// Well path model
@@ -794,11 +794,11 @@ void RimEclipseView::updateVisibleGeometriesAndCellColors()
if ( ( this->hasUserRequestedAnimation() && this->cellResult()->hasResult() ) ||
this->cellResult()->isTernarySaturationSelected() )
{
m_crossSectionCollection->updateCellResultColor( m_currentTimeStep );
m_intersectionCollection->updateCellResultColor( m_currentTimeStep );
}
else
{
m_crossSectionCollection->applySingleColorEffect();
m_intersectionCollection->applySingleColorEffect();
}
}
@@ -1633,7 +1633,7 @@ void RimEclipseView::calculateCompletionTypeAndRedrawIfRequired()
{
this->loadDataAndUpdate();
std::vector<RimExtrudedCurveIntersection*> intersections = m_crossSectionCollection->intersections();
std::vector<RimExtrudedCurveIntersection*> intersections = m_intersectionCollection->intersections();
for ( auto intersection : intersections )
{
if ( intersection && intersection->correspondingIntersectionView() )
@@ -1741,7 +1741,7 @@ void RimEclipseView::defineUiTreeOrdering( caf::PdmUiTreeOrdering& uiTreeOrderin
uiTreeOrdering.add( faultCollection() );
uiTreeOrdering.add( annotationCollection() );
uiTreeOrdering.add( crossSectionCollection() );
uiTreeOrdering.add( intersectionCollection() );
uiTreeOrdering.add( m_rangeFilterCollection() );
uiTreeOrdering.add( m_propertyFilterCollection() );

2
ApplicationCode/ProjectDataModel/RimFaultInView.cpp
View File

@@ -76,7 +76,7 @@ void RimFaultInView::fieldChangedByUi( const caf::PdmFieldHandle* changedField,
if ( reservoirView )
{
reservoirView->scheduleCreateDisplayModelAndRedraw();
reservoirView->crossSectionCollection()->scheduleCreateDisplayModelAndRedraw2dIntersectionViews();
reservoirView->intersectionCollection()->scheduleCreateDisplayModelAndRedraw2dIntersectionViews();
}
}
}

4
ApplicationCode/ProjectDataModel/RimFaultInViewCollection.cpp
View File

@@ -130,7 +130,7 @@ void RimFaultInViewCollection::fieldChangedByUi( const caf::PdmFieldHandle* chan
if ( &faultLabelColor == changedField )
{
parentView()->scheduleReservoirGridGeometryRegen();
parentView()->crossSectionCollection()->scheduleCreateDisplayModelAndRedraw2dIntersectionViews();
parentView()->intersectionCollection()->scheduleCreateDisplayModelAndRedraw2dIntersectionViews();
}
if ( &showFaultFaces == changedField || &showOppositeFaultFaces == changedField ||
@@ -139,7 +139,7 @@ void RimFaultInViewCollection::fieldChangedByUi( const caf::PdmFieldHandle* chan
&faultResult == changedField || &showNNCs == changedField || &hideNncsWhenNoResultIsAvailable == changedField )
{
parentView()->scheduleCreateDisplayModelAndRedraw();
parentView()->crossSectionCollection()->scheduleCreateDisplayModelAndRedraw2dIntersectionViews();
parentView()->intersectionCollection()->scheduleCreateDisplayModelAndRedraw2dIntersectionViews();
}
if ( &showFaultLabel == changedField )

2
ApplicationCode/ProjectDataModel/RimGeoMechCase.cpp
View File

@@ -693,7 +693,7 @@ void RimGeoMechCase::updateFormationNamesData()
view->scheduleGeometryRegen( PROPERTY_FILTERED );
view->scheduleCreateDisplayModelAndRedraw();
geomView->crossSectionCollection()->scheduleCreateDisplayModelAndRedraw2dIntersectionViews();
geomView->intersectionCollection()->scheduleCreateDisplayModelAndRedraw2dIntersectionViews();
}
}
}

2
ApplicationCode/ProjectDataModel/RimGeoMechResultDefinition.cpp
View File

@@ -352,7 +352,7 @@ void RimGeoMechResultDefinition::fieldChangedByUi( const caf::PdmFieldHandle* ch
if ( view )
{
view->scheduleCreateDisplayModelAndRedraw();
view->crossSectionCollection()->scheduleCreateDisplayModelAndRedraw2dIntersectionViews();
view->intersectionCollection()->scheduleCreateDisplayModelAndRedraw2dIntersectionViews();
}
if ( dynamic_cast<RimGeoMechCellColors*>( this ) )

18
ApplicationCode/ProjectDataModel/RimGeoMechView.cpp
View File

@@ -289,10 +289,10 @@ void RimGeoMechView::onCreateDisplayModel()
// Cross sections
m_crossSectionVizModel->removeAllParts();
m_crossSectionCollection->rebuildGeometry();
m_crossSectionCollection->appendPartsToModel( *this, m_crossSectionVizModel.p(), scaleTransform() );
nativeOrOverrideViewer()->addStaticModelOnce( m_crossSectionVizModel.p(), isUsingOverrideViewer() );
m_intersectionVizModel->removeAllParts();
m_intersectionCollection->rebuildGeometry();
m_intersectionCollection->appendPartsToModel( *this, m_intersectionVizModel.p(), scaleTransform() );
nativeOrOverrideViewer()->addStaticModelOnce( m_intersectionVizModel.p(), isUsingOverrideViewer() );
// If the animation was active before recreating everything, make viewer view current frame
@@ -304,7 +304,7 @@ void RimGeoMechView::onCreateDisplayModel()
{
onUpdateLegends();
m_vizLogic->updateStaticCellColors( -1 );
m_crossSectionCollection->applySingleColorEffect();
m_intersectionCollection->applySingleColorEffect();
m_overlayInfoConfig()->update3DInfo();
}
@@ -384,17 +384,17 @@ void RimGeoMechView::onUpdateDisplayModelForCurrentTimeStep()
if ( this->cellResult()->hasResult() )
{
m_crossSectionCollection->updateCellResultColor( m_currentTimeStep );
m_intersectionCollection->updateCellResultColor( m_currentTimeStep );
}
else
{
m_crossSectionCollection->applySingleColorEffect();
m_intersectionCollection->applySingleColorEffect();
}
}
else
{
m_vizLogic->updateStaticCellColors( -1 );
m_crossSectionCollection->applySingleColorEffect();
m_intersectionCollection->applySingleColorEffect();
nativeOrOverrideViewer()->animationControl()->slotPause(); // To avoid animation timer spinning in the background
}
@@ -908,7 +908,7 @@ void RimGeoMechView::defineUiTreeOrdering( caf::PdmUiTreeOrdering& uiTreeOrderin
uiTreeOrdering.add( m_tensorResults() );
uiTreeOrdering.add( &m_intersectionResultDefCollection );
uiTreeOrdering.add( m_crossSectionCollection() );
uiTreeOrdering.add( m_intersectionCollection() );
uiTreeOrdering.add( m_rangeFilterCollection() );
uiTreeOrdering.add( m_propertyFilterCollection() );

14
ApplicationCode/ProjectDataModel/RimGridView.cpp
View File

@@ -62,9 +62,9 @@ RimGridView::RimGridView()
m_overrideRangeFilterCollection.uiCapability()->setUiHidden( true );
m_overrideRangeFilterCollection.xmlCapability()->disableIO();
CAF_PDM_InitFieldNoDefault( &m_crossSectionCollection, "CrossSections", "Intersections", "", "", "" );
m_crossSectionCollection.uiCapability()->setUiHidden( true );
m_crossSectionCollection = new RimIntersectionCollection();
CAF_PDM_InitFieldNoDefault( &m_intersectionCollection, "CrossSections", "Intersections", "", "", "" );
m_intersectionCollection.uiCapability()->setUiHidden( true );
m_intersectionCollection = new RimIntersectionCollection();
CAF_PDM_InitFieldNoDefault( &m_intersectionResultDefCollection,
"IntersectionResultDefColl",
@@ -119,7 +119,7 @@ RimGridView::~RimGridView( void )
delete m_rangeFilterCollection;
delete m_overrideRangeFilterCollection;
delete m_crossSectionCollection;
delete m_intersectionCollection;
delete m_gridCollection;
}
@@ -156,9 +156,9 @@ cvf::ref<cvf::UByteArray> RimGridView::currentTotalCellVisibility()
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RimIntersectionCollection* RimGridView::crossSectionCollection() const
RimIntersectionCollection* RimGridView::intersectionCollection() const
{
return m_crossSectionCollection();
return m_intersectionCollection();
}
//--------------------------------------------------------------------------------------------------
@@ -425,7 +425,7 @@ void RimGridView::fieldChangedByUi( const caf::PdmFieldHandle* changedField,
{
if ( changedField == &scaleZ )
{
m_crossSectionCollection->updateIntersectionBoxGeometry();
m_intersectionCollection->updateIntersectionBoxGeometry();
}
Rim3dView::fieldChangedByUi( changedField, oldValue, newValue );

4
ApplicationCode/ProjectDataModel/RimGridView.h
View File

@@ -45,7 +45,7 @@ public:
cvf::ref<cvf::UByteArray> currentTotalCellVisibility();
RimIntersectionCollection* crossSectionCollection() const;
RimIntersectionCollection* intersectionCollection() const;
RimIntersectionResultsDefinitionCollection* separateIntersectionResultsCollection() const;
RimAnnotationInViewCollection* annotationCollection() const;
@@ -83,7 +83,7 @@ protected:
void initAfterRead() override;
protected: // Fields
caf::PdmChildField<RimIntersectionCollection*> m_crossSectionCollection;
caf::PdmChildField<RimIntersectionCollection*> m_intersectionCollection;
caf::PdmChildField<RimIntersectionResultsDefinitionCollection*> m_intersectionResultDefCollection;

4
ApplicationCode/ProjectDataModel/RimIntersectionCollection.cpp
View File

@@ -131,7 +131,7 @@ void RimIntersectionCollection::appendPartsToModel( Rim3dView& view,
{
if ( cs->isActive() )
{
cs->intersectionPartMgr()->appendNativeCrossSectionFacesToModel( model, scaleTransform );
cs->intersectionPartMgr()->appendNativeIntersectionFacesToModel( model, scaleTransform );
cs->intersectionPartMgr()->appendMeshLinePartsToModel( model, scaleTransform );
cs->intersectionPartMgr()->appendPolylinePartsToModel( view, model, scaleTransform );
}
@@ -141,7 +141,7 @@ void RimIntersectionCollection::appendPartsToModel( Rim3dView& view,
{
if ( cs->isActive() )
{
cs->intersectionBoxPartMgr()->appendNativeCrossSectionFacesToModel( model, scaleTransform );
cs->intersectionBoxPartMgr()->appendNativeIntersectionFacesToModel( model, scaleTransform );
cs->intersectionBoxPartMgr()->appendMeshLinePartsToModel( model, scaleTransform );
if ( cs->show3dManipulator() )

2
ApplicationCode/ProjectDataModel/RimIntersectionResultsDefinitionCollection.cpp
View File

@@ -92,7 +92,7 @@ void RimIntersectionResultsDefinitionCollection::fieldChangedByUi( const caf::Pd
if ( gridView )
{
gridView->scheduleCreateDisplayModelAndRedraw();
gridView->crossSectionCollection()->scheduleCreateDisplayModelAndRedraw2dIntersectionViews();
gridView->intersectionCollection()->scheduleCreateDisplayModelAndRedraw2dIntersectionViews();
}
}

2
ApplicationCode/ProjectDataModel/RimRegularLegendConfig.cpp
View File

@@ -269,7 +269,7 @@ void RimRegularLegendConfig::fieldChangedByUi( const caf::PdmFieldHandle* change
view->updateDisplayModelForCurrentTimeStepAndRedraw();
view->crossSectionCollection()->scheduleCreateDisplayModelAndRedraw2dIntersectionViews();
view->intersectionCollection()->scheduleCreateDisplayModelAndRedraw2dIntersectionViews();
}
// Update stim plan templates if relevant

2
ApplicationCode/ProjectDataModel/RimScaleLegendConfig.cpp
View File

@@ -190,7 +190,7 @@ void RimScaleLegendConfig::fieldChangedByUi( const caf::PdmFieldHandle* changedF
view->updateDisplayModelForCurrentTimeStepAndRedraw();
view->crossSectionCollection()->scheduleCreateDisplayModelAndRedraw2dIntersectionViews();
view->intersectionCollection()->scheduleCreateDisplayModelAndRedraw2dIntersectionViews();
}
// Update stim plan templates if relevant

6
ApplicationCode/ProjectDataModel/RimSimWellInView.cpp
View File

@@ -473,7 +473,7 @@ bool RimSimWellInView::isWellCellsVisible() const
if ( !this->showWellCells() ) return false;
if ( reservoirView->crossSectionCollection()->hasActiveIntersectionForSimulationWell( this ) ) return true;
if ( reservoirView->intersectionCollection()->hasActiveIntersectionForSimulationWell( this ) ) return true;
if ( reservoirView->wellCollection()->showWellsIntersectingVisibleCells() &&
reservoirView->rangeFilterCollection()->hasActiveFilters() )
@@ -514,7 +514,7 @@ bool RimSimWellInView::isWellPipeVisible( size_t frameIndex ) const
if ( !this->showWellPipe() ) return false;
if ( reservoirView->crossSectionCollection()->hasActiveIntersectionForSimulationWell( this ) ) return true;
if ( reservoirView->intersectionCollection()->hasActiveIntersectionForSimulationWell( this ) ) return true;
if ( reservoirView->wellCollection()->showWellsIntersectingVisibleCells() &&
( reservoirView->rangeFilterCollection()->hasActiveFilters() ||
@@ -556,7 +556,7 @@ bool RimSimWellInView::isWellSpheresVisible( size_t frameIndex ) const
if ( !this->showWellSpheres() ) return false;
if ( reservoirView->crossSectionCollection()->hasActiveIntersectionForSimulationWell( this ) ) return true;
if ( reservoirView->intersectionCollection()->hasActiveIntersectionForSimulationWell( this ) ) return true;
if ( reservoirView->wellCollection()->showWellsIntersectingVisibleCells() &&
reservoirView->rangeFilterCollection()->hasActiveFilters() )

2
ApplicationCode/ProjectDataModel/RimSimWellInViewCollection.cpp
View File

@@ -495,7 +495,7 @@ void RimSimWellInViewCollection::fieldChangedByUi( const caf::PdmFieldHandle* ch
{
if ( m_reservoirView )
{
m_reservoirView->crossSectionCollection()->recomputeSimWellBranchData();
m_reservoirView->intersectionCollection()->recomputeSimWellBranchData();
}
for ( RimSimWellInView* w : wells )

2
ApplicationCode/ProjectDataModel/RimTernaryLegendConfig.cpp
View File

@@ -159,7 +159,7 @@ void RimTernaryLegendConfig::fieldChangedByUi( const caf::PdmFieldHandle* change
}
view->updateDisplayModelForCurrentTimeStepAndRedraw();
view->crossSectionCollection()->scheduleCreateDisplayModelAndRedraw2dIntersectionViews();
view->intersectionCollection()->scheduleCreateDisplayModelAndRedraw2dIntersectionViews();
}
}

2
ApplicationCode/ProjectDataModel/RimViewController.cpp
View File

@@ -727,7 +727,7 @@ void RimViewController::scheduleCreateDisplayModelAndRedrawForDependentView() co
if ( this->isResultColorControlled() && this->managedView() )
{
this->managedView()->crossSectionCollection()->scheduleCreateDisplayModelAndRedraw2dIntersectionViews();
this->managedView()->intersectionCollection()->scheduleCreateDisplayModelAndRedraw2dIntersectionViews();
}
}

4
ApplicationCode/ProjectDataModel/RimViewLinker.cpp
View File

@@ -162,7 +162,7 @@ void RimViewLinker::updateCellResult()
}
eclipseView->scheduleCreateDisplayModelAndRedraw();
eclipseView->crossSectionCollection()->scheduleCreateDisplayModelAndRedraw2dIntersectionViews();
eclipseView->intersectionCollection()->scheduleCreateDisplayModelAndRedraw2dIntersectionViews();
}
eclipseView->cellResult()->updateIconState();
@@ -196,7 +196,7 @@ void RimViewLinker::updateCellResult()
}
geoView->scheduleCreateDisplayModelAndRedraw();
geoView->crossSectionCollection()->scheduleCreateDisplayModelAndRedraw2dIntersectionViews();
geoView->intersectionCollection()->scheduleCreateDisplayModelAndRedraw2dIntersectionViews();
}
geoView->cellResult()->updateIconState();