From 524a854d3555dc07faabbfd5fefb5f8c55e13ca9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20T=C5=AFma?= <tumic@cbox.cz>
Date: Sun, 22 Nov 2020 14:51:57 +0100
Subject: [PATCH] Code cleanup

---
 src/GUI/axislabelitem.cpp |  4 ++--
 src/GUI/axislabelitem.h   |  2 +-
 src/GUI/graphview.cpp     | 18 +++---------------
 src/GUI/graphview.h       |  2 --
 4 files changed, 6 insertions(+), 20 deletions(-)

diff --git a/src/GUI/axislabelitem.cpp b/src/GUI/axislabelitem.cpp
index e8d929cc..f0bedfa9 100644
--- a/src/GUI/axislabelitem.cpp
+++ b/src/GUI/axislabelitem.cpp
@@ -11,11 +11,11 @@ AxisLabelItem::AxisLabelItem(Type type, QGraphicsItem *parent)
 	_font.setFamily(FONT_FAMILY);
 }
 
-void AxisLabelItem::setLabel(const QString& label)
+void AxisLabelItem::setLabel(const QString& label, const QString &units)
 {
 	prepareGeometryChange();
 	QFontMetrics fm(_font);
-	_label = label;
+	_label = QString("%1 [%2]").arg(label, units.isEmpty() ? "-" : units);
 	_labelBB = fm.tightBoundingRect(label);
 	updateBoundingRect();
 	update();
diff --git a/src/GUI/axislabelitem.h b/src/GUI/axislabelitem.h
index 31707d92..f4830cee 100644
--- a/src/GUI/axislabelitem.h
+++ b/src/GUI/axislabelitem.h
@@ -15,7 +15,7 @@ public:
 	void paint(QPainter *painter, const QStyleOptionGraphicsItem *option,
 	  QWidget *widget);
 
-	void setLabel(const QString& label);
+	void setLabel(const QString& label, const QString &units);
 
 private:
 	void updateBoundingRect();
diff --git a/src/GUI/graphview.cpp b/src/GUI/graphview.cpp
index 371959c5..dd176eec 100644
--- a/src/GUI/graphview.cpp
+++ b/src/GUI/graphview.cpp
@@ -89,28 +89,16 @@ GraphView::~GraphView()
 	delete _message;
 }
 
-void GraphView::createXLabel()
-{
-	_xAxisLabel->setLabel(QString("%1 [%2]").arg(_xLabel,
-	  _xUnits.isEmpty() ? "-" : _xUnits));
-}
-
-void GraphView::createYLabel()
-{
-	_yAxisLabel->setLabel(QString("%1 [%2]").arg(_yLabel,
-	  _yUnits.isEmpty() ? "-" : _yUnits));
-}
-
 void GraphView::setYLabel(const QString &label)
 {
 	_yLabel = label;
-	createYLabel();
+	_yAxisLabel->setLabel(_yLabel, _yUnits);
 }
 
 void GraphView::setYUnits(const QString &units)
 {
 	_yUnits = units;
-	createYLabel();
+	_yAxisLabel->setLabel(_yLabel, _yUnits);
 }
 
 void GraphView::setXUnits()
@@ -154,7 +142,7 @@ void GraphView::setXUnits()
 			}
 	}
 
-	createXLabel();
+	_xAxisLabel->setLabel(_xLabel, _xUnits);
 }
 
 void GraphView::setUnits(Units units)
diff --git a/src/GUI/graphview.h b/src/GUI/graphview.h
index ba658cf8..18184475 100644
--- a/src/GUI/graphview.h
+++ b/src/GUI/graphview.h
@@ -87,8 +87,6 @@ private slots:
 private:
 	void redraw(const QSizeF &size);
 	void setXUnits();
-	void createXLabel();
-	void createYLabel();
 	void updateSliderPosition();
 	void updateSliderInfo();
 	void removeItem(QGraphicsItem *item);