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

Rename wellPathsPartManager -> wellPathCollection

Browse Source
This commit is contained in:
Rebecca Cox 2017-11-08 09:07:30 +01:00
parent de8b953360
commit ea4a92ab27
4 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ApplicationCode/ProjectDataModel/RimEclipseView.cpp
View File

@ -459,7 +459,7 @@ void RimEclipseView::createDisplayModel()
addWellPathsToModel(m_wellPathPipeVizModel.p(), currentActiveCellInfo()->geometryBoundingBox()); addWellPathsToModel(m_wellPathPipeVizModel.p(), currentActiveCellInfo()->geometryBoundingBox());
#ifdef USE_PROTOTYPE_FEATURE_FRACTURES #ifdef USE_PROTOTYPE_FEATURE_FRACTURES
wellPathsPartManager()->appendStaticFracturePartsToModel(m_wellPathPipeVizModel.p(), this); wellPathCollection()->appendStaticFracturePartsToModel(m_wellPathPipeVizModel.p(), this);
#endif // USE_PROTOTYPE_FEATURE_FRACTURES #endif // USE_PROTOTYPE_FEATURE_FRACTURES
m_wellPathPipeVizModel->updateBoundingBoxesRecursive(); m_wellPathPipeVizModel->updateBoundingBoxesRecursive();
m_viewer->updateWellPathTextColor(); m_viewer->updateWellPathTextColor();

6
ApplicationCode/ProjectDataModel/RimView.cpp
View File

@ -428,7 +428,7 @@ void RimView::endAnimation()
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
RimWellPathCollection* RimView::wellPathsPartManager() RimWellPathCollection* RimView::wellPathCollection()
{ {
RimProject* proj = nullptr; RimProject* proj = nullptr;
this->firstAncestorOrThisOfTypeAsserted(proj); this->firstAncestorOrThisOfTypeAsserted(proj);
@ -724,7 +724,7 @@ void RimView::addWellPathsToModel(cvf::ModelBasicList* wellPathModelBasicList,
cvf::ref<caf::DisplayCoordTransform> transForm = displayCoordTransform(); cvf::ref<caf::DisplayCoordTransform> transForm = displayCoordTransform();
wellPathsPartManager()->appendStaticGeometryPartsToModel(wellPathModelBasicList, wellPathCollection()->appendStaticGeometryPartsToModel(wellPathModelBasicList,
this->ownerCase()->characteristicCellSize(), this->ownerCase()->characteristicCellSize(),
wellPathClipBoundingBox, wellPathClipBoundingBox,
transForm.p()); transForm.p());
@ -748,7 +748,7 @@ void RimView::addDynamicWellPathsToModel(cvf::ModelBasicList* wellPathModelBasic
currentTimeStamp = timeStamps[currentTimeStep()]; currentTimeStamp = timeStamps[currentTimeStep()];
} }
wellPathsPartManager()->appendDynamicGeometryPartsToModel(wellPathModelBasicList, wellPathCollection()->appendDynamicGeometryPartsToModel(wellPathModelBasicList,
currentTimeStamp, currentTimeStamp,
this->ownerCase()->characteristicCellSize(), this->ownerCase()->characteristicCellSize(),
wellPathClipBoundingBox, wellPathClipBoundingBox,

2
ApplicationCode/ProjectDataModel/RimView.h
View File

@ -207,7 +207,7 @@ protected:
virtual void onLoadDataAndUpdate() = 0; virtual void onLoadDataAndUpdate() = 0;
RimWellPathCollection* wellPathsPartManager(); RimWellPathCollection* wellPathCollection();
QPointer<RiuViewer> m_viewer; QPointer<RiuViewer> m_viewer;

14
ApplicationCode/UserInterface/RiuViewer.cpp
View File

@ -774,19 +774,19 @@ void RiuViewer::updateGridBoxData()
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
void RiuViewer::updateAnnotationItems() cvf::Model* RiuViewer::gridBoxModel() const
{ {
updateTextAndTickMarkColorForOverlayItems(); return m_gridBoxGenerator->model();
updateWellPathTextColor();
} }
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
cvf::Model* RiuViewer::gridBoxModel() const void RiuViewer::updateAnnotationItems()
{ {
return m_gridBoxGenerator->model(); updateTextAndTickMarkColorForOverlayItems();
updateWellPathTextColor();
} }
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
@ -799,7 +799,7 @@ void RiuViewer::updateWellPathTextColor()
cvf::Color3f color = computeContrastColor(); cvf::Color3f color = computeContrastColor();
RimWellPathCollection* wellPathCollection = rimView->wellPathsPartManager(); RimWellPathCollection* wellPathCollection = rimView->wellPathCollection();
if (wellPathCollection) if (wellPathCollection)
{ {
for (RimWellPath* path : wellPathCollection->wellPaths()) for (RimWellPath* path : wellPathCollection->wellPaths())