OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2026-08-27 05:37:21 -05:00
Code Issues Packages Projects Releases Wiki Activity

Refactor based on review

Browse Source 
Harmonize plot title enablement for sub-plots
Encapsulate tracking annotation management in RimCorrelationReportPlot
Improve snapshot capture in RimCorrelationReportPlot
This commit is contained in:
Magne Sjaastad
2026-03-30 12:06:57 +02:00
parent c49b6986c0
commit 4798a879d0
4 changed files with 34 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ApplicationLibCode/ProjectDataModel/CorrelationPlots/RimCorrelationMatrixPlot.cpp
+1 -1
View File
@@ -662,7 +662,7 @@ void RimCorrelationMatrixPlot::updatePlotTitle()
if ( m_plotWidget )
{
m_plotWidget->setPlotTitle( m_description );
m_plotWidget->setPlotTitleEnabled( m_showPlotTitle && !isSubPlot() );
m_plotWidget->setPlotTitleEnabled( m_showPlotTitle );
if ( isMdiWindow() )
{
m_plotWidget->setPlotTitleFontSize( titleFontSize() );
ApplicationLibCode/ProjectDataModel/CorrelationPlots/RimCorrelationPlot.cpp
+1 -1
View File
@@ -268,7 +268,7 @@ void RimCorrelationPlot::updatePlotTitle()
m_description = QString( "%1, %2 at %3" ).arg( vectorName ).arg( ensemble->name() ).arg( timeStepString() );
}
m_plotWidget->setPlotTitle( m_description );
m_plotWidget->setPlotTitleEnabled( m_showPlotTitle && !isSubPlot() );
m_plotWidget->setPlotTitleEnabled( m_showPlotTitle );
m_plotWidget->setPlotTitleFontSize( titleFontSize() );
}
ApplicationLibCode/ProjectDataModel/CorrelationPlots/RimCorrelationReportPlot.cpp
+31 -22
View File
@@ -113,15 +113,10 @@ public:
auto* timeAxisProps = m_summaryPlot->timeAxisProperties();
if ( timeAxisProps )
{
if ( m_trackingAnnotation )
{
timeAxisProps->removeAnnotation( m_trackingAnnotation );
m_trackingAnnotation = nullptr;
}
removeTrackingAnnotation( timeAxisProps );
auto* anno = RimTimeAxisAnnotation::createTimeAnnotation( timeTValue, TRACKING_ANNOTATION_COLOR );
anno->setPenStyle( Qt::DashLine );
timeAxisProps->appendAnnotation( anno );
m_trackingAnnotation = anno;
}
m_summaryPlot->updateAnnotationsInPlotWidget();
@@ -132,22 +127,34 @@ public:
void widgetLeaveEvent( QEvent* ) override
{
if ( m_trackingAnnotation && m_summaryPlot )
if ( !m_summaryPlot ) return;
auto* timeAxisProps = m_summaryPlot->timeAxisProperties();
if ( timeAxisProps && removeTrackingAnnotation( timeAxisProps ) )
{
auto* timeAxisProps = m_summaryPlot->timeAxisProperties();
if ( timeAxisProps )
{
timeAxisProps->removeAnnotation( m_trackingAnnotation );
m_trackingAnnotation = nullptr;
}
m_summaryPlot->updateAnnotationsInPlotWidget();
m_summaryPlot->updatePlotWidgetFromAxisRanges();
}
}
private:
caf::PdmPointer<RimSummaryPlot> m_summaryPlot;
mutable caf::PdmPointer<RimTimeAxisAnnotation> m_trackingAnnotation;
static bool removeTrackingAnnotation( RimSummaryTimeAxisProperties* timeAxisProps )
{
if ( !timeAxisProps ) return false;
for ( auto* anno : timeAxisProps->annotations() )
{
// Identify the tracking annotation by its pen style, which is unique among time axis annotations. This way we don't interfere
// with the selected-time annotation, which is also on the time axis.
if ( anno->penStyle() == Qt::DashLine )
{
timeAxisProps->removeAnnotation( dynamic_cast<RimTimeAxisAnnotation*>( anno ) );
return true;
}
}
return false;
}
caf::PdmPointer<RimSummaryPlot> m_summaryPlot;
};
namespace
@@ -280,8 +287,15 @@ QString RimCorrelationReportPlot::description() const
//--------------------------------------------------------------------------------------------------
QImage RimCorrelationReportPlot::snapshotWindowContent()
{
if ( m_viewWidget ) return m_viewWidget->grab().toImage();
return {};
QImage image;
if ( m_viewWidget )
{
QPixmap pix = m_viewWidget->grab();
image = pix.toImage();
}
return image;
}
//--------------------------------------------------------------------------------------------------
@@ -580,13 +594,8 @@ void RimCorrelationReportPlot::onLoadDataAndUpdate()
m_parameterResultCrossPlot->setAxisValueFontSize( m_axisValueFontSize() );
m_correlationMatrixPlot->loadDataAndUpdate();
if ( m_correlationMatrixPlot->viewer() ) m_correlationMatrixPlot->viewer()->setPlotTitleEnabled( true );
m_correlationPlot->loadDataAndUpdate();
if ( m_correlationPlot->viewer() ) m_correlationPlot->viewer()->setPlotTitleEnabled( true );
m_parameterResultCrossPlot->loadDataAndUpdate();
if ( m_parameterResultCrossPlot->viewer() ) m_parameterResultCrossPlot->viewer()->setPlotTitleEnabled( true );
if ( m_showSummaryPlot() )
{
ApplicationLibCode/ProjectDataModel/CorrelationPlots/RimParameterResultCrossPlot.cpp
+1 -1
View File
@@ -658,6 +658,6 @@ void RimParameterResultCrossPlot::updatePlotTitle()
QString( "%1 x %2, %3 at %4" ).arg( vectorName ).arg( m_ensembleParameter ).arg( ensemble->name() ).arg( timeStepString() );
}
m_plotWidget->setPlotTitle( m_description );
m_plotWidget->setPlotTitleEnabled( m_showPlotTitle && !isSubPlot() );
m_plotWidget->setPlotTitleEnabled( m_showPlotTitle );
m_plotWidget->setPlotTitleFontSize( titleFontSize() );
}