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

#4045 Don't accept pick events if the current selected object isn't the object owning the pick handler.

Browse Source
This commit is contained in:
Gaute Lindkvist
2019-02-06 13:20:33 +01:00
parent dbe21b7809
commit c4f5065032
13 changed files with 98 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
ApplicationCode/Commands/MeasurementCommands/RicMeasurementPickEventHandler.cpp
View File

@@ -43,6 +43,13 @@ RicMeasurementPickEventHandler* RicMeasurementPickEventHandler::instance()
return singleton;
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RicMeasurementPickEventHandler::RicMeasurementPickEventHandler()
: Ric3dViewPickEventHandler(nullptr)
{}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------

1
ApplicationCode/Commands/MeasurementCommands/RicMeasurementPickEventHandler.h
View File

@@ -29,6 +29,7 @@ public:
static RicMeasurementPickEventHandler* instance();
protected:
RicMeasurementPickEventHandler();
bool handle3dPickEvent(const Ric3dPickEvent& eventObject) override;
void notifyUnregistered() override;
};

7
ApplicationCode/Commands/Ric3dViewPickEventHandler.cpp
View File

@@ -20,6 +20,13 @@
#include <typeinfo>
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
Ric3dViewPickEventHandler::Ric3dViewPickEventHandler(const caf::PdmObjectHandle* handlingObject)
: caf::PickEventHandler(handlingObject)
{}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------

4
ApplicationCode/Commands/Ric3dViewPickEventHandler.h
View File

@@ -20,6 +20,7 @@
#include "RicPickEventHandler.h"
#include "cafPdmField.h"
#include "cafPdmObjectHandle.h"
//==================================================================================================
/// A temporary, dynamic pick handler that overrides the default ones
@@ -27,11 +28,14 @@
class Ric3dViewPickEventHandler : public caf::PickEventHandler
{
public:
Ric3dViewPickEventHandler(const caf::PdmObjectHandle* handlingObject);
// Override from caf
void registerAsPickEventHandler() override;
void unregisterAsPickEventHandler() override;
bool handlePickEvent(const caf::PickEvent& eventObject) override;
virtual bool handle3dPickEvent(const Ric3dPickEvent& eventObject) = 0;
};

26
ApplicationCode/Commands/RicVec3dPickEventHandler.cpp
View File

@@ -20,12 +20,15 @@
#include "Rim3dView.h"
#include "cafDisplayCoordTransform.h"
#include "cafSelectionManager.h"
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RicVec3dPickEventHandler::RicVec3dPickEventHandler(caf::PdmField<cvf::Vec3d>* vectorField)
: m_vectorField(vectorField)
RicVec3dPickEventHandler::RicVec3dPickEventHandler(const caf::PdmObjectHandle* handlingObject,
caf::PdmField<cvf::Vec3d>* vectorField)
: Ric3dViewPickEventHandler(handlingObject)
, m_vectorField(vectorField)
{
}
@@ -34,14 +37,19 @@ RicVec3dPickEventHandler::RicVec3dPickEventHandler(caf::PdmField<cvf::Vec3d>* ve
//--------------------------------------------------------------------------------------------------
bool RicVec3dPickEventHandler::handle3dPickEvent(const Ric3dPickEvent& eventObject)
{
const Rim3dView* rimView = eventObject.m_view;
caf::PdmObjectHandle* selectedObject = caf::SelectionManager::instance()->selectedItemOfType<caf::PdmObjectHandle>();
if (isObjectBeingModified(selectedObject))
{
const Rim3dView* rimView = eventObject.m_view;
cvf::ref<caf::DisplayCoordTransform> transForm = rimView->displayCoordTransform();
cvf::Vec3d pickedPositionInUTM = transForm->transformToDomainCoord(eventObject.m_pickItemInfos.front().globalPickedPoint());
pickedPositionInUTM.z() *= -1.0;
m_vectorField->setValueWithFieldChanged(pickedPositionInUTM);
return true;
cvf::ref<caf::DisplayCoordTransform> transForm = rimView->displayCoordTransform();
cvf::Vec3d pickedPositionInUTM = transForm->transformToDomainCoord(eventObject.m_pickItemInfos.front().globalPickedPoint());
pickedPositionInUTM.z() *= -1.0;
m_vectorField->setValueWithFieldChanged(pickedPositionInUTM);
return true;
}
return false;
}
//--------------------------------------------------------------------------------------------------

2
ApplicationCode/Commands/RicVec3dPickEventHandler.h
View File

@@ -29,7 +29,7 @@ class Rim3dView;
class RicVec3dPickEventHandler : public Ric3dViewPickEventHandler
{
public:
RicVec3dPickEventHandler(caf::PdmField<cvf::Vec3d>* vectorField);
RicVec3dPickEventHandler(const caf::PdmObjectHandle* handlingObject, caf::PdmField<cvf::Vec3d>* vectorField);
bool handle3dPickEvent(const Ric3dPickEvent& eventObject) override;
void notifyUnregistered() override;

4
ApplicationCode/Commands/WellPathCommands/RicCreateWellTargetsPickEventHandler.cpp
View File

@@ -55,7 +55,7 @@
///
//--------------------------------------------------------------------------------------------------
RicCreateWellTargetsPickEventHandler::RicCreateWellTargetsPickEventHandler(RimWellPathGeometryDef* wellGeometryDef)
: m_geometryToAddTargetsTo(wellGeometryDef)
: Ric3dViewPickEventHandler(wellGeometryDef), m_geometryToAddTargetsTo(wellGeometryDef)
{
}
@@ -77,7 +77,7 @@ void RicCreateWellTargetsPickEventHandler::notifyUnregistered()
//--------------------------------------------------------------------------------------------------
bool RicCreateWellTargetsPickEventHandler::handle3dPickEvent(const Ric3dPickEvent& eventObject)
{
if (!caf::SelectionManager::instance()->isSelected(m_geometryToAddTargetsTo.p(), 0))
if (!isObjectBeingModified(caf::SelectionManager::instance()->selectedItemOfType<caf::PdmObjectHandle>()))
{
m_geometryToAddTargetsTo->enableTargetPointPicking(false);

4
ApplicationCode/Commands/WellPathCommands/RicPolylineTargetsPickEventHandler.cpp
View File

@@ -40,7 +40,7 @@
///
//--------------------------------------------------------------------------------------------------
RicPolylineTargetsPickEventHandler::RicPolylineTargetsPickEventHandler(RimUserDefinedPolylinesAnnotation* polylineDef)
: m_polylineDef(polylineDef)
: Ric3dViewPickEventHandler(polylineDef), m_polylineDef(polylineDef)
{
}
@@ -62,7 +62,7 @@ void RicPolylineTargetsPickEventHandler::notifyUnregistered()
//--------------------------------------------------------------------------------------------------
bool RicPolylineTargetsPickEventHandler::handle3dPickEvent(const Ric3dPickEvent& eventObject)
{
if (!caf::SelectionManager::instance()->isSelected(m_polylineDef.p(), 0))
if (!isObjectBeingModified(caf::SelectionManager::instance()->selectedItemOfType<caf::PdmObjectHandle>()))
{
return false;
}

2
ApplicationCode/ProjectDataModel/Annotations/RimReachCircleAnnotation.cpp
View File

@@ -52,7 +52,7 @@ RimReachCircleAnnotation::RimReachCircleAnnotation()
m_appearance.uiCapability()->setUiTreeHidden(true);
m_appearance.uiCapability()->setUiTreeChildrenHidden(true);
m_centerPointEventHandler.reset(new RicVec3dPickEventHandler(&m_centerPointXyd));
m_centerPointEventHandler.reset(new RicVec3dPickEventHandler(this, &m_centerPointXyd));
}
//--------------------------------------------------------------------------------------------------

4
ApplicationCode/ProjectDataModel/Annotations/RimTextAnnotation.cpp
View File

@@ -67,8 +67,8 @@ RimTextAnnotation::RimTextAnnotation()
m_nameProxy.uiCapability()->setUiReadOnly(true);
m_nameProxy.xmlCapability()->disableIO();
m_anchorPointPickEventHandler.reset(new RicVec3dPickEventHandler(&m_anchorPointXyd));
m_labelPointPickEventHandler.reset(new RicVec3dPickEventHandler(&m_labelPointXyd));
m_anchorPointPickEventHandler.reset(new RicVec3dPickEventHandler(this, &m_anchorPointXyd));
m_labelPointPickEventHandler.reset(new RicVec3dPickEventHandler(this, &m_labelPointXyd));
}