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

Renamed RiuEclipseSelectionItem::m_cellIndex to RiuEclipseSelectionItem::m_gridLocalCellIndex

Browse Source
This commit is contained in:
sigurdp
2017-10-16 14:21:05 +02:00
parent 9c0fa50834
commit 8d96e9e35a
8 changed files with 12 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
.gitignore vendored
View File

@@ -59,6 +59,9 @@ CTest*.cmake
ipch/ ipch/
Ankh.NoLoad Ankh.NoLoad
#Visual Studio Code files
.vscode
#Temp files #Temp files
*.temp *.temp
/Resinsight_Host.includes /Resinsight_Host.includes

2
ApplicationCode/ProjectDataModel/RimEclipseGeometrySelectionItem.cpp
View File

@@ -55,7 +55,7 @@ RimEclipseGeometrySelectionItem::~RimEclipseGeometrySelectionItem()
void RimEclipseGeometrySelectionItem::setFromSelectionItem(const RiuEclipseSelectionItem* selectionItem) void RimEclipseGeometrySelectionItem::setFromSelectionItem(const RiuEclipseSelectionItem* selectionItem)
{ {
m_gridIndex = selectionItem->m_gridIndex; m_gridIndex = selectionItem->m_gridIndex;
m_cellIndex = selectionItem->m_cellIndex; m_cellIndex = selectionItem->m_gridLocalCellIndex;
m_localIntersectionPoint = selectionItem->m_localIntersectionPoint; m_localIntersectionPoint = selectionItem->m_localIntersectionPoint;
m_eclipseCase = selectionItem->m_view->eclipseCase(); m_eclipseCase = selectionItem->m_view->eclipseCase();

2
ApplicationCode/ProjectDataModel/RimEclipseView.cpp
View File

@@ -1671,7 +1671,7 @@ void RimEclipseView::createPartCollectionFromSelection(cvf::Collection<cvf::Part
CVF_ASSERT(eclipseSelItem->m_view->eclipseCase()); CVF_ASSERT(eclipseSelItem->m_view->eclipseCase());
CVF_ASSERT(eclipseSelItem->m_view->eclipseCase()->eclipseCaseData()); 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<cvf::Part> part = partGen.createPart(eclipseSelItem->m_color); cvf::ref<cvf::Part> part = partGen.createPart(eclipseSelItem->m_color);
part->setTransform(this->scaleTransform()); part->setTransform(this->scaleTransform());

2
ApplicationCode/SocketInterface/RiaCaseInfoCommands.cpp
View File

@@ -608,7 +608,7 @@ public:
{ {
const RiuEclipseSelectionItem* eclipseItem = static_cast<const RiuEclipseSelectionItem*>(item); const RiuEclipseSelectionItem* eclipseItem = static_cast<const RiuEclipseSelectionItem*>(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; gridIndex = eclipseItem->m_gridIndex;
caseId = eclipseItem->m_view->eclipseCase()->caseId; caseId = eclipseItem->m_view->eclipseCase()->caseId;
} }

2
ApplicationCode/SocketInterface/RiaPropertyDataCommands.cpp
View File

@@ -1307,7 +1307,7 @@ public:
if (eclipseItem->m_view->eclipseCase()->caseId == reservoirCase->caseId) 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) else if (item->type() == RiuSelectionItem::GEOMECH_SELECTION_OBJECT)

6
ApplicationCode/UserInterface/RiuSelectionChangedHandler.cpp
View File

@@ -124,10 +124,10 @@ void RiuSelectionChangedHandler::addCurveFromSelectionItem(const RiuEclipseSelec
curveName += ", "; curveName += ", ";
curveName += QString("Grid index %1").arg(eclipseSelectionItem->m_gridIndex); curveName += QString("Grid index %1").arg(eclipseSelectionItem->m_gridIndex);
curveName += ", "; 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<double> timeHistoryValues = RigTimeHistoryResultAccessor::timeHistoryValues(eclipseView->eclipseCase()->eclipseCaseData(), eclipseView->cellResult(), eclipseSelectionItem->m_gridIndex, eclipseSelectionItem->m_cellIndex, timeStepDates.size()); std::vector<double> timeHistoryValues = RigTimeHistoryResultAccessor::timeHistoryValues(eclipseView->eclipseCase()->eclipseCaseData(), eclipseView->cellResult(), eclipseSelectionItem->m_gridIndex, eclipseSelectionItem->m_gridLocalCellIndex, timeStepDates.size());
CVF_ASSERT(timeStepDates.size() == timeHistoryValues.size()); CVF_ASSERT(timeStepDates.size() == timeHistoryValues.size());
RiuMainWindow::instance()->resultPlot()->addCurve(curveName, eclipseSelectionItem->m_color, timeStepDates, timeHistoryValues); 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(); 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.setFace(eclipseSelectionItem->m_face);
textBuilder.setNncIndex(eclipseSelectionItem->m_nncIndex); textBuilder.setNncIndex(eclipseSelectionItem->m_nncIndex);
textBuilder.setIntersectionPoint(eclipseSelectionItem->m_localIntersectionPoint); textBuilder.setIntersectionPoint(eclipseSelectionItem->m_localIntersectionPoint);

2
ApplicationCode/UserInterface/RiuSelectionManager.cpp
View File

@@ -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) 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_view(view),
m_gridIndex(gridIndex), m_gridIndex(gridIndex),
m_cellIndex(cellIndex), m_gridLocalCellIndex(cellIndex),
m_nncIndex(nncIndex), m_nncIndex(nncIndex),
m_color(color), m_color(color),
m_face(face), m_face(face),

2
ApplicationCode/UserInterface/RiuSelectionManager.h
View File

@@ -139,7 +139,7 @@ public:
public: public:
caf::PdmPointer<RimEclipseView> m_view; caf::PdmPointer<RimEclipseView> m_view;
size_t m_gridIndex; size_t m_gridIndex;
size_t m_cellIndex; size_t m_gridLocalCellIndex;
size_t m_nncIndex; size_t m_nncIndex;
cvf::Color3f m_color; cvf::Color3f m_color;
cvf::StructGridInterface::FaceType m_face; cvf::StructGridInterface::FaceType m_face;