From 81e2132752062714a7d11667a791b6ac9343d344 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Erik=20Jensen?= Date: Mon, 10 Dec 2018 15:09:41 +0100 Subject: [PATCH] #3839 Annotations. Remove 'targets' tree node for user defined polylines --- .../Annotations/RimUserDefinedPolylinesAnnotation.cpp | 10 ++++++++++ .../Annotations/RimUserDefinedPolylinesAnnotation.h | 1 + 2 files changed, 11 insertions(+) diff --git a/ApplicationCode/ProjectDataModel/Annotations/RimUserDefinedPolylinesAnnotation.cpp b/ApplicationCode/ProjectDataModel/Annotations/RimUserDefinedPolylinesAnnotation.cpp index 0ae8d9b009..0ca783ff78 100644 --- a/ApplicationCode/ProjectDataModel/Annotations/RimUserDefinedPolylinesAnnotation.cpp +++ b/ApplicationCode/ProjectDataModel/Annotations/RimUserDefinedPolylinesAnnotation.cpp @@ -32,6 +32,7 @@ #include "cafPdmUiTableViewEditor.h" #include "cafCmdFeatureMenuBuilder.h" #include "cafPdmUiPushButtonEditor.h" +#include "cafPdmUiTreeOrdering.h" //-------------------------------------------------------------------------------------------------- /// Internal function @@ -65,6 +66,7 @@ RimUserDefinedPolylinesAnnotation::RimUserDefinedPolylinesAnnotation() CAF_PDM_InitFieldNoDefault(&m_targets, "Targets", "Targets", "", "", ""); m_targets.uiCapability()->setUiEditorTypeName(caf::PdmUiTableViewEditor::uiEditorTypeName()); + //m_targets.uiCapability()->setUiTreeHidden(true); m_targets.uiCapability()->setUiTreeChildrenHidden(true); m_targets.uiCapability()->setUiLabelPosition(caf::PdmUiItemInfo::TOP); m_targets.uiCapability()->setCustomContextMenuEnabled(true); @@ -227,6 +229,14 @@ void RimUserDefinedPolylinesAnnotation::defineUiOrdering(QString uiConfigName, c uiOrdering.skipRemainingFields(true); } +//-------------------------------------------------------------------------------------------------- +/// +//-------------------------------------------------------------------------------------------------- +void RimUserDefinedPolylinesAnnotation::defineUiTreeOrdering(caf::PdmUiTreeOrdering& uiTreeOrdering, QString uiConfigName) +{ + uiTreeOrdering.skipRemainingChildren(true); +} + //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationCode/ProjectDataModel/Annotations/RimUserDefinedPolylinesAnnotation.h b/ApplicationCode/ProjectDataModel/Annotations/RimUserDefinedPolylinesAnnotation.h index 0e4aadd0f5..5e5b09be6e 100644 --- a/ApplicationCode/ProjectDataModel/Annotations/RimUserDefinedPolylinesAnnotation.h +++ b/ApplicationCode/ProjectDataModel/Annotations/RimUserDefinedPolylinesAnnotation.h @@ -57,6 +57,7 @@ public: 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; private: