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 RimIntersection to RimExtrudedCurveIntersection

Browse Source
This commit is contained in:
Jacob Støren
2019-11-26 11:35:21 +01:00
parent bf8ed71641
commit 152d2bde17
44 changed files with 176 additions and 176 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
ApplicationCode/ProjectDataModel/Rim2dIntersectionViewCollection.cpp
View File

@@ -20,7 +20,7 @@
#include "Rim2dIntersectionView.h"
#include "RimCase.h"
#include "RimIntersection.h"
#include "RimExtrudedCurveIntersection.h"
CAF_PDM_SOURCE_INIT( Rim2dIntersectionViewCollection, "Intersection2dViewCollection" );
@@ -61,10 +61,10 @@ void Rim2dIntersectionViewCollection::syncFromExistingIntersections( bool doUpda
RimCase* parentCase = nullptr;
this->firstAncestorOrThisOfTypeAsserted( parentCase );
std::vector<RimIntersection*> allOrderedIntersectionsInCase;
std::vector<RimExtrudedCurveIntersection*> allOrderedIntersectionsInCase;
parentCase->descendantsIncludingThisOfType( allOrderedIntersectionsInCase );
std::set<RimIntersection*> currentIntersections( allOrderedIntersectionsInCase.begin(),
std::set<RimExtrudedCurveIntersection*> currentIntersections( allOrderedIntersectionsInCase.begin(),
allOrderedIntersectionsInCase.end() );
// Delete views without a valid intersection
@@ -83,7 +83,7 @@ void Rim2dIntersectionViewCollection::syncFromExistingIntersections( bool doUpda
// Build map from intersection to view
std::map<RimIntersection*, Rim2dIntersectionView*> intersectionToViewMap;
std::map<RimExtrudedCurveIntersection*, Rim2dIntersectionView*> intersectionToViewMap;
for ( Rim2dIntersectionView* iv : m_intersectionViews )
{
CVF_ASSERT( iv && iv->intersection() );
@@ -94,7 +94,7 @@ void Rim2dIntersectionViewCollection::syncFromExistingIntersections( bool doUpda
// Insert the old views in correct order, and create new views as we go
for ( RimIntersection* intersection : allOrderedIntersectionsInCase )
for ( RimExtrudedCurveIntersection* intersection : allOrderedIntersectionsInCase )
{
auto it = intersectionToViewMap.find( intersection );
if ( it == intersectionToViewMap.end() )