Corrected label layout when text is empty

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

diff --git a/pv/view/signal.cpp b/pv/view/signal.cpp
index 02732ffc7a19112d3e6fc236b7beea57ccf6ed8c..9299e9326234b62fdc323009598f312fe14f5975 100644 (file)
--- a/pv/view/signal.cpp
+++ b/pv/view/signal.cpp
@@ -20,6 +20,8 @@
 
 #include <extdef.h>
 
+#include <QApplication>
+
 #include "signal.h"
 #include "view.h"
 
@@ -27,10 +29,14 @@ namespace pv {
 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)
+       _v_offset(0),
+       _selected(false)
 {
 }
 
@@ -64,21 +70,30 @@ void Signal::set_v_offset(int v_offset)
        _v_offset = v_offset;
 }
 
-void Signal::paint_label(QPainter &p, const QRect &rect, bool hover)
+bool Signal::selected() const
+{
+       return _selected;
+}
+
+void Signal::select(bool select)
+{
+       _selected = select;
+}
+
+void Signal::paint_label(QPainter &p, int y, int right, bool hover)
 {
        p.setBrush(_colour);
 
        const QColor colour = get_colour();
-       const float nominal_offset = get_nominal_offset(rect);
 
        compute_text_size(p);
-       const QRectF label_rect = get_label_rect(rect);
+       const QRectF label_rect = get_label_rect(y, right);
 
        // Paint the label
        const QPointF points[] = {
                label_rect.topLeft(),
                label_rect.topRight(),
-               QPointF(rect.right(), nominal_offset),
+               QPointF(right, y),
                label_rect.bottomRight(),
                label_rect.bottomLeft()
        };
@@ -86,11 +101,19 @@ void Signal::paint_label(QPainter &p, const QRect &rect, bool hover)
        const QPointF highlight_points[] = {
                QPointF(label_rect.left() + 1, label_rect.top() + 1),
                QPointF(label_rect.right(), label_rect.top() + 1),
-               QPointF(rect.right() - 1, nominal_offset),
+               QPointF(right - 1, y),
                QPointF(label_rect.right(), label_rect.bottom() - 1),
                QPointF(label_rect.left() + 1, label_rect.bottom() - 1)
        };
 
+       if (_selected) {
+               p.setPen(QPen(QApplication::palette().brush(
+                       QPalette::Highlight), LabelHighlightRadius,
+                       Qt::SolidLine, Qt::RoundCap, Qt::RoundJoin));
+               p.setBrush(Qt::transparent);
+               p.drawPolygon(points, countof(points));
+       }
+
        p.setPen(Qt::transparent);
        p.setBrush(hover ? colour.lighter() : colour);
        p.drawPolygon(points, countof(points));
@@ -108,35 +131,43 @@ void Signal::paint_label(QPainter &p, const QRect &rect, bool hover)
        p.drawText(label_rect, Qt::AlignCenter | Qt::AlignVCenter, _name);
 }
 
-bool Signal::pt_in_label_rect(const QRect &rect, const QPoint &point)
+bool Signal::pt_in_label_rect(int y, int left, int right,
+       const QPoint &point)
 {
-       const QRectF label = get_label_rect(rect);
+       (void)left;
+
+       const QRectF label = get_label_rect(y, right);
        return QRectF(
                QPointF(label.left() - LabelHitPadding,
                        label.top() - LabelHitPadding),
-               QPointF(rect.right(),
-                       label.bottom() + LabelHitPadding)
-               ).contains(point);
+               QPointF(right, label.bottom() + LabelHitPadding)
+                       ).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(const QRect &rect)
+QRectF Signal::get_label_rect(int y, int right)
 {
        using pv::view::View;
 
-       const float nominal_offset = get_nominal_offset(rect) + 0.5;
        const QSizeF label_size(
                _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() - 0.5,
-               nominal_offset - label_size.height() / 2,
+               right - label_arrow_length - label_size.width() - 0.5,
+               y + 0.5f - label_size.height() / 2,
                label_size.width(), label_size.height());
 }