From b5f6185deaa652f946b4d59a9c9f2a0feab689d2 Mon Sep 17 00:00:00 2001 From: Magne Sjaastad Date: Fri, 19 May 2017 10:14:51 +0200 Subject: [PATCH] #1504 Fishbones : Hide name from property editor --- .../Fishbones/RimFishbonesMultipleSubs.h | 1 + .../ProjectDataModel/RimPerforationInterval.cpp | 11 +++++++++-- .../ProjectDataModel/RimPerforationInterval.h | 8 ++++++-- 3 files changed, 16 insertions(+), 4 deletions(-) diff --git a/ApplicationCode/ProjectDataModel/Fishbones/RimFishbonesMultipleSubs.h b/ApplicationCode/ProjectDataModel/Fishbones/RimFishbonesMultipleSubs.h index 182df38faa..a99e9b137d 100644 --- a/ApplicationCode/ProjectDataModel/Fishbones/RimFishbonesMultipleSubs.h +++ b/ApplicationCode/ProjectDataModel/Fishbones/RimFishbonesMultipleSubs.h @@ -73,6 +73,7 @@ protected: virtual void fieldChangedByUi(const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue) override; virtual void defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering& uiOrdering) override; + virtual void defineUiTreeOrdering(caf::PdmUiTreeOrdering& uiTreeOrdering, QString uiConfigName = "") override; virtual void initAfterRead() override; private: diff --git a/ApplicationCode/ProjectDataModel/RimPerforationInterval.cpp b/ApplicationCode/ProjectDataModel/RimPerforationInterval.cpp index 16093557f2..8aca567485 100644 --- a/ApplicationCode/ProjectDataModel/RimPerforationInterval.cpp +++ b/ApplicationCode/ProjectDataModel/RimPerforationInterval.cpp @@ -61,14 +61,21 @@ void RimPerforationInterval::fieldChangedByUi(const caf::PdmFieldHandle* changed //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -void RimPerforationInterval::defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering& uiOrdering) +void RimPerforationInterval::defineUiTreeOrdering(caf::PdmUiTreeOrdering& uiTreeOrdering, QString uiConfigName /*= ""*/) { m_name = QString("%1 - %2").arg(m_startMD).arg(m_endMD); - uiOrdering.add(&m_name); +} +//-------------------------------------------------------------------------------------------------- +/// +//-------------------------------------------------------------------------------------------------- +void RimPerforationInterval::defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering& uiOrdering) +{ uiOrdering.add(&m_startMD); uiOrdering.add(&m_endMD); uiOrdering.add(&m_radius); uiOrdering.add(&m_skinFactor); + + uiOrdering.skipRemainingFields(); } diff --git a/ApplicationCode/ProjectDataModel/RimPerforationInterval.h b/ApplicationCode/ProjectDataModel/RimPerforationInterval.h index 159c847556..298c4bd9ce 100644 --- a/ApplicationCode/ProjectDataModel/RimPerforationInterval.h +++ b/ApplicationCode/ProjectDataModel/RimPerforationInterval.h @@ -36,15 +36,19 @@ public: RimPerforationInterval(); virtual ~RimPerforationInterval(); - virtual void defineUiOrdering( QString uiConfigName, caf::PdmUiOrdering& uiOrdering ) override; - virtual void fieldChangedByUi( const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue ) override; double startMD() { return m_startMD(); } double endMD() { return m_endMD(); } +protected: + virtual void defineUiOrdering( QString uiConfigName, caf::PdmUiOrdering& uiOrdering ) override; + virtual void fieldChangedByUi( const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue ) override; + virtual void defineUiTreeOrdering(caf::PdmUiTreeOrdering& uiTreeOrdering, QString uiConfigName = "") override; + private: caf::PdmField< double > m_startMD; caf::PdmField< double > m_endMD; caf::PdmField< double > m_radius; caf::PdmField< double > m_skinFactor; + };