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

Simplify pick event system

Browse Source
This commit is contained in:
Gaute Lindkvist committed 2019-02-11 15:48:02 +01:00
1 parent fac9870c76
commit d9672ad9a1
28 files changed
+315 -390
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

ApplicationCode/Commands/MeasurementCommands/RicMeasurementPickEventHandler.cpp
-1
View File
@@ -47,7 +47,6 @@ RicMeasurementPickEventHandler* RicMeasurementPickEventHandler::instance()
///
//--------------------------------------------------------------------------------------------------
RicMeasurementPickEventHandler::RicMeasurementPickEventHandler()
: Ric3dViewPickEventHandler(nullptr)
{}
//--------------------------------------------------------------------------------------------------
ApplicationCode/Commands/Ric3dViewPickEventHandler.cpp
-7
View File
@@ -20,13 +20,6 @@
#include <typeinfo>
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
Ric3dViewPickEventHandler::Ric3dViewPickEventHandler(const caf::PdmObjectHandle* handlingObject)
: caf::PickEventHandler(handlingObject)
{}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
ApplicationCode/Commands/Ric3dViewPickEventHandler.h
-2
View File
@@ -28,8 +28,6 @@
class Ric3dViewPickEventHandler : public caf::PickEventHandler
{
public:
Ric3dViewPickEventHandler(const caf::PdmObjectHandle* handlingObject);
// Override from caf
void registerAsPickEventHandler() override;
void unregisterAsPickEventHandler() override;
ApplicationCode/Commands/RicVec3dPickEventHandler.cpp
+8 -15
View File
@@ -26,10 +26,8 @@
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RicVec3dPickEventHandler::RicVec3dPickEventHandler(const caf::PdmObjectHandle* handlingObject,
caf::PdmField<cvf::Vec3d>* vectorField)
: Ric3dViewPickEventHandler(handlingObject)
, m_vectorField(vectorField)
RicVec3dPickEventHandler::RicVec3dPickEventHandler(caf::PdmField<cvf::Vec3d>* vectorField)
: m_vectorField(vectorField)
{
}
@@ -38,19 +36,14 @@ RicVec3dPickEventHandler::RicVec3dPickEventHandler(const caf::PdmObjectHandle* h
//--------------------------------------------------------------------------------------------------
bool RicVec3dPickEventHandler::handle3dPickEvent(const Ric3dPickEvent& eventObject)
{
caf::PdmObjectHandle* selectedObject = caf::SelectionManager::instance()->selectedItemOfType<caf::PdmObjectHandle>();
if (isObjectBeingModified(selectedObject))
{
const Rim3dView* rimView = eventObject.m_view;
const Rim3dView* rimView = eventObject.m_view;
cvf::ref<caf::DisplayCoordTransform> transForm = rimView->displayCoordTransform();
cvf::Vec3d pickedPositionInUTM = transForm->transformToDomainCoord(eventObject.m_pickItemInfos.front().globalPickedPoint());
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;
pickedPositionInUTM.z() *= -1.0;
m_vectorField->setValueWithFieldChanged(pickedPositionInUTM);
return true;
}
//--------------------------------------------------------------------------------------------------
ApplicationCode/Commands/RicVec3dPickEventHandler.h
+1 -1
View File
@@ -29,7 +29,7 @@ class Rim3dView;
class RicVec3dPickEventHandler : public Ric3dViewPickEventHandler
{
public:
RicVec3dPickEventHandler(const caf::PdmObjectHandle* handlingObject, caf::PdmField<cvf::Vec3d>* vectorField);
RicVec3dPickEventHandler(caf::PdmField<cvf::Vec3d>* vectorField);
bool handle3dPickEvent(const Ric3dPickEvent& eventObject) override;
ApplicationCode/Commands/WellPathCommands/PointTangentManipulator/RicPolyline3dEditor.cpp
+17
View File
@@ -23,6 +23,7 @@
#include "RimPolylineTarget.h"
#include "RimUserDefinedPolylinesAnnotation.h"
#include "cafPickEventHandler.h"
CAF_PDM_UI_3D_OBJECT_EDITOR_SOURCE_INIT(RicPolyline3dEditor);
@@ -43,6 +44,10 @@ RicPolyline3dEditor::~RicPolyline3dEditor()
{
delete targetEditor;
}
if (m_attribute.pickEventHandler != nullptr)
{
m_attribute.pickEventHandler->unregisterAsPickEventHandler();
}
}
//--------------------------------------------------------------------------------------------------
@@ -60,6 +65,18 @@ void RicPolyline3dEditor::configureAndUpdateUi(const QString& uiConfigName)
if (!geomDef) return;
geomDef->objectEditorAttribute("", &m_attribute);
if (m_attribute.pickEventHandler != nullptr)
{
if (m_attribute.enablePicking)
{
m_attribute.pickEventHandler->registerAsPickEventHandler();
}
else
{
m_attribute.pickEventHandler->unregisterAsPickEventHandler();
}
}
std::vector<RimPolylineTarget*> targets = geomDef->activeTargets();
ApplicationCode/Commands/WellPathCommands/PointTangentManipulator/RicPolyline3dEditor.h
+31 -2
View File
@@ -17,10 +17,39 @@
/////////////////////////////////////////////////////////////////////////////////
#pragma once
#include "cafPdmUi3dObjectEditorHandle.h"
#include "cafPdmUiFieldEditorHandle.h"
#include <memory>
namespace caf
{
class PickEventHandler;
};
class RicPolylineTarget3dEditor;
//==================================================================================================
///
//==================================================================================================
class RicPolyline3dEditorAttribute : public caf::PdmUiEditorAttribute
{
public:
RicPolyline3dEditorAttribute()
: enablePicking(false)
{
}
public:
bool enablePicking;
std::shared_ptr<caf::PickEventHandler> pickEventHandler;
};
//==================================================================================================
///
//==================================================================================================
class RicPolyline3dEditor : public caf::PdmUi3dObjectEditorHandle
{
CAF_PDM_UI_3D_OBJECT_EDITOR_HEADER_INIT;
@@ -32,9 +61,9 @@ public:
protected:
void configureAndUpdateUi(const QString& uiConfigName) override;
private:
private:
std::vector<RicPolylineTarget3dEditor*> m_targetEditors;
RicPolyline3dEditorAttribute m_attribute;
};
ApplicationCode/Commands/WellPathCommands/PointTangentManipulator/RicWellPathGeometry3dEditor.cpp
+18
View File
@@ -24,6 +24,7 @@
#include "RimWellPathTarget.h"
#include "RimWellPathGeometryDef.h"
#include "cafPickEventHandler.h"
CAF_PDM_UI_3D_OBJECT_EDITOR_SOURCE_INIT(RicWellPathGeometry3dEditor);
@@ -44,6 +45,10 @@ RicWellPathGeometry3dEditor::~RicWellPathGeometry3dEditor()
{
delete targetEditor;
}
if (m_attribute.pickEventHandler)
{
m_attribute.pickEventHandler->unregisterAsPickEventHandler();
}
}
//--------------------------------------------------------------------------------------------------
@@ -61,6 +66,7 @@ void RicWellPathGeometry3dEditor::configureAndUpdateUi(const QString& uiConfigNa
if (!geomDef) return;
geomDef->objectEditorAttribute("", &m_attribute);
std::vector<RimWellPathTarget*> targets = geomDef->activeWellTargets();
@@ -72,6 +78,18 @@ void RicWellPathGeometry3dEditor::configureAndUpdateUi(const QString& uiConfigNa
m_targetEditors.push_back(targetEditor);
targetEditor->updateUi();
}
if (m_attribute.pickEventHandler)
{
if (m_attribute.enablePicking)
{
m_attribute.pickEventHandler->registerAsPickEventHandler();
}
else
{
m_attribute.pickEventHandler->unregisterAsPickEventHandler();
}
}
}
ApplicationCode/Commands/WellPathCommands/PointTangentManipulator/RicWellPathGeometry3dEditor.h
+18 -2
View File
@@ -18,9 +18,25 @@
#pragma once
#include "cafPdmUi3dObjectEditorHandle.h"
#include "cafPdmUiFieldEditorHandle.h"
#include <memory>
namespace caf
{
class PickEventHandler;
}
class RicWellTarget3dEditor;
class RicWellPathGeometry3dEditorAttribute : public caf::PdmUiEditorAttribute
{
public:
RicWellPathGeometry3dEditorAttribute() : enablePicking(false) {}
bool enablePicking;
std::shared_ptr<caf::PickEventHandler> pickEventHandler;
};
class RicWellPathGeometry3dEditor : public caf::PdmUi3dObjectEditorHandle
{
CAF_PDM_UI_3D_OBJECT_EDITOR_HEADER_INIT;
@@ -33,8 +49,8 @@ protected:
void configureAndUpdateUi(const QString& uiConfigName) override;
private:
std::vector<RicWellTarget3dEditor*> m_targetEditors;
std::vector<RicWellTarget3dEditor*> m_targetEditors;
RicWellPathGeometry3dEditorAttribute m_attribute;
};
ApplicationCode/Commands/WellPathCommands/RicCreateWellTargetsPickEventHandler.cpp
+12 -9
View File
@@ -18,6 +18,7 @@
#include "RicCreateWellTargetsPickEventHandler.h"
#include "RiaApplication.h"
#include "RiaOffshoreSphericalCoords.h"
#include "RigFemPart.h"
@@ -55,7 +56,7 @@
///
//--------------------------------------------------------------------------------------------------
RicCreateWellTargetsPickEventHandler::RicCreateWellTargetsPickEventHandler(RimWellPathGeometryDef* wellGeometryDef)
: Ric3dViewPickEventHandler(wellGeometryDef), m_geometryToAddTargetsTo(wellGeometryDef)
: m_geometryToAddTargetsTo(wellGeometryDef)
{
}
@@ -64,12 +65,21 @@ RicCreateWellTargetsPickEventHandler::RicCreateWellTargetsPickEventHandler(RimWe
//--------------------------------------------------------------------------------------------------
RicCreateWellTargetsPickEventHandler::~RicCreateWellTargetsPickEventHandler() {}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RicCreateWellTargetsPickEventHandler::registerAsPickEventHandler()
{
RiaApplication::instance()->setOverrideCursor(Qt::CrossCursor);
Ric3dViewPickEventHandler::registerAsPickEventHandler();
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RicCreateWellTargetsPickEventHandler::notifyUnregistered()
{
m_geometryToAddTargetsTo->enableTargetPointPicking(false);
RiaApplication::instance()->restoreOverrideCursor();
}
//--------------------------------------------------------------------------------------------------
@@ -77,13 +87,6 @@ void RicCreateWellTargetsPickEventHandler::notifyUnregistered()
//--------------------------------------------------------------------------------------------------
bool RicCreateWellTargetsPickEventHandler::handle3dPickEvent(const Ric3dPickEvent& eventObject)
{
if (!isObjectBeingModified(caf::SelectionManager::instance()->selectedItemOfType<caf::PdmObjectHandle>()))
{
m_geometryToAddTargetsTo->enableTargetPointPicking(false);
return false;
}
if (m_geometryToAddTargetsTo)
{
Rim3dView* rimView = eventObject.m_view;
ApplicationCode/Commands/WellPathCommands/RicCreateWellTargetsPickEventHandler.h
+2
View File
@@ -34,6 +34,8 @@ public:
RicCreateWellTargetsPickEventHandler(RimWellPathGeometryDef* wellGeometryDef);
~RicCreateWellTargetsPickEventHandler();
void registerAsPickEventHandler() override;
protected:
bool handle3dPickEvent(const Ric3dPickEvent& eventObject) override;
void notifyUnregistered() override;
ApplicationCode/Commands/WellPathCommands/RicPolylineTargetsPickEventHandler.cpp
+12 -7
View File
@@ -18,6 +18,7 @@
#include "RicPolylineTargetsPickEventHandler.h"
#include "RiaApplication.h"
#include "RiaOffshoreSphericalCoords.h"
#include "RigWellPath.h"
@@ -40,7 +41,7 @@
///
//--------------------------------------------------------------------------------------------------
RicPolylineTargetsPickEventHandler::RicPolylineTargetsPickEventHandler(RimUserDefinedPolylinesAnnotation* polylineDef)
: Ric3dViewPickEventHandler(polylineDef), m_polylineDef(polylineDef)
: m_polylineDef(polylineDef)
{
}
@@ -49,12 +50,21 @@ RicPolylineTargetsPickEventHandler::RicPolylineTargetsPickEventHandler(RimUserDe
//--------------------------------------------------------------------------------------------------
RicPolylineTargetsPickEventHandler::~RicPolylineTargetsPickEventHandler() {}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RicPolylineTargetsPickEventHandler::registerAsPickEventHandler()
{
RiaApplication::instance()->setOverrideCursor(Qt::CrossCursor);
Ric3dViewPickEventHandler::registerAsPickEventHandler();
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RicPolylineTargetsPickEventHandler::notifyUnregistered()
{
//m_polylineDef->enableTargetPointPicking(false);
RiaApplication::instance()->restoreOverrideCursor();
}
//--------------------------------------------------------------------------------------------------
@@ -62,11 +72,6 @@ void RicPolylineTargetsPickEventHandler::notifyUnregistered()
//--------------------------------------------------------------------------------------------------
bool RicPolylineTargetsPickEventHandler::handle3dPickEvent(const Ric3dPickEvent& eventObject)
{
if (!isObjectBeingModified(caf::SelectionManager::instance()->selectedItemOfType<caf::PdmObjectHandle>()))
{
return false;
}
if (m_polylineDef)
{
Rim3dView* rimView = eventObject.m_view;
ApplicationCode/Commands/WellPathCommands/RicPolylineTargetsPickEventHandler.h
+2
View File
@@ -33,6 +33,8 @@ public:
RicPolylineTargetsPickEventHandler(RimUserDefinedPolylinesAnnotation* polylineDef);
~RicPolylineTargetsPickEventHandler();
void registerAsPickEventHandler() override;
protected:
bool handle3dPickEvent(const Ric3dPickEvent& eventObject) override;
void notifyUnregistered() override;