OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2026-09-03 20:53:13 -05:00
Code Issues Packages Projects Releases Wiki Activity

Removed debug output from some well path code

Browse Source
This commit is contained in:
Jacob Støren
2015-06-12 09:05:55 +02:00
parent ceeb38d13a
commit a520a4322a
1 changed files with 6 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ApplicationCode/ModelVisualization/RivWellPathPartMgr.cpp
+6 -21
View File
@@ -93,7 +93,7 @@ RivWellPathPartMgr::~RivWellPathPartMgr()
} }
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// /// The pipe geometry needs to be rebuilt on scale change to keep the pipes round
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
void RivWellPathPartMgr::buildWellPathParts(cvf::Vec3d displayModelOffset, double characteristicCellSize, cvf::BoundingBox boundingBox) void RivWellPathPartMgr::buildWellPathParts(cvf::Vec3d displayModelOffset, double characteristicCellSize, cvf::BoundingBox boundingBox)
{ {
@@ -107,13 +107,9 @@ void RivWellPathPartMgr::buildWellPathParts(cvf::Vec3d displayModelOffset, doubl
m_wellBranches.clear(); m_wellBranches.clear();
double wellPathRadius = m_wellPathCollection->wellPathRadiusScaleFactor() * m_rimWellPath->wellPathRadiusScaleFactor() * characteristicCellSize; double wellPathRadius = m_wellPathCollection->wellPathRadiusScaleFactor() * m_rimWellPath->wellPathRadiusScaleFactor() * characteristicCellSize;
// cvf::Vec3d firstPoint = wellPathGeometry->m_wellPathPoints[0];
// firstPoint -= displayModelOffset;
// firstPoint.transformPoint(m_scaleTransform->worldTransform());
// printf("Well path start pos = (%f, %f, %f)\n", firstPoint.x(), firstPoint.y(), firstPoint.z());
cvf::Vec3d textPosition = wellPathGeometry->m_wellPathPoints[0]; cvf::Vec3d textPosition = wellPathGeometry->m_wellPathPoints[0];
// Generate well path as pipe structure // Generate the well path geometry as a line and pipe structure
{ {
m_wellBranches.push_back(RivPipeBranchData()); m_wellBranches.push_back(RivPipeBranchData());
RivPipeBranchData& pbd = m_wellBranches.back(); RivPipeBranchData& pbd = m_wellBranches.back();
@@ -161,7 +157,6 @@ void RivWellPathPartMgr::buildWellPathParts(cvf::Vec3d displayModelOffset, doubl
{ {
pbd.m_surfacePart = new cvf::Part; pbd.m_surfacePart = new cvf::Part;
pbd.m_surfacePart->setDrawable(pbd.m_surfaceDrawable.p()); pbd.m_surfacePart->setDrawable(pbd.m_surfaceDrawable.p());
//printf("Well Path triangleCount = %i (%i points in well path)\n", pbd.m_surfaceDrawable->triangleCount(), wellPathGeometry->m_wellPathPoints.size());
caf::SurfaceEffectGenerator surfaceGen(cvf::Color4f(m_rimWellPath->wellPathColor()), caf::PO_1); caf::SurfaceEffectGenerator surfaceGen(cvf::Color4f(m_rimWellPath->wellPathColor()), caf::PO_1);
cvf::ref<cvf::Effect> eff = surfaceGen.generateEffect(); cvf::ref<cvf::Effect> eff = surfaceGen.generateEffect();
@@ -173,7 +168,6 @@ void RivWellPathPartMgr::buildWellPathParts(cvf::Vec3d displayModelOffset, doubl
{ {
pbd.m_centerLinePart = new cvf::Part; pbd.m_centerLinePart = new cvf::Part;
pbd.m_centerLinePart->setDrawable(pbd.m_centerLineDrawable.p()); pbd.m_centerLinePart->setDrawable(pbd.m_centerLineDrawable.p());
//printf("Well Path vertexCount = %i\n", pbd.m_centerLineDrawable->vertexCount());
caf::MeshEffectGenerator gen(m_rimWellPath->wellPathColor()); caf::MeshEffectGenerator gen(m_rimWellPath->wellPathColor());
cvf::ref<cvf::Effect> eff = gen.generateEffect(); cvf::ref<cvf::Effect> eff = gen.generateEffect();
@@ -182,7 +176,8 @@ void RivWellPathPartMgr::buildWellPathParts(cvf::Vec3d displayModelOffset, doubl
} }
} }
// Generate label with well path name // Generate label with well-path name
textPosition -= displayModelOffset; textPosition -= displayModelOffset;
textPosition.transformPoint(m_scaleTransform->worldTransform()); textPosition.transformPoint(m_scaleTransform->worldTransform());
textPosition.z() += characteristicCellSize; // * m_rimReservoirView->wellCollection()->wellHeadScaleFactor(); textPosition.z() += characteristicCellSize; // * m_rimReservoirView->wellCollection()->wellHeadScaleFactor();
@@ -238,25 +233,15 @@ void RivWellPathPartMgr::appendStaticGeometryPartsToModel(cvf::ModelBasicList* m
if (m_needsTransformUpdate) if (m_needsTransformUpdate)
{ {
//printf("G"); // The pipe geometry needs to be rebuilt on scale change to keep the pipes round
buildWellPathParts(displayModelOffset, characteristicCellSize, boundingBox); buildWellPathParts(displayModelOffset, characteristicCellSize, boundingBox);
} }
else
{
//printf("s");
}
if (m_wellBranches.size() < 1)
{
//printf("RivWellPathPartMgr::appendStaticGeometryPartsToModel: There are no well branches in well \"%s\"!!!\n", (const char*) m_rimWellPath->name().toLocal8Bit());
}
std::list<RivPipeBranchData>::iterator it; std::list<RivPipeBranchData>::iterator it;
for (it = m_wellBranches.begin(); it != m_wellBranches.end(); it++) for (it = m_wellBranches.begin(); it != m_wellBranches.end(); it++)
{ {
if (it->m_surfacePart.notNull()) if (it->m_surfacePart.notNull())
{ {
//printf("a");
model->addPart(it->m_surfacePart.p()); model->addPart(it->m_surfacePart.p());
} }
if (it->m_centerLinePart.notNull()) if (it->m_centerLinePart.notNull())