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

#2703 An initial implementation of filled drawing style with problems remaining.

Browse Source 
* New vertices are successfully created in the intersections between the
  curve and draw surface triangles
* New vertices are also inserted along the bottom edge of the filled curve.
* However, new vertices will still need to be inserted in the lines connecting the
  top of the curve and the bottom where they intersect with the triangles.
* The option for filled curves remain hidden in the GUI. See #2860.

# Please enter the commit message for your changes. Lines starting
This commit is contained in:
Gaute Lindkvist
2018-05-04 13:20:49 +02:00
parent fba437f595
commit 78326bb19c
6 changed files with 298 additions and 113 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
ApplicationCode/ModelVisualization/Riv3dWellLogCurveGeometryGenerator.h
View File

@@ -59,6 +59,7 @@ public:
const RigWellPath* wellPathGeometry() const;
cvf::ref<cvf::DrawableGeo> curveDrawable();
cvf::ref<cvf::DrawableGeo> curveFilledDrawable();
bool findClosestPointOnCurve(const cvf::Vec3d& globalIntersection,
cvf::Vec3d* closestPoint,
@@ -66,18 +67,29 @@ public:
double* valueAtClosestPoint) const;
private:
void createNewVerticesAlongTriangleEdges(const std::vector<cvf::Vec3f>& drawSurfaceVertices);
void projectVerticesOntoTriangles(const std::vector<cvf::Vec3f>& drawSurfaceVertices);
static cvf::Vec3f projectPointOntoTriangle(const cvf::Vec3f& point,
const cvf::Vec3f& triangleVertex1,
const cvf::Vec3f& triangleVertex2,
const cvf::Vec3f& triangleVertex3,
bool* wasInsideTriangle);
void createNewVerticesAlongTriangleEdges(const std::vector<cvf::Vec3f>& drawSurfaceVertices);
static void createNewVerticesAlongSegment(const cvf::Vec3f& ptStart,
const cvf::Vec3f& ptEnd,
const std::vector<cvf::Vec3f>& drawSurfaceVertices,
std::vector<cvf::Vec3f>* extraVertices,
const cvf::Vec3f* ptBottomStart = nullptr,
const cvf::Vec3f* ptBottomEnd = nullptr,
std::vector<cvf::Vec3f>* extraBottomVertices = nullptr);
static std::vector<cvf::Vec3f> projectVerticesOntoTriangles(const std::vector<cvf::Vec3f>& originalVertices, const std::vector<cvf::Vec3f>& drawSurfaceVertices);
static cvf::Vec3f projectPointOntoTriangle(const cvf::Vec3f& point,
const cvf::Vec3f& triangleVertex1,
const cvf::Vec3f& triangleVertex2,
const cvf::Vec3f& triangleVertex3,
bool* wasInsideTriangle);
caf::PdmPointer<RimWellPath> m_wellPath;
double m_planeWidth;
cvf::ref<cvf::DrawableGeo> m_curveDrawable;
cvf::ref<cvf::DrawableGeo> m_curveFilledDrawable;
std::vector<cvf::Vec3f> m_curveVertices;
std::vector<cvf::Vec3f> m_bottomVertices;
std::vector<double> m_curveMeasuredDepths;
std::vector<double> m_curveValues;
};