diff --git a/ApplicationCode/ModelVisualization/Riv3dWellLogPlanePartMgr.cpp b/ApplicationCode/ModelVisualization/Riv3dWellLogPlanePartMgr.cpp index 5b600f834d..03da723504 100644 --- a/ApplicationCode/ModelVisualization/Riv3dWellLogPlanePartMgr.cpp +++ b/ApplicationCode/ModelVisualization/Riv3dWellLogPlanePartMgr.cpp @@ -41,9 +41,9 @@ Riv3dWellLogPlanePartMgr::Riv3dWellLogPlanePartMgr(RigWellPath* wellPathGeometry //-------------------------------------------------------------------------------------------------- void Riv3dWellLogPlanePartMgr::append3dWellLogCurvesToModel(cvf::ModelBasicList* model, const caf::DisplayCoordTransform* displayCoordTransform, - std::vector* rim3dWellLogCurves) + std::vector rim3dWellLogCurves) { - if (rim3dWellLogCurves->empty()) return; + if (rim3dWellLogCurves.empty()) return; m_3dWellLogCurveGeometryGenerator = new Riv3dWellLogCurveGeometryGenerator; @@ -71,8 +71,10 @@ void Riv3dWellLogPlanePartMgr::append3dWellLogCurvesToModel(cvf::ModelBasicList* if (i % 2 == 0) counter++; } - for (Rim3dWellLogCurve* rim3dWellLogCurve : *rim3dWellLogCurves) + + for (Rim3dWellLogCurve* rim3dWellLogCurve : rim3dWellLogCurves) { + std::vector vertices = createCurveVertices(rim3dWellLogCurve); cvf::ref drawable = m_3dWellLogCurveGeometryGenerator->createDrawable(vertices, indices); caf::SurfaceEffectGenerator surfaceGen(cvf::Color4f(255, 0, 0, 0.5), caf::PO_1); diff --git a/ApplicationCode/ModelVisualization/Riv3dWellLogPlanePartMgr.h b/ApplicationCode/ModelVisualization/Riv3dWellLogPlanePartMgr.h index c0d64f24e2..b3db1054bb 100644 --- a/ApplicationCode/ModelVisualization/Riv3dWellLogPlanePartMgr.h +++ b/ApplicationCode/ModelVisualization/Riv3dWellLogPlanePartMgr.h @@ -44,7 +44,7 @@ public: void append3dWellLogCurvesToModel(cvf::ModelBasicList* model, const caf::DisplayCoordTransform* displayCoordTransform, - std::vector* rim3dWellLogCurves); + std::vector rim3dWellLogCurves); private: cvf::ref m_3dWellLogCurveGeometryGenerator; diff --git a/ApplicationCode/ModelVisualization/RivWellPathPartMgr.cpp b/ApplicationCode/ModelVisualization/RivWellPathPartMgr.cpp index ba8576b5a3..dc358782e0 100644 --- a/ApplicationCode/ModelVisualization/RivWellPathPartMgr.cpp +++ b/ApplicationCode/ModelVisualization/RivWellPathPartMgr.cpp @@ -419,7 +419,7 @@ void RivWellPathPartMgr::appendDynamicGeometryPartsToModel(cvf::ModelBasicList* appendPerforationsToModel(timeStamp, model, displayCoordTransform, characteristicCellSize); m_3dWellLogCurvePartMgr = new Riv3dWellLogPlanePartMgr(m_rimWellPath->wellPathGeometry()); - m_3dWellLogCurvePartMgr->append3dWellLogCurvesToModel(model, displayCoordTransform, &m_rimWellPath->vectorOf3dWellLogCurves()); + m_3dWellLogCurvePartMgr->append3dWellLogCurvesToModel(model, displayCoordTransform, m_rimWellPath->vectorOf3dWellLogCurves()); } //--------------------------------------------------------------------------------------------------