diff --git a/ApplicationCode/Commands/AnnotationCommands/RicCreateReachCircleAnnotationFeature.cpp b/ApplicationCode/Commands/AnnotationCommands/RicCreateReachCircleAnnotationFeature.cpp index 99042ea59d..1457f21857 100644 --- a/ApplicationCode/Commands/AnnotationCommands/RicCreateReachCircleAnnotationFeature.cpp +++ b/ApplicationCode/Commands/AnnotationCommands/RicCreateReachCircleAnnotationFeature.cpp @@ -64,6 +64,7 @@ void RicCreateReachCircleAnnotationFeature::onActionTriggered(bool isChecked) auto newAnnotation = new RimReachCircleAnnotation(); auto newColor = RiaColorTables::categoryPaletteColors().cycledColor3f(coll->lineBasedAnnotationsCount()); newAnnotation->appearance()->setColor(newColor); + newAnnotation->enablePicking(true); coll->addAnnotation(newAnnotation); coll->updateConnectedEditors(); RiuMainWindow::instance()->selectAsCurrentItem(newAnnotation); diff --git a/ApplicationCode/Commands/AnnotationCommands/RicCreateTextAnnotationFeature.cpp b/ApplicationCode/Commands/AnnotationCommands/RicCreateTextAnnotationFeature.cpp index 7920299a19..ea84d3b883 100644 --- a/ApplicationCode/Commands/AnnotationCommands/RicCreateTextAnnotationFeature.cpp +++ b/ApplicationCode/Commands/AnnotationCommands/RicCreateTextAnnotationFeature.cpp @@ -62,6 +62,7 @@ void RicCreateTextAnnotationFeature::onActionTriggered(bool isChecked) if (coll) { auto newAnnotation = new RimTextAnnotation(); + newAnnotation->enablePicking(true); coll->addAnnotation(newAnnotation); coll->updateConnectedEditors(); RiuMainWindow::instance()->selectAsCurrentItem(newAnnotation); diff --git a/ApplicationCode/ProjectDataModel/Annotations/RimReachCircleAnnotation.cpp b/ApplicationCode/ProjectDataModel/Annotations/RimReachCircleAnnotation.cpp index f8a8e3ad17..393cff6c2f 100644 --- a/ApplicationCode/ProjectDataModel/Annotations/RimReachCircleAnnotation.cpp +++ b/ApplicationCode/ProjectDataModel/Annotations/RimReachCircleAnnotation.cpp @@ -44,7 +44,7 @@ RimReachCircleAnnotation::RimReachCircleAnnotation() CAF_PDM_InitField(&m_centerPointXyd, "CenterPointXyd", Vec3d::ZERO, "Center Point", "", "", ""); m_centerPointXyd.uiCapability()->setUiEditorTypeName(caf::PdmUiPickableLineEditor::uiEditorTypeName()); - CAF_PDM_InitField(&m_centerPointPickEnabled, "AnchorPointPick", true, "", "", "", ""); + CAF_PDM_InitField(&m_centerPointPickEnabled, "AnchorPointPick", false, "", "", "", ""); caf::PdmUiPushButtonEditor::configureEditorForField(&m_centerPointPickEnabled); m_centerPointPickEnabled.uiCapability()->setUiLabelPosition(caf::PdmUiItemInfo::LabelPosType::HIDDEN); @@ -79,6 +79,14 @@ bool RimReachCircleAnnotation::isVisible() return coll && coll->isActive() && m_isActive; } +//-------------------------------------------------------------------------------------------------- +/// +//-------------------------------------------------------------------------------------------------- +void RimReachCircleAnnotation::enablePicking(bool enable) +{ + m_centerPointPickEnabled = enable; +} + //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- @@ -120,7 +128,7 @@ void RimReachCircleAnnotation::defineUiOrdering(QString uiConfigName, caf::PdmUi { uiOrdering.add(&m_name); uiOrdering.add(&m_centerPointXyd); - uiOrdering.add(&m_centerPointPickEnabled); + uiOrdering.add(&m_centerPointPickEnabled, false); uiOrdering.add(&m_radius); auto appearanceGroup = uiOrdering.addNewGroup("Appearance"); diff --git a/ApplicationCode/ProjectDataModel/Annotations/RimReachCircleAnnotation.h b/ApplicationCode/ProjectDataModel/Annotations/RimReachCircleAnnotation.h index 3dd1cdd54f..38ff201733 100644 --- a/ApplicationCode/ProjectDataModel/Annotations/RimReachCircleAnnotation.h +++ b/ApplicationCode/ProjectDataModel/Annotations/RimReachCircleAnnotation.h @@ -59,6 +59,7 @@ public: bool isActive(); bool isVisible(); + void enablePicking(bool enable); Vec3d centerPoint() const; double radius() const; diff --git a/ApplicationCode/ProjectDataModel/Annotations/RimTextAnnotation.cpp b/ApplicationCode/ProjectDataModel/Annotations/RimTextAnnotation.cpp index af16a24ee3..11c832c496 100644 --- a/ApplicationCode/ProjectDataModel/Annotations/RimTextAnnotation.cpp +++ b/ApplicationCode/ProjectDataModel/Annotations/RimTextAnnotation.cpp @@ -50,7 +50,7 @@ RimTextAnnotation::RimTextAnnotation() CAF_PDM_InitField(&m_anchorPointXyd, "AnchorPointXyd", Vec3d::ZERO, "Anchor Point", "", "", ""); m_anchorPointXyd.uiCapability()->setUiEditorTypeName(caf::PdmUiPickableLineEditor::uiEditorTypeName()); - CAF_PDM_InitField(&m_anchorPointPickEnabledButtonField, "AnchorPointPick", true, "", "", "", ""); + CAF_PDM_InitField(&m_anchorPointPickEnabledButtonField, "AnchorPointPick", false, "", "", "", ""); caf::PdmUiPushButtonEditor::configureEditorForField(&m_anchorPointPickEnabledButtonField); m_anchorPointPickEnabledButtonField.uiCapability()->setUiLabelPosition(caf::PdmUiItemInfo::LabelPosType::HIDDEN); @@ -224,6 +224,14 @@ bool RimTextAnnotation::isVisible() const return visible; } +//-------------------------------------------------------------------------------------------------- +/// +//-------------------------------------------------------------------------------------------------- +void RimTextAnnotation::enablePicking(bool enable) +{ + m_anchorPointPickEnabledButtonField = enable; +} + //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationCode/ProjectDataModel/Annotations/RimTextAnnotation.h b/ApplicationCode/ProjectDataModel/Annotations/RimTextAnnotation.h index 03b5612422..9ef512845b 100644 --- a/ApplicationCode/ProjectDataModel/Annotations/RimTextAnnotation.h +++ b/ApplicationCode/ProjectDataModel/Annotations/RimTextAnnotation.h @@ -66,6 +66,7 @@ public: const QString& text() const; bool isActive(); bool isVisible() const; + void enablePicking(bool enable); RimAnnotationTextAppearance* appearance() const;