From 8d96e9e35a8bd519eef052a91ba6763daee0c2ac Mon Sep 17 00:00:00 2001 From: sigurdp Date: Mon, 16 Oct 2017 14:21:05 +0200 Subject: [PATCH] Renamed RiuEclipseSelectionItem::m_cellIndex to RiuEclipseSelectionItem::m_gridLocalCellIndex --- .gitignore | 3 +++ .../ProjectDataModel/RimEclipseGeometrySelectionItem.cpp | 2 +- ApplicationCode/ProjectDataModel/RimEclipseView.cpp | 2 +- ApplicationCode/SocketInterface/RiaCaseInfoCommands.cpp | 2 +- ApplicationCode/SocketInterface/RiaPropertyDataCommands.cpp | 2 +- .../UserInterface/RiuSelectionChangedHandler.cpp | 6 +++--- ApplicationCode/UserInterface/RiuSelectionManager.cpp | 2 +- ApplicationCode/UserInterface/RiuSelectionManager.h | 2 +- 8 files changed, 12 insertions(+), 9 deletions(-) diff --git a/.gitignore b/.gitignore index dc1fc79f22..9ce453e6f7 100644 --- a/.gitignore +++ b/.gitignore @@ -59,6 +59,9 @@ CTest*.cmake ipch/ Ankh.NoLoad +#Visual Studio Code files +.vscode + #Temp files *.temp /Resinsight_Host.includes diff --git a/ApplicationCode/ProjectDataModel/RimEclipseGeometrySelectionItem.cpp b/ApplicationCode/ProjectDataModel/RimEclipseGeometrySelectionItem.cpp index d14b7d3cec..5f4c0e6b72 100644 --- a/ApplicationCode/ProjectDataModel/RimEclipseGeometrySelectionItem.cpp +++ b/ApplicationCode/ProjectDataModel/RimEclipseGeometrySelectionItem.cpp @@ -55,7 +55,7 @@ RimEclipseGeometrySelectionItem::~RimEclipseGeometrySelectionItem() void RimEclipseGeometrySelectionItem::setFromSelectionItem(const RiuEclipseSelectionItem* selectionItem) { m_gridIndex = selectionItem->m_gridIndex; - m_cellIndex = selectionItem->m_cellIndex; + m_cellIndex = selectionItem->m_gridLocalCellIndex; m_localIntersectionPoint = selectionItem->m_localIntersectionPoint; m_eclipseCase = selectionItem->m_view->eclipseCase(); diff --git a/ApplicationCode/ProjectDataModel/RimEclipseView.cpp b/ApplicationCode/ProjectDataModel/RimEclipseView.cpp index bb2c818c48..1c407026c5 100644 --- a/ApplicationCode/ProjectDataModel/RimEclipseView.cpp +++ b/ApplicationCode/ProjectDataModel/RimEclipseView.cpp @@ -1671,7 +1671,7 @@ void RimEclipseView::createPartCollectionFromSelection(cvf::Collectionm_view->eclipseCase()); CVF_ASSERT(eclipseSelItem->m_view->eclipseCase()->eclipseCaseData()); - RivSingleCellPartGenerator partGen(eclipseSelItem->m_view->eclipseCase()->eclipseCaseData(), eclipseSelItem->m_gridIndex, eclipseSelItem->m_cellIndex); + RivSingleCellPartGenerator partGen(eclipseSelItem->m_view->eclipseCase()->eclipseCaseData(), eclipseSelItem->m_gridIndex, eclipseSelItem->m_gridLocalCellIndex); cvf::ref part = partGen.createPart(eclipseSelItem->m_color); part->setTransform(this->scaleTransform()); diff --git a/ApplicationCode/SocketInterface/RiaCaseInfoCommands.cpp b/ApplicationCode/SocketInterface/RiaCaseInfoCommands.cpp index 0e0bf8998f..5391466a98 100644 --- a/ApplicationCode/SocketInterface/RiaCaseInfoCommands.cpp +++ b/ApplicationCode/SocketInterface/RiaCaseInfoCommands.cpp @@ -608,7 +608,7 @@ public: { const RiuEclipseSelectionItem* eclipseItem = static_cast(item); - eclipseItem->m_view->eclipseCase()->eclipseCaseData()->grid(eclipseItem->m_gridIndex)->ijkFromCellIndex(eclipseItem->m_cellIndex, &i, &j, &k); + eclipseItem->m_view->eclipseCase()->eclipseCaseData()->grid(eclipseItem->m_gridIndex)->ijkFromCellIndex(eclipseItem->m_gridLocalCellIndex, &i, &j, &k); gridIndex = eclipseItem->m_gridIndex; caseId = eclipseItem->m_view->eclipseCase()->caseId; } diff --git a/ApplicationCode/SocketInterface/RiaPropertyDataCommands.cpp b/ApplicationCode/SocketInterface/RiaPropertyDataCommands.cpp index 66693d8b65..ce3749ca88 100644 --- a/ApplicationCode/SocketInterface/RiaPropertyDataCommands.cpp +++ b/ApplicationCode/SocketInterface/RiaPropertyDataCommands.cpp @@ -1307,7 +1307,7 @@ public: if (eclipseItem->m_view->eclipseCase()->caseId == reservoirCase->caseId) { - selectedCells.push_back(std::make_pair(eclipseItem->m_gridIndex, eclipseItem->m_cellIndex)); + selectedCells.push_back(std::make_pair(eclipseItem->m_gridIndex, eclipseItem->m_gridLocalCellIndex)); } } else if (item->type() == RiuSelectionItem::GEOMECH_SELECTION_OBJECT) diff --git a/ApplicationCode/UserInterface/RiuSelectionChangedHandler.cpp b/ApplicationCode/UserInterface/RiuSelectionChangedHandler.cpp index 6d46bf921f..3f9915e686 100644 --- a/ApplicationCode/UserInterface/RiuSelectionChangedHandler.cpp +++ b/ApplicationCode/UserInterface/RiuSelectionChangedHandler.cpp @@ -124,10 +124,10 @@ void RiuSelectionChangedHandler::addCurveFromSelectionItem(const RiuEclipseSelec curveName += ", "; curveName += QString("Grid index %1").arg(eclipseSelectionItem->m_gridIndex); curveName += ", "; - curveName += RigTimeHistoryResultAccessor::geometrySelectionText(eclipseView->eclipseCase()->eclipseCaseData(), eclipseSelectionItem->m_gridIndex, eclipseSelectionItem->m_cellIndex); + curveName += RigTimeHistoryResultAccessor::geometrySelectionText(eclipseView->eclipseCase()->eclipseCaseData(), eclipseSelectionItem->m_gridIndex, eclipseSelectionItem->m_gridLocalCellIndex); - std::vector timeHistoryValues = RigTimeHistoryResultAccessor::timeHistoryValues(eclipseView->eclipseCase()->eclipseCaseData(), eclipseView->cellResult(), eclipseSelectionItem->m_gridIndex, eclipseSelectionItem->m_cellIndex, timeStepDates.size()); + std::vector timeHistoryValues = RigTimeHistoryResultAccessor::timeHistoryValues(eclipseView->eclipseCase()->eclipseCaseData(), eclipseView->cellResult(), eclipseSelectionItem->m_gridIndex, eclipseSelectionItem->m_gridLocalCellIndex, timeStepDates.size()); CVF_ASSERT(timeStepDates.size() == timeHistoryValues.size()); RiuMainWindow::instance()->resultPlot()->addCurve(curveName, eclipseSelectionItem->m_color, timeStepDates, timeHistoryValues); @@ -267,7 +267,7 @@ void RiuSelectionChangedHandler::updateResultInfo(const RiuSelectionItem* itemAd RimEclipseView* eclipseView = eclipseSelectionItem->m_view.p(); - RiuResultTextBuilder textBuilder(eclipseView, eclipseSelectionItem->m_gridIndex, eclipseSelectionItem->m_cellIndex, eclipseView->currentTimeStep()); + RiuResultTextBuilder textBuilder(eclipseView, eclipseSelectionItem->m_gridIndex, eclipseSelectionItem->m_gridLocalCellIndex, eclipseView->currentTimeStep()); textBuilder.setFace(eclipseSelectionItem->m_face); textBuilder.setNncIndex(eclipseSelectionItem->m_nncIndex); textBuilder.setIntersectionPoint(eclipseSelectionItem->m_localIntersectionPoint); diff --git a/ApplicationCode/UserInterface/RiuSelectionManager.cpp b/ApplicationCode/UserInterface/RiuSelectionManager.cpp index 00fc9e7edb..8edb17ca19 100644 --- a/ApplicationCode/UserInterface/RiuSelectionManager.cpp +++ b/ApplicationCode/UserInterface/RiuSelectionManager.cpp @@ -157,7 +157,7 @@ void RiuSelectionManager::deleteAllItemsFromSelection(int role) RiuEclipseSelectionItem::RiuEclipseSelectionItem(RimEclipseView* view, size_t gridIndex, size_t cellIndex, size_t nncIndex, cvf::Color3f color, cvf::StructGridInterface::FaceType face, const cvf::Vec3d& localIntersectionPoint) : m_view(view), m_gridIndex(gridIndex), - m_cellIndex(cellIndex), + m_gridLocalCellIndex(cellIndex), m_nncIndex(nncIndex), m_color(color), m_face(face), diff --git a/ApplicationCode/UserInterface/RiuSelectionManager.h b/ApplicationCode/UserInterface/RiuSelectionManager.h index d488d9a016..ba0d867816 100644 --- a/ApplicationCode/UserInterface/RiuSelectionManager.h +++ b/ApplicationCode/UserInterface/RiuSelectionManager.h @@ -139,7 +139,7 @@ public: public: caf::PdmPointer m_view; size_t m_gridIndex; - size_t m_cellIndex; + size_t m_gridLocalCellIndex; size_t m_nncIndex; cvf::Color3f m_color; cvf::StructGridInterface::FaceType m_face;