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

#815 More Rename CrossSection -> Intersection

Browse Source
This commit is contained in:
Jacob Støren 2016-09-21 10:40:08 +02:00
parent 16ab7fcb72
commit e5cf69a3fe
6 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -7,7 +7,7 @@ endif()
set (SOURCE_GROUP_HEADER_FILES set (SOURCE_GROUP_HEADER_FILES
${CEE_CURRENT_LIST_DIR}RivIntersectionGeometryGenerator.h ${CEE_CURRENT_LIST_DIR}RivIntersectionGeometryGenerator.h
${CEE_CURRENT_LIST_DIR}RivIntersectionPartMgr.h ${CEE_CURRENT_LIST_DIR}RivIntersectionPartMgr.h
${CEE_CURRENT_LIST_DIR}RivCrossSectionSourceInfo.h ${CEE_CURRENT_LIST_DIR}RivIntersectionSourceInfo.h
${CEE_CURRENT_LIST_DIR}RivHexGridIntersectionTools.h ${CEE_CURRENT_LIST_DIR}RivHexGridIntersectionTools.h
${CEE_CURRENT_LIST_DIR}RivIntersectionBoxGeometryGenerator.h ${CEE_CURRENT_LIST_DIR}RivIntersectionBoxGeometryGenerator.h
) )
@ -15,7 +15,7 @@ ${CEE_CURRENT_LIST_DIR}RivIntersectionBoxGeometryGenerator.h
set (SOURCE_GROUP_SOURCE_FILES set (SOURCE_GROUP_SOURCE_FILES
${CEE_CURRENT_LIST_DIR}RivIntersectionGeometryGenerator.cpp ${CEE_CURRENT_LIST_DIR}RivIntersectionGeometryGenerator.cpp
${CEE_CURRENT_LIST_DIR}RivIntersectionPartMgr.cpp ${CEE_CURRENT_LIST_DIR}RivIntersectionPartMgr.cpp
${CEE_CURRENT_LIST_DIR}RivCrossSectionSourceInfo.cpp ${CEE_CURRENT_LIST_DIR}RivIntersectionSourceInfo.cpp
${CEE_CURRENT_LIST_DIR}RivHexGridIntersectionTools.cpp ${CEE_CURRENT_LIST_DIR}RivHexGridIntersectionTools.cpp
${CEE_CURRENT_LIST_DIR}RivIntersectionBoxGeometryGenerator.cpp ${CEE_CURRENT_LIST_DIR}RivIntersectionBoxGeometryGenerator.cpp
) )

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

@ -37,7 +37,7 @@
#include "RimLegendConfig.h" #include "RimLegendConfig.h"
#include "RimTernaryLegendConfig.h" #include "RimTernaryLegendConfig.h"
#include "RivCrossSectionSourceInfo.h" #include "RivIntersectionSourceInfo.h"
#include "RivResultToTextureMapper.h" #include "RivResultToTextureMapper.h"
#include "RivScalarMapperUtils.h" #include "RivScalarMapperUtils.h"
#include "RivTernaryScalarMapper.h" #include "RivTernaryScalarMapper.h"
@ -300,7 +300,7 @@ void RivIntersectionPartMgr::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<RivCrossSectionSourceInfo> si = new RivCrossSectionSourceInfo(m_crossSectionGenerator.p()); cvf::ref<RivIntersectionSourceInfo> si = new RivIntersectionSourceInfo(m_crossSectionGenerator.p());
part->setSourceInfo(si.p()); part->setSourceInfo(si.p());
part->updateBoundingBox(); part->updateBoundingBox();

8
ApplicationCode/ModelVisualization/Intersections/RivCrossSectionSourceInfo.cpp → ApplicationCode/ModelVisualization/Intersections/RivIntersectionSourceInfo.cpp
View File

@ -17,7 +17,7 @@
// //
///////////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////////
#include "RivCrossSectionSourceInfo.h" #include "RivIntersectionSourceInfo.h"
#include "RivIntersectionGeometryGenerator.h" #include "RivIntersectionGeometryGenerator.h"
@ -25,7 +25,7 @@
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
RivCrossSectionSourceInfo::RivCrossSectionSourceInfo(RivIntersectionGeometryGenerator* geometryGenerator) RivIntersectionSourceInfo::RivIntersectionSourceInfo(RivIntersectionGeometryGenerator* geometryGenerator)
: m_crossSectionGeometryGenerator(geometryGenerator) : m_crossSectionGeometryGenerator(geometryGenerator)
{ {
CVF_ASSERT(m_crossSectionGeometryGenerator.notNull()); CVF_ASSERT(m_crossSectionGeometryGenerator.notNull());
@ -34,7 +34,7 @@ RivCrossSectionSourceInfo::RivCrossSectionSourceInfo(RivIntersectionGeometryGene
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
const std::vector<size_t>& RivCrossSectionSourceInfo::triangleToCellIndex() const const std::vector<size_t>& RivIntersectionSourceInfo::triangleToCellIndex() const
{ {
CVF_ASSERT(m_crossSectionGeometryGenerator.notNull()); CVF_ASSERT(m_crossSectionGeometryGenerator.notNull());
@ -44,7 +44,7 @@ const std::vector<size_t>& RivCrossSectionSourceInfo::triangleToCellIndex() cons
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
const RimCrossSection* RivCrossSectionSourceInfo::crossSection() const const RimCrossSection* RivIntersectionSourceInfo::crossSection() const
{ {
return m_crossSectionGeometryGenerator->crossSection(); return m_crossSectionGeometryGenerator->crossSection();
} }

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

@ -26,10 +26,10 @@
class RivIntersectionGeometryGenerator; class RivIntersectionGeometryGenerator;
class RimCrossSection; class RimCrossSection;
class RivCrossSectionSourceInfo : public cvf::Object class RivIntersectionSourceInfo : public cvf::Object
{ {
public: public:
RivCrossSectionSourceInfo(RivIntersectionGeometryGenerator* geometryGenerator); RivIntersectionSourceInfo(RivIntersectionGeometryGenerator* geometryGenerator);
const std::vector<size_t>& triangleToCellIndex() const; const std::vector<size_t>& triangleToCellIndex() const;

8
ApplicationCode/UserInterface/RiuViewerCommands.cpp
View File

@ -54,7 +54,7 @@
#include "RiuSelectionManager.h" #include "RiuSelectionManager.h"
#include "RiuViewer.h" #include "RiuViewer.h"
#include "RivCrossSectionSourceInfo.h" #include "RivIntersectionSourceInfo.h"
#include "RivFemPartGeometryGenerator.h" #include "RivFemPartGeometryGenerator.h"
#include "RivFemPickSourceInfo.h" #include "RivFemPickSourceInfo.h"
#include "RivSourceInfo.h" #include "RivSourceInfo.h"
@ -152,7 +152,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*>(firstHitPart->sourceInfo()); const RivFemPickSourceInfo* femSourceInfo = dynamic_cast<const RivFemPickSourceInfo*>(firstHitPart->sourceInfo());
const RivCrossSectionSourceInfo* crossSectionSourceInfo = dynamic_cast<const RivCrossSectionSourceInfo*>(firstHitPart->sourceInfo()); const RivIntersectionSourceInfo* crossSectionSourceInfo = dynamic_cast<const RivIntersectionSourceInfo*>(firstHitPart->sourceInfo());
if (rivSourceInfo || femSourceInfo || crossSectionSourceInfo) if (rivSourceInfo || femSourceInfo || crossSectionSourceInfo)
{ {
@ -464,7 +464,7 @@ void RiuViewerCommands::handlePickAction(int winPosX, int winPosY, Qt::KeyboardM
{ {
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*>(firstHitPart->sourceInfo()); const RivFemPickSourceInfo* femSourceInfo = dynamic_cast<const RivFemPickSourceInfo*>(firstHitPart->sourceInfo());
const RivCrossSectionSourceInfo* crossSectionSourceInfo = dynamic_cast<const RivCrossSectionSourceInfo*>(firstHitPart->sourceInfo()); const RivIntersectionSourceInfo* crossSectionSourceInfo = dynamic_cast<const RivIntersectionSourceInfo*>(firstHitPart->sourceInfo());
if (rivSourceInfo) if (rivSourceInfo)
{ {
@ -548,7 +548,7 @@ void RiuViewerCommands::handlePickAction(int winPosX, int winPosY, Qt::KeyboardM
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
void RiuViewerCommands::findCellAndGridIndex(const RivCrossSectionSourceInfo* crossSectionSourceInfo, cvf::uint firstPartTriangleIndex, size_t* cellIndex, size_t* gridIndex) void RiuViewerCommands::findCellAndGridIndex(const RivIntersectionSourceInfo* crossSectionSourceInfo, cvf::uint firstPartTriangleIndex, size_t* cellIndex, size_t* gridIndex)
{ {
CVF_ASSERT(cellIndex && gridIndex); CVF_ASSERT(cellIndex && gridIndex);

4
ApplicationCode/UserInterface/RiuViewerCommands.h
View File

@ -30,7 +30,7 @@ class RimEclipseView;
class RimGeoMechView; class RimGeoMechView;
class RimView; class RimView;
class RiuViewer; class RiuViewer;
class RivCrossSectionSourceInfo; class RivIntersectionSourceInfo;
class RicViewerEventInterface; class RicViewerEventInterface;
class QMouseEvent; class QMouseEvent;
@ -53,7 +53,7 @@ public:
void displayContextMenu(QMouseEvent* event); void displayContextMenu(QMouseEvent* event);
void handlePickAction(int winPosX, int winPosY, Qt::KeyboardModifiers keyboardModifiers); void handlePickAction(int winPosX, int winPosY, Qt::KeyboardModifiers keyboardModifiers);
void findCellAndGridIndex(const RivCrossSectionSourceInfo* crossSectionSourceInfo, cvf::uint firstPartTriangleIndex, size_t* cellIndex, size_t* gridIndex); void findCellAndGridIndex(const RivIntersectionSourceInfo* crossSectionSourceInfo, cvf::uint firstPartTriangleIndex, size_t* cellIndex, size_t* gridIndex);
private slots: private slots:
void slotRangeFilterI(); void slotRangeFilterI();