OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2025-01-23 23:13:39 -06:00
Code Issues Packages Projects Releases Wiki Activity

#2585 Fix linux build

Browse Source
This commit is contained in:
Rebecca Cox 2018-03-09 14:00:41 +01:00
parent d72d5ba343
commit 62a2ddfe82
3 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ApplicationCode/ModelVisualization/Riv3dWellLogPlanePartMgr.cpp
View File

@ -41,9 +41,9 @@ Riv3dWellLogPlanePartMgr::Riv3dWellLogPlanePartMgr(RigWellPath* wellPathGeometry
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
void Riv3dWellLogPlanePartMgr::append3dWellLogCurvesToModel(cvf::ModelBasicList* model, void Riv3dWellLogPlanePartMgr::append3dWellLogCurvesToModel(cvf::ModelBasicList* model,
const caf::DisplayCoordTransform* displayCoordTransform, const caf::DisplayCoordTransform* displayCoordTransform,
std::vector<Rim3dWellLogCurve*>* rim3dWellLogCurves) std::vector<Rim3dWellLogCurve*> rim3dWellLogCurves)
{ {
if (rim3dWellLogCurves->empty()) return; if (rim3dWellLogCurves.empty()) return;
m_3dWellLogCurveGeometryGenerator = new Riv3dWellLogCurveGeometryGenerator; m_3dWellLogCurveGeometryGenerator = new Riv3dWellLogCurveGeometryGenerator;
@ -71,8 +71,10 @@ void Riv3dWellLogPlanePartMgr::append3dWellLogCurvesToModel(cvf::ModelBasicList*
if (i % 2 == 0) counter++; if (i % 2 == 0) counter++;
} }
for (Rim3dWellLogCurve* rim3dWellLogCurve : *rim3dWellLogCurves)
for (Rim3dWellLogCurve* rim3dWellLogCurve : rim3dWellLogCurves)
{ {
std::vector<cvf::Vec3f> vertices = createCurveVertices(rim3dWellLogCurve);
cvf::ref<cvf::Drawable> drawable = m_3dWellLogCurveGeometryGenerator->createDrawable(vertices, indices); cvf::ref<cvf::Drawable> drawable = m_3dWellLogCurveGeometryGenerator->createDrawable(vertices, indices);
caf::SurfaceEffectGenerator surfaceGen(cvf::Color4f(255, 0, 0, 0.5), caf::PO_1); caf::SurfaceEffectGenerator surfaceGen(cvf::Color4f(255, 0, 0, 0.5), caf::PO_1);

2
ApplicationCode/ModelVisualization/Riv3dWellLogPlanePartMgr.h
View File

@ -44,7 +44,7 @@ public:
void append3dWellLogCurvesToModel(cvf::ModelBasicList* model, void append3dWellLogCurvesToModel(cvf::ModelBasicList* model,
const caf::DisplayCoordTransform* displayCoordTransform, const caf::DisplayCoordTransform* displayCoordTransform,
std::vector<Rim3dWellLogCurve*>* rim3dWellLogCurves); std::vector<Rim3dWellLogCurve*> rim3dWellLogCurves);
private: private:
cvf::ref<Riv3dWellLogCurveGeometryGenerator> m_3dWellLogCurveGeometryGenerator; cvf::ref<Riv3dWellLogCurveGeometryGenerator> m_3dWellLogCurveGeometryGenerator;

2
ApplicationCode/ModelVisualization/RivWellPathPartMgr.cpp
View File

@ -419,7 +419,7 @@ void RivWellPathPartMgr::appendDynamicGeometryPartsToModel(cvf::ModelBasicList*
appendPerforationsToModel(timeStamp, model, displayCoordTransform, characteristicCellSize); appendPerforationsToModel(timeStamp, model, displayCoordTransform, characteristicCellSize);
m_3dWellLogCurvePartMgr = new Riv3dWellLogPlanePartMgr(m_rimWellPath->wellPathGeometry()); m_3dWellLogCurvePartMgr = new Riv3dWellLogPlanePartMgr(m_rimWellPath->wellPathGeometry());
m_3dWellLogCurvePartMgr->append3dWellLogCurvesToModel(model, displayCoordTransform, &m_rimWellPath->vectorOf3dWellLogCurves()); m_3dWellLogCurvePartMgr->append3dWellLogCurvesToModel(model, displayCoordTransform, m_rimWellPath->vectorOf3dWellLogCurves());
} }
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------