OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2025-02-25 18:55:39 -06:00
Code Issues Packages Projects Releases Wiki Activity

#12090 Add option to hide time labels on x axis

Browse Source
This commit is contained in:
Magne Sjaastad 2025-02-05 14:01:03 +01:00
parent 2021b286ab
commit 037102196e
3 changed files with 44 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ApplicationLibCode/ProjectDataModel/Summary/RimSummaryPlot.cpp
View File

@ -921,6 +921,7 @@ void RimSummaryPlot::updateTimeAxis( RimSummaryTimeAxisProperties* timeAxisPrope
}
plotWidget()->enableAxis( RimSummaryPlot::plotAxisForTime(), true );
plotWidget()->enableAxisNumberLabels( RimSummaryPlot::plotAxisForTime(), timeAxisProperties->showLabels() );
{
Qt::AlignmentFlag alignment = Qt::AlignCenter;
@ -935,7 +936,7 @@ void RimSummaryPlot::updateTimeAxis( RimSummaryTimeAxisProperties* timeAxisPrope
true,
alignment );
plotWidget()->setAxisTitleText( RimSummaryPlot::plotAxisForTime(), timeAxisProperties->title() );
plotWidget()->setAxisTitleEnabled( RimSummaryPlot::plotAxisForTime(), timeAxisProperties->showTitle );
plotWidget()->setAxisTitleEnabled( RimSummaryPlot::plotAxisForTime(), timeAxisProperties->showTitle() );
if ( timeAxisProperties->tickmarkType() == RimSummaryTimeAxisProperties::TickmarkType::TICKMARK_COUNT )
{

44
ApplicationLibCode/ProjectDataModel/Summary/RimSummaryTimeAxisProperties.cpp
View File

@ -95,8 +95,9 @@ RimSummaryTimeAxisProperties::RimSummaryTimeAxisProperties()
CAF_PDM_InitField( &m_isActive, "Active", true, "Active" );
m_isActive.uiCapability()->setUiHidden( true );
CAF_PDM_InitField( &showTitle, "ShowTitle", false, "Show Title " );
CAF_PDM_InitField( &title, "Title", QString( "Time" ), "Title " );
CAF_PDM_InitField( &m_showTitle, "ShowTitle", false, "Show Title " );
CAF_PDM_InitField( &m_title, "Title", QString( "Time" ), "Title " );
CAF_PDM_InitField( &m_showLabels, "ShowLabels", true, "Show Labels" );
CAF_PDM_InitField( &m_isAutoZoom, "AutoZoom", true, "Set Range Automatically" );
CAF_PDM_InitFieldNoDefault( &m_timeMode, "TimeMode", "Time Mode" );
@ -152,6 +153,30 @@ RimSummaryTimeAxisProperties::RimSummaryTimeAxisProperties()
m_annotations.uiCapability()->setUiTreeChildrenHidden( true );
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
bool RimSummaryTimeAxisProperties::showTitle() const
{
return m_showTitle();
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
QString RimSummaryTimeAxisProperties::title() const
{
return m_title();
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
bool RimSummaryTimeAxisProperties::showLabels() const
{
return m_showLabels();
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
@ -571,7 +596,7 @@ void RimSummaryTimeAxisProperties::enableAutoValueForMajorTickmarkCount( bool en
//--------------------------------------------------------------------------------------------------
const QString RimSummaryTimeAxisProperties::objectName() const
{
return title();
return m_title();
}
//--------------------------------------------------------------------------------------------------
@ -579,7 +604,7 @@ const QString RimSummaryTimeAxisProperties::objectName() const
//--------------------------------------------------------------------------------------------------
const QString RimSummaryTimeAxisProperties::axisTitleText() const
{
return title();
return m_title();
}
//--------------------------------------------------------------------------------------------------
@ -787,16 +812,17 @@ const QString& RimSummaryTimeAxisProperties::timeFormat() const
void RimSummaryTimeAxisProperties::defineUiOrdering( QString uiConfigName, caf::PdmUiOrdering& uiOrdering )
{
caf::PdmUiGroup& titleGroup = *( uiOrdering.addNewGroup( "Axis Title" ) );
titleGroup.add( &showTitle );
titleGroup.add( &title );
title.uiCapability()->setUiReadOnly( !showTitle() );
if ( showTitle() )
titleGroup.add( &m_showTitle );
titleGroup.add( &m_title );
m_title.uiCapability()->setUiReadOnly( !m_showTitle() );
if ( m_showTitle() )
{
titleGroup.add( &m_titlePositionEnum );
titleGroup.add( &m_titleFontSize );
}
caf::PdmUiGroup* timeGroup = uiOrdering.addNewGroup( "Time Values" );
timeGroup->add( &m_showLabels );
timeGroup->add( &m_timeMode );
if ( m_timeMode() == DATE )
{
@ -916,7 +942,7 @@ void RimSummaryTimeAxisProperties::fieldChangedByUi( const caf::PdmFieldHandle*
requestLoadDataAndUpdate.send();
return;
}
else if ( changedField == &m_timeUnit || changedField == &m_dateFormat || changedField == &m_timeFormat )
else if ( changedField == &m_timeUnit || changedField == &m_dateFormat || changedField == &m_timeFormat || changedField == &m_showLabels )
{
// Changing these settings requires a full update of the plot
requestLoadDataAndUpdate.send();

9
ApplicationLibCode/ProjectDataModel/Summary/RimSummaryTimeAxisProperties.h
View File

@ -82,8 +82,9 @@ public:
public:
RimSummaryTimeAxisProperties();
caf::PdmField<QString> title;
caf::PdmField<bool> showTitle;
bool showTitle() const;
QString title() const;
bool showLabels() const;
RiuPlotAxis plotAxis() const override;
AxisTitlePositionType titlePosition() const override;
@ -158,6 +159,10 @@ private:
void defineObjectEditorAttribute( QString uiConfigName, caf::PdmUiEditorAttribute* attribute ) override;
private:
caf::PdmField<QString> m_title;
caf::PdmField<bool> m_showTitle;
caf::PdmField<bool> m_showLabels;
caf::PdmField<caf::AppEnum<TimeModeType>> m_timeMode;
caf::PdmField<caf::AppEnum<TimeUnitType>> m_timeUnit;