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 RimintersectionBox to RimBoxIntersection

Browse Source 
Rename RivIntersectionBoxPartMgr to RimBoxIntersectionPartManager
This commit is contained in:
Jacob Støren
2019-11-26 13:14:55 +01:00
parent 0e14c63f07
commit 4672528a4d
28 changed files with 130 additions and 130 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -23,7 +23,7 @@
#include "RimEclipseCase.h"
#include "RimGridView.h"
#include "RimExtrudedCurveIntersection.h"
#include "RimIntersectionBox.h"
#include "RimBoxIntersection.h"
#include "RimIntersectionCollection.h"
#include "cafCmdExecCommandManager.h"
@@ -50,7 +50,7 @@ enum SelectionComposition
static RimIntersectionCollection* selectedIntersectionCollection();
static std::vector<RimExtrudedCurveIntersection*> selectedIntersections();
static std::vector<RimIntersectionBox*> selectedIntersectionBoxes();
static std::vector<RimBoxIntersection*> selectedIntersectionBoxes();
static SelectionComposition selectionComposition();
static RimCase* commonGridCase( std::vector<caf::PdmUiItem*> selectedItems );
@@ -84,7 +84,7 @@ void RicCopyIntersectionsToAllViewsInCaseFeature::onActionTriggered( bool isChec
}
std::vector<RimExtrudedCurveIntersection*> selIntersections = selectedIntersections();
std::vector<RimIntersectionBox*> selIntersectionBoxes = selectedIntersectionBoxes();
std::vector<RimBoxIntersection*> selIntersectionBoxes = selectedIntersectionBoxes();
if ( compostion == SEL_INTERSECTIONS || compostion == SEL_BOTH_INTERSECTION_TYPES )
{
@@ -143,9 +143,9 @@ void RicCopyIntersectionsToAllViewsInCaseFeature::copyIntersectionsToOtherViews(
//--------------------------------------------------------------------------------------------------
void RicCopyIntersectionsToAllViewsInCaseFeature::copyIntersectionBoxesToOtherViews(
RimCase& gridCase,
std::vector<RimIntersectionBox*> intersectionBoxes )
std::vector<RimBoxIntersection*> intersectionBoxes )
{
for ( RimIntersectionBox* intersectionBox : intersectionBoxes )
for ( RimBoxIntersection* intersectionBox : intersectionBoxes )
{
for ( Rim3dView* const view : gridCase.views() )
{
@@ -157,7 +157,7 @@ void RicCopyIntersectionsToAllViewsInCaseFeature::copyIntersectionBoxesToOtherVi
{
RimIntersectionCollection* destCollection = currGridView->intersectionCollection();
RimIntersectionBox* copy = dynamic_cast<RimIntersectionBox*>(
RimBoxIntersection* copy = dynamic_cast<RimBoxIntersection*>(
intersectionBox->xmlCapability()->copyByXmlSerialization( caf::PdmDefaultObjectFactory::instance() ) );
CVF_ASSERT( copy );
@@ -187,9 +187,9 @@ std::vector<RimExtrudedCurveIntersection*> selectedIntersections()
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
std::vector<RimIntersectionBox*> selectedIntersectionBoxes()
std::vector<RimBoxIntersection*> selectedIntersectionBoxes()
{
return caf::selectedObjectsByType<RimIntersectionBox*>();
return caf::selectedObjectsByType<RimBoxIntersection*>();
}
//--------------------------------------------------------------------------------------------------
@@ -205,7 +205,7 @@ SelectionComposition selectionComposition()
{
RimIntersectionCollection* selColl = selectedIntersectionCollection();
std::vector<RimExtrudedCurveIntersection*> selIntersections = selectedIntersections();
std::vector<RimIntersectionBox*> selIntersectionBoxes = selectedIntersectionBoxes();
std::vector<RimBoxIntersection*> selIntersectionBoxes = selectedIntersectionBoxes();
if ( selColl )
{

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

@@ -25,7 +25,7 @@
class RimCase;
class RimExtrudedCurveIntersection;
class RimIntersectionBox;
class RimBoxIntersection;
class RimIntersectionCollection;
//==================================================================================================
@@ -42,5 +42,5 @@ protected:
void setupActionLook( QAction* actionToSetup ) override;
void copyIntersectionsToOtherViews( RimCase& gridCase, std::vector<RimExtrudedCurveIntersection*> intersections );
void copyIntersectionBoxesToOtherViews( RimCase& gridCase, std::vector<RimIntersectionBox*> intersectionBoxes );
void copyIntersectionBoxesToOtherViews( RimCase& gridCase, std::vector<RimBoxIntersection*> intersectionBoxes );
};

4
ApplicationCode/Commands/IntersectionBoxCommands/RicAppendIntersectionBoxFeature.cpp
View File

@@ -20,7 +20,7 @@
#include "RimCase.h"
#include "RimGridView.h"
#include "RimIntersectionBox.h"
#include "RimBoxIntersection.h"
#include "RimIntersectionCollection.h"
#include "Riu3DMainWindowTools.h"
@@ -53,7 +53,7 @@ void RicAppendIntersectionBoxFeature::onActionTriggered( bool isChecked )
if ( coll )
{
RimIntersectionBox* intersectionBox = new RimIntersectionBox();
RimBoxIntersection* intersectionBox = new RimBoxIntersection();
intersectionBox->setName( "Intersection Box" );
coll->appendIntersectionBoxAndUpdate( intersectionBox );

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

@@ -22,7 +22,7 @@
#include "RimCase.h"
#include "RimGridView.h"
#include "RimIntersectionBox.h"
#include "RimBoxIntersection.h"
#include "RimIntersectionCollection.h"
#include "RiuMainWindow.h"
@@ -58,14 +58,14 @@ void RicIntersectionBoxAtPosFeature::onActionTriggered( bool isChecked )
RimIntersectionCollection* coll = activeMainOrComparisonView->intersectionCollection();
CVF_ASSERT( coll );
RimIntersectionBox* intersectionBox = new RimIntersectionBox();
RimBoxIntersection* intersectionBox = new RimBoxIntersection();
intersectionBox->setName( "Intersection box" );
coll->appendIntersectionBoxAndUpdate( intersectionBox );
cvf::Vec3d domainCoord = activeView->viewer()->viewerCommands()->lastPickPositionInDomainCoords();
intersectionBox->setToDefaultSizeSlice( RimIntersectionBox::PLANE_STATE_NONE, domainCoord );
intersectionBox->setToDefaultSizeSlice( RimBoxIntersection::PLANE_STATE_NONE, domainCoord );
coll->updateConnectedEditors();
RiuMainWindow::instance()->selectAsCurrentItem( intersectionBox, false );

4
ApplicationCode/Commands/IntersectionBoxCommands/RicIntersectionBoxXSliceFeature.cpp
View File

@@ -24,7 +24,7 @@
#include "RimCase.h"
#include "RimGridView.h"
#include "RimIntersectionBox.h"
#include "RimBoxIntersection.h"
#include "RimIntersectionCollection.h"
#include "RiuViewerCommands.h"
@@ -54,7 +54,7 @@ bool RicIntersectionBoxXSliceFeature::isCommandEnabled()
void RicIntersectionBoxXSliceFeature::onActionTriggered( bool isChecked )
{
RicIntersectionFeatureImpl::createIntersectionBoxSlize( "X-slice (Intersection box)",
RimIntersectionBox::PLANE_STATE_X );
RimBoxIntersection::PLANE_STATE_X );
}
//--------------------------------------------------------------------------------------------------

4
ApplicationCode/Commands/IntersectionBoxCommands/RicIntersectionBoxYSliceFeature.cpp
View File

@@ -24,7 +24,7 @@
#include "RimCase.h"
#include "RimGridView.h"
#include "RimIntersectionBox.h"
#include "RimBoxIntersection.h"
#include "RimIntersectionCollection.h"
#include "RiuMainWindow.h"
@@ -54,7 +54,7 @@ bool RicIntersectionBoxYSliceFeature::isCommandEnabled()
void RicIntersectionBoxYSliceFeature::onActionTriggered( bool isChecked )
{
RicIntersectionFeatureImpl::createIntersectionBoxSlize( "Y-slice (Intersection box)",
RimIntersectionBox::PLANE_STATE_Y );
RimBoxIntersection::PLANE_STATE_Y );
}
//--------------------------------------------------------------------------------------------------

4
ApplicationCode/Commands/IntersectionBoxCommands/RicIntersectionBoxZSliceFeature.cpp
View File

@@ -24,7 +24,7 @@
#include "RimCase.h"
#include "RimGridView.h"
#include "RimIntersectionBox.h"
#include "RimBoxIntersection.h"
#include "RimIntersectionCollection.h"
#include "RiuViewerCommands.h"
@@ -54,7 +54,7 @@ bool RicIntersectionBoxZSliceFeature::isCommandEnabled()
void RicIntersectionBoxZSliceFeature::onActionTriggered( bool isChecked )
{
RicIntersectionFeatureImpl::createIntersectionBoxSlize( "Z-slice (Intersection box)",
RimIntersectionBox::PLANE_STATE_Z );
RimBoxIntersection::PLANE_STATE_Z );
}
//--------------------------------------------------------------------------------------------------

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

@@ -20,7 +20,7 @@
#include "RiaApplication.h"
#include "RimGridView.h"
#include "RimIntersectionBox.h"
#include "RimBoxIntersection.h"
#include "RimIntersectionCollection.h"
#include "RiuMainWindow.h"
@@ -31,7 +31,7 @@
///
//--------------------------------------------------------------------------------------------------
void RicIntersectionFeatureImpl::createIntersectionBoxSlize( const QString& name,
RimIntersectionBox::SinglePlaneState plane )
RimBoxIntersection::SinglePlaneState plane )
{
RimGridView* activeView = RiaApplication::instance()->activeGridView();
RimGridView* activeMainOrComparisonView = RiaApplication::instance()->activeMainOrComparisonGridView();
@@ -43,7 +43,7 @@ void RicIntersectionFeatureImpl::createIntersectionBoxSlize( const QString&
cvf::Vec3d domainCoord = activeView->viewer()->viewerCommands()->lastPickPositionInDomainCoords();
RimIntersectionBox* intersectionBox = new RimIntersectionBox();
RimBoxIntersection* intersectionBox = new RimBoxIntersection();
intersectionBox->setName( name );
coll->appendIntersectionBoxNoUpdate( intersectionBox );

4
ApplicationCode/Commands/IntersectionBoxCommands/RicIntersectionFeatureImpl.h
View File

@@ -18,12 +18,12 @@
#pragma once
#include "RimIntersectionBox.h"
#include "RimBoxIntersection.h"
class QString;
class RicIntersectionFeatureImpl
{
public:
static void createIntersectionBoxSlize( const QString& name, RimIntersectionBox::SinglePlaneState plane );
static void createIntersectionBoxSlize( const QString& name, RimBoxIntersection::SinglePlaneState plane );
};

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

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

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

@@ -21,7 +21,7 @@
#include "RicPasteFeatureImpl.h"
#include "RimExtrudedCurveIntersection.h"
#include "RimIntersectionBox.h"
#include "RimBoxIntersection.h"
#include "RimIntersectionCollection.h"
#include "RiuMainWindow.h"
@@ -44,7 +44,7 @@ bool RicPasteIntersectionsFeature::isCommandEnabled()
std::vector<caf::PdmPointer<RimExtrudedCurveIntersection>> intersectionObjects;
objectGroup.objectsByType( &intersectionObjects );
std::vector<caf::PdmPointer<RimIntersectionBox>> intersectionBoxObjects;
std::vector<caf::PdmPointer<RimBoxIntersection>> intersectionBoxObjects;
objectGroup.objectsByType( &intersectionBoxObjects );
if ( intersectionObjects.empty() && intersectionBoxObjects.empty() )
@@ -102,12 +102,12 @@ void RicPasteIntersectionsFeature::onActionTriggered( bool isChecked )
}
}
std::vector<caf::PdmPointer<RimIntersectionBox>> intersectionBoxObjects;
std::vector<caf::PdmPointer<RimBoxIntersection>> intersectionBoxObjects;
objectGroup.objectsByType( &intersectionBoxObjects );
for ( size_t i = 0; i < intersectionBoxObjects.size(); i++ )
{
RimIntersectionBox* intersectionBox = dynamic_cast<RimIntersectionBox*>(
RimBoxIntersection* intersectionBox = dynamic_cast<RimBoxIntersection*>(
intersectionBoxObjects[i]->xmlCapability()->copyByXmlSerialization(
caf::PdmDefaultObjectFactory::instance() ) );
@@ -153,7 +153,7 @@ RimIntersectionCollection* RicPasteIntersectionsFeature::findIntersectionCollect
return intersectionCollection;
}
RimIntersectionBox* intersectionBox = dynamic_cast<RimIntersectionBox*>( objectHandle );
RimBoxIntersection* intersectionBox = dynamic_cast<RimBoxIntersection*>( objectHandle );
if ( intersectionBox )
{
intersectionBox->firstAncestorOrThisOfType( intersectionCollection );

4
ApplicationCode/Commands/RicDeleteItemFeature.cpp
View File

@@ -42,7 +42,7 @@
#include "RimGridTimeHistoryCurve.h"
#include "RimIdenticalGridCaseGroup.h"
#include "RimExtrudedCurveIntersection.h"
#include "RimIntersectionBox.h"
#include "RimBoxIntersection.h"
#include "RimIntersectionResultDefinition.h"
#include "RimMultiPlotWindow.h"
#include "RimPerforationInterval.h"
@@ -118,7 +118,7 @@ bool isDeletable( caf::PdmUiItem* uiItem )
if ( dynamic_cast<RimSummaryCurve*>( uiItem ) ) return true;
if ( dynamic_cast<RimGridTimeHistoryCurve*>( uiItem ) ) return true;
if ( dynamic_cast<RimExtrudedCurveIntersection*>( uiItem ) ) return true;
if ( dynamic_cast<RimIntersectionBox*>( uiItem ) ) return true;
if ( dynamic_cast<RimBoxIntersection*>( uiItem ) ) return true;
if ( dynamic_cast<RimFormationNames*>( uiItem ) ) return true;
if ( dynamic_cast<RimFormationNamesCollection*>( uiItem ) ) return true;
if ( dynamic_cast<RimFishboneWellPath*>( uiItem ) ) return true;

6
ApplicationCode/Commands/RicHideIntersectionBoxFeature.cpp
View File

@@ -21,7 +21,7 @@
#include "RiaApplication.h"
#include "Rim3dView.h"
#include "RimIntersectionBox.h"
#include "RimBoxIntersection.h"
#include "Riu3dSelectionManager.h"
@@ -43,7 +43,7 @@ bool RicHideIntersectionBoxFeature::isCommandEnabled()
RiuGeneralSelectionItem* generalSelectionItem = static_cast<RiuGeneralSelectionItem*>( selItem );
if ( !generalSelectionItem ) return false;
RimIntersectionBox* intersectionBox = dynamic_cast<RimIntersectionBox*>( generalSelectionItem->m_object );
RimBoxIntersection* intersectionBox = dynamic_cast<RimBoxIntersection*>( generalSelectionItem->m_object );
if ( intersectionBox )
{
return true;
@@ -65,7 +65,7 @@ void RicHideIntersectionBoxFeature::onActionTriggered( bool isChecked )
RiuGeneralSelectionItem* generalSelectionItem = static_cast<RiuGeneralSelectionItem*>( selItem );
if ( !generalSelectionItem ) return;
RimIntersectionBox* intersectionBox = dynamic_cast<RimIntersectionBox*>( generalSelectionItem->m_object );
RimBoxIntersection* intersectionBox = dynamic_cast<RimBoxIntersection*>( generalSelectionItem->m_object );
if ( intersectionBox )
{
intersectionBox->setActive(false);