Move Show Disks from Visibility group into Disk group

This commit is contained in:
Magne Sjaastad
2024-10-21 12:52:42 +02:00
parent c3d60869bd
commit 5ffd7f3f61

View File

@@ -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() )
{