From 5ffd7f3f6122321df3eedf554d5bd7f1c1636904 Mon Sep 17 00:00:00 2001 From: Magne Sjaastad Date: Mon, 21 Oct 2024 12:52:42 +0200 Subject: [PATCH] Move Show Disks from Visibility group into Disk group --- .../ProjectDataModel/RimSimWellInViewCollection.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/ApplicationLibCode/ProjectDataModel/RimSimWellInViewCollection.cpp b/ApplicationLibCode/ProjectDataModel/RimSimWellInViewCollection.cpp index cf14080a43..93e085a1cb 100644 --- a/ApplicationLibCode/ProjectDataModel/RimSimWellInViewCollection.cpp +++ b/ApplicationLibCode/ProjectDataModel/RimSimWellInViewCollection.cpp @@ -151,7 +151,6 @@ RimSimWellInViewCollection::RimSimWellInViewCollection() CAF_PDM_InitFieldNoDefault( &m_showWellLabel, "ShowWellLabelTristate", "Label" ); CAF_PDM_InitFieldNoDefault( &m_showWellPipe, "ShowWellPipe", "Pipe" ); CAF_PDM_InitFieldNoDefault( &m_showWellSpheres, "ShowWellSpheres", "Spheres" ); - CAF_PDM_InitFieldNoDefault( &m_showWellDisks, "ShowWellDisks", "Disks" ); m_showWellHead.uiCapability()->setUiEditorTypeName( caf::PdmUiCheckBoxTristateEditor::uiEditorTypeName() ); m_showWellHead.xmlCapability()->disableIO(); @@ -165,9 +164,6 @@ RimSimWellInViewCollection::RimSimWellInViewCollection() m_showWellSpheres.uiCapability()->setUiEditorTypeName( caf::PdmUiCheckBoxTristateEditor::uiEditorTypeName() ); m_showWellSpheres.xmlCapability()->disableIO(); - m_showWellDisks.uiCapability()->setUiEditorTypeName( caf::PdmUiCheckBoxTristateEditor::uiEditorTypeName() ); - m_showWellDisks.xmlCapability()->disableIO(); - // Scaling CAF_PDM_InitField( &wellHeadScaleFactor, "WellHeadScale", 1.0, "Well Head Scale" ); CAF_PDM_InitField( &wellHeadPositionScaleFactor, "WellHeadPositionScaleFactor", 0.1, "Well Head Position Scale" ); @@ -213,6 +209,10 @@ RimSimWellInViewCollection::RimSimWellInViewCollection() CAF_PDM_InitField( &m_showWellValves, "ShowWellValvesTristate", true, "Valves" ); + CAF_PDM_InitFieldNoDefault( &m_showWellDisks, "ShowWellDisks", "Show Disks" ); + m_showWellDisks.uiCapability()->setUiEditorTypeName( caf::PdmUiCheckBoxTristateEditor::uiEditorTypeName() ); + m_showWellDisks.xmlCapability()->disableIO(); + CAF_PDM_InitFieldNoDefault( &m_wellDiskSummaryCase, "WellDiskSummaryCase", "Summary Case" ); CAF_PDM_InitField( &m_wellDiskQuantity, "WellDiskQuantity", QString( "WOPT" ), "Disk Quantity" ); @@ -623,7 +623,6 @@ void RimSimWellInViewCollection::defineUiOrdering( QString uiConfigName, caf::Pd appearanceGroup->add( &m_showWellHead ); appearanceGroup->add( &m_showWellPipe ); appearanceGroup->add( &m_showWellSpheres ); - appearanceGroup->add( &m_showWellDisks ); appearanceGroup->add( &m_showWellCommunicationLines ); appearanceGroup->add( &m_showWellValves ); @@ -665,6 +664,7 @@ void RimSimWellInViewCollection::defineUiOrdering( QString uiConfigName, caf::Pd { caf::PdmUiGroup* wellDiskGroup = uiOrdering.addNewGroup( "Disks" ); + wellDiskGroup->add( &m_showWellDisks ); if ( !m_wellDiskSummaryCase() ) {