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

#8779 Summary Multi Plot : Sync time axis properties across sub plots

Browse Source
This commit is contained in:
Magne Sjaastad 2022-04-06 14:07:08 +02:00
parent 6ecb1a8ea0
commit a0507c85f4
6 changed files with 24 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ApplicationLibCode/ProjectDataModel/RimPlotAxisProperties.cpp
View File

@ -50,8 +50,7 @@ CAF_PDM_SOURCE_INIT( RimPlotAxisProperties, "SummaryYAxisProperties" );
///
//--------------------------------------------------------------------------------------------------
RimPlotAxisProperties::RimPlotAxisProperties()
: settingsChanged( this )
, logarithmicChanged( this )
: logarithmicChanged( this )
, axisPositionChanged( this )
, m_enableTitleTextSettings( true )
, m_isRangeSettingsEnabled( true )

1
ApplicationLibCode/ProjectDataModel/RimPlotAxisProperties.h
View File

@ -51,7 +51,6 @@ public:
};
public:
caf::Signal<> settingsChanged;
caf::Signal<bool> logarithmicChanged;
caf::Signal<RimPlotAxisProperties*, RiuPlotAxis, RiuPlotAxis> axisPositionChanged;

8
ApplicationLibCode/ProjectDataModel/RimPlotAxisPropertiesInterface.cpp
View File

@ -45,6 +45,14 @@ void RimPlotAxisPropertiesInterface::LegendTickmarkCountEnum::setUp()
}
} // namespace caf
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RimPlotAxisPropertiesInterface::RimPlotAxisPropertiesInterface()
: settingsChanged( this )
{
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------

5
ApplicationLibCode/ProjectDataModel/RimPlotAxisPropertiesInterface.h
View File

@ -47,6 +47,11 @@ public:
};
using LegendTickmarkCountEnum = caf::AppEnum<LegendTickmarkCount>;
caf::Signal<> settingsChanged;
public:
RimPlotAxisPropertiesInterface();
virtual std::vector<RimPlotAxisAnnotation*> annotations() const = 0;
virtual void appendAnnotation( RimPlotAxisAnnotation* annotation ) = 0;
virtual void removeAllAnnotations() = 0;

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

@ -138,6 +138,8 @@ RimSummaryPlot::RimSummaryPlot( bool isCrossPlot )
else
{
auto* timeAxisProperties = new RimSummaryTimeAxisProperties;
timeAxisProperties->settingsChanged.connect( this, &RimSummaryPlot::axisSettingsChanged );
m_axisProperties.push_back( timeAxisProperties );
}
@ -1770,6 +1772,7 @@ void RimSummaryPlot::axisSettingsChanged( const caf::SignalEmitter* emitter )
//--------------------------------------------------------------------------------------------------
void RimSummaryPlot::axisLogarithmicChanged( const caf::SignalEmitter* emitter, bool isLogarithmic )
{
axisChanged.send( this );
loadDataAndUpdate();
}
@ -2274,6 +2277,11 @@ void RimSummaryPlot::initAfterRead()
{
connectAxisSignals( plotAxisProperties );
}
auto* timeAxis = dynamic_cast<RimSummaryTimeAxisProperties*>( axisProperties.p() );
if ( timeAxis )
{
timeAxis->settingsChanged.connect( this, &RimSummaryPlot::axisSettingsChanged );
}
}
for ( auto curve : summaryCurves() )

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

@ -669,6 +669,8 @@ void RimSummaryTimeAxisProperties::fieldChangedByUi( const caf::PdmFieldHandle*
}
rimSummaryPlot->updateAxes();
settingsChanged.send();
}
//--------------------------------------------------------------------------------------------------