OilfieldToolsNet/ResInsight
4
0 Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2026-10-25 14:40:26 -05:00
Code Issues Packages Projects Releases Wiki Activity

#4857 Fix measurement picking in comparison view.

Browse Source
This commit is contained in:
Kristian Bendiksen committed 2019-10-29 10:52:04 +01:00
1 parent 6e43fee396
commit 2c3b51ad3f
7 files changed
+22 -14
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

ApplicationCode/Commands/MeasurementCommands/RicMeasurementPickEventHandler.cpp
+3 -3
View File
@@ -23,6 +23,7 @@
#include "RiuViewerCommands.h"
#include "Rim3dView.h"
#include "RimGridView.h"
#include "RimIntersection.h"
#include "RimMeasurement.h"
#include "RimProject.h"
@@ -84,7 +85,7 @@ void RicMeasurementPickEventHandler::enablePolyLineMode( bool polyLineModeEnable
//--------------------------------------------------------------------------------------------------
bool RicMeasurementPickEventHandler::handle3dPickEvent( const Ric3dPickEvent& eventObject )
{
auto measurement = RiaApplication::instance()->project()->measurement();
RimMeasurement* measurement = RiaApplication::instance()->project()->measurement();
if ( measurement && measurement->measurementMode() )
{
@@ -98,8 +99,7 @@ bool RicMeasurementPickEventHandler::handle3dPickEvent( const Ric3dPickEvent& ev
}
}
Rim3dView* rimView = RiaApplication::instance()->activeReservoirView();
Rim3dView* rimView = dynamic_cast<Rim3dView*>( RiaApplication::instance()->activeMainOrComparisonGridView() );
if ( firstGeometryPickInfo && rimView )
{
cvf::ref<caf::DisplayCoordTransform> transForm = rimView->displayCoordTransform();
ApplicationCode/Commands/MeasurementCommands/RicToggleMeasurementModeFeature.cpp
+2 -1
View File
@@ -23,6 +23,7 @@
#include "Rim3dView.h"
#include "RimMeasurement.h"
#include "RimProject.h"
#include "RimGridView.h"
#include "cafCmdFeatureManager.h"
#include "cafPdmUiPropertyViewDialog.h"
@@ -123,7 +124,7 @@ Rim3dView* RicToggleMeasurementModeFeature::activeView() const
{
RiaApplication* app = RiaApplication::instance();
CAF_ASSERT( app );
auto view = app->activeReservoirView();
auto view = dynamic_cast<Rim3dView*>(app->activeMainOrComparisonGridView());
return view;
}