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

4
ApplicationCode/Commands/OperationsUsingObjReferences/RicCopyReferencesToClipboardFeature.cpp
View File

@@ -26,7 +26,7 @@
#include "RimGeoMechView.h"
#include "RimGridCrossPlotCurve.h"
#include "RimGridCrossPlotDataSet.h"
#include "RimIntersection.h"
#include "RimExtrudedCurveIntersection.h"
#include "RimIntersectionBox.h"
#include "RimMimeData.h"
#include "RimSummaryCurveFilter.h"
@@ -141,7 +141,7 @@ bool RicCopyReferencesToClipboardFeature::isCopyOfObjectSupported( caf::PdmObjec
{
return true;
}
else if ( dynamic_cast<RimIntersection*>( pdmObject ) )
else if ( dynamic_cast<RimExtrudedCurveIntersection*>( pdmObject ) )
{
return true;
}

10
ApplicationCode/Commands/OperationsUsingObjReferences/RicPasteIntersectionsFeature.cpp
View File

@@ -20,7 +20,7 @@
#include "RicPasteFeatureImpl.h"
#include "RimIntersection.h"
#include "RimExtrudedCurveIntersection.h"
#include "RimIntersectionBox.h"
#include "RimIntersectionCollection.h"
@@ -41,7 +41,7 @@ bool RicPasteIntersectionsFeature::isCommandEnabled()
caf::PdmObjectGroup objectGroup;
RicPasteFeatureImpl::findObjectsFromClipboardRefs( &objectGroup );
std::vector<caf::PdmPointer<RimIntersection>> intersectionObjects;
std::vector<caf::PdmPointer<RimExtrudedCurveIntersection>> intersectionObjects;
objectGroup.objectsByType( &intersectionObjects );
std::vector<caf::PdmPointer<RimIntersectionBox>> intersectionBoxObjects;
@@ -81,12 +81,12 @@ void RicPasteIntersectionsFeature::onActionTriggered( bool isChecked )
if ( objectGroup.objects.size() == 0 ) return;
std::vector<caf::PdmPointer<RimIntersection>> intersectionObjects;
std::vector<caf::PdmPointer<RimExtrudedCurveIntersection>> intersectionObjects;
objectGroup.objectsByType( &intersectionObjects );
for ( size_t i = 0; i < intersectionObjects.size(); i++ )
{
RimIntersection* intersection = dynamic_cast<RimIntersection*>(
RimExtrudedCurveIntersection* intersection = dynamic_cast<RimExtrudedCurveIntersection*>(
intersectionObjects[i]->xmlCapability()->copyByXmlSerialization( caf::PdmDefaultObjectFactory::instance() ) );
QString nameOfCopy = QString( "Copy of " ) + intersection->name();
@@ -146,7 +146,7 @@ RimIntersectionCollection* RicPasteIntersectionsFeature::findIntersectionCollect
return intersectionCollection;
}
RimIntersection* intersection = dynamic_cast<RimIntersection*>( objectHandle );
RimExtrudedCurveIntersection* intersection = dynamic_cast<RimExtrudedCurveIntersection*>( objectHandle );
if ( intersection )
{
intersection->firstAncestorOrThisOfType( intersectionCollection );