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

Simplify pick event system

Browse Source
This commit is contained in:
Gaute Lindkvist
2019-02-11 13:46:48 +01:00
parent fac9870c76
commit d9672ad9a1
28 changed files with 315 additions and 390 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -26,7 +26,8 @@
#include "RicVec3dPickEventHandler.h"
#include "cafPdmUiVec3dEditor.h"
#include "cafPdmUiPushButtonEditor.h"
#include "cafPdmUiPickableLineEditor.h"
CAF_PDM_SOURCE_INIT(RimReachCircleAnnotation, "RimReachCircleAnnotation");
@@ -42,7 +43,11 @@ RimReachCircleAnnotation::RimReachCircleAnnotation()
m_isActive.uiCapability()->setUiHidden(true);
CAF_PDM_InitField(&m_centerPointXyd, "CenterPointXyd", Vec3d::ZERO, "Center Point", "", "", "");
m_centerPointXyd.uiCapability()->setUiEditorTypeName(caf::PdmUiVec3dEditor::uiEditorTypeName());
m_centerPointXyd.uiCapability()->setUiEditorTypeName(caf::PdmUiPickableLineEditor::uiEditorTypeName());
CAF_PDM_InitField(&m_centerPointPickEnabled, "AnchorPointPick", true, "", "", "", "");
caf::PdmUiPushButtonEditor::configureEditorForField(&m_centerPointPickEnabled);
m_centerPointPickEnabled.uiCapability()->setUiLabelPosition(caf::PdmUiItemInfo::LabelPosType::HIDDEN);
CAF_PDM_InitField(&m_radius, "Radius", 100.0, "Radius", "", "", "");
CAF_PDM_InitField(&m_name, "Name", QString("Circle Annotation"), "Name", "", "", "");
@@ -52,7 +57,7 @@ RimReachCircleAnnotation::RimReachCircleAnnotation()
m_appearance.uiCapability()->setUiTreeHidden(true);
m_appearance.uiCapability()->setUiTreeChildrenHidden(true);
m_centerPointEventHandler.reset(new RicVec3dPickEventHandler(this, &m_centerPointXyd));
m_centerPointEventHandler.reset(new RicVec3dPickEventHandler(&m_centerPointXyd));
}
//--------------------------------------------------------------------------------------------------
@@ -115,6 +120,7 @@ void RimReachCircleAnnotation::defineUiOrdering(QString uiConfigName, caf::PdmUi
{
uiOrdering.add(&m_name);
uiOrdering.add(&m_centerPointXyd);
uiOrdering.add(&m_centerPointPickEnabled);
uiOrdering.add(&m_radius);
auto appearanceGroup = uiOrdering.addNewGroup("Appearance");
@@ -130,6 +136,15 @@ void RimReachCircleAnnotation::fieldChangedByUi(const caf::PdmFieldHandle* chang
const QVariant& oldValue,
const QVariant& newValue)
{
if (changedField == &m_centerPointXyd)
{
m_centerPointPickEnabled = false;
this->updateConnectedEditors();
}
if (changedField == &m_centerPointPickEnabled)
{
this->updateConnectedEditors();
}
RimAnnotationCollection* annColl = nullptr;
this->firstAncestorOrThisOfTypeAsserted(annColl);
@@ -161,13 +176,30 @@ void RimReachCircleAnnotation::defineEditorAttribute(const caf::PdmFieldHandle*
{
if (field == &m_centerPointXyd)
{
caf::PdmUiVec3dEditorAttribute* attr = dynamic_cast<caf::PdmUiVec3dEditorAttribute*>(attribute);
auto* attr = dynamic_cast<caf::PdmUiPickableLineEditorAttribute*>(attribute);
if (attr)
{
attr->pickEventHandler = m_centerPointEventHandler;
attr->enablePicking = m_centerPointPickEnabled;
if (m_centerPointXyd().isZero())
{
attr->startInPickingMode = true;
attr->enablePicking = true;
}
}
}
if (field == &m_centerPointPickEnabled)
{
auto* attr = dynamic_cast<caf::PdmUiPushButtonEditorAttribute*>(attribute);
if (attr)
{
if (m_centerPointPickEnabled)
{
attr->m_buttonText = "Stop";
}
else
{
attr->m_buttonText = "Pick";
}
}
}

1
ApplicationCode/ProjectDataModel/Annotations/RimReachCircleAnnotation.h
View File

@@ -76,6 +76,7 @@ private:
caf::PdmField<bool> m_isActive;
caf::PdmField<Vec3d> m_centerPointXyd;
caf::PdmField<bool> m_centerPointPickEnabled;
caf::PdmField<double> m_radius;
caf::PdmField<QString> m_name;
caf::PdmChildField<RimReachCircleLineAppearance*> m_appearance;

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

@@ -29,9 +29,10 @@
#include "AnnotationCommands/RicTextAnnotation3dEditor.h"
#include "cafCmdFeatureManager.h"
#include "cafPdmUiPushButtonEditor.h"
#include "cafPdmUiTextEditor.h"
#include "cafPdmUiTreeOrdering.h"
#include "cafPdmUiVec3dEditor.h"
#include "cafPdmUiPickableLineEditor.h"
#include <QAction>
#include <QPointer>
@@ -48,9 +49,17 @@ RimTextAnnotation::RimTextAnnotation()
this->setUi3dEditorTypeName(RicTextAnnotation3dEditor::uiEditorTypeName());
CAF_PDM_InitField(&m_anchorPointXyd, "AnchorPointXyd", Vec3d::ZERO, "Anchor Point", "", "", "");
m_anchorPointXyd.uiCapability()->setUiEditorTypeName(caf::PdmUiVec3dEditor::uiEditorTypeName());
m_anchorPointXyd.uiCapability()->setUiEditorTypeName(caf::PdmUiPickableLineEditor::uiEditorTypeName());
CAF_PDM_InitField(&m_anchorPointPickEnabledButtonField, "AnchorPointPick", true, "", "", "", "");
caf::PdmUiPushButtonEditor::configureEditorForField(&m_anchorPointPickEnabledButtonField);
m_anchorPointPickEnabledButtonField.uiCapability()->setUiLabelPosition(caf::PdmUiItemInfo::LabelPosType::HIDDEN);
CAF_PDM_InitField(&m_labelPointXyd, "LabelPointXyd", Vec3d::ZERO, "Label Point", "", "", "");
m_labelPointXyd.uiCapability()->setUiEditorTypeName(caf::PdmUiVec3dEditor::uiEditorTypeName());
m_labelPointXyd.uiCapability()->setUiEditorTypeName(caf::PdmUiPickableLineEditor::uiEditorTypeName());
CAF_PDM_InitField(&m_labelPointPickEnabledButtonField, "LabelPointPick", false, "", "", "", "");
caf::PdmUiPushButtonEditor::configureEditorForField(&m_labelPointPickEnabledButtonField);
m_labelPointPickEnabledButtonField.uiCapability()->setUiLabelPosition(caf::PdmUiItemInfo::LabelPosType::HIDDEN);
CAF_PDM_InitField(&m_text, "Text", QString("(New text)"), "Text", "", "", "");
m_text.uiCapability()->setUiEditorTypeName(caf::PdmUiTextEditor::uiEditorTypeName());
@@ -67,8 +76,8 @@ RimTextAnnotation::RimTextAnnotation()
m_nameProxy.uiCapability()->setUiReadOnly(true);
m_nameProxy.xmlCapability()->disableIO();
m_anchorPointPickEventHandler.reset(new RicVec3dPickEventHandler(this, &m_anchorPointXyd));
m_labelPointPickEventHandler.reset(new RicVec3dPickEventHandler(this, &m_labelPointXyd));
m_anchorPointPickEventHandler.reset(new RicVec3dPickEventHandler(&m_anchorPointXyd));
m_labelPointPickEventHandler.reset(new RicVec3dPickEventHandler(&m_labelPointXyd));
}
@@ -140,7 +149,10 @@ const QString& RimTextAnnotation::text() const
void RimTextAnnotation::defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering& uiOrdering)
{
uiOrdering.add(&m_anchorPointXyd);
uiOrdering.add(&m_anchorPointPickEnabledButtonField, false);
uiOrdering.add(&m_labelPointXyd);
uiOrdering.add(&m_labelPointPickEnabledButtonField, false);
uiOrdering.add(&m_text);
auto appearanceGroup = uiOrdering.addNewGroup("Text Appearance");
@@ -156,15 +168,24 @@ void RimTextAnnotation::fieldChangedByUi(const caf::PdmFieldHandle* changedField
const QVariant& oldValue,
const QVariant& newValue)
{
if (changedField == &m_anchorPointXyd && m_labelPointXyd().isZero())
if (changedField == &m_anchorPointXyd)
{
m_labelPointXyd = m_anchorPointXyd();
m_anchorPointPickEnabledButtonField = false;
if (m_labelPointXyd().isZero())
{
m_labelPointXyd = m_anchorPointXyd;
}
this->updateConnectedEditors();
}
if (changedField == &m_labelPointXyd && m_anchorPointXyd().isZero())
if (changedField == &m_labelPointXyd)
{
m_anchorPointXyd = m_labelPointXyd();
m_labelPointPickEnabledButtonField = false;
this->updateConnectedEditors();
}
if (changedField == &m_anchorPointPickEnabledButtonField || changedField == &m_labelPointPickEnabledButtonField)
{
this->updateConnectedEditors();
}
RimAnnotationCollectionBase* annColl = nullptr;
this->firstAncestorOrThisOfTypeAsserted(annColl);
@@ -226,20 +247,36 @@ void RimTextAnnotation::defineEditorAttribute(const caf::PdmFieldHandle* field,
QString uiConfigName,
caf::PdmUiEditorAttribute* attribute)
{
caf::PdmUiVec3dEditorAttribute* attr = dynamic_cast<caf::PdmUiVec3dEditorAttribute*>(attribute);
caf::PdmUiPickableLineEditorAttribute* attr = dynamic_cast<caf::PdmUiPickableLineEditorAttribute*>(attribute);
if (attr && field == &m_anchorPointXyd)
{
attr->pickEventHandler = m_anchorPointPickEventHandler;
if (m_anchorPointXyd().isZero())
{
attr->startInPickingMode = true;
}
attr->enablePicking = m_anchorPointPickEnabledButtonField;
}
else if (attr && field == &m_labelPointXyd)
{
attr->pickEventHandler = m_labelPointPickEventHandler;
attr->enablePicking = m_labelPointPickEnabledButtonField;
}
if (field == &m_anchorPointPickEnabledButtonField || field == &m_labelPointPickEnabledButtonField)
{
auto* pbAttribute = dynamic_cast<caf::PdmUiPushButtonEditorAttribute*>(attribute);
if (pbAttribute)
{
auto boolField = static_cast<const caf::PdmField<bool>*>(field);
if (boolField->v())
{
pbAttribute->m_buttonText = "Stop";
}
else
{
pbAttribute->m_buttonText = "Pick";
}
}
}
}
//--------------------------------------------------------------------------------------------------

2
ApplicationCode/ProjectDataModel/Annotations/RimTextAnnotation.h
View File

@@ -84,7 +84,9 @@ private:
QString extractNameFromText() const;
caf::PdmField<Vec3d> m_anchorPointXyd;
caf::PdmField<bool> m_anchorPointPickEnabledButtonField;
caf::PdmField<Vec3d> m_labelPointXyd;
caf::PdmField<bool> m_labelPointPickEnabledButtonField;
caf::PdmField<QString> m_text;
caf::PdmField<bool> m_isActive;

23
ApplicationCode/ProjectDataModel/Annotations/RimUserDefinedPolylinesAnnotation.cpp
View File

@@ -209,14 +209,6 @@ void RimUserDefinedPolylinesAnnotation::updateVisualization()
void RimUserDefinedPolylinesAnnotation::enablePicking(bool enable)
{
m_enablePicking = enable;
if (enable)
{
RiuViewerCommands::setPickEventHandler(m_pickTargetsEventHandler);
}
else
{
RiuViewerCommands::removePickEventHandlerIfActive(m_pickTargetsEventHandler);
}
updateConnectedEditors();
}
@@ -259,7 +251,7 @@ void RimUserDefinedPolylinesAnnotation::fieldChangedByUi(const caf::PdmFieldHand
{
if (changedField == &m_enablePicking)
{
enablePicking(m_enablePicking);
this->updateConnectedEditors();
}
else if (changedField == &m_showLines)
{
@@ -273,6 +265,19 @@ void RimUserDefinedPolylinesAnnotation::fieldChangedByUi(const caf::PdmFieldHand
updateVisualization();
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimUserDefinedPolylinesAnnotation::defineObjectEditorAttribute(QString uiConfigName, caf::PdmUiEditorAttribute* attribute)
{
RicPolyline3dEditorAttribute* attrib = dynamic_cast<RicPolyline3dEditorAttribute*>(attribute);
if (attrib)
{
attrib->pickEventHandler = m_pickTargetsEventHandler;
attrib->enablePicking = m_enablePicking;
}
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------

6
ApplicationCode/ProjectDataModel/Annotations/RimUserDefinedPolylinesAnnotation.h
View File

@@ -22,6 +22,8 @@
#include "cafPdmFieldCvfVec3d.h"
#include "cafPdmChildArrayField.h"
#include <memory>
class RicPolylineTargetsPickEventHandler;
class RimPolylineTarget;
@@ -59,6 +61,7 @@ protected:
void defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering& uiOrdering) override;
void defineUiTreeOrdering(caf::PdmUiTreeOrdering& uiTreeOrdering, QString uiConfigName) override;
void fieldChangedByUi(const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue) override;
void defineObjectEditorAttribute(QString uiConfigName, caf::PdmUiEditorAttribute* attribute) override;
private:
void defineCustomContextMenu(const caf::PdmFieldHandle* fieldNeedingMenu, QMenu* menu, QWidget* fieldEditorWidget) override;
@@ -71,7 +74,8 @@ private:
caf::PdmField<QString> m_name;
caf::PdmField<bool> m_enablePicking;
caf::PdmChildArrayField<RimPolylineTarget*> m_targets;
RicPolylineTargetsPickEventHandler* m_pickTargetsEventHandler;
std::shared_ptr<RicPolylineTargetsPickEventHandler> m_pickTargetsEventHandler;
};

34
ApplicationCode/ProjectDataModel/RimWellPathGeometryDef.cpp
View File

@@ -100,11 +100,6 @@ RimWellPathGeometryDef::RimWellPathGeometryDef()
//--------------------------------------------------------------------------------------------------
RimWellPathGeometryDef::~RimWellPathGeometryDef()
{
RiuViewerCommands::removePickEventHandlerIfActive(m_pickTargetsEventHandler);
delete m_pickTargetsEventHandler;
m_pickTargetsEventHandler = nullptr;
}
//--------------------------------------------------------------------------------------------------
@@ -290,18 +285,8 @@ const RimWellPathTarget* RimWellPathGeometryDef::lastActiveTarget() const
//--------------------------------------------------------------------------------------------------
void RimWellPathGeometryDef::enableTargetPointPicking(bool isEnabling)
{
if (isEnabling)
{
m_pickPointsEnabled = true;
RiuViewerCommands::setPickEventHandler(m_pickTargetsEventHandler);
updateConnectedEditors();
}
else
{
RiuViewerCommands::removePickEventHandlerIfActive(m_pickTargetsEventHandler);
m_pickPointsEnabled = false;
updateConnectedEditors();
}
m_pickPointsEnabled = isEnabling;
this->updateConnectedEditors();
}
//--------------------------------------------------------------------------------------------------
@@ -333,7 +318,7 @@ void RimWellPathGeometryDef::fieldChangedByUi(const caf::PdmFieldHandle* changed
}
else if (changedField == &m_pickPointsEnabled)
{
enableTargetPointPicking(m_pickPointsEnabled);
this->updateConnectedEditors();
}
updateWellPathVisualization();
@@ -640,6 +625,19 @@ void RimWellPathGeometryDef::defineEditorAttribute(const caf::PdmFieldHandle* fi
}
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimWellPathGeometryDef::defineObjectEditorAttribute(QString uiConfigName, caf::PdmUiEditorAttribute* attribute)
{
RicWellPathGeometry3dEditorAttribute* attrib = dynamic_cast<RicWellPathGeometry3dEditorAttribute*>(attribute);
if (attrib)
{
attrib->pickEventHandler = m_pickTargetsEventHandler;
attrib->enablePicking = m_pickPointsEnabled;
}
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------

8
ApplicationCode/ProjectDataModel/RimWellPathGeometryDef.h
View File

@@ -80,6 +80,9 @@ protected:
virtual void defineObjectEditorAttribute(QString uiConfigName, caf::PdmUiEditorAttribute* attribute) override;
private:
void fieldChangedByUi(const caf::PdmFieldHandle* changedField,
const QVariant& oldValue,
@@ -101,11 +104,12 @@ private:
caf::PdmChildArrayField<RimWellPathTarget*> m_wellTargets;
caf::PdmField< bool > m_pickPointsEnabled;
RicCreateWellTargetsPickEventHandler* m_pickTargetsEventHandler;
// Unused for now. Remove when dust settles
// TODO: Unused for now. Remove when dust settles
caf::PdmField<caf::AppEnum<WellStartType> > m_wellStartType;
caf::PdmField<double> m_kickoffDepthOrMD;
caf::PdmPtrField<RimWellPath*> m_parentWell;
std::shared_ptr<RicCreateWellTargetsPickEventHandler> m_pickTargetsEventHandler;
};