]> sigrok.org Git - pulseview.git/blobdiff - pv/view/trace.cpp
RowItemOwner: Replaced parent notification scheme
[pulseview.git] / pv / view / trace.cpp
index 464cadcde2ede54aaa6b4c8e0f3fcae9a1308e9f..9caa8f012adf57310f4ca65fe29c3254380b7c38 100644 (file)
@@ -23,7 +23,9 @@
 #include <assert.h>
 #include <math.h>
 
+#include <QApplication>
 #include <QFormLayout>
+#include <QKeyEvent>
 #include <QLineEdit>
 
 #include "trace.h"
@@ -31,6 +33,7 @@
 #include "view.h"
 
 #include <pv/widgets/colourbutton.h>
+#include <pv/widgets/popup.h>
 
 namespace pv {
 namespace view {
@@ -38,16 +41,14 @@ namespace view {
 const QPen Trace::AxisPen(QColor(128, 128, 128, 64));
 const int Trace::LabelHitPadding = 2;
 
-Trace::Trace(pv::SigSession &session, QString name) :
-       _session(session),
+Trace::Trace(QString name) :
        _name(name),
-       _v_offset(0),
        _popup(NULL),
        _popup_form(NULL)
 {
 }
 
-QString Trace::get_name() const
+QString Trace::name() const
 {
        return _name;
 }
@@ -57,7 +58,7 @@ void Trace::set_name(QString name)
        _name = name;
 }
 
-QColor Trace::get_colour() const
+QColor Trace::colour() const
 {
        return _colour;
 }
@@ -67,73 +68,32 @@ void Trace::set_colour(QColor colour)
        _colour = colour;
 }
 
-int Trace::get_v_offset() const
-{
-       return _v_offset;
-}
-
-void Trace::set_v_offset(int v_offset)
-{
-       _v_offset = v_offset;
-}
-
-void Trace::set_view(pv::view::View *view)
-{
-       assert(view);
-       _view = view;
-}
-
-void Trace::paint_back(QPainter &p, int left, int right)
-{
-       (void)p;
-       (void)left;
-       (void)right;
-}
-
-void Trace::paint_mid(QPainter &p, int left, int right)
-{
-       (void)p;
-       (void)left;
-       (void)right;
-}
-
-void Trace::paint_fore(QPainter &p, int left, int right)
-{
-       (void)p;
-       (void)left;
-       (void)right;
-}
-
 void Trace::paint_label(QPainter &p, int right, bool hover)
 {
-       assert(_view);
-       const int y = _v_offset - _view->v_offset();
+       const int y = get_visual_y();
 
        p.setBrush(_colour);
 
        if (!enabled())
                return;
 
-       const QColor colour = get_colour();
-
-       compute_text_size(p);
-       const QRectF label_rect = get_label_rect(right);
+       const QRectF r = label_rect(right);
 
        // Paint the label
+       const float label_arrow_length = r.height() / 2;
        const QPointF points[] = {
-               label_rect.topLeft(),
-               label_rect.topRight(),
-               QPointF(right, y),
-               label_rect.bottomRight(),
-               label_rect.bottomLeft()
+               r.topLeft(),
+               QPointF(r.right() - label_arrow_length, r.top()),
+               QPointF(r.right(), y),
+               QPointF(r.right() - label_arrow_length, r.bottom()),
+               r.bottomLeft()
        };
-
        const QPointF highlight_points[] = {
-               QPointF(label_rect.left() + 1, label_rect.top() + 1),
-               QPointF(label_rect.right(), label_rect.top() + 1),
-               QPointF(right - 1, y),
-               QPointF(label_rect.right(), label_rect.bottom() - 1),
-               QPointF(label_rect.left() + 1, label_rect.bottom() - 1)
+               QPointF(r.left() + 1, r.top() + 1),
+               QPointF(r.right() - label_arrow_length, r.top() + 1),
+               QPointF(r.right() - 1, y),
+               QPointF(r.right() - label_arrow_length, r.bottom() - 1),
+               QPointF(r.left() + 1, r.bottom() - 1)
        };
 
        if (selected()) {
@@ -143,32 +103,23 @@ void Trace::paint_label(QPainter &p, int right, bool hover)
        }
 
        p.setPen(Qt::transparent);
-       p.setBrush(hover ? colour.lighter() : colour);
+       p.setBrush(hover ? _colour.lighter() : _colour);
        p.drawPolygon(points, countof(points));
 
-       p.setPen(colour.lighter());
+       p.setPen(_colour.lighter());
        p.setBrush(Qt::transparent);
        p.drawPolygon(highlight_points, countof(highlight_points));
 
-       p.setPen(colour.darker());
+       p.setPen(_colour.darker());
        p.setBrush(Qt::transparent);
        p.drawPolygon(points, countof(points));
 
        // Paint the text
        p.setPen(get_text_colour());
-       p.drawText(label_rect, Qt::AlignCenter | Qt::AlignVCenter, _name);
-}
-
-bool Trace::pt_in_label_rect(int left, int right, const QPoint &point)
-{
-       (void)left;
-
-       const QRectF label = get_label_rect(right);
-       return QRectF(
-               QPointF(label.left() - LabelHitPadding,
-                       label.top() - LabelHitPadding),
-               QPointF(right, label.bottom() + LabelHitPadding)
-                       ).contains(point);
+       p.setFont(QApplication::font());
+       p.drawText(QRectF(r.x(), r.y(),
+               r.width() - label_arrow_length, r.height()),
+               Qt::AlignCenter | Qt::AlignVCenter, _name);
 }
 
 QMenu* Trace::create_context_menu(QWidget *parent)
@@ -192,9 +143,23 @@ pv::widgets::Popup* Trace::create_popup(QWidget *parent)
        return _popup;
 }
 
-int Trace::get_y() const
+QRectF Trace::label_rect(int right) const
 {
-       return _v_offset - _view->v_offset();
+       using pv::view::View;
+
+       QFontMetrics m(QApplication::font());
+       const QSize text_size(
+               m.boundingRect(QRect(), 0, _name).width(),
+               m.boundingRect(QRect(), 0, "Tg").height());
+       const QSizeF label_size(
+               text_size.width() + View::LabelPadding.width() * 2,
+               ceilf((text_size.height() + View::LabelPadding.height() * 2) / 2) * 2);
+       const float half_height = label_size.height() / 2;
+       return QRectF(
+               right - half_height - label_size.width() - 0.5,
+               get_visual_y() + 0.5f - half_height,
+               label_size.width() + half_height,
+               label_size.height());
 }
 
 QColor Trace::get_text_colour() const
@@ -249,29 +214,6 @@ void Trace::populate_popup_form(QWidget *parent, QFormLayout *form)
        add_colour_option(parent, form);
 }
 
-void Trace::compute_text_size(QPainter &p)
-{
-       _text_size = QSize(
-               p.boundingRect(QRectF(), 0, _name).width(),
-               p.boundingRect(QRectF(), 0, "Tg").height());
-}
-
-QRectF Trace::get_label_rect(int right)
-{
-       using pv::view::View;
-
-       assert(_view);
-
-       const QSizeF label_size(
-               _text_size.width() + View::LabelPadding.width() * 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,
-               get_y() + 0.5f - label_size.height() / 2,
-               label_size.width(), label_size.height());
-}
-
 void Trace::on_popup_closed()
 {
        _popup = NULL;
@@ -281,13 +223,17 @@ void Trace::on_popup_closed()
 void Trace::on_text_changed(const QString &text)
 {
        set_name(text);
-       text_changed();
+
+       if (_owner)
+               _owner->extents_changed(true, false);
 }
 
 void Trace::on_colour_changed(const QColor &colour)
 {
        set_colour(colour);
-       colour_changed();
+
+       if (_owner)
+               _owner->appearance_changed(true, false);
 }
 
 } // namespace view