diff --git a/ApplicationLibCode/Application/Tools/RiaFieldHandleTools.cpp b/ApplicationLibCode/Application/Tools/RiaFieldHandleTools.cpp index 55517ec38e..949bfbaa2e 100644 --- a/ApplicationLibCode/Application/Tools/RiaFieldHandleTools.cpp +++ b/ApplicationLibCode/Application/Tools/RiaFieldHandleTools.cpp @@ -48,3 +48,19 @@ void RiaFieldhandleTools::disableWriteAndSetFieldHidden( caf::PdmFieldHandle* fi fieldHandle->xmlCapability()->setIOWritable( false ); } } + +//-------------------------------------------------------------------------------------------------- +/// +//-------------------------------------------------------------------------------------------------- +void RiaFieldhandleTools::updateOverrideStateAndLabel( caf::PdmFieldHandle* fieldHandle, + bool isOverridden, + const QString& toolTip ) +{ + // Get the label text as given by the init_field macro + QString labelText = fieldHandle->uiCapability()->uiName( fieldHandle->uiCapability()->uiConfigNameForStaticData() ); + + if ( isOverridden ) labelText += " (overridden)"; + fieldHandle->uiCapability()->setUiToolTip( toolTip ); + fieldHandle->uiCapability()->setUiName( labelText ); + fieldHandle->uiCapability()->setUiReadOnly( isOverridden ); +} diff --git a/ApplicationLibCode/Application/Tools/RiaFieldHandleTools.h b/ApplicationLibCode/Application/Tools/RiaFieldHandleTools.h index 0eaa0913b4..97fa9b1b7c 100644 --- a/ApplicationLibCode/Application/Tools/RiaFieldHandleTools.h +++ b/ApplicationLibCode/Application/Tools/RiaFieldHandleTools.h @@ -19,6 +19,8 @@ #pragma once +#include + namespace caf { class PdmFieldHandle; @@ -31,4 +33,5 @@ class RiaFieldhandleTools { public: static void disableWriteAndSetFieldHidden( caf::PdmFieldHandle* fieldHandle ); + static void updateOverrideStateAndLabel( caf::PdmFieldHandle* fieldHandle, bool isOverridden, const QString& toolTip ); }; diff --git a/ApplicationLibCode/ProjectDataModel/RimPlotAxisProperties.cpp b/ApplicationLibCode/ProjectDataModel/RimPlotAxisProperties.cpp index 6f4813cd86..18892c9b0b 100644 --- a/ApplicationLibCode/ProjectDataModel/RimPlotAxisProperties.cpp +++ b/ApplicationLibCode/ProjectDataModel/RimPlotAxisProperties.cpp @@ -20,6 +20,7 @@ #include "RimPlotAxisProperties.h" #include "RiaDefines.h" +#include "RiaFieldHandleTools.h" #include "RiaPlotDefines.h" #include "RiaPreferences.h" @@ -61,6 +62,9 @@ RimPlotAxisProperties::RimPlotAxisProperties() CAF_PDM_InitField( &m_isActive, "Active", true, "Active" ); m_isActive.uiCapability()->setUiHidden( true ); + CAF_PDM_InitField( &m_isMinMaxOverridden, "IsMinMaxOverridden", false, "IsMinMaxOverridden" ); + m_isMinMaxOverridden.uiCapability()->setUiHidden( true ); + CAF_PDM_InitFieldNoDefault( &m_objectName, "Name", "Name" ); m_objectName.uiCapability()->setUiHidden( true ); @@ -73,14 +77,14 @@ RimPlotAxisProperties::RimPlotAxisProperties() CAF_PDM_InitField( &m_displayShortName, "DisplayShortName", false, " Acronyms" ); CAF_PDM_InitField( &m_displayUnitText, "DisplayUnitText", true, " Units" ); - CAF_PDM_InitFieldNoDefault( &customTitle, "CustomTitle", "Title" ); + CAF_PDM_InitFieldNoDefault( &m_customTitle, "CustomTitle", "Title" ); CAF_PDM_InitField( &m_visibleRangeMax, "VisibleRangeMax", RiaDefines::maximumDefaultValuePlot(), "Max" ); CAF_PDM_InitField( &m_visibleRangeMin, "VisibleRangeMin", RiaDefines::minimumDefaultValuePlot(), "Min" ); - CAF_PDM_InitFieldNoDefault( &numberFormat, "NumberFormat", "Number Format" ); - CAF_PDM_InitField( &numberOfDecimals, "Decimals", 2, "Number of Decimals" ); - CAF_PDM_InitField( &scaleFactor, "ScaleFactor", 1.0, "Scale Factor" ); + CAF_PDM_InitFieldNoDefault( &m_numberFormat, "NumberFormat", "Number Format" ); + CAF_PDM_InitField( &m_numberOfDecimals, "Decimals", 2, "Number of Decimals" ); + CAF_PDM_InitField( &m_scaleFactor, "ScaleFactor", 1.0, "Scale Factor" ); CAF_PDM_InitField( &m_isAutoZoom, "AutoZoom", true, "Set Range Automatically" ); CAF_PDM_InitField( &m_isLogarithmicScaleEnabled, "LogarithmicScale", false, "Logarithmic Scale" ); @@ -166,7 +170,7 @@ QList RimPlotAxisProperties::calculateValueOptions( cons { QList options; - if ( fieldNeedingOptions == &scaleFactor ) + if ( fieldNeedingOptions == &m_scaleFactor ) { for ( int exp = -12; exp <= 12; exp += 3 ) { @@ -214,12 +218,12 @@ void RimPlotAxisProperties::defineUiOrdering( QString uiConfigName, caf::PdmUiOr titleTextGroup->add( &m_displayShortName ); titleTextGroup->add( &m_displayUnitText ); - customTitle.uiCapability()->setUiReadOnly( true ); + m_customTitle.uiCapability()->setUiReadOnly( true ); } else { - titleTextGroup->add( &customTitle ); - customTitle.uiCapability()->setUiReadOnly( false ); + titleTextGroup->add( &m_customTitle ); + m_customTitle.uiCapability()->setUiReadOnly( false ); } } @@ -236,25 +240,27 @@ void RimPlotAxisProperties::defineUiOrdering( QString uiConfigName, caf::PdmUiOr scaleGroup.add( &m_isAxisInverted ); scaleGroup.add( &m_showNumbers ); } - scaleGroup.add( &numberFormat ); + scaleGroup.add( &m_numberFormat ); - if ( numberFormat() != NUMBER_FORMAT_AUTO ) + if ( m_numberFormat() != NUMBER_FORMAT_AUTO ) { - scaleGroup.add( &numberOfDecimals ); + scaleGroup.add( &m_numberOfDecimals ); } - scaleGroup.add( &scaleFactor ); + scaleGroup.add( &m_scaleFactor ); if ( m_isRangeSettingsEnabled ) { scaleGroup.add( &m_visibleRangeMin ); scaleGroup.add( &m_visibleRangeMax ); } + scaleGroup.add( &m_valuesFontSize ); scaleGroup.add( &m_majorTickmarkCount ); - scaleGroup.add( &m_plotAxis ); m_plotAxis.uiCapability()->setUiReadOnly( m_isAlwaysRequired ); uiOrdering.skipRemainingFields( true ); + + updateOverriddenLabelAndReadOnlyState(); } //-------------------------------------------------------------------------------------------------- @@ -284,6 +290,14 @@ RimPlotAxisPropertiesInterface::AxisTitlePositionType RimPlotAxisProperties::tit return m_titlePositionEnum(); } +//-------------------------------------------------------------------------------------------------- +/// +//-------------------------------------------------------------------------------------------------- +QString RimPlotAxisProperties::customTitle() const +{ + return m_customTitle(); +} + //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- @@ -452,6 +466,30 @@ void RimPlotAxisProperties::setShowNumbers( bool enable ) m_showNumbers = enable; } +//-------------------------------------------------------------------------------------------------- +/// +//-------------------------------------------------------------------------------------------------- +RimPlotAxisProperties::NumberFormatType RimPlotAxisProperties::numberFormat() const +{ + return m_numberFormat(); +} + +//-------------------------------------------------------------------------------------------------- +/// +//-------------------------------------------------------------------------------------------------- +int RimPlotAxisProperties::decimalCount() const +{ + return m_numberOfDecimals(); +} + +//-------------------------------------------------------------------------------------------------- +/// +//-------------------------------------------------------------------------------------------------- +double RimPlotAxisProperties::scaleFactor() const +{ + return m_scaleFactor(); +} + //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- @@ -470,14 +508,14 @@ void RimPlotAxisProperties::computeAndSetScaleFactor() if ( maxAbsValue < 1.0 && maxAbsValue > 1e-6 ) { // Do not use scale factor for small values above 1e-6 - scaleFactor = 1.0; + m_scaleFactor = 1.0; return; } if ( maxAbsValue > 1.0 && maxAbsValue < 1e6 ) { // Do not use scale factor for values above 1 and below 1e-6 - scaleFactor = 1.0; + m_scaleFactor = 1.0; return; } @@ -497,7 +535,7 @@ void RimPlotAxisProperties::computeAndSetScaleFactor() } } - scaleFactor = std::pow( 10, exponent ); + m_scaleFactor = std::pow( 10, exponent ); } //-------------------------------------------------------------------------------------------------- @@ -524,6 +562,14 @@ double RimPlotAxisProperties::visibleRangeMax() const return m_visibleRangeMax; } +//-------------------------------------------------------------------------------------------------- +/// +//-------------------------------------------------------------------------------------------------- +void RimPlotAxisProperties::setMinMaxOverridden( bool isOverridden ) +{ + m_isMinMaxOverridden = isOverridden; +} + //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- @@ -608,7 +654,24 @@ void RimPlotAxisProperties::fieldChangedByUi( const caf::PdmFieldHandle* changed //-------------------------------------------------------------------------------------------------- void RimPlotAxisProperties::updateOptionSensitivity() { - customTitle.uiCapability()->setUiReadOnly( isAutoTitle ); + m_customTitle.uiCapability()->setUiReadOnly( isAutoTitle ); +} + +//-------------------------------------------------------------------------------------------------- +/// +//-------------------------------------------------------------------------------------------------- +void RimPlotAxisProperties::updateOverriddenLabelAndReadOnlyState() +{ + // Auto Appearance is defined in RimSummaryMultiPlot::analyzePlotsAndAdjustAppearanceSettings() + QString axisRangeToolTip = "Controlled by Axis Range Control"; + + RiaFieldhandleTools::updateOverrideStateAndLabel( &m_visibleRangeMin, m_isMinMaxOverridden, axisRangeToolTip ); + RiaFieldhandleTools::updateOverrideStateAndLabel( &m_visibleRangeMax, m_isMinMaxOverridden, axisRangeToolTip ); + + QString autoAppearanceToolTip = "Controlled by Auto Adjust Appearance"; + RiaFieldhandleTools::updateOverrideStateAndLabel( &m_majorTickmarkCount, isAppearanceOverridden(), autoAppearanceToolTip ); + RiaFieldhandleTools::updateOverrideStateAndLabel( &m_scaleFactor, isAppearanceOverridden(), autoAppearanceToolTip ); + RiaFieldhandleTools::updateOverrideStateAndLabel( &m_displayLongName, isAppearanceOverridden(), autoAppearanceToolTip ); } //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationLibCode/ProjectDataModel/RimPlotAxisProperties.h b/ApplicationLibCode/ProjectDataModel/RimPlotAxisProperties.h index ba60fc813a..8e997b231a 100644 --- a/ApplicationLibCode/ProjectDataModel/RimPlotAxisProperties.h +++ b/ApplicationLibCode/ProjectDataModel/RimPlotAxisProperties.h @@ -65,6 +65,8 @@ public: void setNameAndAxis( const QString& objectName, const QString& axistTitle, RiaDefines::PlotAxis axis, int axisIndex = 0 ); AxisTitlePositionType titlePosition() const override; + QString customTitle() const; + int titleFontSize() const override; int valuesFontSize() const override; @@ -90,6 +92,10 @@ public: bool showNumbers() const; void setShowNumbers( bool enable ); + NumberFormatType numberFormat() const; + int decimalCount() const; + double scaleFactor() const; + void setVisible( bool visible ); void computeAndSetScaleFactor(); @@ -99,12 +105,6 @@ public: void appendAnnotation( RimPlotAxisAnnotation* annotation ) override; void removeAllAnnotations() override; - caf::PdmField customTitle; - - caf::PdmField> numberFormat; - caf::PdmField numberOfDecimals; - caf::PdmField scaleFactor; - bool isLogarithmicScaleEnabled() const override; bool isActive() const override; @@ -113,6 +113,7 @@ public: double visibleRangeMin() const override; double visibleRangeMax() const override; + void setMinMaxOverridden( bool isOverridden ); void setVisibleRangeMin( double value ) override; void setVisibleRangeMax( double value ) override; @@ -130,11 +131,14 @@ protected: private: void updateOptionSensitivity(); + void updateOverriddenLabelAndReadOnlyState(); caf::FontTools::FontSize plotFontSize() const; private: caf::PdmField m_isActive; + caf::PdmField m_isMinMaxOverridden; + caf::PdmField isAutoTitle; caf::PdmField m_displayShortName; caf::PdmField m_displayLongName; @@ -153,6 +157,12 @@ private: caf::PdmField m_plotAxisIndex; caf::PdmField m_majorTickmarkCount; + caf::PdmField m_customTitle; + + caf::PdmField> m_numberFormat; + caf::PdmField m_numberOfDecimals; + caf::PdmField m_scaleFactor; + caf::PdmField m_isLogarithmicScaleEnabled; bool m_enableTitleTextSettings; diff --git a/ApplicationLibCode/ProjectDataModel/RimPlotAxisPropertiesInterface.cpp b/ApplicationLibCode/ProjectDataModel/RimPlotAxisPropertiesInterface.cpp index 20ef8d8628..03e5081fd3 100644 --- a/ApplicationLibCode/ProjectDataModel/RimPlotAxisPropertiesInterface.cpp +++ b/ApplicationLibCode/ProjectDataModel/RimPlotAxisPropertiesInterface.cpp @@ -55,6 +55,10 @@ void RimPlotAxisPropertiesInterface::LegendTickmarkCountEnum::setUp() RimPlotAxisPropertiesInterface::RimPlotAxisPropertiesInterface() : settingsChanged( this ) { + CAF_PDM_InitObject( "Time Axis Interface" ); + + CAF_PDM_InitField( &m_isAppearanceOverridden, "IsAppearanceOverridden", false, "IsAppearanceOverridden" ); + m_isAppearanceOverridden.uiCapability()->setUiHidden( true ); } //-------------------------------------------------------------------------------------------------- @@ -73,6 +77,14 @@ bool RimPlotAxisPropertiesInterface::isLogarithmicScaleEnabled() const return false; } +//-------------------------------------------------------------------------------------------------- +/// +//-------------------------------------------------------------------------------------------------- +void RimPlotAxisPropertiesInterface::setAppearanceOverridden( bool isOverridden ) +{ + m_isAppearanceOverridden = isOverridden; +} + //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- @@ -101,6 +113,14 @@ int RimPlotAxisPropertiesInterface::tickmarkCountFromEnum( LegendTickmarkCount c return maxTickmarkCount; } +//-------------------------------------------------------------------------------------------------- +/// +//-------------------------------------------------------------------------------------------------- +bool RimPlotAxisPropertiesInterface::isAppearanceOverridden() const +{ + return m_isAppearanceOverridden(); +} + //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationLibCode/ProjectDataModel/RimPlotAxisPropertiesInterface.h b/ApplicationLibCode/ProjectDataModel/RimPlotAxisPropertiesInterface.h index c43351e47d..1d73b3e533 100644 --- a/ApplicationLibCode/ProjectDataModel/RimPlotAxisPropertiesInterface.h +++ b/ApplicationLibCode/ProjectDataModel/RimPlotAxisPropertiesInterface.h @@ -23,6 +23,7 @@ #include "RiuPlotAxis.h" #include "cafAppEnum.h" +#include "cafPdmField.h" #include "cafPdmObject.h" class RimPlotAxisAnnotation; @@ -77,6 +78,7 @@ public: virtual LegendTickmarkCount majorTickmarkCount() const = 0; virtual void setMajorTickmarkCount( LegendTickmarkCount count ) = 0; + void setAppearanceOverridden( bool isOverridden ); static int tickmarkCountFromEnum( LegendTickmarkCount count ); @@ -85,6 +87,12 @@ public: virtual int titleFontSize() const = 0; virtual int valuesFontSize() const = 0; +protected: + bool isAppearanceOverridden() const; + private: void defineObjectEditorAttribute( QString uiConfigName, caf::PdmUiEditorAttribute* attribute ) override; + +private: + caf::PdmField m_isAppearanceOverridden; }; diff --git a/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryMultiPlot.cpp b/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryMultiPlot.cpp index 4a12b72010..92f8ba4daf 100644 --- a/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryMultiPlot.cpp +++ b/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryMultiPlot.cpp @@ -196,6 +196,10 @@ void RimSummaryMultiPlot::insertPlot( RimPlot* plot, size_t index ) { sumPlot->axisChanged.connect( this, &RimSummaryMultiPlot::onSubPlotAxisChanged ); sumPlot->curvesChanged.connect( this, &RimSummaryMultiPlot::onSubPlotChanged ); + + bool isMinMaxOverridden = m_axisRangeAggregation() != AxisRangeAggregation::NONE; + setOverriddenFlagsForPlot( sumPlot, isMinMaxOverridden, m_autoAdjustAppearance() ); + RimMultiPlot::insertPlot( plot, index ); } @@ -426,6 +430,8 @@ void RimSummaryMultiPlot::fieldChangedByUi( const caf::PdmFieldHandle* changedFi else if ( changedField == &m_linkSubPlotAxes || changedField == &m_axisRangeAggregation ) { syncAxisRanges(); + + setOverriddenFlag(); } else if ( changedField == &m_hidePlotsWithValuesBelow ) { @@ -464,6 +470,7 @@ void RimSummaryMultiPlot::fieldChangedByUi( const caf::PdmFieldHandle* changedFi else if ( changedField == &m_autoAdjustAppearance ) { checkAndApplyAutoAppearance(); + setOverriddenFlag(); } else { @@ -766,6 +773,8 @@ void RimSummaryMultiPlot::setDefaultRangeAggregationSteppingDimension() m_axisRangeAggregation = rangeAggregation; m_sourceStepping->setStepDimension( stepDimension ); + + setOverriddenFlag(); } //-------------------------------------------------------------------------------------------------- @@ -1045,6 +1054,36 @@ void RimSummaryMultiPlot::updatePlotVisibility() if ( !m_viewer.isNull() ) m_viewer->scheduleUpdate(); } +//-------------------------------------------------------------------------------------------------- +/// +//-------------------------------------------------------------------------------------------------- +void RimSummaryMultiPlot::setOverriddenFlag() +{ + bool isMinMaxOverridden = m_axisRangeAggregation() != AxisRangeAggregation::NONE; + for ( auto p : summaryPlots() ) + { + setOverriddenFlagsForPlot( p, isMinMaxOverridden, m_autoAdjustAppearance() ); + } +} + +//-------------------------------------------------------------------------------------------------- +/// +//-------------------------------------------------------------------------------------------------- +void RimSummaryMultiPlot::setOverriddenFlagsForPlot( RimSummaryPlot* summaryPlot, + bool isMinMaxOverridden, + bool isAppearanceOverridden ) +{ + for ( auto plotAxis : summaryPlot->plotAxes() ) + { + plotAxis->setAppearanceOverridden( isAppearanceOverridden ); + auto plotAxProp = dynamic_cast( plotAxis ); + if ( plotAxProp ) + { + plotAxProp->setMinMaxOverridden( isMinMaxOverridden ); + } + } +} + //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryMultiPlot.h b/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryMultiPlot.h index 974d2f739d..58c81571b5 100644 --- a/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryMultiPlot.h +++ b/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryMultiPlot.h @@ -128,6 +128,8 @@ private: void updateSourceStepper(); void updatePlotVisibility(); + void setOverriddenFlag(); + void setOverriddenFlagsForPlot( RimSummaryPlot* summaryPlot, bool isMinMaxOverridden, bool isAppearanceOverridden ); void duplicate(); diff --git a/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryPlotAxisFormatter.cpp b/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryPlotAxisFormatter.cpp index 5b3b019bbc..560741ad03 100644 --- a/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryPlotAxisFormatter.cpp +++ b/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryPlotAxisFormatter.cpp @@ -121,7 +121,7 @@ void RimSummaryPlotAxisFormatter::applyAxisPropertiesToPlot( RiuPlotWidget* plot RiuPlotAxis axis = m_axisProperties->plotAxisType(); { - QString axisTitle = m_axisProperties->customTitle; + QString axisTitle = m_axisProperties->customTitle(); if ( m_axisProperties->useAutoTitle() ) axisTitle = autoAxisTitle(); Qt::AlignmentFlag titleAlignment = Qt::AlignCenter; @@ -148,7 +148,7 @@ void RimSummaryPlotAxisFormatter::applyAxisPropertiesToPlot( RiuPlotWidget* plot { auto qwtAxisId = qwtPlotWidget->toQwtPlotAxis( axis ); - if ( m_axisProperties->numberFormat == RimPlotAxisProperties::NUMBER_FORMAT_AUTO && + if ( m_axisProperties->numberFormat() == RimPlotAxisProperties::NUMBER_FORMAT_AUTO && m_axisProperties->scaleFactor() == 1.0 ) { // Default to Qwt's own scale draw to avoid changing too much for default values @@ -158,7 +158,7 @@ void RimSummaryPlotAxisFormatter::applyAxisPropertiesToPlot( RiuPlotWidget* plot { qwtPlotWidget->qwtPlot()->setAxisScaleDraw( qwtAxisId, new SummaryScaleDraw( m_axisProperties->scaleFactor(), - m_axisProperties->numberOfDecimals(), + m_axisProperties->decimalCount(), m_axisProperties->numberFormat() ) ); } } @@ -178,7 +178,7 @@ void RimSummaryPlotAxisFormatter::applyAxisPropertiesToPlot( RiuPlotWidget* plot }; auto formatType = mapToRiaNumberFormatType( m_axisProperties->numberFormat() ); - QString format = RiaNumberFormat::sprintfFormat( formatType, m_axisProperties->numberOfDecimals() ); + QString format = RiaNumberFormat::sprintfFormat( formatType, m_axisProperties->decimalCount() ); qtChartsPlotWidget->setAxisFormat( axis, format ); } #endif diff --git a/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryTimeAxisProperties.cpp b/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryTimeAxisProperties.cpp index f532a4d8a2..a7f48d790c 100644 --- a/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryTimeAxisProperties.cpp +++ b/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryTimeAxisProperties.cpp @@ -19,6 +19,7 @@ #include "RimSummaryTimeAxisProperties.h" #include "RiaApplication.h" +#include "RiaFieldHandleTools.h" #include "RiaFontCache.h" #include "RiaPreferences.h" #include "RiaQDateTimeTools.h" @@ -591,6 +592,10 @@ void RimSummaryTimeAxisProperties::defineUiOrdering( QString uiConfigName, caf:: timeGroup->add( &m_valuesFontSize ); timeGroup->add( &m_majorTickmarkCount ); + // Auto Appearance is defined in RimSummaryMultiPlot::analyzePlotsAndAdjustAppearanceSettings() + QString autoAppearanceToolTip = "Controlled by Auto Adjust Appearance"; + RiaFieldhandleTools::updateOverrideStateAndLabel( &m_majorTickmarkCount, isAppearanceOverridden(), autoAppearanceToolTip ); + if ( m_timeMode() == DATE ) { caf::PdmUiGroup* advancedGroup = timeGroup->addNewGroup( "Date/Time Label Format" ); diff --git a/Fwk/AppFwk/cafProjectDataModel/cafPdmUiCore/cafPdmUiItem.cpp b/Fwk/AppFwk/cafProjectDataModel/cafPdmUiCore/cafPdmUiItem.cpp index 9d2484e330..dfc2fd83a5 100644 --- a/Fwk/AppFwk/cafProjectDataModel/cafPdmUiCore/cafPdmUiItem.cpp +++ b/Fwk/AppFwk/cafProjectDataModel/cafPdmUiCore/cafPdmUiItem.cpp @@ -227,9 +227,11 @@ bool PdmUiItem::sm_showExtraDebugText = false; //-------------------------------------------------------------------------------------------------- const QString PdmUiItem::uiName( const QString& uiConfigName ) const { + const PdmUiItemInfo* sttInfo = m_staticItemInfo; + if ( uiConfigName == uiConfigNameForStaticData() && sttInfo ) return sttInfo->m_uiName; + const PdmUiItemInfo* conInfo = configInfo( uiConfigName ); const PdmUiItemInfo* defInfo = defaultInfo(); - const PdmUiItemInfo* sttInfo = m_staticItemInfo; if ( conInfo && !( conInfo->m_uiName.isNull() ) ) return conInfo->m_uiName; if ( defInfo && !( defInfo->m_uiName.isNull() ) ) return defInfo->m_uiName; @@ -246,6 +248,14 @@ void PdmUiItem::setUiName( const QString& uiName, const QString& uiConfigName /* m_configItemInfos[uiConfigName].m_uiName = uiName; } +//-------------------------------------------------------------------------------------------------- +/// +//-------------------------------------------------------------------------------------------------- +QString PdmUiItem::uiConfigNameForStaticData() +{ + return "uiConfigNameForStaticData"; +} + //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- diff --git a/Fwk/AppFwk/cafProjectDataModel/cafPdmUiCore/cafPdmUiItem.h b/Fwk/AppFwk/cafProjectDataModel/cafPdmUiCore/cafPdmUiItem.h index 9c67228696..8032082a17 100644 --- a/Fwk/AppFwk/cafProjectDataModel/cafPdmUiCore/cafPdmUiItem.h +++ b/Fwk/AppFwk/cafProjectDataModel/cafPdmUiCore/cafPdmUiItem.h @@ -248,8 +248,9 @@ public: PdmUiItem( const PdmUiItem& ) = delete; PdmUiItem& operator=( const PdmUiItem& ) = delete; - const QString uiName( const QString& uiConfigName = "" ) const; - void setUiName( const QString& uiName, const QString& uiConfigName = "" ); + const QString uiName( const QString& uiConfigName = "" ) const; + void setUiName( const QString& uiName, const QString& uiConfigName = "" ); + static QString uiConfigNameForStaticData(); std::unique_ptr uiIcon( const QString& uiConfigName = "" ) const; const IconProvider uiIconProvider( const QString& uiConfigName = "" ) const;