OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2026-09-03 20:53:13 -05:00
Code Issues Packages Projects Releases Wiki Activity

Fix grouping of properties for date tickmarks

Browse Source
This commit is contained in:
Jørgen Herje
2023-02-20 16:04:57 +01:00
committed by Magne Sjaastad
parent dfb942cc97
commit a6ee41aaee
1 changed files with 16 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ApplicationLibCode/ProjectDataModel/Summary/RimSummaryTimeAxisProperties.cpp
+16 -15
View File
@@ -807,12 +807,6 @@ void RimSummaryTimeAxisProperties::defineUiOrdering( QString uiConfigName, caf::
timeGroup->add( &m_visibleTimeRangeMax, false ); timeGroup->add( &m_visibleTimeRangeMax, false );
timeGroup->add( &m_visibleDateRangeMin, true ); timeGroup->add( &m_visibleDateRangeMin, true );
timeGroup->add( &m_visibleTimeRangeMin, false ); timeGroup->add( &m_visibleTimeRangeMin, false );
timeGroup->add( &m_automaticDateComponents );
if ( !m_automaticDateComponents() )
{
timeGroup->add( &m_dateComponents );
timeGroup->add( &m_timeComponents );
}
} }
else else
{ {
@@ -821,30 +815,37 @@ void RimSummaryTimeAxisProperties::defineUiOrdering( QString uiConfigName, caf::
timeGroup->add( &m_visibleTimeSinceStartRangeMin ); timeGroup->add( &m_visibleTimeSinceStartRangeMin );
} }
timeGroup->add( &m_valuesFontSize ); caf::PdmUiGroup* tickmarkDistributionGroup = timeGroup->addNewGroup( "Tickmark Distribution" );
timeGroup->add( &m_tickmarkType ); tickmarkDistributionGroup->add( &m_tickmarkType );
m_tickmarkType.uiCapability()->setUiReadOnly( m_timeMode() == TIME_FROM_SIMULATION_START ); m_tickmarkType.uiCapability()->setUiReadOnly( m_timeMode() == TIME_FROM_SIMULATION_START );
if ( m_tickmarkType() == TickmarkType::TICKMARK_COUNT ) if ( m_tickmarkType() == TickmarkType::TICKMARK_COUNT )
{ {
timeGroup->add( &m_majorTickmarkCount ); tickmarkDistributionGroup->add( &m_majorTickmarkCount );
} }
if ( m_tickmarkType() == TickmarkType::TICKMARK_CUSTOM && m_timeMode() == DATE ) if ( m_tickmarkType() == TickmarkType::TICKMARK_CUSTOM && m_timeMode() == DATE )
{ {
timeGroup->add( &m_tickmarkInterval ); tickmarkDistributionGroup->add( &m_tickmarkInterval );
timeGroup->add( &m_tickmarkIntervalStep ); tickmarkDistributionGroup->add( &m_tickmarkIntervalStep );
} }
caf::PdmUiGroup* tickmarkLabelGroup = timeGroup->addNewGroup( "Tickmark Label Format" );
tickmarkLabelGroup->setCollapsedByDefault();
tickmarkLabelGroup->add( &m_valuesFontSize );
if ( m_timeMode() == DATE ) if ( m_timeMode() == DATE )
{ {
caf::PdmUiGroup* advancedGroup = timeGroup->addNewGroup( "Date/Time Label Format" ); tickmarkLabelGroup->add( &m_automaticDateComponents );
advancedGroup->setCollapsedByDefault(); if ( !m_automaticDateComponents() )
{
tickmarkLabelGroup->add( &m_dateComponents );
tickmarkLabelGroup->add( &m_timeComponents );
}
if ( m_automaticDateComponents() || m_dateComponents() != RiaDefines::DateFormatComponents::DATE_FORMAT_NONE ) if ( m_automaticDateComponents() || m_dateComponents() != RiaDefines::DateFormatComponents::DATE_FORMAT_NONE )
{ {
advancedGroup->add( &m_dateFormat ); tickmarkLabelGroup->add( &m_dateFormat );
} }
if ( m_automaticDateComponents() || m_timeComponents() != RiaDefines::TimeFormatComponents::TIME_FORMAT_NONE ) if ( m_automaticDateComponents() || m_timeComponents() != RiaDefines::TimeFormatComponents::TIME_FORMAT_NONE )
{ {
advancedGroup->add( &m_timeFormat ); tickmarkLabelGroup->add( &m_timeFormat );
} }
} }