From fcc2b4c119423875ee176e1aea8440f05dfab0da Mon Sep 17 00:00:00 2001
From: Gennady Pospelov <g.pospelov@fz-juelich.de>
Date: Fri, 20 Oct 2017 16:25:01 +0200
Subject: [PATCH] Fixing grey margins appeared after migration to
SessionItemWidget
---
GUI/coregui/Views/FitWidgets/FitComparisonWidget.cpp | 2 ++
GUI/coregui/Views/FitWidgets/FitFlowWidget.cpp | 2 +-
GUI/coregui/Views/FitWidgets/FitFlowWidget.h | 6 +++---
GUI/coregui/Views/FitWidgets/HistogramPlot.cpp | 8 ++++++++
4 files changed, 14 insertions(+), 4 deletions(-)
diff --git a/GUI/coregui/Views/FitWidgets/FitComparisonWidget.cpp b/GUI/coregui/Views/FitWidgets/FitComparisonWidget.cpp
index ebe1f35b9be..ed8715309b9 100644
--- a/GUI/coregui/Views/FitWidgets/FitComparisonWidget.cpp
+++ b/GUI/coregui/Views/FitWidgets/FitComparisonWidget.cpp
@@ -75,6 +75,8 @@ FitComparisonWidget::FitComparisonWidget(QWidget *parent)
m_relativeDiffItem = createRelativeDifferenceItem();
m_relativeDiffPlot->setItem(m_relativeDiffItem);
+
+ setStyleSheet("background-color:white;");
}
FitComparisonWidget::~FitComparisonWidget() { delete m_tempIntensityDataModel; }
diff --git a/GUI/coregui/Views/FitWidgets/FitFlowWidget.cpp b/GUI/coregui/Views/FitWidgets/FitFlowWidget.cpp
index 00b780871c5..644f463644d 100644
--- a/GUI/coregui/Views/FitWidgets/FitFlowWidget.cpp
+++ b/GUI/coregui/Views/FitWidgets/FitFlowWidget.cpp
@@ -26,7 +26,7 @@ FitFlowWidget::FitFlowWidget(QWidget *parent)
setSizePolicy(QSizePolicy::Minimum, QSizePolicy::Minimum);
auto layout = new QVBoxLayout;
- layout->setContentsMargins(0, 15, 15, 0);
+ layout->setContentsMargins(0, 0, 0, 0);
layout->addWidget(m_histPlot);
setStyleSheet("background-color:white;");
diff --git a/GUI/coregui/Views/FitWidgets/FitFlowWidget.h b/GUI/coregui/Views/FitWidgets/FitFlowWidget.h
index c82cdc017ef..4c8d3fbf6e8 100644
--- a/GUI/coregui/Views/FitWidgets/FitFlowWidget.h
+++ b/GUI/coregui/Views/FitWidgets/FitFlowWidget.h
@@ -29,11 +29,11 @@ class BA_CORE_API_ FitFlowWidget : public SessionItemWidget
{
Q_OBJECT
public:
- explicit FitFlowWidget(QWidget *parent = 0);
+ explicit FitFlowWidget(QWidget *parent = nullptr);
protected:
- virtual void subscribeToItem();
- virtual void unsubscribeFromItem();
+ void subscribeToItem();
+ void unsubscribeFromItem();
private:
FitSuiteItem* fitSuiteItem();
diff --git a/GUI/coregui/Views/FitWidgets/HistogramPlot.cpp b/GUI/coregui/Views/FitWidgets/HistogramPlot.cpp
index 7ca90081691..1e1c8c43a13 100644
--- a/GUI/coregui/Views/FitWidgets/HistogramPlot.cpp
+++ b/GUI/coregui/Views/FitWidgets/HistogramPlot.cpp
@@ -23,8 +23,10 @@ HistogramPlot::HistogramPlot(QWidget* parent) : QWidget(parent), m_customPlot(ne
QVBoxLayout* vlayout = new QVBoxLayout(this);
vlayout->setMargin(0);
vlayout->setSpacing(0);
+ vlayout->setContentsMargins(0, 0, 0, 0);
vlayout->addWidget(m_customPlot);
setLayout(vlayout);
+ setStyleSheet("background-color:white;");
initGraph();
@@ -78,4 +80,10 @@ void HistogramPlot::initGraph()
m_customPlot->graph()->setLineStyle(QCPGraph::lsLine);
m_customPlot->graph()->setPen(pen);
m_customPlot->graph()->setBrush(QBrush(QColor(255 / 4, 160, 50, 150)));
+
+ QFontMetrics fontMetric(font());
+ auto em = fontMetric.width('M'), fontAscent = fontMetric.ascent();
+ auto* axisRectangle = m_customPlot->axisRect();
+ axisRectangle->setAutoMargins(QCP::msTop | QCP::msBottom);
+ axisRectangle->setMargins(QMargins(em*4, fontAscent*2, em*2, fontAscent*2));
}
--
GitLab