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

@@ -6,7 +6,7 @@ ${CMAKE_CURRENT_LIST_DIR}/RivExtrudedCurveIntersectionSourceInfo.h
${CMAKE_CURRENT_LIST_DIR}/RivIntersectionResultsColoringTools.h
${CMAKE_CURRENT_LIST_DIR}/RivHexGridIntersectionTools.h
${CMAKE_CURRENT_LIST_DIR}/RivIntersectionBoxGeometryGenerator.h
${CMAKE_CURRENT_LIST_DIR}/RivIntersectionBoxPartMgr.h
${CMAKE_CURRENT_LIST_DIR}/RivBoxIntersectionPartMgr.h
${CMAKE_CURRENT_LIST_DIR}/RivIntersectionBoxSourceInfo.h
${CMAKE_CURRENT_LIST_DIR}/RivSectionFlattner.h
)
@@ -18,7 +18,7 @@ ${CMAKE_CURRENT_LIST_DIR}/RivExtrudedCurveIntersectionSourceInfo.cpp
${CMAKE_CURRENT_LIST_DIR}/RivIntersectionResultsColoringTools.cpp
${CMAKE_CURRENT_LIST_DIR}/RivHexGridIntersectionTools.cpp
${CMAKE_CURRENT_LIST_DIR}/RivIntersectionBoxGeometryGenerator.cpp
${CMAKE_CURRENT_LIST_DIR}/RivIntersectionBoxPartMgr.cpp
${CMAKE_CURRENT_LIST_DIR}/RivBoxIntersectionPartMgr.cpp
${CMAKE_CURRENT_LIST_DIR}/RivIntersectionBoxSourceInfo.cpp
${CMAKE_CURRENT_LIST_DIR}/RivSectionFlattner.cpp
)

18
ApplicationCode/ModelVisualization/Intersections/RivIntersectionBoxPartMgr.cpp → ApplicationCode/ModelVisualization/Intersections/RivBoxIntersectionPartMgr.cpp
View File

@@ -16,7 +16,7 @@
//
/////////////////////////////////////////////////////////////////////////////////
#include "RivIntersectionBoxPartMgr.h"
#include "RivBoxIntersectionPartMgr.h"
#include "RigCaseCellResultsData.h"
#include "RigFemPartCollection.h"
@@ -31,7 +31,7 @@
#include "RimGeoMechCase.h"
#include "RimGeoMechCellColors.h"
#include "RimGeoMechView.h"
#include "RimIntersectionBox.h"
#include "RimBoxIntersection.h"
#include "RimIntersectionResultDefinition.h"
#include "RimRegularLegendConfig.h"
#include "RimTernaryLegendConfig.h"
@@ -58,7 +58,7 @@
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RivIntersectionBoxPartMgr::RivIntersectionBoxPartMgr( RimIntersectionBox* intersectionBox )
RivBoxIntersectionPartMgr::RivBoxIntersectionPartMgr( RimBoxIntersection* intersectionBox )
: m_rimIntersectionBox( intersectionBox )
, m_defaultColor( cvf::Color3::WHITE )
{
@@ -73,7 +73,7 @@ RivIntersectionBoxPartMgr::RivIntersectionBoxPartMgr( RimIntersectionBox* inters
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RivIntersectionBoxPartMgr::applySingleColorEffect()
void RivBoxIntersectionPartMgr::applySingleColorEffect()
{
m_defaultColor = cvf::Color3f::OLIVE; // m_rimCrossSection->CrossSectionColor();
this->updatePartEffect();
@@ -82,7 +82,7 @@ void RivIntersectionBoxPartMgr::applySingleColorEffect()
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RivIntersectionBoxPartMgr::updateCellResultColor( size_t timeStepIndex )
void RivBoxIntersectionPartMgr::updateCellResultColor( size_t timeStepIndex )
{
RivIntersectionResultsColoringTools::calculateIntersectionResultColors( timeStepIndex,
true,
@@ -97,7 +97,7 @@ void RivIntersectionBoxPartMgr::updateCellResultColor( size_t timeStepIndex )
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RivIntersectionBoxPartMgr::generatePartGeometry()
void RivBoxIntersectionPartMgr::generatePartGeometry()
{
bool useBufferObjects = true;
// Surface geometry
@@ -158,7 +158,7 @@ void RivIntersectionBoxPartMgr::generatePartGeometry()
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RivIntersectionBoxPartMgr::updatePartEffect()
void RivBoxIntersectionPartMgr::updatePartEffect()
{
// Set deCrossSection effect
caf::SurfaceEffectGenerator geometryEffgen( m_defaultColor, caf::PO_1 );
@@ -186,7 +186,7 @@ void RivIntersectionBoxPartMgr::updatePartEffect()
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RivIntersectionBoxPartMgr::appendNativeIntersectionFacesToModel( cvf::ModelBasicList* model,
void RivBoxIntersectionPartMgr::appendNativeIntersectionFacesToModel( cvf::ModelBasicList* model,
cvf::Transform* scaleTransform )
{
if ( m_intersectionBoxFaces.isNull() && m_intersectionBoxGridLines.isNull() )
@@ -204,7 +204,7 @@ void RivIntersectionBoxPartMgr::appendNativeIntersectionFacesToModel( cvf::Model
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RivIntersectionBoxPartMgr::appendMeshLinePartsToModel( cvf::ModelBasicList* model, cvf::Transform* scaleTransform )
void RivBoxIntersectionPartMgr::appendMeshLinePartsToModel( cvf::ModelBasicList* model, cvf::Transform* scaleTransform )
{
if ( m_intersectionBoxFaces.isNull() && m_intersectionBoxGridLines.isNull() )
{

8
ApplicationCode/ModelVisualization/Intersections/RivIntersectionBoxPartMgr.h → ApplicationCode/ModelVisualization/Intersections/RivBoxIntersectionPartMgr.h
View File

@@ -37,7 +37,7 @@ class RivTernaryScalarMapper;
class RimCellEdgeColors;
class RimEclipseCellColors;
class RimIntersectionBox;
class RimBoxIntersection;
class RimIntersectionHandle;
class RimEclipseView;
class RimGeoMechView;
@@ -49,10 +49,10 @@ class RimGeoMechResultDefinition;
///
//==================================================================================================
class RivIntersectionBoxPartMgr : public cvf::Object
class RivBoxIntersectionPartMgr : public cvf::Object
{
public:
explicit RivIntersectionBoxPartMgr( RimIntersectionBox* intersectionBox );
explicit RivBoxIntersectionPartMgr( RimBoxIntersection* intersectionBox );
void applySingleColorEffect();
void updateCellResultColor( size_t timeStepIndex );
@@ -65,7 +65,7 @@ private:
void generatePartGeometry();
private:
RimIntersectionBox* m_rimIntersectionBox;
RimBoxIntersection* m_rimIntersectionBox;
cvf::Color3f m_defaultColor;

14
ApplicationCode/ModelVisualization/Intersections/RivIntersectionBoxGeometryGenerator.cpp
View File

@@ -20,7 +20,7 @@
#include "RimCase.h"
#include "RimGridView.h"
#include "RimIntersectionBox.h"
#include "RimBoxIntersection.h"
#include "cafHexGridIntersectionTools/cafHexGridIntersectionTools.h"
@@ -34,7 +34,7 @@
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RivIntersectionBoxGeometryGenerator::RivIntersectionBoxGeometryGenerator( RimIntersectionBox* intersectionBox,
RivIntersectionBoxGeometryGenerator::RivIntersectionBoxGeometryGenerator( RimBoxIntersection* intersectionBox,
const RivIntersectionHexGridInterface* grid )
: m_intersectionBoxDefinition( intersectionBox )
, m_hexGrid( grid )
@@ -236,7 +236,7 @@ private:
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RimIntersectionBox* RivIntersectionBoxGeometryGenerator::intersectionBox() const
RimBoxIntersection* RivIntersectionBoxGeometryGenerator::intersectionBox() const
{
return m_intersectionBoxDefinition;
}
@@ -264,13 +264,13 @@ void RivIntersectionBoxGeometryGenerator::calculateArrays()
Box box( m_intersectionBoxDefinition->boxOrigin(), m_intersectionBoxDefinition->boxSize() );
std::array<cvf::Plane, 6> boxPlanes = box.planes();
RimIntersectionBox::SinglePlaneState singlePlane = m_intersectionBoxDefinition->singlePlaneState();
RimBoxIntersection::SinglePlaneState singlePlane = m_intersectionBoxDefinition->singlePlaneState();
int startFace = 0;
int endFace = 5;
if ( singlePlane == RimIntersectionBox::PLANE_STATE_X ) startFace = endFace = Box::FaceType::POS_I;
if ( singlePlane == RimIntersectionBox::PLANE_STATE_Y ) startFace = endFace = Box::FaceType::POS_J;
if ( singlePlane == RimIntersectionBox::PLANE_STATE_Z ) startFace = endFace = Box::FaceType::POS_K;
if ( singlePlane == RimBoxIntersection::PLANE_STATE_X ) startFace = endFace = Box::FaceType::POS_I;
if ( singlePlane == RimBoxIntersection::PLANE_STATE_Y ) startFace = endFace = Box::FaceType::POS_J;
if ( singlePlane == RimBoxIntersection::PLANE_STATE_Z ) startFace = endFace = Box::FaceType::POS_K;
for ( int faceIdx = startFace; faceIdx <= endFace; ++faceIdx )
{

8
ApplicationCode/ModelVisualization/Intersections/RivIntersectionBoxGeometryGenerator.h
View File

@@ -29,7 +29,7 @@
#include <vector>
class RimIntersectionBox;
class RimBoxIntersection;
namespace cvf
{
@@ -40,7 +40,7 @@ class DrawableGeo;
class RivIntersectionBoxGeometryGenerator : public cvf::Object, public RivIntersectionGeometryGeneratorIF
{
public:
RivIntersectionBoxGeometryGenerator( RimIntersectionBox* intersectionBox,
RivIntersectionBoxGeometryGenerator( RimBoxIntersection* intersectionBox,
const RivIntersectionHexGridInterface* grid );
~RivIntersectionBoxGeometryGenerator() override;
@@ -49,7 +49,7 @@ public:
cvf::ref<cvf::DrawableGeo> generateSurface();
cvf::ref<cvf::DrawableGeo> createMeshDrawable();
RimIntersectionBox* intersectionBox() const;
RimBoxIntersection* intersectionBox() const;
// GeomGen Interface
@@ -70,5 +70,5 @@ private:
std::vector<size_t> m_triangleToCellIdxMap;
std::vector<RivIntersectionVertexWeights> m_triVxToCellCornerWeights;
RimIntersectionBox* m_intersectionBoxDefinition;
RimBoxIntersection* m_intersectionBoxDefinition;
};

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

@@ -55,7 +55,7 @@ std::array<cvf::Vec3f, 3> RivIntersectionBoxSourceInfo::triangle( int triangleId
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RimIntersectionBox* RivIntersectionBoxSourceInfo::intersectionBox() const
RimBoxIntersection* RivIntersectionBoxSourceInfo::intersectionBox() const
{
return m_intersectionBoxGeometryGenerator->intersectionBox();
}

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

@@ -23,7 +23,7 @@
#include <array>
class RivIntersectionBoxGeometryGenerator;
class RimIntersectionBox;
class RimBoxIntersection;
class RivIntersectionBoxSourceInfo : public cvf::Object
{
@@ -33,7 +33,7 @@ public:
const std::vector<size_t>& triangleToCellIndex() const;
std::array<cvf::Vec3f, 3> triangle( int triangleIdx ) const;
RimIntersectionBox* intersectionBox() const;
RimBoxIntersection* intersectionBox() const;
private:
cvf::cref<RivIntersectionBoxGeometryGenerator> m_intersectionBoxGeometryGenerator;