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 renaming CrossSection -> Intersection

Browse Source
This commit is contained in:
Jacob Støren 2016-09-21 10:36:11 +02:00
parent 0083fb068f
commit 16ab7fcb72
8 changed files with 27 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ApplicationCode/CMakeLists.txt
View File

@ -392,7 +392,7 @@ if(RESINSIGHT_ENABLE_COTIRE)
set_source_files_properties (UnitTests/opm-parser-Test.cpp PROPERTIES COTIRE_EXCLUDED TRUE) set_source_files_properties (UnitTests/opm-parser-Test.cpp PROPERTIES COTIRE_EXCLUDED TRUE)
# variables at global file scope # variables at global file scope
set_source_files_properties (ModelVisualization/RivCrossSectionGeometryGenerator.cpp PROPERTIES COTIRE_EXCLUDED TRUE) set_source_files_properties (ModelVisualization/RivIntersectionGeometryGenerator.cpp PROPERTIES COTIRE_EXCLUDED TRUE)
set_source_files_properties (ModelVisualization/RivIntersectionPartMgr.cpp PROPERTIES COTIRE_EXCLUDED TRUE) set_source_files_properties (ModelVisualization/RivIntersectionPartMgr.cpp PROPERTIES COTIRE_EXCLUDED TRUE)
set_source_files_properties (ModelVisualization/GridBox/RivGridBoxGenerator.cpp PROPERTIES COTIRE_EXCLUDED TRUE) set_source_files_properties (ModelVisualization/GridBox/RivGridBoxGenerator.cpp PROPERTIES COTIRE_EXCLUDED TRUE)
set_source_files_properties (Commands/WellLogCommands/RicWellLogPlotCurveFeatureImpl.cpp PROPERTIES COTIRE_EXCLUDED TRUE) set_source_files_properties (Commands/WellLogCommands/RicWellLogPlotCurveFeatureImpl.cpp PROPERTIES COTIRE_EXCLUDED TRUE)

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

@ -5,7 +5,7 @@ if (${CMAKE_VERSION} VERSION_GREATER "2.8.2")
endif() endif()
set (SOURCE_GROUP_HEADER_FILES set (SOURCE_GROUP_HEADER_FILES
${CEE_CURRENT_LIST_DIR}RivCrossSectionGeometryGenerator.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}RivCrossSectionSourceInfo.h
${CEE_CURRENT_LIST_DIR}RivHexGridIntersectionTools.h ${CEE_CURRENT_LIST_DIR}RivHexGridIntersectionTools.h
@ -13,7 +13,7 @@ ${CEE_CURRENT_LIST_DIR}RivIntersectionBoxGeometryGenerator.h
) )
set (SOURCE_GROUP_SOURCE_FILES set (SOURCE_GROUP_SOURCE_FILES
${CEE_CURRENT_LIST_DIR}RivCrossSectionGeometryGenerator.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}RivCrossSectionSourceInfo.cpp
${CEE_CURRENT_LIST_DIR}RivHexGridIntersectionTools.cpp ${CEE_CURRENT_LIST_DIR}RivHexGridIntersectionTools.cpp

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

@ -19,13 +19,13 @@
#include "RivCrossSectionSourceInfo.h" #include "RivCrossSectionSourceInfo.h"
#include "RivCrossSectionGeometryGenerator.h" #include "RivIntersectionGeometryGenerator.h"
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
RivCrossSectionSourceInfo::RivCrossSectionSourceInfo(RivCrossSectionGeometryGenerator* geometryGenerator) RivCrossSectionSourceInfo::RivCrossSectionSourceInfo(RivIntersectionGeometryGenerator* geometryGenerator)
: m_crossSectionGeometryGenerator(geometryGenerator) : m_crossSectionGeometryGenerator(geometryGenerator)
{ {
CVF_ASSERT(m_crossSectionGeometryGenerator.notNull()); CVF_ASSERT(m_crossSectionGeometryGenerator.notNull());

6
ApplicationCode/ModelVisualization/Intersections/RivCrossSectionSourceInfo.h
View File

@ -23,18 +23,18 @@
#include "cvfObject.h" #include "cvfObject.h"
#include "cvfArray.h" #include "cvfArray.h"
class RivCrossSectionGeometryGenerator; class RivIntersectionGeometryGenerator;
class RimCrossSection; class RimCrossSection;
class RivCrossSectionSourceInfo : public cvf::Object class RivCrossSectionSourceInfo : public cvf::Object
{ {
public: public:
RivCrossSectionSourceInfo(RivCrossSectionGeometryGenerator* geometryGenerator); RivCrossSectionSourceInfo(RivIntersectionGeometryGenerator* geometryGenerator);
const std::vector<size_t>& triangleToCellIndex() const; const std::vector<size_t>& triangleToCellIndex() const;
const RimCrossSection* crossSection() const; const RimCrossSection* crossSection() const;
private: private:
cvf::cref<RivCrossSectionGeometryGenerator> m_crossSectionGeometryGenerator; cvf::cref<RivIntersectionGeometryGenerator> m_crossSectionGeometryGenerator;
}; };

26
ApplicationCode/ModelVisualization/Intersections/RivCrossSectionGeometryGenerator.cpp → ApplicationCode/ModelVisualization/Intersections/RivIntersectionGeometryGenerator.cpp
View File

@ -17,7 +17,7 @@
// //
///////////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////////
#include "RivCrossSectionGeometryGenerator.h" #include "RivIntersectionGeometryGenerator.h"
#include "RigMainGrid.h" #include "RigMainGrid.h"
#include "RigResultAccessor.h" #include "RigResultAccessor.h"
@ -35,7 +35,7 @@
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
RivCrossSectionGeometryGenerator::RivCrossSectionGeometryGenerator(const RimCrossSection* crossSection, RivIntersectionGeometryGenerator::RivIntersectionGeometryGenerator(const RimCrossSection* crossSection,
std::vector<std::vector<cvf::Vec3d> > &polylines, std::vector<std::vector<cvf::Vec3d> > &polylines,
const cvf::Vec3d& extrusionDirection, const cvf::Vec3d& extrusionDirection,
const RivIntersectionHexGridInterface* grid) const RivIntersectionHexGridInterface* grid)
@ -51,7 +51,7 @@ RivCrossSectionGeometryGenerator::RivCrossSectionGeometryGenerator(const RimCros
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
RivCrossSectionGeometryGenerator::~RivCrossSectionGeometryGenerator() RivIntersectionGeometryGenerator::~RivIntersectionGeometryGenerator()
{ {
} }
@ -59,7 +59,7 @@ RivCrossSectionGeometryGenerator::~RivCrossSectionGeometryGenerator()
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
void RivCrossSectionGeometryGenerator::calculateArrays() void RivIntersectionGeometryGenerator::calculateArrays()
{ {
if (m_triangleVxes->size()) return; if (m_triangleVxes->size()) return;
@ -207,7 +207,7 @@ void RivCrossSectionGeometryGenerator::calculateArrays()
/// Generate surface drawable geo from the specified region /// Generate surface drawable geo from the specified region
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
cvf::ref<cvf::DrawableGeo> RivCrossSectionGeometryGenerator::generateSurface() cvf::ref<cvf::DrawableGeo> RivIntersectionGeometryGenerator::generateSurface()
{ {
calculateArrays(); calculateArrays();
@ -225,7 +225,7 @@ cvf::ref<cvf::DrawableGeo> RivCrossSectionGeometryGenerator::generateSurface()
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
cvf::ref<cvf::DrawableGeo> RivCrossSectionGeometryGenerator::createMeshDrawable() cvf::ref<cvf::DrawableGeo> RivIntersectionGeometryGenerator::createMeshDrawable()
{ {
if (!(m_cellBorderLineVxes.notNull() && m_cellBorderLineVxes->size() != 0)) return NULL; if (!(m_cellBorderLineVxes.notNull() && m_cellBorderLineVxes->size() != 0)) return NULL;
@ -244,7 +244,7 @@ cvf::ref<cvf::DrawableGeo> RivCrossSectionGeometryGenerator::createMeshDrawable(
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
cvf::ref<cvf::DrawableGeo> RivCrossSectionGeometryGenerator::createLineAlongPolylineDrawable() cvf::ref<cvf::DrawableGeo> RivIntersectionGeometryGenerator::createLineAlongPolylineDrawable()
{ {
std::vector<cvf::uint> lineIndices; std::vector<cvf::uint> lineIndices;
std::vector<cvf::Vec3f> vertices; std::vector<cvf::Vec3f> vertices;
@ -287,7 +287,7 @@ cvf::ref<cvf::DrawableGeo> RivCrossSectionGeometryGenerator::createLineAlongPoly
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
cvf::ref<cvf::DrawableGeo> RivCrossSectionGeometryGenerator::createPointsFromPolylineDrawable() cvf::ref<cvf::DrawableGeo> RivIntersectionGeometryGenerator::createPointsFromPolylineDrawable()
{ {
std::vector<cvf::Vec3f> vertices; std::vector<cvf::Vec3f> vertices;
@ -321,7 +321,7 @@ cvf::ref<cvf::DrawableGeo> RivCrossSectionGeometryGenerator::createPointsFromPol
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// Remove the lines from the polyline that is nearly parallel to the extrusion direction /// Remove the lines from the polyline that is nearly parallel to the extrusion direction
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
void RivCrossSectionGeometryGenerator::adjustPolyline(const std::vector<cvf::Vec3d>& polyLine, void RivIntersectionGeometryGenerator::adjustPolyline(const std::vector<cvf::Vec3d>& polyLine,
const cvf::Vec3d extrDir, const cvf::Vec3d extrDir,
std::vector<cvf::Vec3d>* adjustedPolyline) std::vector<cvf::Vec3d>* adjustedPolyline)
{ {
@ -347,7 +347,7 @@ void RivCrossSectionGeometryGenerator::adjustPolyline(const std::vector<cvf::Vec
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
const std::vector<size_t>& RivCrossSectionGeometryGenerator::triangleToCellIndex() const const std::vector<size_t>& RivIntersectionGeometryGenerator::triangleToCellIndex() const
{ {
CVF_ASSERT(m_triangleVxes->size()); CVF_ASSERT(m_triangleVxes->size());
return m_triangleToCellIdxMap; return m_triangleToCellIdxMap;
@ -356,7 +356,7 @@ const std::vector<size_t>& RivCrossSectionGeometryGenerator::triangleToCellIndex
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
const std::vector<RivIntersectionVertexWeights>& RivCrossSectionGeometryGenerator::triangleVxToCellCornerInterpolationWeights() const const std::vector<RivIntersectionVertexWeights>& RivIntersectionGeometryGenerator::triangleVxToCellCornerInterpolationWeights() const
{ {
CVF_ASSERT(m_triangleVxes->size()); CVF_ASSERT(m_triangleVxes->size());
return m_triVxToCellCornerWeights; return m_triVxToCellCornerWeights;
@ -365,7 +365,7 @@ const std::vector<RivIntersectionVertexWeights>& RivCrossSectionGeometryGenerato
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
const RimCrossSection* RivCrossSectionGeometryGenerator::crossSection() const const RimCrossSection* RivIntersectionGeometryGenerator::crossSection() const
{ {
return m_crossSection; return m_crossSection;
} }
@ -373,7 +373,7 @@ const RimCrossSection* RivCrossSectionGeometryGenerator::crossSection() const
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
bool RivCrossSectionGeometryGenerator::isAnyGeometryPresent() const bool RivIntersectionGeometryGenerator::isAnyGeometryPresent() const
{ {
if (m_triangleVxes->size() == 0) if (m_triangleVxes->size() == 0)
{ {

6
ApplicationCode/ModelVisualization/Intersections/RivCrossSectionGeometryGenerator.h → ApplicationCode/ModelVisualization/Intersections/RivIntersectionGeometryGenerator.h
View File

@ -43,15 +43,15 @@ namespace cvf
} }
class RivCrossSectionGeometryGenerator : public cvf::Object class RivIntersectionGeometryGenerator : public cvf::Object
{ {
public: public:
RivCrossSectionGeometryGenerator(const RimCrossSection* crossSection, RivIntersectionGeometryGenerator(const RimCrossSection* crossSection,
std::vector<std::vector<cvf::Vec3d> > &polylines, std::vector<std::vector<cvf::Vec3d> > &polylines,
const cvf::Vec3d& extrusionDirection, const cvf::Vec3d& extrusionDirection,
const RivIntersectionHexGridInterface* grid ); const RivIntersectionHexGridInterface* grid );
~RivCrossSectionGeometryGenerator(); ~RivIntersectionGeometryGenerator();
bool isAnyGeometryPresent() const; bool isAnyGeometryPresent() const;

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

@ -507,7 +507,7 @@ void RivIntersectionPartMgr::computeData()
{ {
cvf::Vec3d direction = extrusionDirection(polyLines[0]); cvf::Vec3d direction = extrusionDirection(polyLines[0]);
cvf::ref<RivIntersectionHexGridInterface> hexGrid = createHexGridInterface(); cvf::ref<RivIntersectionHexGridInterface> hexGrid = createHexGridInterface();
m_crossSectionGenerator = new RivCrossSectionGeometryGenerator(m_rimCrossSection, polyLines, direction, hexGrid.p()); m_crossSectionGenerator = new RivIntersectionGeometryGenerator(m_rimCrossSection, polyLines, direction, hexGrid.p());
} }
} }

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

@ -19,7 +19,7 @@
#pragma once #pragma once
#include "RivCrossSectionGeometryGenerator.h" #include "RivIntersectionGeometryGenerator.h"
#include "cvfBase.h" #include "cvfBase.h"
#include "cvfObject.h" #include "cvfObject.h"
@ -80,7 +80,7 @@ private:
cvf::Color3f m_defaultColor; cvf::Color3f m_defaultColor;
cvf::ref<RivCrossSectionGeometryGenerator> m_crossSectionGenerator; cvf::ref<RivIntersectionGeometryGenerator> m_crossSectionGenerator;
cvf::ref<cvf::Part> m_crossSectionFaces; cvf::ref<cvf::Part> m_crossSectionFaces;
cvf::ref<cvf::Part> m_crossSectionGridLines; cvf::ref<cvf::Part> m_crossSectionGridLines;
cvf::ref<cvf::Vec2fArray> m_crossSectionFacesTextureCoords; cvf::ref<cvf::Vec2fArray> m_crossSectionFacesTextureCoords;