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 RivIntersectionSourceInfo to RivExtrudedCurveIntersectionSourceInfo

Browse Source
This commit is contained in:
Jacob Støren
2019-11-26 11:56:05 +01:00
parent 0617b56850
commit 54c96581f1
7 changed files with 19 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ApplicationCode/Commands/HoloLensCommands/RicHoloLensExportImpl.cpp
View File

@@ -34,7 +34,7 @@
#include "RivFemPickSourceInfo.h" #include "RivFemPickSourceInfo.h"
#include "RivGeoMechVizLogic.h" #include "RivGeoMechVizLogic.h"
#include "RivIntersectionBoxSourceInfo.h" #include "RivIntersectionBoxSourceInfo.h"
#include "RivIntersectionSourceInfo.h" #include "RivExtrudedCurveIntersectionSourceInfo.h"
#include "RivMeshLinesSourceInfo.h" #include "RivMeshLinesSourceInfo.h"
#include "RivSimWellPipeSourceInfo.h" #include "RivSimWellPipeSourceInfo.h"
#include "RivSourceInfo.h" #include "RivSourceInfo.h"
@@ -351,7 +351,7 @@ bool RicHoloLensExportImpl::isGrid( const cvf::Part* part )
} }
{ {
auto sourceInfoOfType = dynamic_cast<const RivIntersectionSourceInfo*>( sourceInfo ); auto sourceInfoOfType = dynamic_cast<const RivExtrudedCurveIntersectionSourceInfo*>( sourceInfo );
if ( sourceInfoOfType ) if ( sourceInfoOfType )
{ {
return true; return true;

4
ApplicationCode/ModelVisualization/Intersections/CMakeLists_files.cmake
View File

@@ -2,7 +2,7 @@
set (SOURCE_GROUP_HEADER_FILES set (SOURCE_GROUP_HEADER_FILES
${CMAKE_CURRENT_LIST_DIR}/RivExtrudedCurveIntersectionGeometryGenerator.h ${CMAKE_CURRENT_LIST_DIR}/RivExtrudedCurveIntersectionGeometryGenerator.h
${CMAKE_CURRENT_LIST_DIR}/RivExtrudedCurveIntersectionPartMgr.h ${CMAKE_CURRENT_LIST_DIR}/RivExtrudedCurveIntersectionPartMgr.h
${CMAKE_CURRENT_LIST_DIR}/RivIntersectionSourceInfo.h ${CMAKE_CURRENT_LIST_DIR}/RivExtrudedCurveIntersectionSourceInfo.h
${CMAKE_CURRENT_LIST_DIR}/RivIntersectionResultsColoringTools.h ${CMAKE_CURRENT_LIST_DIR}/RivIntersectionResultsColoringTools.h
${CMAKE_CURRENT_LIST_DIR}/RivHexGridIntersectionTools.h ${CMAKE_CURRENT_LIST_DIR}/RivHexGridIntersectionTools.h
${CMAKE_CURRENT_LIST_DIR}/RivIntersectionBoxGeometryGenerator.h ${CMAKE_CURRENT_LIST_DIR}/RivIntersectionBoxGeometryGenerator.h
@@ -14,7 +14,7 @@ ${CMAKE_CURRENT_LIST_DIR}/RivSectionFlattner.h
set (SOURCE_GROUP_SOURCE_FILES set (SOURCE_GROUP_SOURCE_FILES
${CMAKE_CURRENT_LIST_DIR}/RivExtrudedCurveIntersectionGeometryGenerator.cpp ${CMAKE_CURRENT_LIST_DIR}/RivExtrudedCurveIntersectionGeometryGenerator.cpp
${CMAKE_CURRENT_LIST_DIR}/RivExtrudedCurveIntersectionPartMgr.cpp ${CMAKE_CURRENT_LIST_DIR}/RivExtrudedCurveIntersectionPartMgr.cpp
${CMAKE_CURRENT_LIST_DIR}/RivIntersectionSourceInfo.cpp ${CMAKE_CURRENT_LIST_DIR}/RivExtrudedCurveIntersectionSourceInfo.cpp
${CMAKE_CURRENT_LIST_DIR}/RivIntersectionResultsColoringTools.cpp ${CMAKE_CURRENT_LIST_DIR}/RivIntersectionResultsColoringTools.cpp
${CMAKE_CURRENT_LIST_DIR}/RivHexGridIntersectionTools.cpp ${CMAKE_CURRENT_LIST_DIR}/RivHexGridIntersectionTools.cpp
${CMAKE_CURRENT_LIST_DIR}/RivIntersectionBoxGeometryGenerator.cpp ${CMAKE_CURRENT_LIST_DIR}/RivIntersectionBoxGeometryGenerator.cpp

4
ApplicationCode/ModelVisualization/Intersections/RivExtrudedCurveIntersectionPartMgr.cpp
View File

@@ -52,7 +52,7 @@
#include "RivHexGridIntersectionTools.h" #include "RivHexGridIntersectionTools.h"
#include "RivExtrudedCurveIntersectionGeometryGenerator.h" #include "RivExtrudedCurveIntersectionGeometryGenerator.h"
#include "RivIntersectionResultsColoringTools.h" #include "RivIntersectionResultsColoringTools.h"
#include "RivIntersectionSourceInfo.h" #include "RivExtrudedCurveIntersectionSourceInfo.h"
#include "RivMeshLinesSourceInfo.h" #include "RivMeshLinesSourceInfo.h"
#include "RivObjectSourceInfo.h" #include "RivObjectSourceInfo.h"
#include "RivPartPriority.h" #include "RivPartPriority.h"
@@ -243,7 +243,7 @@ void RivExtrudedCurveIntersectionPartMgr::generatePartGeometry()
part->setDrawable( geo.p() ); part->setDrawable( geo.p() );
// Set mapping from triangle face index to cell index // Set mapping from triangle face index to cell index
cvf::ref<RivIntersectionSourceInfo> si = new RivIntersectionSourceInfo( m_crossSectionGenerator.p() ); cvf::ref<RivExtrudedCurveIntersectionSourceInfo> si = new RivExtrudedCurveIntersectionSourceInfo( m_crossSectionGenerator.p() );
part->setSourceInfo( si.p() ); part->setSourceInfo( si.p() );
part->updateBoundingBox(); part->updateBoundingBox();

10
ApplicationCode/ModelVisualization/Intersections/RivIntersectionSourceInfo.cpp → ApplicationCode/ModelVisualization/Intersections/RivExtrudedCurveIntersectionSourceInfo.cpp
View File

@@ -17,14 +17,14 @@
// //
///////////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////////
#include "RivIntersectionSourceInfo.h" #include "RivExtrudedCurveIntersectionSourceInfo.h"
#include "RivExtrudedCurveIntersectionGeometryGenerator.h" #include "RivExtrudedCurveIntersectionGeometryGenerator.h"
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
RivIntersectionSourceInfo::RivIntersectionSourceInfo( RivExtrudedCurveIntersectionGeometryGenerator* geometryGenerator ) RivExtrudedCurveIntersectionSourceInfo::RivExtrudedCurveIntersectionSourceInfo( RivExtrudedCurveIntersectionGeometryGenerator* geometryGenerator )
: m_crossSectionGeometryGenerator( geometryGenerator ) : m_crossSectionGeometryGenerator( geometryGenerator )
{ {
CVF_ASSERT( m_crossSectionGeometryGenerator.notNull() ); CVF_ASSERT( m_crossSectionGeometryGenerator.notNull() );
@@ -33,7 +33,7 @@ RivIntersectionSourceInfo::RivIntersectionSourceInfo( RivExtrudedCurveIntersecti
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
const std::vector<size_t>& RivIntersectionSourceInfo::triangleToCellIndex() const const std::vector<size_t>& RivExtrudedCurveIntersectionSourceInfo::triangleToCellIndex() const
{ {
CVF_ASSERT( m_crossSectionGeometryGenerator.notNull() ); CVF_ASSERT( m_crossSectionGeometryGenerator.notNull() );
@@ -43,7 +43,7 @@ const std::vector<size_t>& RivIntersectionSourceInfo::triangleToCellIndex() cons
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
std::array<cvf::Vec3f, 3> RivIntersectionSourceInfo::triangle( int triangleIdx ) const std::array<cvf::Vec3f, 3> RivExtrudedCurveIntersectionSourceInfo::triangle( int triangleIdx ) const
{ {
std::array<cvf::Vec3f, 3> tri; std::array<cvf::Vec3f, 3> tri;
tri[0] = ( *m_crossSectionGeometryGenerator->triangleVxes() )[triangleIdx * 3]; tri[0] = ( *m_crossSectionGeometryGenerator->triangleVxes() )[triangleIdx * 3];
@@ -56,7 +56,7 @@ std::array<cvf::Vec3f, 3> RivIntersectionSourceInfo::triangle( int triangleIdx )
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
RimExtrudedCurveIntersection* RivIntersectionSourceInfo::crossSection() const RimExtrudedCurveIntersection* RivExtrudedCurveIntersectionSourceInfo::crossSection() const
{ {
return m_crossSectionGeometryGenerator->crossSection(); return m_crossSectionGeometryGenerator->crossSection();
} }

4
ApplicationCode/ModelVisualization/Intersections/RivIntersectionSourceInfo.h → ApplicationCode/ModelVisualization/Intersections/RivExtrudedCurveIntersectionSourceInfo.h
View File

@@ -26,10 +26,10 @@
class RivExtrudedCurveIntersectionGeometryGenerator; class RivExtrudedCurveIntersectionGeometryGenerator;
class RimExtrudedCurveIntersection; class RimExtrudedCurveIntersection;
class RivIntersectionSourceInfo : public cvf::Object class RivExtrudedCurveIntersectionSourceInfo : public cvf::Object
{ {
public: public:
explicit RivIntersectionSourceInfo( RivExtrudedCurveIntersectionGeometryGenerator* geometryGenerator ); explicit RivExtrudedCurveIntersectionSourceInfo( RivExtrudedCurveIntersectionGeometryGenerator* geometryGenerator );
const std::vector<size_t>& triangleToCellIndex() const; const std::vector<size_t>& triangleToCellIndex() const;
std::array<cvf::Vec3f, 3> triangle( int triangleIdx ) const; std::array<cvf::Vec3f, 3> triangle( int triangleIdx ) const;

8
ApplicationCode/UserInterface/RiuViewerCommands.cpp
View File

@@ -78,7 +78,7 @@
#include "RivFemPartGeometryGenerator.h" #include "RivFemPartGeometryGenerator.h"
#include "RivFemPickSourceInfo.h" #include "RivFemPickSourceInfo.h"
#include "RivIntersectionBoxSourceInfo.h" #include "RivIntersectionBoxSourceInfo.h"
#include "RivIntersectionSourceInfo.h" #include "RivExtrudedCurveIntersectionSourceInfo.h"
#include "RivObjectSourceInfo.h" #include "RivObjectSourceInfo.h"
#include "RivPartPriority.h" #include "RivPartPriority.h"
#include "RivSimWellConnectionSourceInfo.h" #include "RivSimWellConnectionSourceInfo.h"
@@ -270,7 +270,7 @@ void RiuViewerCommands::displayContextMenu( QMouseEvent* event )
const RivSourceInfo* rivSourceInfo = dynamic_cast<const RivSourceInfo*>( firstHitPart->sourceInfo() ); const RivSourceInfo* rivSourceInfo = dynamic_cast<const RivSourceInfo*>( firstHitPart->sourceInfo() );
const RivFemPickSourceInfo* femSourceInfo = dynamic_cast<const RivFemPickSourceInfo*>( const RivFemPickSourceInfo* femSourceInfo = dynamic_cast<const RivFemPickSourceInfo*>(
firstHitPart->sourceInfo() ); firstHitPart->sourceInfo() );
const RivIntersectionSourceInfo* crossSectionSourceInfo = dynamic_cast<const RivIntersectionSourceInfo*>( const RivExtrudedCurveIntersectionSourceInfo* crossSectionSourceInfo = dynamic_cast<const RivExtrudedCurveIntersectionSourceInfo*>(
firstHitPart->sourceInfo() ); firstHitPart->sourceInfo() );
const RivIntersectionBoxSourceInfo* intersectionBoxSourceInfo = dynamic_cast<const RivIntersectionBoxSourceInfo*>( const RivIntersectionBoxSourceInfo* intersectionBoxSourceInfo = dynamic_cast<const RivIntersectionBoxSourceInfo*>(
firstHitPart->sourceInfo() ); firstHitPart->sourceInfo() );
@@ -723,7 +723,7 @@ void RiuViewerCommands::handlePickAction( int winPosX, int winPosY, Qt::Keyboard
const RivSourceInfo* rivSourceInfo = dynamic_cast<const RivSourceInfo*>( firstHitPart->sourceInfo() ); const RivSourceInfo* rivSourceInfo = dynamic_cast<const RivSourceInfo*>( firstHitPart->sourceInfo() );
const RivFemPickSourceInfo* femSourceInfo = dynamic_cast<const RivFemPickSourceInfo*>( const RivFemPickSourceInfo* femSourceInfo = dynamic_cast<const RivFemPickSourceInfo*>(
firstHitPart->sourceInfo() ); firstHitPart->sourceInfo() );
const RivIntersectionSourceInfo* crossSectionSourceInfo = dynamic_cast<const RivIntersectionSourceInfo*>( const RivExtrudedCurveIntersectionSourceInfo* crossSectionSourceInfo = dynamic_cast<const RivExtrudedCurveIntersectionSourceInfo*>(
firstHitPart->sourceInfo() ); firstHitPart->sourceInfo() );
const RivIntersectionBoxSourceInfo* intersectionBoxSourceInfo = const RivIntersectionBoxSourceInfo* intersectionBoxSourceInfo =
dynamic_cast<const RivIntersectionBoxSourceInfo*>( firstHitPart->sourceInfo() ); dynamic_cast<const RivIntersectionBoxSourceInfo*>( firstHitPart->sourceInfo() );
@@ -1137,7 +1137,7 @@ void RiuViewerCommands::removeDefaultPickEventHandler( RicDefaultPickEventHandle
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
void RiuViewerCommands::findCellAndGridIndex( Rim3dView* mainOrComparisonView, void RiuViewerCommands::findCellAndGridIndex( Rim3dView* mainOrComparisonView,
const RivIntersectionSourceInfo* crossSectionSourceInfo, const RivExtrudedCurveIntersectionSourceInfo* crossSectionSourceInfo,
cvf::uint firstPartTriangleIndex, cvf::uint firstPartTriangleIndex,
size_t* cellIndex, size_t* cellIndex,
size_t* gridIndex ) size_t* gridIndex )

4
ApplicationCode/UserInterface/RiuViewerCommands.h
View File

@@ -33,7 +33,7 @@ class RimExtrudedCurveIntersection;
class Rim3dView; class Rim3dView;
class RiuViewer; class RiuViewer;
class RivIntersectionBoxSourceInfo; class RivIntersectionBoxSourceInfo;
class RivIntersectionSourceInfo; class RivExtrudedCurveIntersectionSourceInfo;
class RiuPickItemInfo; class RiuPickItemInfo;
class QMouseEvent; class QMouseEvent;
@@ -71,7 +71,7 @@ public:
private: private:
void findCellAndGridIndex( Rim3dView* mainOrComparisonView, void findCellAndGridIndex( Rim3dView* mainOrComparisonView,
const RivIntersectionSourceInfo* crossSectionSourceInfo, const RivExtrudedCurveIntersectionSourceInfo* crossSectionSourceInfo,
cvf::uint firstPartTriangleIndex, cvf::uint firstPartTriangleIndex,
size_t* cellIndex, size_t* cellIndex,
size_t* gridIndex ); size_t* gridIndex );