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

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 );
};