#12455 Date format string and precision

Use date format string from preferences when date is displayed. Use default number of decimals.
This commit is contained in:
Magne Sjaastad committed 2025-05-09 08:32:04 +02:00
1 parent fa61fbb78b
commit c57eace568
2 files changed
+15 -5

No files matched your search

@@ -553,9 +553,8 @@ void RimEnsembleCurveFilter::defineEditorAttribute( const caf::PdmFieldHandle* f
{
if ( auto attr = dynamic_cast<caf::PdmUiDoubleSliderEditorAttribute*>( attribute ) )
{
attr->m_minimum = m_lowerLimit;
attr->m_maximum = m_upperLimit;
attr->m_decimals = 2;
attr->m_minimum = m_lowerLimit;
attr->m_maximum = m_upperLimit;
}
}
else if ( field == &m_objectiveValuesSelectSummaryAddressPushButton )
@@ -222,13 +222,15 @@ RimEnsembleCurveSet::RimEnsembleCurveSet()
CAF_PDM_InitField( &m_showObjectiveFunctionFormula, "ShowObjectiveFunctionFormula", true, "Show Text Box in Plot" );
CAF_PDM_InitFieldNoDefault( &m_minDateRange, "MinDateRange", "From" );
const QString formatString = RiaQDateTimeTools::dateFormatString( RiaPreferences::current()->dateFormat() );
CAF_PDM_InitFieldNoDefault( &m_minDateRange, "MinDateRange", "From", "", formatString );
m_minDateRange.uiCapability()->setUiEditorTypeName( caf::PdmUiDateEditor::uiEditorTypeName() );
CAF_PDM_InitField( &m_minTimeSliderPosition, "MinTimeSliderPosition", 0, "" );
m_minTimeSliderPosition.uiCapability()->setUiEditorTypeName( caf::PdmUiSliderEditor::uiEditorTypeName() );
CAF_PDM_InitFieldNoDefault( &m_maxDateRange, "MaxDateRange", "To" );
CAF_PDM_InitFieldNoDefault( &m_maxDateRange, "MaxDateRange", "To", "", formatString );
m_maxDateRange.uiCapability()->setUiEditorTypeName( caf::PdmUiDateEditor::uiEditorTypeName() );
CAF_PDM_InitField( &m_maxTimeSliderPosition, "MaxTimeSliderPosition", 100, "" );
@@ -1591,6 +1593,15 @@ void RimEnsembleCurveSet::defineEditorAttribute( const caf::PdmFieldHandle* fiel
myAttr->m_decimals = 2;
}
}
if ( field == &m_minDateRange || field == &m_maxDateRange )
{
if ( auto attrib = dynamic_cast<caf::PdmUiDateEditorAttribute*>( attribute ) )
{
QString formatString = RiaQDateTimeTools::dateFormatString( RiaPreferences::current()->dateFormat() );
attrib->dateFormat = formatString;
}
}
}
//--------------------------------------------------------------------------------------------------