From bb961ab460d11a885eb9bdbaa200e0cc2ce28656 Mon Sep 17 00:00:00 2001 From: Kristian Bendiksen Date: Wed, 17 Feb 2021 14:38:35 +0100 Subject: [PATCH] #7339 StimPlanModelTemplate: Hide some levels in the project tree. --- .../RimStimPlanModelTemplate.cpp | 21 +++++++++++++++++-- .../StimPlanModel/RimStimPlanModelTemplate.h | 5 ++++- 2 files changed, 23 insertions(+), 3 deletions(-) diff --git a/ApplicationLibCode/ProjectDataModel/StimPlanModel/RimStimPlanModelTemplate.cpp b/ApplicationLibCode/ProjectDataModel/StimPlanModel/RimStimPlanModelTemplate.cpp index f78d846656..6d213b1b3a 100644 --- a/ApplicationLibCode/ProjectDataModel/StimPlanModel/RimStimPlanModelTemplate.cpp +++ b/ApplicationLibCode/ProjectDataModel/StimPlanModel/RimStimPlanModelTemplate.cpp @@ -41,11 +41,14 @@ #include "cafPdmFieldCvfVec3d.h" #include "cafPdmFieldScriptingCapabilityCvfVec3d.h" + #include "cafPdmObjectScriptingCapability.h" #include "cafPdmUiDoubleValueEditor.h" +#include "cafPdmUiItem.h" #include "cafPdmUiPushButtonEditor.h" #include "cafPdmUiTableViewEditor.h" #include "cafPdmUiToolButtonEditor.h" +#include "cafPdmUiTreeOrdering.h" #include "cafPdmUiTreeSelectionEditor.h" #include "cvfBoundingBox.h" @@ -169,12 +172,12 @@ RimStimPlanModelTemplate::RimStimPlanModelTemplate() CAF_PDM_InitScriptableFieldNoDefault( &m_faciesInitialPressureConfigs, "FaciesInitialPressureConfigs", - "FaciesInitialPressureConfigs", + "Facies Initial Pressure Configs", "", "", "" ); m_faciesInitialPressureConfigs.uiCapability()->setUiEditorTypeName( caf::PdmUiTableViewEditor::uiEditorTypeName() ); - m_faciesInitialPressureConfigs.uiCapability()->setUiLabelPosition( caf::PdmUiItemInfo::TOP ); + m_faciesInitialPressureConfigs.uiCapability()->setUiLabelPosition( caf::PdmUiItemInfo::HIDDEN ); m_faciesInitialPressureConfigs.uiCapability()->setUiTreeChildrenHidden( true ); CAF_PDM_InitScriptableFieldNoDefault( &m_pressureTable, "PressureTable", "Pressure Table", "", "", "" ); @@ -318,6 +321,20 @@ void RimStimPlanModelTemplate::defineUiOrdering( QString uiConfigName, caf::PdmU uiOrdering.skipRemainingFields( true ); } +//-------------------------------------------------------------------------------------------------- +/// +//-------------------------------------------------------------------------------------------------- +void RimStimPlanModelTemplate::defineUiTreeOrdering( caf::PdmUiTreeOrdering& uiTreeOrdering, + QString uiConfigName /*= ""*/ ) +{ + if ( m_elasticProperties ) uiTreeOrdering.add( m_elasticProperties ); + if ( m_faciesProperties ) uiTreeOrdering.add( m_faciesProperties ); + if ( m_pressureTable ) uiTreeOrdering.add( m_pressureTable ); + if ( m_nonNetLayers ) uiTreeOrdering.add( m_nonNetLayers ); + + uiTreeOrdering.skipRemainingChildren( true ); +} + //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationLibCode/ProjectDataModel/StimPlanModel/RimStimPlanModelTemplate.h b/ApplicationLibCode/ProjectDataModel/StimPlanModel/RimStimPlanModelTemplate.h index 56bb925ff2..f1fbee80f4 100644 --- a/ApplicationLibCode/ProjectDataModel/StimPlanModel/RimStimPlanModelTemplate.h +++ b/ApplicationLibCode/ProjectDataModel/StimPlanModel/RimStimPlanModelTemplate.h @@ -119,7 +119,10 @@ public: bool usePressureTableForProperty( RiaDefines::CurveProperty curveProperty ) const; protected: - void defineUiOrdering( QString uiConfigName, caf::PdmUiOrdering& uiOrdering ) override; + void defineUiOrdering( QString uiConfigName, caf::PdmUiOrdering& uiOrdering ) override; + + void defineUiTreeOrdering( caf::PdmUiTreeOrdering& uiTreeOrdering, QString uiConfigName /*= ""*/ ) override; + QList calculateValueOptions( const caf::PdmFieldHandle* fieldNeedingOptions, bool* useOptionsOnly ) override; void initAfterRead() override;