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/ProjectDataModel/CMakeLists_files.cmake
View File

@@ -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

70
ApplicationCode/ProjectDataModel/RimIntersectionBox.cpp → ApplicationCode/ProjectDataModel/RimBoxIntersection.cpp
View File

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

12
ApplicationCode/ProjectDataModel/RimIntersectionBox.h → ApplicationCode/ProjectDataModel/RimBoxIntersection.h
View File

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

4
ApplicationCode/ProjectDataModel/RimContextCommandBuilder.cpp
View File

@@ -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();

20
ApplicationCode/ProjectDataModel/RimIntersectionCollection.cpp
View File

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

10
ApplicationCode/ProjectDataModel/RimIntersectionCollection.h
View File

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