Fix Summary Multiplot subplot colspan issue (#8805)

Fix colspan bug for summary multiplots
This commit is contained in:
jonjenssen authored and GitHub committed 2022-04-19 12:34:40 +02:00
1 parent c41ab07c1a
commit db3395da44
9 files changed
+215 -31

No files matched your search

@@ -594,8 +594,9 @@ void RiuMultiPlotBook::createPages()
m_pages[i]->setPlotTitle( QString( "%1 %2/%3" ).arg( m_plotTitle ).arg( pageNumber ).arg( m_pages.size() ) );
}
}
m_book->adjustSize();
adjustBookFrame();
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
@@ -609,20 +610,24 @@ const QList<QPointer<RiuMultiPlotPage>>& RiuMultiPlotBook::pages() const
//--------------------------------------------------------------------------------------------------
RiuMultiPlotPage* RiuMultiPlotBook::createPage()
{
RiuMultiPlotPage* page;
RiuMultiPlotPage* page = new RiuMultiPlotPage( m_plotDefinition, this );
RimSummaryMultiPlot* sumMultPlot = dynamic_cast<RimSummaryMultiPlot*>( m_plotDefinition.p() );
applyPageSettings( page );
if ( sumMultPlot )
{
page = new RiuSummaryMultiPlotPage( sumMultPlot, this );
}
else
{
page = new RiuMultiPlotPage( m_plotDefinition, this );
}
m_pages.push_back( page );
m_bookLayout->addWidget( page );
page->setVisible( true );
return page;
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RiuMultiPlotBook::applyPageSettings( RiuMultiPlotPage* page )
{
if ( !page ) return;
// Reapply plot settings
page->setPlotTitle( m_plotTitle );
page->setTitleFontSizes( m_plotDefinition->titleFontSize(), m_plotDefinition->subTitleFontSize() );
page->setLegendFontSize( m_plotDefinition->legendFontSize() );
@@ -630,12 +635,6 @@ RiuMultiPlotPage* RiuMultiPlotBook::createPage()
page->setTitleVisible( m_titleVisible );
page->setSubTitlesVisible( m_subTitlesVisible );
page->setPagePreviewModeEnabled( m_previewMode );
m_pages.push_back( page );
m_bookLayout->addWidget( page );
page->setVisible( true );
return page;
}
//--------------------------------------------------------------------------------------------------
@@ -748,3 +747,11 @@ bool RiuMultiPlotBook::eventFilter( QObject* obj, QEvent* event )
}
return QWidget::eventFilter( obj, event );
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RiuMultiPlotBook::adjustBookFrame()
{
m_book->adjustSize();
}