mirror of
https://github.com/OPM/ResInsight.git
synced 2025-02-25 18:55:39 -06:00
Remove unused space caused by bottom margin
This commit is contained in:
parent
a33f651bcc
commit
f6bde92d81
@ -78,6 +78,8 @@ RimPlotWindow::RimPlotWindow()
|
|||||||
|
|
||||||
m_titleFontSize = caf::FontTools::RelativeSize::XXLarge;
|
m_titleFontSize = caf::FontTools::RelativeSize::XXLarge;
|
||||||
m_legendFontSize = caf::FontTools::RelativeSize::Large;
|
m_legendFontSize = caf::FontTools::RelativeSize::Large;
|
||||||
|
|
||||||
|
m_bottomMargin = -1;
|
||||||
}
|
}
|
||||||
|
|
||||||
//--------------------------------------------------------------------------------------------------
|
//--------------------------------------------------------------------------------------------------
|
||||||
@ -286,6 +288,22 @@ QPageLayout RimPlotWindow::pageLayout() const
|
|||||||
return defaultPageLayout;
|
return defaultPageLayout;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
//--------------------------------------------------------------------------------------------------
|
||||||
|
///
|
||||||
|
//--------------------------------------------------------------------------------------------------
|
||||||
|
void RimPlotWindow::setBottomMargin( int bottomMargin )
|
||||||
|
{
|
||||||
|
m_bottomMargin = bottomMargin;
|
||||||
|
}
|
||||||
|
|
||||||
|
//--------------------------------------------------------------------------------------------------
|
||||||
|
///
|
||||||
|
//--------------------------------------------------------------------------------------------------
|
||||||
|
int RimPlotWindow::bottomMargin() const
|
||||||
|
{
|
||||||
|
return m_bottomMargin;
|
||||||
|
}
|
||||||
|
|
||||||
//--------------------------------------------------------------------------------------------------
|
//--------------------------------------------------------------------------------------------------
|
||||||
///
|
///
|
||||||
//--------------------------------------------------------------------------------------------------
|
//--------------------------------------------------------------------------------------------------
|
||||||
|
@ -86,6 +86,7 @@ public:
|
|||||||
|
|
||||||
void renderWindowContent( QPaintDevice* painter );
|
void renderWindowContent( QPaintDevice* painter );
|
||||||
QPageLayout pageLayout() const;
|
QPageLayout pageLayout() const;
|
||||||
|
int bottomMargin() const;
|
||||||
|
|
||||||
virtual bool handleGlobalKeyEvent( QKeyEvent* keyEvent );
|
virtual bool handleGlobalKeyEvent( QKeyEvent* keyEvent );
|
||||||
virtual bool handleGlobalWheelEvent( QWheelEvent* wheelEvent );
|
virtual bool handleGlobalWheelEvent( QWheelEvent* wheelEvent );
|
||||||
@ -100,6 +101,7 @@ protected:
|
|||||||
void uiOrderingForLegendsAndFonts( QString uiConfigName, caf::PdmUiOrdering& uiOrdering, bool showLegendPosition = false );
|
void uiOrderingForLegendsAndFonts( QString uiConfigName, caf::PdmUiOrdering& uiOrdering, bool showLegendPosition = false );
|
||||||
|
|
||||||
void updateWindowVisibility();
|
void updateWindowVisibility();
|
||||||
|
void setBottomMargin( int bottomMargin );
|
||||||
|
|
||||||
private:
|
private:
|
||||||
virtual void doUpdateLayout() {}
|
virtual void doUpdateLayout() {}
|
||||||
@ -122,4 +124,7 @@ protected:
|
|||||||
|
|
||||||
caf::PdmField<caf::FontTools::RelativeSizeEnum> m_titleFontSize;
|
caf::PdmField<caf::FontTools::RelativeSizeEnum> m_titleFontSize;
|
||||||
caf::PdmField<caf::FontTools::RelativeSizeEnum> m_legendFontSize;
|
caf::PdmField<caf::FontTools::RelativeSizeEnum> m_legendFontSize;
|
||||||
|
|
||||||
|
private:
|
||||||
|
int m_bottomMargin;
|
||||||
};
|
};
|
||||||
|
@ -173,6 +173,8 @@ RimSummaryMultiPlot::RimSummaryMultiPlot()
|
|||||||
m_defaultStepDimension.uiCapability()->setUiHidden( true );
|
m_defaultStepDimension.uiCapability()->setUiHidden( true );
|
||||||
|
|
||||||
m_nameHelper = std::make_unique<RimSummaryPlotNameHelper>();
|
m_nameHelper = std::make_unique<RimSummaryPlotNameHelper>();
|
||||||
|
|
||||||
|
setBottomMargin( 40 );
|
||||||
}
|
}
|
||||||
|
|
||||||
//--------------------------------------------------------------------------------------------------
|
//--------------------------------------------------------------------------------------------------
|
||||||
|
@ -25,13 +25,10 @@
|
|||||||
#include "RiaPlotWindowRedrawScheduler.h"
|
#include "RiaPlotWindowRedrawScheduler.h"
|
||||||
#include "RiaPreferences.h"
|
#include "RiaPreferences.h"
|
||||||
|
|
||||||
#include "WellLogCommands/RicWellLogPlotTrackFeatureImpl.h"
|
|
||||||
|
|
||||||
#include "RimContextCommandBuilder.h"
|
#include "RimContextCommandBuilder.h"
|
||||||
#include "RimMultiPlot.h"
|
#include "RimMultiPlot.h"
|
||||||
#include "RimPlotCurve.h"
|
#include "RimPlotCurve.h"
|
||||||
#include "RimPlotWindow.h"
|
#include "RimPlotWindow.h"
|
||||||
#include "RimWellLogTrack.h"
|
|
||||||
|
|
||||||
#include "RiuDraggableOverlayFrame.h"
|
#include "RiuDraggableOverlayFrame.h"
|
||||||
#include "RiuMainWindow.h"
|
#include "RiuMainWindow.h"
|
||||||
@ -109,7 +106,7 @@ RiuMultiPlotPage::RiuMultiPlotPage( RimPlotWindow* plotDefinition, QWidget* pare
|
|||||||
|
|
||||||
m_gridLayout = new QGridLayout( m_plotWidgetFrame );
|
m_gridLayout = new QGridLayout( m_plotWidgetFrame );
|
||||||
m_gridLayout->setContentsMargins( 0, 0, 0, 0 );
|
m_gridLayout->setContentsMargins( 0, 0, 0, 0 );
|
||||||
m_gridLayout->setSpacing( 5 );
|
m_gridLayout->setSpacing( 0 );
|
||||||
|
|
||||||
new RiuPlotObjectPicker( m_plotTitle, m_plotDefinition );
|
new RiuPlotObjectPicker( m_plotTitle, m_plotDefinition );
|
||||||
|
|
||||||
@ -829,8 +826,15 @@ void RiuMultiPlotPage::adjustHeadingSpacing( RiuPlotWidget* plotWidget )
|
|||||||
{
|
{
|
||||||
// Adjust the space below a graph to make sure the heading of the row below is closest to the
|
// Adjust the space below a graph to make sure the heading of the row below is closest to the
|
||||||
// corresponding graph
|
// corresponding graph
|
||||||
|
|
||||||
|
if ( !m_plotDefinition ) return;
|
||||||
|
|
||||||
|
int bottomMargin = m_plotDefinition->bottomMargin();
|
||||||
|
if ( bottomMargin < 0 ) return;
|
||||||
|
|
||||||
auto margins = plotWidget->contentsMargins();
|
auto margins = plotWidget->contentsMargins();
|
||||||
margins.setBottom( 40 );
|
|
||||||
|
margins.setBottom( bottomMargin );
|
||||||
plotWidget->setContentsMargins( margins );
|
plotWidget->setContentsMargins( margins );
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user