mirror of
https://github.com/OPM/ResInsight.git
synced 2025-02-25 18:55:39 -06:00
#9011 Disable input controls controlled by automation
Disable fields controlled by automation and append label text with (overridden)
This commit is contained in:
parent
4146e8bbd1
commit
2b8bab3bd8
@ -48,3 +48,19 @@ void RiaFieldhandleTools::disableWriteAndSetFieldHidden( caf::PdmFieldHandle* fi
|
|||||||
fieldHandle->xmlCapability()->setIOWritable( false );
|
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 );
|
||||||
|
}
|
||||||
|
@ -19,6 +19,8 @@
|
|||||||
|
|
||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
|
#include <QString>
|
||||||
|
|
||||||
namespace caf
|
namespace caf
|
||||||
{
|
{
|
||||||
class PdmFieldHandle;
|
class PdmFieldHandle;
|
||||||
@ -31,4 +33,5 @@ class RiaFieldhandleTools
|
|||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
static void disableWriteAndSetFieldHidden( caf::PdmFieldHandle* fieldHandle );
|
static void disableWriteAndSetFieldHidden( caf::PdmFieldHandle* fieldHandle );
|
||||||
|
static void updateOverrideStateAndLabel( caf::PdmFieldHandle* fieldHandle, bool isOverridden, const QString& toolTip );
|
||||||
};
|
};
|
||||||
|
@ -20,6 +20,7 @@
|
|||||||
#include "RimPlotAxisProperties.h"
|
#include "RimPlotAxisProperties.h"
|
||||||
|
|
||||||
#include "RiaDefines.h"
|
#include "RiaDefines.h"
|
||||||
|
#include "RiaFieldHandleTools.h"
|
||||||
#include "RiaPlotDefines.h"
|
#include "RiaPlotDefines.h"
|
||||||
#include "RiaPreferences.h"
|
#include "RiaPreferences.h"
|
||||||
|
|
||||||
@ -61,6 +62,9 @@ RimPlotAxisProperties::RimPlotAxisProperties()
|
|||||||
CAF_PDM_InitField( &m_isActive, "Active", true, "Active" );
|
CAF_PDM_InitField( &m_isActive, "Active", true, "Active" );
|
||||||
m_isActive.uiCapability()->setUiHidden( true );
|
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" );
|
CAF_PDM_InitFieldNoDefault( &m_objectName, "Name", "Name" );
|
||||||
m_objectName.uiCapability()->setUiHidden( true );
|
m_objectName.uiCapability()->setUiHidden( true );
|
||||||
|
|
||||||
@ -73,14 +77,14 @@ RimPlotAxisProperties::RimPlotAxisProperties()
|
|||||||
CAF_PDM_InitField( &m_displayShortName, "DisplayShortName", false, " Acronyms" );
|
CAF_PDM_InitField( &m_displayShortName, "DisplayShortName", false, " Acronyms" );
|
||||||
CAF_PDM_InitField( &m_displayUnitText, "DisplayUnitText", true, " Units" );
|
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_visibleRangeMax, "VisibleRangeMax", RiaDefines::maximumDefaultValuePlot(), "Max" );
|
||||||
CAF_PDM_InitField( &m_visibleRangeMin, "VisibleRangeMin", RiaDefines::minimumDefaultValuePlot(), "Min" );
|
CAF_PDM_InitField( &m_visibleRangeMin, "VisibleRangeMin", RiaDefines::minimumDefaultValuePlot(), "Min" );
|
||||||
|
|
||||||
CAF_PDM_InitFieldNoDefault( &numberFormat, "NumberFormat", "Number Format" );
|
CAF_PDM_InitFieldNoDefault( &m_numberFormat, "NumberFormat", "Number Format" );
|
||||||
CAF_PDM_InitField( &numberOfDecimals, "Decimals", 2, "Number of Decimals" );
|
CAF_PDM_InitField( &m_numberOfDecimals, "Decimals", 2, "Number of Decimals" );
|
||||||
CAF_PDM_InitField( &scaleFactor, "ScaleFactor", 1.0, "Scale Factor" );
|
CAF_PDM_InitField( &m_scaleFactor, "ScaleFactor", 1.0, "Scale Factor" );
|
||||||
|
|
||||||
CAF_PDM_InitField( &m_isAutoZoom, "AutoZoom", true, "Set Range Automatically" );
|
CAF_PDM_InitField( &m_isAutoZoom, "AutoZoom", true, "Set Range Automatically" );
|
||||||
CAF_PDM_InitField( &m_isLogarithmicScaleEnabled, "LogarithmicScale", false, "Logarithmic Scale" );
|
CAF_PDM_InitField( &m_isLogarithmicScaleEnabled, "LogarithmicScale", false, "Logarithmic Scale" );
|
||||||
@ -166,7 +170,7 @@ QList<caf::PdmOptionItemInfo> RimPlotAxisProperties::calculateValueOptions( cons
|
|||||||
{
|
{
|
||||||
QList<caf::PdmOptionItemInfo> options;
|
QList<caf::PdmOptionItemInfo> options;
|
||||||
|
|
||||||
if ( fieldNeedingOptions == &scaleFactor )
|
if ( fieldNeedingOptions == &m_scaleFactor )
|
||||||
{
|
{
|
||||||
for ( int exp = -12; exp <= 12; exp += 3 )
|
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_displayShortName );
|
||||||
titleTextGroup->add( &m_displayUnitText );
|
titleTextGroup->add( &m_displayUnitText );
|
||||||
|
|
||||||
customTitle.uiCapability()->setUiReadOnly( true );
|
m_customTitle.uiCapability()->setUiReadOnly( true );
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
titleTextGroup->add( &customTitle );
|
titleTextGroup->add( &m_customTitle );
|
||||||
customTitle.uiCapability()->setUiReadOnly( false );
|
m_customTitle.uiCapability()->setUiReadOnly( false );
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -236,25 +240,27 @@ void RimPlotAxisProperties::defineUiOrdering( QString uiConfigName, caf::PdmUiOr
|
|||||||
scaleGroup.add( &m_isAxisInverted );
|
scaleGroup.add( &m_isAxisInverted );
|
||||||
scaleGroup.add( &m_showNumbers );
|
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 )
|
if ( m_isRangeSettingsEnabled )
|
||||||
{
|
{
|
||||||
scaleGroup.add( &m_visibleRangeMin );
|
scaleGroup.add( &m_visibleRangeMin );
|
||||||
scaleGroup.add( &m_visibleRangeMax );
|
scaleGroup.add( &m_visibleRangeMax );
|
||||||
}
|
}
|
||||||
|
|
||||||
scaleGroup.add( &m_valuesFontSize );
|
scaleGroup.add( &m_valuesFontSize );
|
||||||
scaleGroup.add( &m_majorTickmarkCount );
|
scaleGroup.add( &m_majorTickmarkCount );
|
||||||
|
|
||||||
scaleGroup.add( &m_plotAxis );
|
scaleGroup.add( &m_plotAxis );
|
||||||
m_plotAxis.uiCapability()->setUiReadOnly( m_isAlwaysRequired );
|
m_plotAxis.uiCapability()->setUiReadOnly( m_isAlwaysRequired );
|
||||||
|
|
||||||
uiOrdering.skipRemainingFields( true );
|
uiOrdering.skipRemainingFields( true );
|
||||||
|
|
||||||
|
updateOverriddenLabelAndReadOnlyState();
|
||||||
}
|
}
|
||||||
|
|
||||||
//--------------------------------------------------------------------------------------------------
|
//--------------------------------------------------------------------------------------------------
|
||||||
@ -284,6 +290,14 @@ RimPlotAxisPropertiesInterface::AxisTitlePositionType RimPlotAxisProperties::tit
|
|||||||
return m_titlePositionEnum();
|
return m_titlePositionEnum();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
//--------------------------------------------------------------------------------------------------
|
||||||
|
///
|
||||||
|
//--------------------------------------------------------------------------------------------------
|
||||||
|
QString RimPlotAxisProperties::customTitle() const
|
||||||
|
{
|
||||||
|
return m_customTitle();
|
||||||
|
}
|
||||||
|
|
||||||
//--------------------------------------------------------------------------------------------------
|
//--------------------------------------------------------------------------------------------------
|
||||||
///
|
///
|
||||||
//--------------------------------------------------------------------------------------------------
|
//--------------------------------------------------------------------------------------------------
|
||||||
@ -452,6 +466,30 @@ void RimPlotAxisProperties::setShowNumbers( bool enable )
|
|||||||
m_showNumbers = 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 )
|
if ( maxAbsValue < 1.0 && maxAbsValue > 1e-6 )
|
||||||
{
|
{
|
||||||
// Do not use scale factor for small values above 1e-6
|
// Do not use scale factor for small values above 1e-6
|
||||||
scaleFactor = 1.0;
|
m_scaleFactor = 1.0;
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
if ( maxAbsValue > 1.0 && maxAbsValue < 1e6 )
|
if ( maxAbsValue > 1.0 && maxAbsValue < 1e6 )
|
||||||
{
|
{
|
||||||
// Do not use scale factor for values above 1 and below 1e-6
|
// Do not use scale factor for values above 1 and below 1e-6
|
||||||
scaleFactor = 1.0;
|
m_scaleFactor = 1.0;
|
||||||
return;
|
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;
|
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()
|
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 );
|
||||||
}
|
}
|
||||||
|
|
||||||
//--------------------------------------------------------------------------------------------------
|
//--------------------------------------------------------------------------------------------------
|
||||||
|
@ -65,6 +65,8 @@ public:
|
|||||||
void setNameAndAxis( const QString& objectName, const QString& axistTitle, RiaDefines::PlotAxis axis, int axisIndex = 0 );
|
void setNameAndAxis( const QString& objectName, const QString& axistTitle, RiaDefines::PlotAxis axis, int axisIndex = 0 );
|
||||||
AxisTitlePositionType titlePosition() const override;
|
AxisTitlePositionType titlePosition() const override;
|
||||||
|
|
||||||
|
QString customTitle() const;
|
||||||
|
|
||||||
int titleFontSize() const override;
|
int titleFontSize() const override;
|
||||||
int valuesFontSize() const override;
|
int valuesFontSize() const override;
|
||||||
|
|
||||||
@ -90,6 +92,10 @@ public:
|
|||||||
bool showNumbers() const;
|
bool showNumbers() const;
|
||||||
void setShowNumbers( bool enable );
|
void setShowNumbers( bool enable );
|
||||||
|
|
||||||
|
NumberFormatType numberFormat() const;
|
||||||
|
int decimalCount() const;
|
||||||
|
double scaleFactor() const;
|
||||||
|
|
||||||
void setVisible( bool visible );
|
void setVisible( bool visible );
|
||||||
void computeAndSetScaleFactor();
|
void computeAndSetScaleFactor();
|
||||||
|
|
||||||
@ -99,12 +105,6 @@ public:
|
|||||||
void appendAnnotation( RimPlotAxisAnnotation* annotation ) override;
|
void appendAnnotation( RimPlotAxisAnnotation* annotation ) override;
|
||||||
void removeAllAnnotations() override;
|
void removeAllAnnotations() override;
|
||||||
|
|
||||||
caf::PdmField<QString> customTitle;
|
|
||||||
|
|
||||||
caf::PdmField<caf::AppEnum<NumberFormatType>> numberFormat;
|
|
||||||
caf::PdmField<int> numberOfDecimals;
|
|
||||||
caf::PdmField<double> scaleFactor;
|
|
||||||
|
|
||||||
bool isLogarithmicScaleEnabled() const override;
|
bool isLogarithmicScaleEnabled() const override;
|
||||||
bool isActive() const override;
|
bool isActive() const override;
|
||||||
|
|
||||||
@ -113,6 +113,7 @@ public:
|
|||||||
double visibleRangeMin() const override;
|
double visibleRangeMin() const override;
|
||||||
double visibleRangeMax() const override;
|
double visibleRangeMax() const override;
|
||||||
|
|
||||||
|
void setMinMaxOverridden( bool isOverridden );
|
||||||
void setVisibleRangeMin( double value ) override;
|
void setVisibleRangeMin( double value ) override;
|
||||||
void setVisibleRangeMax( double value ) override;
|
void setVisibleRangeMax( double value ) override;
|
||||||
|
|
||||||
@ -130,11 +131,14 @@ protected:
|
|||||||
|
|
||||||
private:
|
private:
|
||||||
void updateOptionSensitivity();
|
void updateOptionSensitivity();
|
||||||
|
void updateOverriddenLabelAndReadOnlyState();
|
||||||
caf::FontTools::FontSize plotFontSize() const;
|
caf::FontTools::FontSize plotFontSize() const;
|
||||||
|
|
||||||
private:
|
private:
|
||||||
caf::PdmField<bool> m_isActive;
|
caf::PdmField<bool> m_isActive;
|
||||||
|
|
||||||
|
caf::PdmField<bool> m_isMinMaxOverridden;
|
||||||
|
|
||||||
caf::PdmField<bool> isAutoTitle;
|
caf::PdmField<bool> isAutoTitle;
|
||||||
caf::PdmField<bool> m_displayShortName;
|
caf::PdmField<bool> m_displayShortName;
|
||||||
caf::PdmField<bool> m_displayLongName;
|
caf::PdmField<bool> m_displayLongName;
|
||||||
@ -153,6 +157,12 @@ private:
|
|||||||
caf::PdmField<int> m_plotAxisIndex;
|
caf::PdmField<int> m_plotAxisIndex;
|
||||||
caf::PdmField<LegendTickmarkCountEnum> m_majorTickmarkCount;
|
caf::PdmField<LegendTickmarkCountEnum> m_majorTickmarkCount;
|
||||||
|
|
||||||
|
caf::PdmField<QString> m_customTitle;
|
||||||
|
|
||||||
|
caf::PdmField<caf::AppEnum<NumberFormatType>> m_numberFormat;
|
||||||
|
caf::PdmField<int> m_numberOfDecimals;
|
||||||
|
caf::PdmField<double> m_scaleFactor;
|
||||||
|
|
||||||
caf::PdmField<bool> m_isLogarithmicScaleEnabled;
|
caf::PdmField<bool> m_isLogarithmicScaleEnabled;
|
||||||
|
|
||||||
bool m_enableTitleTextSettings;
|
bool m_enableTitleTextSettings;
|
||||||
|
@ -55,6 +55,10 @@ void RimPlotAxisPropertiesInterface::LegendTickmarkCountEnum::setUp()
|
|||||||
RimPlotAxisPropertiesInterface::RimPlotAxisPropertiesInterface()
|
RimPlotAxisPropertiesInterface::RimPlotAxisPropertiesInterface()
|
||||||
: settingsChanged( this )
|
: 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;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
//--------------------------------------------------------------------------------------------------
|
||||||
|
///
|
||||||
|
//--------------------------------------------------------------------------------------------------
|
||||||
|
void RimPlotAxisPropertiesInterface::setAppearanceOverridden( bool isOverridden )
|
||||||
|
{
|
||||||
|
m_isAppearanceOverridden = isOverridden;
|
||||||
|
}
|
||||||
|
|
||||||
//--------------------------------------------------------------------------------------------------
|
//--------------------------------------------------------------------------------------------------
|
||||||
///
|
///
|
||||||
//--------------------------------------------------------------------------------------------------
|
//--------------------------------------------------------------------------------------------------
|
||||||
@ -101,6 +113,14 @@ int RimPlotAxisPropertiesInterface::tickmarkCountFromEnum( LegendTickmarkCount c
|
|||||||
return maxTickmarkCount;
|
return maxTickmarkCount;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
//--------------------------------------------------------------------------------------------------
|
||||||
|
///
|
||||||
|
//--------------------------------------------------------------------------------------------------
|
||||||
|
bool RimPlotAxisPropertiesInterface::isAppearanceOverridden() const
|
||||||
|
{
|
||||||
|
return m_isAppearanceOverridden();
|
||||||
|
}
|
||||||
|
|
||||||
//--------------------------------------------------------------------------------------------------
|
//--------------------------------------------------------------------------------------------------
|
||||||
///
|
///
|
||||||
//--------------------------------------------------------------------------------------------------
|
//--------------------------------------------------------------------------------------------------
|
||||||
|
@ -23,6 +23,7 @@
|
|||||||
#include "RiuPlotAxis.h"
|
#include "RiuPlotAxis.h"
|
||||||
|
|
||||||
#include "cafAppEnum.h"
|
#include "cafAppEnum.h"
|
||||||
|
#include "cafPdmField.h"
|
||||||
#include "cafPdmObject.h"
|
#include "cafPdmObject.h"
|
||||||
|
|
||||||
class RimPlotAxisAnnotation;
|
class RimPlotAxisAnnotation;
|
||||||
@ -77,6 +78,7 @@ public:
|
|||||||
|
|
||||||
virtual LegendTickmarkCount majorTickmarkCount() const = 0;
|
virtual LegendTickmarkCount majorTickmarkCount() const = 0;
|
||||||
virtual void setMajorTickmarkCount( LegendTickmarkCount count ) = 0;
|
virtual void setMajorTickmarkCount( LegendTickmarkCount count ) = 0;
|
||||||
|
void setAppearanceOverridden( bool isOverridden );
|
||||||
|
|
||||||
static int tickmarkCountFromEnum( LegendTickmarkCount count );
|
static int tickmarkCountFromEnum( LegendTickmarkCount count );
|
||||||
|
|
||||||
@ -85,6 +87,12 @@ public:
|
|||||||
virtual int titleFontSize() const = 0;
|
virtual int titleFontSize() const = 0;
|
||||||
virtual int valuesFontSize() const = 0;
|
virtual int valuesFontSize() const = 0;
|
||||||
|
|
||||||
|
protected:
|
||||||
|
bool isAppearanceOverridden() const;
|
||||||
|
|
||||||
private:
|
private:
|
||||||
void defineObjectEditorAttribute( QString uiConfigName, caf::PdmUiEditorAttribute* attribute ) override;
|
void defineObjectEditorAttribute( QString uiConfigName, caf::PdmUiEditorAttribute* attribute ) override;
|
||||||
|
|
||||||
|
private:
|
||||||
|
caf::PdmField<bool> m_isAppearanceOverridden;
|
||||||
};
|
};
|
||||||
|
@ -196,6 +196,10 @@ void RimSummaryMultiPlot::insertPlot( RimPlot* plot, size_t index )
|
|||||||
{
|
{
|
||||||
sumPlot->axisChanged.connect( this, &RimSummaryMultiPlot::onSubPlotAxisChanged );
|
sumPlot->axisChanged.connect( this, &RimSummaryMultiPlot::onSubPlotAxisChanged );
|
||||||
sumPlot->curvesChanged.connect( this, &RimSummaryMultiPlot::onSubPlotChanged );
|
sumPlot->curvesChanged.connect( this, &RimSummaryMultiPlot::onSubPlotChanged );
|
||||||
|
|
||||||
|
bool isMinMaxOverridden = m_axisRangeAggregation() != AxisRangeAggregation::NONE;
|
||||||
|
setOverriddenFlagsForPlot( sumPlot, isMinMaxOverridden, m_autoAdjustAppearance() );
|
||||||
|
|
||||||
RimMultiPlot::insertPlot( plot, index );
|
RimMultiPlot::insertPlot( plot, index );
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -426,6 +430,8 @@ void RimSummaryMultiPlot::fieldChangedByUi( const caf::PdmFieldHandle* changedFi
|
|||||||
else if ( changedField == &m_linkSubPlotAxes || changedField == &m_axisRangeAggregation )
|
else if ( changedField == &m_linkSubPlotAxes || changedField == &m_axisRangeAggregation )
|
||||||
{
|
{
|
||||||
syncAxisRanges();
|
syncAxisRanges();
|
||||||
|
|
||||||
|
setOverriddenFlag();
|
||||||
}
|
}
|
||||||
else if ( changedField == &m_hidePlotsWithValuesBelow )
|
else if ( changedField == &m_hidePlotsWithValuesBelow )
|
||||||
{
|
{
|
||||||
@ -464,6 +470,7 @@ void RimSummaryMultiPlot::fieldChangedByUi( const caf::PdmFieldHandle* changedFi
|
|||||||
else if ( changedField == &m_autoAdjustAppearance )
|
else if ( changedField == &m_autoAdjustAppearance )
|
||||||
{
|
{
|
||||||
checkAndApplyAutoAppearance();
|
checkAndApplyAutoAppearance();
|
||||||
|
setOverriddenFlag();
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
@ -766,6 +773,8 @@ void RimSummaryMultiPlot::setDefaultRangeAggregationSteppingDimension()
|
|||||||
|
|
||||||
m_axisRangeAggregation = rangeAggregation;
|
m_axisRangeAggregation = rangeAggregation;
|
||||||
m_sourceStepping->setStepDimension( stepDimension );
|
m_sourceStepping->setStepDimension( stepDimension );
|
||||||
|
|
||||||
|
setOverriddenFlag();
|
||||||
}
|
}
|
||||||
|
|
||||||
//--------------------------------------------------------------------------------------------------
|
//--------------------------------------------------------------------------------------------------
|
||||||
@ -1045,6 +1054,36 @@ void RimSummaryMultiPlot::updatePlotVisibility()
|
|||||||
if ( !m_viewer.isNull() ) m_viewer->scheduleUpdate();
|
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<RimPlotAxisProperties*>( plotAxis );
|
||||||
|
if ( plotAxProp )
|
||||||
|
{
|
||||||
|
plotAxProp->setMinMaxOverridden( isMinMaxOverridden );
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
//--------------------------------------------------------------------------------------------------
|
//--------------------------------------------------------------------------------------------------
|
||||||
///
|
///
|
||||||
//--------------------------------------------------------------------------------------------------
|
//--------------------------------------------------------------------------------------------------
|
||||||
|
@ -128,6 +128,8 @@ private:
|
|||||||
void updateSourceStepper();
|
void updateSourceStepper();
|
||||||
|
|
||||||
void updatePlotVisibility();
|
void updatePlotVisibility();
|
||||||
|
void setOverriddenFlag();
|
||||||
|
void setOverriddenFlagsForPlot( RimSummaryPlot* summaryPlot, bool isMinMaxOverridden, bool isAppearanceOverridden );
|
||||||
|
|
||||||
void duplicate();
|
void duplicate();
|
||||||
|
|
||||||
|
@ -121,7 +121,7 @@ void RimSummaryPlotAxisFormatter::applyAxisPropertiesToPlot( RiuPlotWidget* plot
|
|||||||
|
|
||||||
RiuPlotAxis axis = m_axisProperties->plotAxisType();
|
RiuPlotAxis axis = m_axisProperties->plotAxisType();
|
||||||
{
|
{
|
||||||
QString axisTitle = m_axisProperties->customTitle;
|
QString axisTitle = m_axisProperties->customTitle();
|
||||||
if ( m_axisProperties->useAutoTitle() ) axisTitle = autoAxisTitle();
|
if ( m_axisProperties->useAutoTitle() ) axisTitle = autoAxisTitle();
|
||||||
|
|
||||||
Qt::AlignmentFlag titleAlignment = Qt::AlignCenter;
|
Qt::AlignmentFlag titleAlignment = Qt::AlignCenter;
|
||||||
@ -148,7 +148,7 @@ void RimSummaryPlotAxisFormatter::applyAxisPropertiesToPlot( RiuPlotWidget* plot
|
|||||||
{
|
{
|
||||||
auto qwtAxisId = qwtPlotWidget->toQwtPlotAxis( axis );
|
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 )
|
m_axisProperties->scaleFactor() == 1.0 )
|
||||||
{
|
{
|
||||||
// Default to Qwt's own scale draw to avoid changing too much for default values
|
// 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,
|
qwtPlotWidget->qwtPlot()->setAxisScaleDraw( qwtAxisId,
|
||||||
new SummaryScaleDraw( m_axisProperties->scaleFactor(),
|
new SummaryScaleDraw( m_axisProperties->scaleFactor(),
|
||||||
m_axisProperties->numberOfDecimals(),
|
m_axisProperties->decimalCount(),
|
||||||
m_axisProperties->numberFormat() ) );
|
m_axisProperties->numberFormat() ) );
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -178,7 +178,7 @@ void RimSummaryPlotAxisFormatter::applyAxisPropertiesToPlot( RiuPlotWidget* plot
|
|||||||
};
|
};
|
||||||
|
|
||||||
auto formatType = mapToRiaNumberFormatType( m_axisProperties->numberFormat() );
|
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 );
|
qtChartsPlotWidget->setAxisFormat( axis, format );
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
@ -19,6 +19,7 @@
|
|||||||
#include "RimSummaryTimeAxisProperties.h"
|
#include "RimSummaryTimeAxisProperties.h"
|
||||||
|
|
||||||
#include "RiaApplication.h"
|
#include "RiaApplication.h"
|
||||||
|
#include "RiaFieldHandleTools.h"
|
||||||
#include "RiaFontCache.h"
|
#include "RiaFontCache.h"
|
||||||
#include "RiaPreferences.h"
|
#include "RiaPreferences.h"
|
||||||
#include "RiaQDateTimeTools.h"
|
#include "RiaQDateTimeTools.h"
|
||||||
@ -591,6 +592,10 @@ void RimSummaryTimeAxisProperties::defineUiOrdering( QString uiConfigName, caf::
|
|||||||
timeGroup->add( &m_valuesFontSize );
|
timeGroup->add( &m_valuesFontSize );
|
||||||
timeGroup->add( &m_majorTickmarkCount );
|
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 )
|
if ( m_timeMode() == DATE )
|
||||||
{
|
{
|
||||||
caf::PdmUiGroup* advancedGroup = timeGroup->addNewGroup( "Date/Time Label Format" );
|
caf::PdmUiGroup* advancedGroup = timeGroup->addNewGroup( "Date/Time Label Format" );
|
||||||
|
@ -227,9 +227,11 @@ bool PdmUiItem::sm_showExtraDebugText = false;
|
|||||||
//--------------------------------------------------------------------------------------------------
|
//--------------------------------------------------------------------------------------------------
|
||||||
const QString PdmUiItem::uiName( const QString& uiConfigName ) const
|
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* conInfo = configInfo( uiConfigName );
|
||||||
const PdmUiItemInfo* defInfo = defaultInfo();
|
const PdmUiItemInfo* defInfo = defaultInfo();
|
||||||
const PdmUiItemInfo* sttInfo = m_staticItemInfo;
|
|
||||||
|
|
||||||
if ( conInfo && !( conInfo->m_uiName.isNull() ) ) return conInfo->m_uiName;
|
if ( conInfo && !( conInfo->m_uiName.isNull() ) ) return conInfo->m_uiName;
|
||||||
if ( defInfo && !( defInfo->m_uiName.isNull() ) ) return defInfo->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;
|
m_configItemInfos[uiConfigName].m_uiName = uiName;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
//--------------------------------------------------------------------------------------------------
|
||||||
|
///
|
||||||
|
//--------------------------------------------------------------------------------------------------
|
||||||
|
QString PdmUiItem::uiConfigNameForStaticData()
|
||||||
|
{
|
||||||
|
return "uiConfigNameForStaticData";
|
||||||
|
}
|
||||||
|
|
||||||
//--------------------------------------------------------------------------------------------------
|
//--------------------------------------------------------------------------------------------------
|
||||||
///
|
///
|
||||||
//--------------------------------------------------------------------------------------------------
|
//--------------------------------------------------------------------------------------------------
|
||||||
|
@ -248,8 +248,9 @@ public:
|
|||||||
PdmUiItem( const PdmUiItem& ) = delete;
|
PdmUiItem( const PdmUiItem& ) = delete;
|
||||||
PdmUiItem& operator=( const PdmUiItem& ) = delete;
|
PdmUiItem& operator=( const PdmUiItem& ) = delete;
|
||||||
|
|
||||||
const QString uiName( const QString& uiConfigName = "" ) const;
|
const QString uiName( const QString& uiConfigName = "" ) const;
|
||||||
void setUiName( const QString& uiName, const QString& uiConfigName = "" );
|
void setUiName( const QString& uiName, const QString& uiConfigName = "" );
|
||||||
|
static QString uiConfigNameForStaticData();
|
||||||
|
|
||||||
std::unique_ptr<QIcon> uiIcon( const QString& uiConfigName = "" ) const;
|
std::unique_ptr<QIcon> uiIcon( const QString& uiConfigName = "" ) const;
|
||||||
const IconProvider uiIconProvider( const QString& uiConfigName = "" ) const;
|
const IconProvider uiIconProvider( const QString& uiConfigName = "" ) const;
|
||||||
|
Loading…
Reference in New Issue
Block a user