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

4
ApplicationCode/Commands/CrossSectionCommands/RicCopyIntersectionsToAllViewsInCaseFeature.cpp
View File

@@ -122,7 +122,7 @@ void RicCopyIntersectionsToAllViewsInCaseFeature::copyIntersectionsToOtherViews(
if ( currGridView && parentView != nullptr && parentView != currGridView )
{
RimIntersectionCollection* destCollection = currGridView->crossSectionCollection();
RimIntersectionCollection* destCollection = currGridView->intersectionCollection();
RimExtrudedCurveIntersection* copy = dynamic_cast<RimExtrudedCurveIntersection*>(
intersection->xmlCapability()->copyByXmlSerialization( caf::PdmDefaultObjectFactory::instance() ) );
@@ -155,7 +155,7 @@ void RicCopyIntersectionsToAllViewsInCaseFeature::copyIntersectionBoxesToOtherVi
if ( currGridView && parentView != nullptr && parentView != currGridView )
{
RimIntersectionCollection* destCollection = currGridView->crossSectionCollection();
RimIntersectionCollection* destCollection = currGridView->intersectionCollection();
RimIntersectionBox* copy = dynamic_cast<RimIntersectionBox*>(
intersectionBox->xmlCapability()->copyByXmlSerialization( caf::PdmDefaultObjectFactory::instance() ) );

2
ApplicationCode/Commands/CrossSectionCommands/RicNewAzimuthDipIntersectionFeature.cpp
View File

@@ -62,7 +62,7 @@ void RicNewAzimuthDipIntersectionFeature::onActionTriggered( bool isChecked )
if ( !activeView ) return;
RicNewAzimuthDipIntersectionFeatureCmd* cmd = new RicNewAzimuthDipIntersectionFeatureCmd(
activeView->crossSectionCollection() );
activeView->intersectionCollection() );
caf::CmdExecCommandManager::instance()->processExecuteCommand( cmd );
}

2
ApplicationCode/Commands/CrossSectionCommands/RicNewPolylineIntersectionFeature.cpp
View File

@@ -61,7 +61,7 @@ void RicNewPolylineIntersectionFeature::onActionTriggered( bool isChecked )
if ( !activeView ) return;
RicNewPolylineIntersectionFeatureCmd* cmd = new RicNewPolylineIntersectionFeatureCmd(
activeView->crossSectionCollection() );
activeView->intersectionCollection() );
caf::CmdExecCommandManager::instance()->processExecuteCommand( cmd );
}

2
ApplicationCode/Commands/CrossSectionCommands/RicNewSimWellIntersectionFeature.cpp
View File

@@ -56,7 +56,7 @@ void RicNewSimWellIntersectionFeature::onActionTriggered( bool isChecked )
simWell->firstAncestorOrThisOfType( eclView );
CVF_ASSERT( eclView );
RicNewSimWellIntersectionCmd* cmd = new RicNewSimWellIntersectionCmd( eclView->crossSectionCollection(), simWell );
RicNewSimWellIntersectionCmd* cmd = new RicNewSimWellIntersectionCmd( eclView->intersectionCollection(), simWell );
caf::CmdExecCommandManager::instance()->processExecuteCommand( cmd );
}

2
ApplicationCode/Commands/CrossSectionCommands/RicNewWellPathIntersectionFeature.cpp
View File

@@ -63,7 +63,7 @@ void RicNewWellPathIntersectionFeature::onActionTriggered( bool isChecked )
RimWellPath* wellPath = collection[0];
RicNewWellPathIntersectionFeatureCmd* cmd =
new RicNewWellPathIntersectionFeatureCmd( activeView->crossSectionCollection(), wellPath );
new RicNewWellPathIntersectionFeatureCmd( activeView->intersectionCollection(), wellPath );
caf::CmdExecCommandManager::instance()->processExecuteCommand( cmd );
}

2
ApplicationCode/Commands/IntersectionBoxCommands/RicIntersectionBoxAtPosFeature.cpp
View File

@@ -55,7 +55,7 @@ void RicIntersectionBoxAtPosFeature::onActionTriggered( bool isChecked )
RimGridView* activeMainOrComparisonView = RiaApplication::instance()->activeMainOrComparisonGridView();
if ( activeMainOrComparisonView )
{
RimIntersectionCollection* coll = activeMainOrComparisonView->crossSectionCollection();
RimIntersectionCollection* coll = activeMainOrComparisonView->intersectionCollection();
CVF_ASSERT( coll );
RimIntersectionBox* intersectionBox = new RimIntersectionBox();

2
ApplicationCode/Commands/IntersectionBoxCommands/RicIntersectionFeatureImpl.cpp
View File

@@ -38,7 +38,7 @@ void RicIntersectionFeatureImpl::createIntersectionBoxSlize( const QString&
if ( activeMainOrComparisonView )
{
RimIntersectionCollection* coll = activeMainOrComparisonView->crossSectionCollection();
RimIntersectionCollection* coll = activeMainOrComparisonView->intersectionCollection();
CVF_ASSERT( coll );
cvf::Vec3d domainCoord = activeView->viewer()->viewerCommands()->lastPickPositionInDomainCoords();

10
ApplicationCode/Commands/RicDeleteItemExec.cpp
View File

@@ -130,11 +130,11 @@ void RicDeleteItemExec::redo()
// Intersections
RimIntersectionCollection* crossSectionColl;
parentObj->firstAncestorOrThisOfType( crossSectionColl );
if ( view && crossSectionColl )
RimIntersectionCollection* intersectionColl;
parentObj->firstAncestorOrThisOfType( intersectionColl );
if ( view && intersectionColl )
{
crossSectionColl->syncronize2dIntersectionViews();
intersectionColl->syncronize2dIntersectionViews();
view->scheduleCreateDisplayModelAndRedraw();
}
else
@@ -153,7 +153,7 @@ void RicDeleteItemExec::redo()
if ( gridView && separateIntersectResDefColl )
{
gridView->scheduleCreateDisplayModelAndRedraw();
gridView->crossSectionCollection()->scheduleCreateDisplayModelAndRedraw2dIntersectionViews();
gridView->intersectionCollection()->scheduleCreateDisplayModelAndRedraw2dIntersectionViews();
}
// SimWell Fractures