Moved LabelPadding into View

[pulseview.git] / pv / signal.cpp

diff --git a/pv/signal.cpp b/pv/signal.cpp
index 091dd8d4406ef62dfc56b325c96f770890342323..c23a3954455b155d74b042907c361fa245f18c3a 100644 (file)
--- a/pv/signal.cpp
+++ b/pv/signal.cpp
@@ -24,7 +24,6 @@
 
 namespace pv {
 
-const QSizeF Signal::LabelPadding(4, 0);
 const int Signal::LabelHitPadding = 2;
 
 Signal::Signal(QString name) :
@@ -37,6 +36,11 @@ QString Signal::get_name() const
        return _name;
 }
 
+void Signal::set_name(QString name)
+{
+       _name = name;
+}
+
 void Signal::paint_label(QPainter &p, const QRect &rect, bool hover)
 {
        p.setBrush(get_colour());
@@ -99,10 +103,12 @@ void Signal::compute_text_size(QPainter &p)
 
 QRectF Signal::get_label_rect(const QRect &rect)
 {
+       using pv::view::View;
+
        const float nominal_offset = get_nominal_offset(rect);
        const QSizeF label_size(
-               _text_size.width() + LabelPadding.width() * 2,
-               _text_size.height() + LabelPadding.height() * 2);
+               _text_size.width() + View::LabelPadding.width() * 2,
+               _text_size.height() + View::LabelPadding.height() * 2);
        const float label_arrow_length = label_size.height() / 2;
        return QRectF(
                rect.right() - label_arrow_length - label_size.width(),