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

#3988 Deeper : Zoom all of intersections gives empty view

Browse Source 
Only allow poly line pick handler to respond when the active view is parent of intersection object.
This commit is contained in:
Magne Sjaastad
2019-01-28 22:17:04 +01:00
parent fe53380a36
commit 79701a6233
1 changed files with 17 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
ApplicationCode/Commands/WellPathCommands/RicIntersectionPickEventHandler.cpp
View File

@@ -1,24 +1,26 @@
/////////////////////////////////////////////////////////////////////////////////
//
// Copyright (C) 2017- Statoil ASA
//
//
// ResInsight is free software: you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
//
//
// ResInsight is distributed in the hope that it will be useful, but WITHOUT ANY
// WARRANTY; without even the implied warranty of MERCHANTABILITY or
// FITNESS FOR A PARTICULAR PURPOSE.
//
// See the GNU General Public License at <http://www.gnu.org/licenses/gpl.html>
//
// See the GNU General Public License at <http://www.gnu.org/licenses/gpl.html>
// for more details.
//
/////////////////////////////////////////////////////////////////////////////////
#include "RicIntersectionPickEventHandler.h"
#include "RiaApplication.h"
#include "RimGridView.h"
#include "RimIntersection.h"
#include "Rim3dView.h"
#include "cafDisplayCoordTransform.h"
#include "cafSelectionManager.h"
@@ -26,7 +28,7 @@
#include <vector>
//--------------------------------------------------------------------------------------------------
///
///
//--------------------------------------------------------------------------------------------------
RicIntersectionPickEventHandler* RicIntersectionPickEventHandler::instance()
{
@@ -35,7 +37,7 @@ RicIntersectionPickEventHandler* RicIntersectionPickEventHandler::instance()
}
//--------------------------------------------------------------------------------------------------
///
///
//--------------------------------------------------------------------------------------------------
bool RicIntersectionPickEventHandler::handlePickEvent(const Ric3DPickEvent& eventObject)
{
@@ -47,11 +49,15 @@ bool RicIntersectionPickEventHandler::handlePickEvent(const Ric3DPickEvent& even
{
RimIntersection* intersection = selection[0];
Rim3dView* rimView = nullptr;
intersection->firstAncestorOrThisOfType(rimView);
CVF_ASSERT(rimView);
RimGridView* gridView = nullptr;
intersection->firstAncestorOrThisOfTypeAsserted(gridView);
cvf::ref<caf::DisplayCoordTransform> transForm = rimView->displayCoordTransform();
if (RiaApplication::instance()->activeGridView() != gridView)
{
return false;
}
cvf::ref<caf::DisplayCoordTransform> transForm = gridView->displayCoordTransform();
cvf::Vec3d domainCoord = transForm->transformToDomainCoord(eventObject.m_pickItemInfos.front().globalPickedPoint());
if (intersection->inputPolyLineFromViewerEnabled())
@@ -80,4 +86,3 @@ bool RicIntersectionPickEventHandler::handlePickEvent(const Ric3DPickEvent& even
return false;
}