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

#1025 Code cean-up. Removed obsolete scaletransform for cell center spheres.

Browse Source
This commit is contained in:
astridkbjorke 2016-12-12 10:28:04 +01:00
parent 21a8acdb76
commit 8e81c53520
5 changed files with 1 additions and 74 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
ApplicationCode/ModelVisualization/RivReservoirWellSpheresPartMgr.cpp
View File

@ -37,7 +37,6 @@ RivReservoirWellSpheresPartMgr::RivReservoirWellSpheresPartMgr(RimEclipseView* r
{
m_reservoirView = reservoirView;
m_scaleTransform = new cvf::Transform();
}
//--------------------------------------------------------------------------------------------------
@ -48,15 +47,6 @@ RivReservoirWellSpheresPartMgr::~RivReservoirWellSpheresPartMgr()
}
// --------------------------------------------------------------------------------------------------
// /
// --------------------------------------------------------------------------------------------------
void RivReservoirWellSpheresPartMgr::setScaleTransform(cvf::Transform * scaleTransform)
{
m_scaleTransform = scaleTransform;
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
@ -72,7 +62,6 @@ void RivReservoirWellSpheresPartMgr::appendDynamicGeometryPartsToModel(cvf::Mode
{
RivWellSpheresPartMgr* wppmgr = new RivWellSpheresPartMgr(m_reservoirView, rimWell);
m_wellSpheresPartMgrs.push_back(wppmgr);
wppmgr->setScaleTransform(m_scaleTransform.p());
}
}

4
ApplicationCode/ModelVisualization/RivReservoirWellSpheresPartMgr.h
View File

@ -39,8 +39,6 @@ public:
~RivReservoirWellSpheresPartMgr();
void setScaleTransform(cvf::Transform* scaleTransform);
void appendDynamicGeometryPartsToModel(cvf::ModelBasicList* model, size_t frameIndex);
private:
@ -48,8 +46,6 @@ private:
private:
caf::PdmPointer<RimEclipseView> m_reservoirView;
cvf::ref<cvf::Transform> m_scaleTransform;
cvf::Collection< RivWellSpheresPartMgr > m_wellSpheresPartMgrs;
};

52
ApplicationCode/ModelVisualization/RivWellSpheresPartMgr.cpp
View File

@ -71,11 +71,7 @@ void RivWellSpheresPartMgr::appendDynamicGeometryPartsToModel(cvf::ModelBasicLis
{
if (m_rimReservoirView.isNull()) return;
if (!m_rimReservoirView->eclipseCase()) return;
if (!m_rimReservoirView->eclipseCase()->reservoirData()) return;
// if (!m_rimWell->showWellSpheres() ) return; //TODO: Check that all on is not on...
if (!m_rimReservoirView->eclipseCase()->reservoirData()) return;
const RigMainGrid* mainGrid = m_rimReservoirView->eclipseCase()->reservoirData()->mainGrid();
CVF_ASSERT(mainGrid);
@ -119,52 +115,6 @@ void RivWellSpheresPartMgr::appendDynamicGeometryPartsToModel(cvf::ModelBasicLis
model->addPart(part.p());
}
// --------------------------------------------------------------------------------------------------
// /
// --------------------------------------------------------------------------------------------------
// cvf::ref<cvf::DrawableGeo> RivWellSpheresPartMgr::createSphere(double radius, const cvf::Vec3d& pos)
// {
// cvf::Vec3f posFloat(pos);
//
// cvf::ref<cvf::DrawableGeo> geo = new cvf::DrawableGeo;
//
// cvf::GeometryBuilderFaceList builder;
// cvf::GeometryUtils::createSphere(radius, 10, 10, &builder);
//
// cvf::ref<cvf::Vec3fArray> vertices = builder.vertices();
//
// // Move sphere coordinates to the destination location
// for (size_t i = 0; i < vertices->size(); i++)
// {
// vertices->set(i, vertices->val(i) + posFloat);
// }
//
// cvf::ref<cvf::UIntArray> faceList = builder.faceList();
//
// geo->setVertexArray(vertices.p());
// geo->setFromFaceList(*faceList);
// geo->computeNormals();
//
// return geo;
// }
//
// --------------------------------------------------------------------------------------------------
// /
// --------------------------------------------------------------------------------------------------
// cvf::ref<cvf::Part> RivWellSpheresPartMgr::createPart(cvf::DrawableGeo* geo, const cvf::Color3f& color)
// {
// cvf::ref<cvf::Part> part = new cvf::Part;
// part->setDrawable(geo);
//
// caf::SurfaceEffectGenerator surfaceGen(cvf::Color4f(color), caf::PO_1);
// cvf::ref<cvf::Effect> eff = surfaceGen.generateCachedEffect();
//
// part->setEffect(eff.p());
//
// return part;
// }
//
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------

6
ApplicationCode/ModelVisualization/RivWellSpheresPartMgr.h
View File

@ -52,16 +52,11 @@ public:
RivWellSpheresPartMgr(RimEclipseView* reservoirView, RimEclipseWell* well);
~RivWellSpheresPartMgr();
void setScaleTransform(cvf::Transform * scaleTransform) { m_scaleTransform = scaleTransform; scheduleGeometryRegen();}
void scheduleGeometryRegen() { m_needsTransformUpdate = true; }
void appendDynamicGeometryPartsToModel(cvf::ModelBasicList* model, size_t frameIndex);
private:
// static cvf::ref<cvf::DrawableGeo> createSphere(double radius, const cvf::Vec3d& pos);
// cvf::ref<cvf::Part> createPart(cvf::DrawableGeo* geo, const cvf::Color3f& color);
cvf::Color3f wellCellColor(const RigWellResultFrame& wellResultFrame, const RigWellResultPoint& wellResultPoint);
cvf::ref<cvf::Part> createPart(std::vector<std::pair<cvf::Vec3f, cvf::Color3f> >& centerColorPairs);
@ -69,6 +64,5 @@ private:
caf::PdmPointer<RimEclipseView> m_rimReservoirView;
caf::PdmPointer<RimEclipseWell> m_rimWell;
cvf::ref<cvf::Transform> m_scaleTransform;
bool m_needsTransformUpdate;
};

2
ApplicationCode/ProjectDataModel/RimEclipseView.cpp
View File

@ -269,8 +269,6 @@ void RimEclipseView::updateScaleTransform()
this->scaleTransform()->setLocalTransform(scale);
m_pipesPartManager->setScaleTransform(this->scaleTransform());
m_wellSpheresPartManager->setScaleTransform(this->scaleTransform());
if (m_viewer) m_viewer->updateCachedValuesInScene();
}