#5391 Fix page sizes for Well Log Plots

This commit is contained in:
Gaute Lindkvist 2020-01-24 10:19:41 +01:00
parent 23e6bc2e86
commit d5b6923c44

View File

@ -98,7 +98,14 @@ RiuMultiPlotPage::RiuMultiPlotPage( RimPlotWindow* plotDefinition, QWidget* pare
new RiuPlotObjectPicker( m_plotTitle, m_plotDefinition ); new RiuPlotObjectPicker( m_plotTitle, m_plotDefinition );
this->setSizePolicy( QSizePolicy::MinimumExpanding, QSizePolicy::MinimumExpanding ); if ( m_previewMode )
{
this->setSizePolicy( QSizePolicy::MinimumExpanding, QSizePolicy::MinimumExpanding );
}
else
{
this->setSizePolicy( QSizePolicy::Preferred, QSizePolicy::Preferred );
}
setFocusPolicy( Qt::StrongFocus ); setFocusPolicy( Qt::StrongFocus );
@ -460,15 +467,19 @@ void RiuMultiPlotPage::updateMarginsFromPageLayout()
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
QSize RiuMultiPlotPage::sizeHint() const QSize RiuMultiPlotPage::sizeHint() const
{ {
QPageLayout pageLayout = RiaApplication::instance()->preferences()->defaultPageLayout(); if ( m_previewMode )
if ( m_plotDefinition )
{ {
pageLayout = m_plotDefinition->pageLayout(); QPageLayout pageLayout = RiaApplication::instance()->preferences()->defaultPageLayout();
} if ( m_plotDefinition )
{
pageLayout = m_plotDefinition->pageLayout();
}
const int resolution = RiaGuiApplication::applicationResolution(); const int resolution = RiaGuiApplication::applicationResolution();
QRect rect = pageLayout.fullRectPixels( resolution ); QRect rect = pageLayout.fullRectPixels( resolution );
return rect.size(); return rect.size();
}
return QWidget::sizeHint();
} }
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///