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

#2544 Well CF Visualization: Use simplified star geometry

Browse Source
This commit is contained in:
Magne Sjaastad 2018-03-16 15:58:04 +01:00
parent 7bb705b1b7
commit 1aad577a49
4 changed files with 65 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
ApplicationCode/ModelVisualization/RivWellConnectionFactorGeometryGenerator.cpp
View File

@ -126,6 +126,60 @@ void RivWellConnectionFactorGeometryGenerator::createStarGeometry(std::vector<cv
indices->push_back(9);
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RivWellConnectionFactorGeometryGenerator::createSimplifiedStarGeometry(std::vector<cvf::Vec3f>* vertices,
std::vector<cvf::uint>* indices,
float radius,
float thickness)
{
auto p0 = cvf::Vec3f::Y_AXIS * thickness;
auto p1 = -p0;
auto p2 = cvf::Vec3f::Z_AXIS * radius;
auto p3 = p0;
auto p4 = p1;
auto p5 = cvf::Vec3f::X_AXIS * radius;
auto p6 = p0;
auto p7 = p1;
auto p8 = -p2;
auto p9 = p0;
auto p10 = p1;
auto p11 = -p5;
vertices->push_back(p0);
vertices->push_back(p1);
vertices->push_back(p2);
vertices->push_back(p3);
vertices->push_back(p4);
vertices->push_back(p5);
vertices->push_back(p6);
vertices->push_back(p7);
vertices->push_back(p8);
vertices->push_back(p9);
vertices->push_back(p10);
vertices->push_back(p11);
indices->push_back(0);
indices->push_back(1);
indices->push_back(2);
indices->push_back(3);
indices->push_back(4);
indices->push_back(5);
indices->push_back(6);
indices->push_back(7);
indices->push_back(8);
indices->push_back(9);
indices->push_back(10);
indices->push_back(11);
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
@ -146,13 +200,15 @@ RivWellConnectionFactorGeometryGenerator::~RivWellConnectionFactorGeometryGenera
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
cvf::ref<cvf::DrawableGeo> RivWellConnectionFactorGeometryGenerator::createPipeSurface()
cvf::ref<cvf::DrawableGeo> RivWellConnectionFactorGeometryGenerator::createSurfaceGeometry()
{
std::vector<cvf::Vec3f> verticesForOneObject;
std::vector<cvf::uint> indicesForOneObject;
RivWellConnectionFactorGeometryGenerator::createStarGeometry(
RivWellConnectionFactorGeometryGenerator::createSimplifiedStarGeometry(
&verticesForOneObject, &indicesForOneObject, m_radius, m_radius * 0.3f);
// RivWellConnectionFactorGeometryGenerator::createStarGeometry(
// &verticesForOneObject, &indicesForOneObject, m_radius, m_radius * 0.3f);
m_trianglesPerConnection = indicesForOneObject.size() / 3;

7
ApplicationCode/ModelVisualization/RivWellConnectionFactorGeometryGenerator.h
View File

@ -58,7 +58,7 @@ public:
RivWellConnectionFactorGeometryGenerator(std::vector<CompletionVizData>& centerColorPairs, float radius);
~RivWellConnectionFactorGeometryGenerator();
cvf::ref<cvf::DrawableGeo> createPipeSurface();
cvf::ref<cvf::DrawableGeo> createSurfaceGeometry();
size_t globalCellIndexFromTriangleIndex(cvf::uint triangleIndex) const;
@ -67,6 +67,11 @@ private:
static void
createStarGeometry(std::vector<cvf::Vec3f>* vertices, std::vector<cvf::uint>* indices, float radius, float thickness);
static void createSimplifiedStarGeometry(std::vector<cvf::Vec3f>* vertices,
std::vector<cvf::uint>* indices,
float radius,
float thickness);
private:
std::vector<CompletionVizData> m_centerColorPairs;
float m_radius;

2
ApplicationCode/ModelVisualization/RivWellConnectionFactorPartMgr.cpp
View File

@ -145,7 +145,7 @@ void RivWellConnectionFactorPartMgr::appendDynamicGeometryPartsToModel(cvf::Mode
double radius = mainGrid->characteristicIJCellSize() * m_virtualPerforationResult->geometryScaleFactor();
m_geometryGenerator = new RivWellConnectionFactorGeometryGenerator(centerColorPairs, radius);
auto drawable = m_geometryGenerator->createPipeSurface();
auto drawable = m_geometryGenerator->createSurfaceGeometry();
cvf::ref<cvf::Part> part = new cvf::Part;
part->setDrawable(drawable.p());

1
ApplicationCode/UserInterface/RiuViewerCommands.cpp
View File

@ -76,7 +76,6 @@
#include "RivWellConnectionSourceInfo.h"
#include "RivWellFracturePartMgr.h"
#include "RivWellPathSourceInfo.h"
#include "cafCmdExecCommandManager.h"
#include "cafCmdFeatureManager.h"
#include "cafCmdFeatureMenuBuilder.h"