diff --git a/ApplicationCode/CMakeLists.txt b/ApplicationCode/CMakeLists.txt index 60e67371e1..8b97b48dc5 100644 --- a/ApplicationCode/CMakeLists.txt +++ b/ApplicationCode/CMakeLists.txt @@ -393,7 +393,7 @@ if(RESINSIGHT_ENABLE_COTIRE) # variables at global file scope set_source_files_properties (ModelVisualization/RivCrossSectionGeometryGenerator.cpp PROPERTIES COTIRE_EXCLUDED TRUE) - set_source_files_properties (ModelVisualization/RivCrossSectionPartMgr.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 (Commands/WellLogCommands/RicWellLogPlotCurveFeatureImpl.cpp PROPERTIES COTIRE_EXCLUDED TRUE) diff --git a/ApplicationCode/ModelVisualization/Intersections/CMakeLists_files.cmake b/ApplicationCode/ModelVisualization/Intersections/CMakeLists_files.cmake index 1185f67b41..2592bf3180 100644 --- a/ApplicationCode/ModelVisualization/Intersections/CMakeLists_files.cmake +++ b/ApplicationCode/ModelVisualization/Intersections/CMakeLists_files.cmake @@ -6,7 +6,7 @@ endif() set (SOURCE_GROUP_HEADER_FILES ${CEE_CURRENT_LIST_DIR}RivCrossSectionGeometryGenerator.h -${CEE_CURRENT_LIST_DIR}RivCrossSectionPartMgr.h +${CEE_CURRENT_LIST_DIR}RivIntersectionPartMgr.h ${CEE_CURRENT_LIST_DIR}RivCrossSectionSourceInfo.h ${CEE_CURRENT_LIST_DIR}RivHexGridIntersectionTools.h ${CEE_CURRENT_LIST_DIR}RivIntersectionBoxGeometryGenerator.h @@ -14,7 +14,7 @@ ${CEE_CURRENT_LIST_DIR}RivIntersectionBoxGeometryGenerator.h set (SOURCE_GROUP_SOURCE_FILES ${CEE_CURRENT_LIST_DIR}RivCrossSectionGeometryGenerator.cpp -${CEE_CURRENT_LIST_DIR}RivCrossSectionPartMgr.cpp +${CEE_CURRENT_LIST_DIR}RivIntersectionPartMgr.cpp ${CEE_CURRENT_LIST_DIR}RivCrossSectionSourceInfo.cpp ${CEE_CURRENT_LIST_DIR}RivHexGridIntersectionTools.cpp ${CEE_CURRENT_LIST_DIR}RivIntersectionBoxGeometryGenerator.cpp diff --git a/ApplicationCode/ModelVisualization/Intersections/RivCrossSectionPartMgr.cpp b/ApplicationCode/ModelVisualization/Intersections/RivIntersectionPartMgr.cpp similarity index 95% rename from ApplicationCode/ModelVisualization/Intersections/RivCrossSectionPartMgr.cpp rename to ApplicationCode/ModelVisualization/Intersections/RivIntersectionPartMgr.cpp index 411abbc222..f4d95da239 100644 --- a/ApplicationCode/ModelVisualization/Intersections/RivCrossSectionPartMgr.cpp +++ b/ApplicationCode/ModelVisualization/Intersections/RivIntersectionPartMgr.cpp @@ -17,7 +17,7 @@ // ///////////////////////////////////////////////////////////////////////////////// -#include "RivCrossSectionPartMgr.h" +#include "RivIntersectionPartMgr.h" #include "RigCaseCellResultsData.h" #include "RigCaseData.h" @@ -55,7 +55,7 @@ //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -RivCrossSectionPartMgr::RivCrossSectionPartMgr(const RimCrossSection* rimCrossSection) +RivIntersectionPartMgr::RivIntersectionPartMgr(const RimCrossSection* rimCrossSection) : m_rimCrossSection(rimCrossSection), m_defaultColor(cvf::Color3::WHITE) { @@ -69,7 +69,7 @@ RivCrossSectionPartMgr::RivCrossSectionPartMgr(const RimCrossSection* rimCrossSe //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -void RivCrossSectionPartMgr::applySingleColorEffect() +void RivIntersectionPartMgr::applySingleColorEffect() { if (m_crossSectionGenerator.isNull()) return; @@ -80,7 +80,7 @@ void RivCrossSectionPartMgr::applySingleColorEffect() //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -void RivCrossSectionPartMgr::updateCellResultColor(size_t timeStepIndex) +void RivIntersectionPartMgr::updateCellResultColor(size_t timeStepIndex) { if (m_crossSectionGenerator.isNull()) return; @@ -133,7 +133,7 @@ void RivCrossSectionPartMgr::updateCellResultColor(size_t timeStepIndex) cellResultColors); } - RivCrossSectionPartMgr::calculateEclipseTextureCoordinates(m_crossSectionFacesTextureCoords.p(), + RivIntersectionPartMgr::calculateEclipseTextureCoordinates(m_crossSectionFacesTextureCoords.p(), m_crossSectionGenerator->triangleToCellIndex(), resultAccessor.p(), mapper); @@ -170,7 +170,7 @@ void RivCrossSectionPartMgr::updateCellResultColor(size_t timeStepIndex) RigFemPart* femPart = caseData->femParts()->part(0); const cvf::ScalarMapper* mapper = cellResultColors->legendConfig()->scalarMapper(); - RivCrossSectionPartMgr::calculateGeoMechTextureCoords(m_crossSectionFacesTextureCoords.p(), + RivIntersectionPartMgr::calculateGeoMechTextureCoords(m_crossSectionFacesTextureCoords.p(), vertexWeights, resultValues, isElementNodalResult, @@ -190,7 +190,7 @@ void RivCrossSectionPartMgr::updateCellResultColor(size_t timeStepIndex) //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -void RivCrossSectionPartMgr::calculateGeoMechTextureCoords(cvf::Vec2fArray* textureCoords, +void RivIntersectionPartMgr::calculateGeoMechTextureCoords(cvf::Vec2fArray* textureCoords, const std::vector &vertexWeights, const std::vector &resultValues, bool isElementNodalResult, @@ -239,7 +239,7 @@ void RivCrossSectionPartMgr::calculateGeoMechTextureCoords(cvf::Vec2fArray* text /// Calculates the texture coordinates in a "nearly" one dimensional texture. /// Undefined values are coded with a y-texturecoordinate value of 1.0 instead of the normal 0.5 //-------------------------------------------------------------------------------------------------- -void RivCrossSectionPartMgr::calculateEclipseTextureCoordinates(cvf::Vec2fArray* textureCoords, +void RivIntersectionPartMgr::calculateEclipseTextureCoordinates(cvf::Vec2fArray* textureCoords, const std::vector& triangleToCellIdxMap, const RigResultAccessor* resultAccessor, const cvf::ScalarMapper* mapper) @@ -278,7 +278,7 @@ const int priMesh = 3; //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -void RivCrossSectionPartMgr::generatePartGeometry() +void RivIntersectionPartMgr::generatePartGeometry() { if (m_crossSectionGenerator.isNull()) return; @@ -416,7 +416,7 @@ void RivCrossSectionPartMgr::generatePartGeometry() //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -void RivCrossSectionPartMgr::updatePartEffect() +void RivIntersectionPartMgr::updatePartEffect() { if (m_crossSectionGenerator.isNull()) return; @@ -447,7 +447,7 @@ void RivCrossSectionPartMgr::updatePartEffect() //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -void RivCrossSectionPartMgr::appendNativeCrossSectionFacesToModel(cvf::ModelBasicList* model, cvf::Transform* scaleTransform) +void RivIntersectionPartMgr::appendNativeCrossSectionFacesToModel(cvf::ModelBasicList* model, cvf::Transform* scaleTransform) { if (m_crossSectionFaces.isNull()) { @@ -465,7 +465,7 @@ void RivCrossSectionPartMgr::appendNativeCrossSectionFacesToModel(cvf::ModelBasi //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -void RivCrossSectionPartMgr::appendMeshLinePartsToModel(cvf::ModelBasicList* model, cvf::Transform* scaleTransform) +void RivIntersectionPartMgr::appendMeshLinePartsToModel(cvf::ModelBasicList* model, cvf::Transform* scaleTransform) { if (m_crossSectionGridLines.isNull()) { @@ -483,7 +483,7 @@ void RivCrossSectionPartMgr::appendMeshLinePartsToModel(cvf::ModelBasicList* mod //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -void RivCrossSectionPartMgr::appendPolylinePartsToModel(cvf::ModelBasicList* model, cvf::Transform* scaleTransform) +void RivIntersectionPartMgr::appendPolylinePartsToModel(cvf::ModelBasicList* model, cvf::Transform* scaleTransform) { if (m_highlightLineAlongPolyline.notNull()) { @@ -500,7 +500,7 @@ void RivCrossSectionPartMgr::appendPolylinePartsToModel(cvf::ModelBasicList* mod //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -void RivCrossSectionPartMgr::computeData() +void RivIntersectionPartMgr::computeData() { std::vector< std::vector > polyLines = m_rimCrossSection->polyLines(); if (polyLines.size() > 0) @@ -514,7 +514,7 @@ void RivCrossSectionPartMgr::computeData() //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -cvf::ref RivCrossSectionPartMgr::createHexGridInterface() +cvf::ref RivIntersectionPartMgr::createHexGridInterface() { RimEclipseView* eclipseView; @@ -540,7 +540,7 @@ cvf::ref RivCrossSectionPartMgr::createHexGridI //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -cvf::Vec3d RivCrossSectionPartMgr::extrusionDirection(const std::vector& polyline) const +cvf::Vec3d RivIntersectionPartMgr::extrusionDirection(const std::vector& polyline) const { CVF_ASSERT(m_rimCrossSection); diff --git a/ApplicationCode/ModelVisualization/Intersections/RivCrossSectionPartMgr.h b/ApplicationCode/ModelVisualization/Intersections/RivIntersectionPartMgr.h similarity index 96% rename from ApplicationCode/ModelVisualization/Intersections/RivCrossSectionPartMgr.h rename to ApplicationCode/ModelVisualization/Intersections/RivIntersectionPartMgr.h index 8e6c39de22..486861559b 100644 --- a/ApplicationCode/ModelVisualization/Intersections/RivCrossSectionPartMgr.h +++ b/ApplicationCode/ModelVisualization/Intersections/RivIntersectionPartMgr.h @@ -44,10 +44,10 @@ class RimCrossSection; /// //================================================================================================== -class RivCrossSectionPartMgr : public cvf::Object +class RivIntersectionPartMgr : public cvf::Object { public: - RivCrossSectionPartMgr(const RimCrossSection* rimCrossSection); + RivIntersectionPartMgr(const RimCrossSection* rimCrossSection); void applySingleColorEffect(); void updateCellResultColor(size_t timeStepIndex); diff --git a/ApplicationCode/ProjectDataModel/RimCrossSection.cpp b/ApplicationCode/ProjectDataModel/RimCrossSection.cpp index 40f3ffcc77..1bba215379 100644 --- a/ApplicationCode/ProjectDataModel/RimCrossSection.cpp +++ b/ApplicationCode/ProjectDataModel/RimCrossSection.cpp @@ -33,7 +33,7 @@ #include "RimWellPath.h" #include "RiuViewer.h" -#include "RivCrossSectionPartMgr.h" +#include "RivIntersectionPartMgr.h" #include "cafCmdFeature.h" #include "cafCmdFeatureManager.h" @@ -336,9 +336,9 @@ std::vector< std::vector > RimCrossSection::polyLines() const //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -RivCrossSectionPartMgr* RimCrossSection::crossSectionPartMgr() +RivIntersectionPartMgr* RimCrossSection::crossSectionPartMgr() { - if (m_crossSectionPartMgr.isNull()) m_crossSectionPartMgr = new RivCrossSectionPartMgr(this); + if (m_crossSectionPartMgr.isNull()) m_crossSectionPartMgr = new RivIntersectionPartMgr(this); return m_crossSectionPartMgr.p(); } diff --git a/ApplicationCode/ProjectDataModel/RimCrossSection.h b/ApplicationCode/ProjectDataModel/RimCrossSection.h index 85e20ba85b..cb41ca809f 100644 --- a/ApplicationCode/ProjectDataModel/RimCrossSection.h +++ b/ApplicationCode/ProjectDataModel/RimCrossSection.h @@ -32,7 +32,7 @@ class RimEclipseWell; class RimEclipseWellCollection; class RimWellPath; -class RivCrossSectionPartMgr; +class RivIntersectionPartMgr; //================================================================================================== // @@ -74,7 +74,7 @@ public: caf::PdmField< bool > inputFromViewerEnabled; std::vector< std::vector > polyLines() const; - RivCrossSectionPartMgr* crossSectionPartMgr(); + RivIntersectionPartMgr* crossSectionPartMgr(); void appendPointToPolyLine(const cvf::Vec3d& point); @@ -104,7 +104,7 @@ private: void updateName(); void rebuildGeometryAndScheduleCreateDisplayModel(); private: - cvf::ref m_crossSectionPartMgr; + cvf::ref m_crossSectionPartMgr; mutable std::vector< std::vector > m_wellBranchCenterlines; diff --git a/ApplicationCode/ProjectDataModel/RimCrossSectionCollection.cpp b/ApplicationCode/ProjectDataModel/RimCrossSectionCollection.cpp index a88934215e..7189461921 100644 --- a/ApplicationCode/ProjectDataModel/RimCrossSectionCollection.cpp +++ b/ApplicationCode/ProjectDataModel/RimCrossSectionCollection.cpp @@ -25,7 +25,7 @@ #include "RiuMainWindow.h" -#include "RivCrossSectionPartMgr.h" +#include "RivIntersectionPartMgr.h" CAF_PDM_SOURCE_INIT(RimCrossSectionCollection, "CrossSectionCollection"); diff --git a/ApplicationCode/ProjectDataModel/RimEclipseView.h b/ApplicationCode/ProjectDataModel/RimEclipseView.h index d0d04d1caf..d6ce87cdbd 100644 --- a/ApplicationCode/ProjectDataModel/RimEclipseView.h +++ b/ApplicationCode/ProjectDataModel/RimEclipseView.h @@ -55,7 +55,7 @@ class RimEclipseCellColors; class RimEclipseWellCollection; class RiuViewer; class RivReservoirPipesPartMgr; -class RivCrossSectionPartMgr; +class RivIntersectionPartMgr; namespace cvf {