pv::DeviceManager now manages opening/closing devices

[pulseview.git] / pv / view / signal.cpp

diff --git a/pv/view/signal.cpp b/pv/view/signal.cpp
index 2469d981632b59d9f8eaadb0b8cc2248d41e831c..48e47f27aa9a49304dddc6d1feef879463183cf4 100644 (file)
--- a/pv/view/signal.cpp
+++ b/pv/view/signal.cpp
@@ -20,6 +20,8 @@
 
 #include <extdef.h>
 
+#include <math.h>
+
 #include <QApplication>
 
 #include "signal.h"
@@ -31,6 +33,8 @@ namespace view {
 const int Signal::LabelHitPadding = 2;
 const int Signal::LabelHighlightRadius = 6;
 
+const QPen Signal::SignalAxisPen(QColor(128, 128, 128, 64));
+
 Signal::Signal(QString name) :
        _name(name),
        _v_offset(0),
@@ -132,6 +136,8 @@ void Signal::paint_label(QPainter &p, int y, int right, bool hover)
 bool Signal::pt_in_label_rect(int y, int left, int right,
        const QPoint &point)
 {
+       (void)left;
+
        const QRectF label = get_label_rect(y, right);
        return QRectF(
                QPointF(label.left() - LabelHitPadding,
@@ -140,9 +146,17 @@ bool Signal::pt_in_label_rect(int y, int left, int right,
                        ).contains(point);
 }
 
+void Signal::paint_axis(QPainter &p, int y, int left, int right)
+{
+       p.setPen(SignalAxisPen);
+       p.drawLine(QPointF(left, y + 0.5f), QPointF(right, y + 0.5f));
+}
+
 void Signal::compute_text_size(QPainter &p)
 {
-       _text_size = p.boundingRect(QRectF(), 0, _name).size();
+       _text_size = QSize(
+               p.boundingRect(QRectF(), 0, _name).width(),
+               p.boundingRect(QRectF(), 0, "Tg").height());
 }
 
 QRectF Signal::get_label_rect(int y, int right)
@@ -151,7 +165,7 @@ QRectF Signal::get_label_rect(int y, int right)
 
        const QSizeF label_size(
                _text_size.width() + View::LabelPadding.width() * 2,
-               _text_size.height() + View::LabelPadding.height() * 2);
+               ceilf((_text_size.height() + View::LabelPadding.height() * 2) / 2) * 2);
        const float label_arrow_length = label_size.height() / 2;
        return QRectF(
                right - label_arrow_length - label_size.width() - 0.5,