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

Fix computation of measured depth when picking in 3D

Browse Source
This commit is contained in:
Magne Sjaastad 2017-05-20 20:10:03 +02:00
parent 123b404809
commit 6e78c0b2cc
1 changed files with 3 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
ApplicationCode/UserInterface/RiuViewerCommands.cpp
View File

@ -71,6 +71,7 @@
#include "cafCmdExecCommandManager.h" #include "cafCmdExecCommandManager.h"
#include "cafCmdFeatureManager.h" #include "cafCmdFeatureManager.h"
#include "cafDisplayCoordTransform.h"
#include "cafSelectionManager.h" #include "cafSelectionManager.h"
#include "cvfDrawableGeo.h" #include "cvfDrawableGeo.h"
@ -164,14 +165,8 @@ void RiuViewerCommands::displayContextMenu(QMouseEvent* event)
RimView* activeView = RiaApplication::instance()->activeReservoirView(); RimView* activeView = RiaApplication::instance()->activeReservoirView();
CVF_ASSERT(activeView); CVF_ASSERT(activeView);
RimCase* rimCase = NULL; cvf::ref<caf::DisplayCoordTransform> transForm = activeView->displayCoordTransform();
activeView->firstAncestorOrThisOfType(rimCase); m_currentPickPositionInDomainCoords = transForm->transformToDomainCoord(globalIntersectionPoint);
if (rimCase)
{
displayModelOffset = rimCase->displayModelOffset();
}
m_currentPickPositionInDomainCoords = localIntersectionPoint + displayModelOffset;
} }
if (firstHitPart && firstPartTriangleIndex != cvf::UNDEFINED_UINT) if (firstHitPart && firstPartTriangleIndex != cvf::UNDEFINED_UINT)
@ -847,7 +842,6 @@ void RiuViewerCommands::ijkFromCellIndex(size_t gridIdx, size_t cellIndex, size
RimEclipseView* eclipseView = dynamic_cast<RimEclipseView*>(m_reservoirView.p()); RimEclipseView* eclipseView = dynamic_cast<RimEclipseView*>(m_reservoirView.p());
RimGeoMechView* geomView = dynamic_cast<RimGeoMechView*>(m_reservoirView.p()); RimGeoMechView* geomView = dynamic_cast<RimGeoMechView*>(m_reservoirView.p());
if (eclipseView && eclipseView->eclipseCase()) if (eclipseView && eclipseView->eclipseCase())
{ {
eclipseView->eclipseCase()->eclipseCaseData()->grid(gridIdx)->ijkFromCellIndex(cellIndex, i, j, k); eclipseView->eclipseCase()->eclipseCaseData()->grid(gridIdx)->ijkFromCellIndex(cellIndex, i, j, k);