mirror of
https://github.com/OPM/ResInsight.git
synced 2026-10-16 10:22:15 -05:00
Renaming and improved some readability around well paths
This commit is contained in:
1 parent
a520a4322a
commit
b5cfa8ab53
8 files changed
+36
-16
No files matched your search
@@ -446,7 +446,10 @@ void RimEclipseView::createDisplayModel()
|
||||
scene->addModel(model);
|
||||
|
||||
// Add well paths, if any
|
||||
addWellPathsToScene(scene.p(), mainGrid->displayModelOffset(), mainGrid->characteristicIJCellSize(), currentActiveCellInfo()->geometryBoundingBox(), m_reservoirGridPartManager->scaleTransform());
|
||||
addWellPathsToScene(scene.p(), mainGrid->displayModelOffset(),
|
||||
mainGrid->characteristicIJCellSize(),
|
||||
currentActiveCellInfo()->geometryBoundingBox(),
|
||||
m_reservoirGridPartManager->scaleTransform());
|
||||
|
||||
if (frameIndex == 0)
|
||||
m_viewer->setMainScene(scene.p());
|
||||
@@ -634,7 +637,11 @@ void RimEclipseView::updateCurrentTimeStep()
|
||||
RigMainGrid* mainGrid = caseData ? caseData->mainGrid() : NULL;
|
||||
CVF_ASSERT(mainGrid);
|
||||
|
||||
addWellPathsToScene(frameScene, mainGrid->displayModelOffset(), mainGrid->characteristicIJCellSize(), currentActiveCellInfo()->geometryBoundingBox(), m_reservoirGridPartManager->scaleTransform());
|
||||
addWellPathsToScene(frameScene,
|
||||
mainGrid->displayModelOffset(),
|
||||
mainGrid->characteristicIJCellSize(),
|
||||
currentActiveCellInfo()->geometryBoundingBox(),
|
||||
m_reservoirGridPartManager->scaleTransform());
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -247,7 +247,8 @@ void RimGeoMechView::createDisplayModel()
|
||||
double characteristicCellSize = geoMechCase()->geoMechData()->femParts()->characteristicElementSize();
|
||||
cvf::BoundingBox femBBox = geoMechCase()->geoMechData()->femParts()->boundingBox();
|
||||
|
||||
addWellPathsToScene(scene.p(), cvf::Vec3d(0, 0, 0), characteristicCellSize, femBBox, scaleTransform());
|
||||
addWellPathsToScene(scene.p(), cvf::Vec3d(0, 0, 0),
|
||||
characteristicCellSize, femBBox, scaleTransform());
|
||||
}
|
||||
|
||||
// If the animation was active before recreating everything, make viewer view current frame
|
||||
@@ -286,7 +287,8 @@ void RimGeoMechView::updateCurrentTimeStep()
|
||||
|
||||
double characteristicCellSize = geoMechCase()->geoMechData()->femParts()->characteristicElementSize();
|
||||
cvf::BoundingBox femBBox = geoMechCase()->geoMechData()->femParts()->boundingBox();
|
||||
addWellPathsToScene(frameScene, cvf::Vec3d(0, 0, 0), characteristicCellSize, femBBox, scaleTransform());
|
||||
addWellPathsToScene(frameScene, cvf::Vec3d(0, 0, 0),
|
||||
characteristicCellSize, femBBox, scaleTransform());
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -448,7 +448,9 @@ void RimView::fieldChangedByUi(const caf::PdmFieldHandle* changedField, const QV
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
///
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
void RimView::addWellPathsToScene(cvf::Scene* scene, const cvf::Vec3d& displayModelOffset, double characteristicCellSize, const cvf::BoundingBox& boundingBox, cvf::Transform* scaleTransform)
|
||||
void RimView::addWellPathsToScene(cvf::Scene* scene, const cvf::Vec3d& displayModelOffset,
|
||||
double characteristicCellSize, const cvf::BoundingBox& wellPathClipBoundingBox,
|
||||
cvf::Transform* scaleTransform)
|
||||
{
|
||||
CVF_ASSERT(scene);
|
||||
CVF_ASSERT(scaleTransform);
|
||||
@@ -478,7 +480,8 @@ void RimView::addWellPathsToScene(cvf::Scene* scene, const cvf::Vec3d& displayMo
|
||||
|
||||
if (wellPathCollectionPartMgr)
|
||||
{
|
||||
wellPathCollectionPartMgr->appendStaticGeometryPartsToModel(wellPathModelBasicList.p(), displayModelOffset, scaleTransform, characteristicCellSize, boundingBox);
|
||||
wellPathCollectionPartMgr->appendStaticGeometryPartsToModel(wellPathModelBasicList.p(), displayModelOffset,
|
||||
scaleTransform, characteristicCellSize, wellPathClipBoundingBox);
|
||||
}
|
||||
|
||||
wellPathModelBasicList->updateBoundingBoxesRecursive();
|
||||
|
||||
@@ -110,7 +110,11 @@ public:
|
||||
protected:
|
||||
|
||||
void setDefaultView();
|
||||
void addWellPathsToScene(cvf::Scene* scene, const cvf::Vec3d& displayModelOffset, double characteristicCellSize, const cvf::BoundingBox& boundingBox, cvf::Transform* scaleTransform);
|
||||
void addWellPathsToScene(cvf::Scene* scene,
|
||||
const cvf::Vec3d& displayModelOffset,
|
||||
double characteristicCellSize,
|
||||
const cvf::BoundingBox& wellPathClipBoundingBox,
|
||||
cvf::Transform* scaleTransform);
|
||||
|
||||
virtual void createDisplayModel() = 0;
|
||||
virtual void updateDisplayModelVisibility() = 0;
|
||||
|
||||
Reference in new issue
Block a user