mirror of
https://github.com/OPM/ResInsight.git
synced 2025-02-25 18:55:39 -06:00
Rename RimintersectionBox to RimBoxIntersection
Rename RivIntersectionBoxPartMgr to RimBoxIntersectionPartManager
This commit is contained in:
Jacob Støren
parent
0e14c63f07
commit
4672528a4d
@ -270,7 +270,7 @@ set ( QT_MOC_HEADERS
|
||||
${QT_MOC_HEADERS}
|
||||
|
||||
ProjectDataModel/RimMimeData.h
|
||||
ProjectDataModel/RimIntersectionBox.h
|
||||
ProjectDataModel/RimBoxIntersection.h
|
||||
|
||||
SocketInterface/RiaSocketServer.h
|
||||
)
|
||||
|
||||
@ -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 )
|
||||
{
|
||||
|
||||
@ -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 );
|
||||
};
|
||||
|
||||
@ -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 );
|
||||
|
||||
@ -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 );
|
||||
|
||||
@ -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 );
|
||||
}
|
||||
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
|
||||
@ -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 );
|
||||
}
|
||||
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
|
||||
@ -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 );
|
||||
}
|
||||
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
|
||||
@ -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 );
|
||||
|
||||
@ -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 );
|
||||
};
|
||||
|
||||
@ -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;
|
||||
}
|
||||
|
||||
@ -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 );
|
||||
|
||||
@ -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;
|
||||
|
||||
@ -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);
|
||||
|
||||
@ -6,7 +6,7 @@ ${CMAKE_CURRENT_LIST_DIR}/RivExtrudedCurveIntersectionSourceInfo.h
|
||||
${CMAKE_CURRENT_LIST_DIR}/RivIntersectionResultsColoringTools.h
|
||||
${CMAKE_CURRENT_LIST_DIR}/RivHexGridIntersectionTools.h
|
||||
${CMAKE_CURRENT_LIST_DIR}/RivIntersectionBoxGeometryGenerator.h
|
||||
${CMAKE_CURRENT_LIST_DIR}/RivIntersectionBoxPartMgr.h
|
||||
${CMAKE_CURRENT_LIST_DIR}/RivBoxIntersectionPartMgr.h
|
||||
${CMAKE_CURRENT_LIST_DIR}/RivIntersectionBoxSourceInfo.h
|
||||
${CMAKE_CURRENT_LIST_DIR}/RivSectionFlattner.h
|
||||
)
|
||||
@ -18,7 +18,7 @@ ${CMAKE_CURRENT_LIST_DIR}/RivExtrudedCurveIntersectionSourceInfo.cpp
|
||||
${CMAKE_CURRENT_LIST_DIR}/RivIntersectionResultsColoringTools.cpp
|
||||
${CMAKE_CURRENT_LIST_DIR}/RivHexGridIntersectionTools.cpp
|
||||
${CMAKE_CURRENT_LIST_DIR}/RivIntersectionBoxGeometryGenerator.cpp
|
||||
${CMAKE_CURRENT_LIST_DIR}/RivIntersectionBoxPartMgr.cpp
|
||||
${CMAKE_CURRENT_LIST_DIR}/RivBoxIntersectionPartMgr.cpp
|
||||
${CMAKE_CURRENT_LIST_DIR}/RivIntersectionBoxSourceInfo.cpp
|
||||
${CMAKE_CURRENT_LIST_DIR}/RivSectionFlattner.cpp
|
||||
)
|
||||
|
||||
@ -16,7 +16,7 @@
|
||||
//
|
||||
/////////////////////////////////////////////////////////////////////////////////
|
||||
|
||||
#include "RivIntersectionBoxPartMgr.h"
|
||||
#include "RivBoxIntersectionPartMgr.h"
|
||||
|
||||
#include "RigCaseCellResultsData.h"
|
||||
#include "RigFemPartCollection.h"
|
||||
@ -31,7 +31,7 @@
|
||||
#include "RimGeoMechCase.h"
|
||||
#include "RimGeoMechCellColors.h"
|
||||
#include "RimGeoMechView.h"
|
||||
#include "RimIntersectionBox.h"
|
||||
#include "RimBoxIntersection.h"
|
||||
#include "RimIntersectionResultDefinition.h"
|
||||
#include "RimRegularLegendConfig.h"
|
||||
#include "RimTernaryLegendConfig.h"
|
||||
@ -58,7 +58,7 @@
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
///
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
RivIntersectionBoxPartMgr::RivIntersectionBoxPartMgr( RimIntersectionBox* intersectionBox )
|
||||
RivBoxIntersectionPartMgr::RivBoxIntersectionPartMgr( RimBoxIntersection* intersectionBox )
|
||||
: m_rimIntersectionBox( intersectionBox )
|
||||
, m_defaultColor( cvf::Color3::WHITE )
|
||||
{
|
||||
@ -73,7 +73,7 @@ RivIntersectionBoxPartMgr::RivIntersectionBoxPartMgr( RimIntersectionBox* inters
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
///
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
void RivIntersectionBoxPartMgr::applySingleColorEffect()
|
||||
void RivBoxIntersectionPartMgr::applySingleColorEffect()
|
||||
{
|
||||
m_defaultColor = cvf::Color3f::OLIVE; // m_rimCrossSection->CrossSectionColor();
|
||||
this->updatePartEffect();
|
||||
@ -82,7 +82,7 @@ void RivIntersectionBoxPartMgr::applySingleColorEffect()
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
///
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
void RivIntersectionBoxPartMgr::updateCellResultColor( size_t timeStepIndex )
|
||||
void RivBoxIntersectionPartMgr::updateCellResultColor( size_t timeStepIndex )
|
||||
{
|
||||
RivIntersectionResultsColoringTools::calculateIntersectionResultColors( timeStepIndex,
|
||||
true,
|
||||
@ -97,7 +97,7 @@ void RivIntersectionBoxPartMgr::updateCellResultColor( size_t timeStepIndex )
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
///
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
void RivIntersectionBoxPartMgr::generatePartGeometry()
|
||||
void RivBoxIntersectionPartMgr::generatePartGeometry()
|
||||
{
|
||||
bool useBufferObjects = true;
|
||||
// Surface geometry
|
||||
@ -158,7 +158,7 @@ void RivIntersectionBoxPartMgr::generatePartGeometry()
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
///
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
void RivIntersectionBoxPartMgr::updatePartEffect()
|
||||
void RivBoxIntersectionPartMgr::updatePartEffect()
|
||||
{
|
||||
// Set deCrossSection effect
|
||||
caf::SurfaceEffectGenerator geometryEffgen( m_defaultColor, caf::PO_1 );
|
||||
@ -186,7 +186,7 @@ void RivIntersectionBoxPartMgr::updatePartEffect()
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
///
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
void RivIntersectionBoxPartMgr::appendNativeIntersectionFacesToModel( cvf::ModelBasicList* model,
|
||||
void RivBoxIntersectionPartMgr::appendNativeIntersectionFacesToModel( cvf::ModelBasicList* model,
|
||||
cvf::Transform* scaleTransform )
|
||||
{
|
||||
if ( m_intersectionBoxFaces.isNull() && m_intersectionBoxGridLines.isNull() )
|
||||
@ -204,7 +204,7 @@ void RivIntersectionBoxPartMgr::appendNativeIntersectionFacesToModel( cvf::Model
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
///
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
void RivIntersectionBoxPartMgr::appendMeshLinePartsToModel( cvf::ModelBasicList* model, cvf::Transform* scaleTransform )
|
||||
void RivBoxIntersectionPartMgr::appendMeshLinePartsToModel( cvf::ModelBasicList* model, cvf::Transform* scaleTransform )
|
||||
{
|
||||
if ( m_intersectionBoxFaces.isNull() && m_intersectionBoxGridLines.isNull() )
|
||||
{
|
||||
@ -37,7 +37,7 @@ class RivTernaryScalarMapper;
|
||||
|
||||
class RimCellEdgeColors;
|
||||
class RimEclipseCellColors;
|
||||
class RimIntersectionBox;
|
||||
class RimBoxIntersection;
|
||||
class RimIntersectionHandle;
|
||||
class RimEclipseView;
|
||||
class RimGeoMechView;
|
||||
@ -49,10 +49,10 @@ class RimGeoMechResultDefinition;
|
||||
///
|
||||
//==================================================================================================
|
||||
|
||||
class RivIntersectionBoxPartMgr : public cvf::Object
|
||||
class RivBoxIntersectionPartMgr : public cvf::Object
|
||||
{
|
||||
public:
|
||||
explicit RivIntersectionBoxPartMgr( RimIntersectionBox* intersectionBox );
|
||||
explicit RivBoxIntersectionPartMgr( RimBoxIntersection* intersectionBox );
|
||||
|
||||
void applySingleColorEffect();
|
||||
void updateCellResultColor( size_t timeStepIndex );
|
||||
@ -65,7 +65,7 @@ private:
|
||||
void generatePartGeometry();
|
||||
|
||||
private:
|
||||
RimIntersectionBox* m_rimIntersectionBox;
|
||||
RimBoxIntersection* m_rimIntersectionBox;
|
||||
|
||||
cvf::Color3f m_defaultColor;
|
||||
|
||||
@ -20,7 +20,7 @@
|
||||
|
||||
#include "RimCase.h"
|
||||
#include "RimGridView.h"
|
||||
#include "RimIntersectionBox.h"
|
||||
#include "RimBoxIntersection.h"
|
||||
|
||||
#include "cafHexGridIntersectionTools/cafHexGridIntersectionTools.h"
|
||||
|
||||
@ -34,7 +34,7 @@
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
///
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
RivIntersectionBoxGeometryGenerator::RivIntersectionBoxGeometryGenerator( RimIntersectionBox* intersectionBox,
|
||||
RivIntersectionBoxGeometryGenerator::RivIntersectionBoxGeometryGenerator( RimBoxIntersection* intersectionBox,
|
||||
const RivIntersectionHexGridInterface* grid )
|
||||
: m_intersectionBoxDefinition( intersectionBox )
|
||||
, m_hexGrid( grid )
|
||||
@ -236,7 +236,7 @@ private:
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
///
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
RimIntersectionBox* RivIntersectionBoxGeometryGenerator::intersectionBox() const
|
||||
RimBoxIntersection* RivIntersectionBoxGeometryGenerator::intersectionBox() const
|
||||
{
|
||||
return m_intersectionBoxDefinition;
|
||||
}
|
||||
@ -264,13 +264,13 @@ void RivIntersectionBoxGeometryGenerator::calculateArrays()
|
||||
Box box( m_intersectionBoxDefinition->boxOrigin(), m_intersectionBoxDefinition->boxSize() );
|
||||
std::array<cvf::Plane, 6> boxPlanes = box.planes();
|
||||
|
||||
RimIntersectionBox::SinglePlaneState singlePlane = m_intersectionBoxDefinition->singlePlaneState();
|
||||
RimBoxIntersection::SinglePlaneState singlePlane = m_intersectionBoxDefinition->singlePlaneState();
|
||||
|
||||
int startFace = 0;
|
||||
int endFace = 5;
|
||||
if ( singlePlane == RimIntersectionBox::PLANE_STATE_X ) startFace = endFace = Box::FaceType::POS_I;
|
||||
if ( singlePlane == RimIntersectionBox::PLANE_STATE_Y ) startFace = endFace = Box::FaceType::POS_J;
|
||||
if ( singlePlane == RimIntersectionBox::PLANE_STATE_Z ) startFace = endFace = Box::FaceType::POS_K;
|
||||
if ( singlePlane == RimBoxIntersection::PLANE_STATE_X ) startFace = endFace = Box::FaceType::POS_I;
|
||||
if ( singlePlane == RimBoxIntersection::PLANE_STATE_Y ) startFace = endFace = Box::FaceType::POS_J;
|
||||
if ( singlePlane == RimBoxIntersection::PLANE_STATE_Z ) startFace = endFace = Box::FaceType::POS_K;
|
||||
|
||||
for ( int faceIdx = startFace; faceIdx <= endFace; ++faceIdx )
|
||||
{
|
||||
|
||||
@ -29,7 +29,7 @@
|
||||
|
||||
#include <vector>
|
||||
|
||||
class RimIntersectionBox;
|
||||
class RimBoxIntersection;
|
||||
|
||||
namespace cvf
|
||||
{
|
||||
@ -40,7 +40,7 @@ class DrawableGeo;
|
||||
class RivIntersectionBoxGeometryGenerator : public cvf::Object, public RivIntersectionGeometryGeneratorIF
|
||||
{
|
||||
public:
|
||||
RivIntersectionBoxGeometryGenerator( RimIntersectionBox* intersectionBox,
|
||||
RivIntersectionBoxGeometryGenerator( RimBoxIntersection* intersectionBox,
|
||||
const RivIntersectionHexGridInterface* grid );
|
||||
|
||||
~RivIntersectionBoxGeometryGenerator() override;
|
||||
@ -49,7 +49,7 @@ public:
|
||||
cvf::ref<cvf::DrawableGeo> generateSurface();
|
||||
cvf::ref<cvf::DrawableGeo> createMeshDrawable();
|
||||
|
||||
RimIntersectionBox* intersectionBox() const;
|
||||
RimBoxIntersection* intersectionBox() const;
|
||||
|
||||
// GeomGen Interface
|
||||
|
||||
@ -70,5 +70,5 @@ private:
|
||||
std::vector<size_t> m_triangleToCellIdxMap;
|
||||
std::vector<RivIntersectionVertexWeights> m_triVxToCellCornerWeights;
|
||||
|
||||
RimIntersectionBox* m_intersectionBoxDefinition;
|
||||
RimBoxIntersection* m_intersectionBoxDefinition;
|
||||
};
|
||||
|
||||
@ -55,7 +55,7 @@ std::array<cvf::Vec3f, 3> RivIntersectionBoxSourceInfo::triangle( int triangleId
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
///
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
RimIntersectionBox* RivIntersectionBoxSourceInfo::intersectionBox() const
|
||||
RimBoxIntersection* RivIntersectionBoxSourceInfo::intersectionBox() const
|
||||
{
|
||||
return m_intersectionBoxGeometryGenerator->intersectionBox();
|
||||
}
|
||||
|
||||
@ -23,7 +23,7 @@
|
||||
#include <array>
|
||||
|
||||
class RivIntersectionBoxGeometryGenerator;
|
||||
class RimIntersectionBox;
|
||||
class RimBoxIntersection;
|
||||
|
||||
class RivIntersectionBoxSourceInfo : public cvf::Object
|
||||
{
|
||||
@ -33,7 +33,7 @@ public:
|
||||
const std::vector<size_t>& triangleToCellIndex() const;
|
||||
|
||||
std::array<cvf::Vec3f, 3> triangle( int triangleIdx ) const;
|
||||
RimIntersectionBox* intersectionBox() const;
|
||||
RimBoxIntersection* intersectionBox() const;
|
||||
|
||||
private:
|
||||
cvf::cref<RivIntersectionBoxGeometryGenerator> m_intersectionBoxGeometryGenerator;
|
||||
|
||||
@ -95,7 +95,7 @@ ${CMAKE_CURRENT_LIST_DIR}/RimIntersectionResultsDefinitionCollection.h
|
||||
${CMAKE_CURRENT_LIST_DIR}/RimContextCommandBuilder.h
|
||||
${CMAKE_CURRENT_LIST_DIR}/RimGridCollection.h
|
||||
${CMAKE_CURRENT_LIST_DIR}/RimPlotCurve.h
|
||||
${CMAKE_CURRENT_LIST_DIR}/RimIntersectionBox.h
|
||||
${CMAKE_CURRENT_LIST_DIR}/RimBoxIntersection.h
|
||||
${CMAKE_CURRENT_LIST_DIR}/RimAdvancedSnapshotExportDefinition.h
|
||||
${CMAKE_CURRENT_LIST_DIR}/RimMdiWindowController.h
|
||||
${CMAKE_CURRENT_LIST_DIR}/RimPropertyFilter.h
|
||||
@ -240,7 +240,7 @@ ${CMAKE_CURRENT_LIST_DIR}/RimIntersectionResultsDefinitionCollection.cpp
|
||||
${CMAKE_CURRENT_LIST_DIR}/RimContextCommandBuilder.cpp
|
||||
${CMAKE_CURRENT_LIST_DIR}/RimGridCollection.cpp
|
||||
${CMAKE_CURRENT_LIST_DIR}/RimPlotCurve.cpp
|
||||
${CMAKE_CURRENT_LIST_DIR}/RimIntersectionBox.cpp
|
||||
${CMAKE_CURRENT_LIST_DIR}/RimBoxIntersection.cpp
|
||||
${CMAKE_CURRENT_LIST_DIR}/RimAdvancedSnapshotExportDefinition.cpp
|
||||
${CMAKE_CURRENT_LIST_DIR}/RimMdiWindowController.cpp
|
||||
${CMAKE_CURRENT_LIST_DIR}/RimPropertyFilter.cpp
|
||||
|
||||
@ -16,7 +16,7 @@
|
||||
//
|
||||
/////////////////////////////////////////////////////////////////////////////////
|
||||
|
||||
#include "RimIntersectionBox.h"
|
||||
#include "RimBoxIntersection.h"
|
||||
|
||||
#include "Rim3dView.h"
|
||||
#include "RimCase.h"
|
||||
@ -26,7 +26,7 @@
|
||||
|
||||
#include "RiuViewer.h"
|
||||
|
||||
#include "RivIntersectionBoxPartMgr.h"
|
||||
#include "RivBoxIntersectionPartMgr.h"
|
||||
|
||||
#include "cafDisplayCoordTransform.h"
|
||||
#include "cafPdmUiDoubleSliderEditor.h"
|
||||
@ -36,22 +36,22 @@
|
||||
namespace caf
|
||||
{
|
||||
template <>
|
||||
void AppEnum<RimIntersectionBox::SinglePlaneState>::setUp()
|
||||
void AppEnum<RimBoxIntersection::SinglePlaneState>::setUp()
|
||||
{
|
||||
addItem( RimIntersectionBox::PLANE_STATE_NONE, "PLANE_STATE_NONE", "Box" );
|
||||
addItem( RimIntersectionBox::PLANE_STATE_X, "PLANE_STATE_X", "X Plane" );
|
||||
addItem( RimIntersectionBox::PLANE_STATE_Y, "PLANE_STATE_Y", "Y Plane" );
|
||||
addItem( RimIntersectionBox::PLANE_STATE_Z, "PLANE_STATE_Z", "Z Plane" );
|
||||
setDefault( RimIntersectionBox::PLANE_STATE_NONE );
|
||||
addItem( RimBoxIntersection::PLANE_STATE_NONE, "PLANE_STATE_NONE", "Box" );
|
||||
addItem( RimBoxIntersection::PLANE_STATE_X, "PLANE_STATE_X", "X Plane" );
|
||||
addItem( RimBoxIntersection::PLANE_STATE_Y, "PLANE_STATE_Y", "Y Plane" );
|
||||
addItem( RimBoxIntersection::PLANE_STATE_Z, "PLANE_STATE_Z", "Z Plane" );
|
||||
setDefault( RimBoxIntersection::PLANE_STATE_NONE );
|
||||
}
|
||||
} // namespace caf
|
||||
|
||||
CAF_PDM_SOURCE_INIT( RimIntersectionBox, "IntersectionBox" );
|
||||
CAF_PDM_SOURCE_INIT( RimBoxIntersection, "IntersectionBox" );
|
||||
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
///
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
RimIntersectionBox::RimIntersectionBox()
|
||||
RimBoxIntersection::RimBoxIntersection()
|
||||
{
|
||||
CAF_PDM_InitObject( "Intersection Box", ":/IntersectionBox16x16.png", "", "" );
|
||||
|
||||
@ -92,7 +92,7 @@ RimIntersectionBox::RimIntersectionBox()
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
///
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
RimIntersectionBox::~RimIntersectionBox()
|
||||
RimBoxIntersection::~RimBoxIntersection()
|
||||
{
|
||||
if ( m_boxManipulator )
|
||||
{
|
||||
@ -103,7 +103,7 @@ RimIntersectionBox::~RimIntersectionBox()
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
///
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
cvf::Mat4d RimIntersectionBox::boxOrigin() const
|
||||
cvf::Mat4d RimBoxIntersection::boxOrigin() const
|
||||
{
|
||||
cvf::Mat4d mx( cvf::Mat4d::IDENTITY );
|
||||
mx.setTranslation( cvf::Vec3d( m_minXCoord, m_minYCoord, -m_maxDepth ) );
|
||||
@ -113,7 +113,7 @@ cvf::Mat4d RimIntersectionBox::boxOrigin() const
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
///
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
cvf::Vec3d RimIntersectionBox::boxSize() const
|
||||
cvf::Vec3d RimBoxIntersection::boxSize() const
|
||||
{
|
||||
return cvf::Vec3d( m_maxXCoord, m_maxYCoord, m_maxDepth ) - cvf::Vec3d( m_minXCoord, m_minYCoord, m_minDepth );
|
||||
}
|
||||
@ -121,7 +121,7 @@ cvf::Vec3d RimIntersectionBox::boxSize() const
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
///
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
void RimIntersectionBox::setFromOriginAndSize( const cvf::Vec3d& origin, const cvf::Vec3d& size )
|
||||
void RimBoxIntersection::setFromOriginAndSize( const cvf::Vec3d& origin, const cvf::Vec3d& size )
|
||||
{
|
||||
m_minXCoord = origin.x();
|
||||
m_minYCoord = origin.y();
|
||||
@ -143,7 +143,7 @@ void RimIntersectionBox::setFromOriginAndSize( const cvf::Vec3d& origin, const c
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
///
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
bool RimIntersectionBox::show3dManipulator() const
|
||||
bool RimBoxIntersection::show3dManipulator() const
|
||||
{
|
||||
return m_show3DManipulator;
|
||||
}
|
||||
@ -151,7 +151,7 @@ bool RimIntersectionBox::show3dManipulator() const
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
///
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
RimIntersectionBox::SinglePlaneState RimIntersectionBox::singlePlaneState() const
|
||||
RimBoxIntersection::SinglePlaneState RimBoxIntersection::singlePlaneState() const
|
||||
{
|
||||
return m_singlePlaneState();
|
||||
}
|
||||
@ -159,7 +159,7 @@ RimIntersectionBox::SinglePlaneState RimIntersectionBox::singlePlaneState() cons
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
///
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
void RimIntersectionBox::setToDefaultSizeBox()
|
||||
void RimBoxIntersection::setToDefaultSizeBox()
|
||||
{
|
||||
cvf::BoundingBox boundingBox = currentCellBoundingBox();
|
||||
cvf::Vec3d center = boundingBox.center();
|
||||
@ -177,7 +177,7 @@ void RimIntersectionBox::setToDefaultSizeBox()
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
///
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
void RimIntersectionBox::setToDefaultSizeSlice( SinglePlaneState plane, const cvf::Vec3d& position )
|
||||
void RimBoxIntersection::setToDefaultSizeSlice( SinglePlaneState plane, const cvf::Vec3d& position )
|
||||
{
|
||||
m_singlePlaneState = plane;
|
||||
|
||||
@ -214,9 +214,9 @@ void RimIntersectionBox::setToDefaultSizeSlice( SinglePlaneState plane, const cv
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
///
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
RivIntersectionBoxPartMgr* RimIntersectionBox::intersectionBoxPartMgr()
|
||||
RivBoxIntersectionPartMgr* RimBoxIntersection::intersectionBoxPartMgr()
|
||||
{
|
||||
if ( m_intersectionBoxPartMgr.isNull() ) m_intersectionBoxPartMgr = new RivIntersectionBoxPartMgr( this );
|
||||
if ( m_intersectionBoxPartMgr.isNull() ) m_intersectionBoxPartMgr = new RivBoxIntersectionPartMgr( this );
|
||||
|
||||
return m_intersectionBoxPartMgr.p();
|
||||
}
|
||||
@ -224,7 +224,7 @@ RivIntersectionBoxPartMgr* RimIntersectionBox::intersectionBoxPartMgr()
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
///
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
void RimIntersectionBox::appendManipulatorPartsToModel( cvf::ModelBasicList* model )
|
||||
void RimBoxIntersection::appendManipulatorPartsToModel( cvf::ModelBasicList* model )
|
||||
{
|
||||
if ( show3dManipulator() && m_boxManipulator )
|
||||
{
|
||||
@ -235,7 +235,7 @@ void RimIntersectionBox::appendManipulatorPartsToModel( cvf::ModelBasicList* mod
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
///
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
void RimIntersectionBox::rebuildGeometry()
|
||||
void RimBoxIntersection::rebuildGeometry()
|
||||
{
|
||||
m_intersectionBoxPartMgr = nullptr;
|
||||
}
|
||||
@ -243,7 +243,7 @@ void RimIntersectionBox::rebuildGeometry()
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
///
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
void RimIntersectionBox::fieldChangedByUi( const caf::PdmFieldHandle* changedField,
|
||||
void RimBoxIntersection::fieldChangedByUi( const caf::PdmFieldHandle* changedField,
|
||||
const QVariant& oldValue,
|
||||
const QVariant& newValue )
|
||||
{
|
||||
@ -359,7 +359,7 @@ void RimIntersectionBox::fieldChangedByUi( const caf::PdmFieldHandle* changedFie
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
///
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
void RimIntersectionBox::updateBoxManipulatorGeometry()
|
||||
void RimBoxIntersection::updateBoxManipulatorGeometry()
|
||||
{
|
||||
if ( m_boxManipulator.isNull() ) return;
|
||||
|
||||
@ -376,7 +376,7 @@ void RimIntersectionBox::updateBoxManipulatorGeometry()
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
///
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
void RimIntersectionBox::defineEditorAttribute( const caf::PdmFieldHandle* field,
|
||||
void RimBoxIntersection::defineEditorAttribute( const caf::PdmFieldHandle* field,
|
||||
QString uiConfigName,
|
||||
caf::PdmUiEditorAttribute* attribute )
|
||||
{
|
||||
@ -437,7 +437,7 @@ void RimIntersectionBox::defineEditorAttribute( const caf::PdmFieldHandle* field
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
///
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
void RimIntersectionBox::defineUiOrdering( QString uiConfigName, caf::PdmUiOrdering& uiOrdering )
|
||||
void RimBoxIntersection::defineUiOrdering( QString uiConfigName, caf::PdmUiOrdering& uiOrdering )
|
||||
{
|
||||
uiOrdering.add( &m_name );
|
||||
|
||||
@ -484,7 +484,7 @@ void RimIntersectionBox::defineUiOrdering( QString uiConfigName, caf::PdmUiOrder
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
///
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
void RimIntersectionBox::initAfterRead()
|
||||
void RimBoxIntersection::initAfterRead()
|
||||
{
|
||||
RimIntersectionHandle::initAfterRead();
|
||||
updateVisibility();
|
||||
@ -493,7 +493,7 @@ void RimIntersectionBox::initAfterRead()
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
///
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
void RimIntersectionBox::slotScheduleRedraw()
|
||||
void RimBoxIntersection::slotScheduleRedraw()
|
||||
{
|
||||
Rim3dView* rimView = nullptr;
|
||||
this->firstAncestorOrThisOfType( rimView );
|
||||
@ -506,7 +506,7 @@ void RimIntersectionBox::slotScheduleRedraw()
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
///
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
void RimIntersectionBox::slotUpdateGeometry( const cvf::Vec3d& origin, const cvf::Vec3d& size )
|
||||
void RimBoxIntersection::slotUpdateGeometry( const cvf::Vec3d& origin, const cvf::Vec3d& size )
|
||||
{
|
||||
Rim3dView* rimView = nullptr;
|
||||
this->firstAncestorOrThisOfType( rimView );
|
||||
@ -526,7 +526,7 @@ void RimIntersectionBox::slotUpdateGeometry( const cvf::Vec3d& origin, const cvf
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
///
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
void RimIntersectionBox::rebuildGeometryAndScheduleCreateDisplayModel()
|
||||
void RimBoxIntersection::rebuildGeometryAndScheduleCreateDisplayModel()
|
||||
{
|
||||
m_intersectionBoxPartMgr = nullptr;
|
||||
|
||||
@ -536,7 +536,7 @@ void RimIntersectionBox::rebuildGeometryAndScheduleCreateDisplayModel()
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
///
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
void RimIntersectionBox::updateVisibility()
|
||||
void RimBoxIntersection::updateVisibility()
|
||||
{
|
||||
m_maxXCoord.uiCapability()->setUiReadOnly( false );
|
||||
m_maxYCoord.uiCapability()->setUiReadOnly( false );
|
||||
@ -566,7 +566,7 @@ void RimIntersectionBox::updateVisibility()
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
///
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
void RimIntersectionBox::clampSinglePlaneValues()
|
||||
void RimBoxIntersection::clampSinglePlaneValues()
|
||||
{
|
||||
if ( m_singlePlaneState == PLANE_STATE_X )
|
||||
{
|
||||
@ -585,7 +585,7 @@ void RimIntersectionBox::clampSinglePlaneValues()
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
///
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
void RimIntersectionBox::switchSingelPlaneState()
|
||||
void RimBoxIntersection::switchSingelPlaneState()
|
||||
{
|
||||
cvf::Vec3d orgSize = boxSize();
|
||||
double orgWidth = orgSize.length();
|
||||
@ -635,7 +635,7 @@ void RimIntersectionBox::switchSingelPlaneState()
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
///
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
cvf::BoundingBox RimIntersectionBox::currentCellBoundingBox()
|
||||
cvf::BoundingBox RimBoxIntersection::currentCellBoundingBox()
|
||||
{
|
||||
RimCase* rimCase = nullptr;
|
||||
this->firstAncestorOrThisOfType( rimCase );
|
||||
@ -660,7 +660,7 @@ cvf::BoundingBox RimIntersectionBox::currentCellBoundingBox()
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
///
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
RiuViewer* RimIntersectionBox::viewer()
|
||||
RiuViewer* RimBoxIntersection::viewer()
|
||||
{
|
||||
Rim3dView* rimView = nullptr;
|
||||
this->firstAncestorOrThisOfType( rimView );
|
||||
@ -31,7 +31,7 @@
|
||||
|
||||
class RicBoxManipulatorEventHandler;
|
||||
class RiuViewer;
|
||||
class RivIntersectionBoxPartMgr;
|
||||
class RivBoxIntersectionPartMgr;
|
||||
|
||||
namespace cvf
|
||||
{
|
||||
@ -43,7 +43,7 @@ class ModelBasicList;
|
||||
//
|
||||
//
|
||||
//==================================================================================================
|
||||
class RimIntersectionBox : public QObject, public RimIntersectionHandle
|
||||
class RimBoxIntersection : public QObject, public RimIntersectionHandle
|
||||
{
|
||||
Q_OBJECT;
|
||||
|
||||
@ -59,8 +59,8 @@ public:
|
||||
};
|
||||
|
||||
public:
|
||||
RimIntersectionBox();
|
||||
~RimIntersectionBox() override;
|
||||
RimBoxIntersection();
|
||||
~RimBoxIntersection() override;
|
||||
|
||||
cvf::Mat4d boxOrigin() const;
|
||||
cvf::Vec3d boxSize() const;
|
||||
@ -68,7 +68,7 @@ public:
|
||||
|
||||
bool show3dManipulator() const;
|
||||
|
||||
RivIntersectionBoxPartMgr* intersectionBoxPartMgr();
|
||||
RivBoxIntersectionPartMgr* intersectionBoxPartMgr();
|
||||
void appendManipulatorPartsToModel( cvf::ModelBasicList* model );
|
||||
void rebuildGeometry();
|
||||
|
||||
@ -120,6 +120,6 @@ private:
|
||||
|
||||
caf::PdmField<bool> m_show3DManipulator;
|
||||
|
||||
cvf::ref<RivIntersectionBoxPartMgr> m_intersectionBoxPartMgr;
|
||||
cvf::ref<RivBoxIntersectionPartMgr> m_intersectionBoxPartMgr;
|
||||
QPointer<RicBoxManipulatorEventHandler> m_boxManipulator;
|
||||
};
|
||||
@ -75,7 +75,7 @@
|
||||
#include "RimGridCrossPlotDataSet.h"
|
||||
#include "RimIdenticalGridCaseGroup.h"
|
||||
#include "RimExtrudedCurveIntersection.h"
|
||||
#include "RimIntersectionBox.h"
|
||||
#include "RimBoxIntersection.h"
|
||||
#include "RimIntersectionCollection.h"
|
||||
#include "RimIntersectionResultDefinition.h"
|
||||
#include "RimIntersectionResultsDefinitionCollection.h"
|
||||
@ -677,7 +677,7 @@ caf::CmdFeatureMenuBuilder RimContextCommandBuilder::commandsFromSelection()
|
||||
menuBuilder.addSeparator();
|
||||
menuBuilder << "RicCopyIntersectionsToAllViewsInCaseFeature";
|
||||
}
|
||||
else if ( dynamic_cast<RimIntersectionBox*>( uiItem ) )
|
||||
else if ( dynamic_cast<RimBoxIntersection*>( uiItem ) )
|
||||
{
|
||||
menuBuilder << "RicPasteIntersectionsFeature";
|
||||
menuBuilder.addSeparator();
|
||||
|
||||
@ -24,12 +24,12 @@
|
||||
#include "Rim3dView.h"
|
||||
#include "RimCase.h"
|
||||
#include "RimExtrudedCurveIntersection.h"
|
||||
#include "RimIntersectionBox.h"
|
||||
#include "RimBoxIntersection.h"
|
||||
#include "RimSimWellInView.h"
|
||||
|
||||
#include "Riu3DMainWindowTools.h"
|
||||
|
||||
#include "RivIntersectionBoxPartMgr.h"
|
||||
#include "RivBoxIntersectionPartMgr.h"
|
||||
#include "RivExtrudedCurveIntersectionPartMgr.h"
|
||||
|
||||
#include "cvfModelBasicList.h"
|
||||
@ -85,7 +85,7 @@ void RimIntersectionCollection::applySingleColorEffect()
|
||||
}
|
||||
}
|
||||
|
||||
for ( RimIntersectionBox* cs : m_intersectionBoxes )
|
||||
for ( RimBoxIntersection* cs : m_intersectionBoxes )
|
||||
{
|
||||
if ( cs->isActive() )
|
||||
{
|
||||
@ -109,7 +109,7 @@ void RimIntersectionCollection::updateCellResultColor( size_t timeStepIndex )
|
||||
}
|
||||
}
|
||||
|
||||
for ( RimIntersectionBox* cs : m_intersectionBoxes )
|
||||
for ( RimBoxIntersection* cs : m_intersectionBoxes )
|
||||
{
|
||||
if ( cs->isActive() )
|
||||
{
|
||||
@ -137,7 +137,7 @@ void RimIntersectionCollection::appendPartsToModel( Rim3dView& view,
|
||||
}
|
||||
}
|
||||
|
||||
for ( RimIntersectionBox* cs : m_intersectionBoxes )
|
||||
for ( RimBoxIntersection* cs : m_intersectionBoxes )
|
||||
{
|
||||
if ( cs->isActive() )
|
||||
{
|
||||
@ -164,7 +164,7 @@ void RimIntersectionCollection::rebuildGeometry()
|
||||
intersection->rebuildGeometry();
|
||||
}
|
||||
|
||||
for ( RimIntersectionBox* intersectionBox : m_intersectionBoxes )
|
||||
for ( RimBoxIntersection* intersectionBox : m_intersectionBoxes )
|
||||
{
|
||||
intersectionBox->rebuildGeometry();
|
||||
}
|
||||
@ -181,7 +181,7 @@ std::vector<RimExtrudedCurveIntersection*> RimIntersectionCollection::intersecti
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
///
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
std::vector<RimIntersectionBox*> RimIntersectionCollection::intersectionBoxes() const
|
||||
std::vector<RimBoxIntersection*> RimIntersectionCollection::intersectionBoxes() const
|
||||
{
|
||||
return m_intersectionBoxes.childObjects();
|
||||
}
|
||||
@ -252,7 +252,7 @@ void RimIntersectionCollection::scheduleCreateDisplayModelAndRedraw2dIntersectio
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
///
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
void RimIntersectionCollection::appendIntersectionBoxAndUpdate( RimIntersectionBox* intersectionBox )
|
||||
void RimIntersectionCollection::appendIntersectionBoxAndUpdate( RimBoxIntersection* intersectionBox )
|
||||
{
|
||||
m_intersectionBoxes.push_back( intersectionBox );
|
||||
|
||||
@ -270,7 +270,7 @@ void RimIntersectionCollection::appendIntersectionBoxAndUpdate( RimIntersectionB
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
///
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
void RimIntersectionCollection::appendIntersectionBoxNoUpdate( RimIntersectionBox* intersectionBox )
|
||||
void RimIntersectionCollection::appendIntersectionBoxNoUpdate( RimBoxIntersection* intersectionBox )
|
||||
{
|
||||
m_intersectionBoxes.push_back( intersectionBox );
|
||||
}
|
||||
@ -318,7 +318,7 @@ bool RimIntersectionCollection::hasActiveIntersectionForSimulationWell( const Ri
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
void RimIntersectionCollection::updateIntersectionBoxGeometry()
|
||||
{
|
||||
for ( RimIntersectionBox* intersectionBox : m_intersectionBoxes )
|
||||
for ( RimBoxIntersection* intersectionBox : m_intersectionBoxes )
|
||||
{
|
||||
intersectionBox->updateBoxManipulatorGeometry();
|
||||
}
|
||||
|
||||
@ -25,7 +25,7 @@
|
||||
|
||||
class Rim3dView;
|
||||
class RimExtrudedCurveIntersection;
|
||||
class RimIntersectionBox;
|
||||
class RimBoxIntersection;
|
||||
class RimEclipseCellColors;
|
||||
class RimSimWellInView;
|
||||
class RivTernaryScalarMapper;
|
||||
@ -55,8 +55,8 @@ public:
|
||||
void appendIntersectionAndUpdate( RimExtrudedCurveIntersection* intersection, bool allowActiveViewChange = true );
|
||||
void appendIntersectionNoUpdate( RimExtrudedCurveIntersection* intersection );
|
||||
|
||||
void appendIntersectionBoxAndUpdate( RimIntersectionBox* intersectionBox );
|
||||
void appendIntersectionBoxNoUpdate( RimIntersectionBox* intersectionBox );
|
||||
void appendIntersectionBoxAndUpdate( RimBoxIntersection* intersectionBox );
|
||||
void appendIntersectionBoxNoUpdate( RimBoxIntersection* intersectionBox );
|
||||
|
||||
bool hasActiveIntersectionForSimulationWell( const RimSimWellInView* simWell ) const;
|
||||
|
||||
@ -74,7 +74,7 @@ public:
|
||||
void rebuildGeometry();
|
||||
|
||||
std::vector<RimExtrudedCurveIntersection*> intersections() const;
|
||||
std::vector<RimIntersectionBox*> intersectionBoxes() const;
|
||||
std::vector<RimBoxIntersection*> intersectionBoxes() const;
|
||||
|
||||
protected:
|
||||
void fieldChangedByUi( const caf::PdmFieldHandle* changedField,
|
||||
@ -84,5 +84,5 @@ protected:
|
||||
|
||||
private:
|
||||
caf::PdmChildArrayField<RimExtrudedCurveIntersection*> m_intersections;
|
||||
caf::PdmChildArrayField<RimIntersectionBox*> m_intersectionBoxes;
|
||||
caf::PdmChildArrayField<RimBoxIntersection*> m_intersectionBoxes;
|
||||
};
|
||||
|
||||
@ -58,7 +58,7 @@
|
||||
#include "RimGeoMechContourMapView.h"
|
||||
#include "RimGeoMechView.h"
|
||||
#include "RimExtrudedCurveIntersection.h"
|
||||
#include "RimIntersectionBox.h"
|
||||
#include "RimBoxIntersection.h"
|
||||
#include "RimIntersectionResultDefinition.h"
|
||||
#include "RimLegendConfig.h"
|
||||
#include "RimPerforationInterval.h"
|
||||
|
||||
Loading…
Reference in New Issue
Block a user