X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fview%2Ftrace.cpp;h=1231eae4830b61ccc0429566963408e5bcbd175a;hp=79255bec3f98fa4491a4e81c6cb4529c12b176f0;hb=a77dac4e7ab85ac97f7ff63862d28948ae4dec61;hpb=20eaae392762d69fc97cdc68115bcc0e648a59da diff --git a/pv/view/trace.cpp b/pv/view/trace.cpp index 79255bec..1231eae4 100644 --- a/pv/view/trace.cpp +++ b/pv/view/trace.cpp @@ -23,7 +23,9 @@ #include #include +#include #include +#include #include #include "trace.h" @@ -31,6 +33,7 @@ #include "view.h" #include +#include namespace pv { namespace view { @@ -38,8 +41,8 @@ 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) : + _view(NULL), _name(name), _v_offset(0), _popup(NULL), @@ -106,8 +109,7 @@ void Trace::paint_fore(QPainter &p, int left, int 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_y(); p.setBrush(_colour); @@ -116,24 +118,23 @@ void Trace::paint_label(QPainter &p, int right, bool hover) 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()) { @@ -156,19 +157,10 @@ void Trace::paint_label(QPainter &p, int right, bool hover) // 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) @@ -183,10 +175,8 @@ pv::widgets::Popup* Trace::create_popup(QWidget *parent) using pv::widgets::Popup; _popup = new Popup(parent); - _popup_form = new QFormLayout(_popup); - _popup->setLayout(_popup_form); - populate_popup_form(_popup, _popup_form); + create_popup_form(); connect(_popup, SIGNAL(closed()), this, SLOT(on_popup_closed())); @@ -196,9 +186,33 @@ pv::widgets::Popup* Trace::create_popup(QWidget *parent) int Trace::get_y() const { + assert(_view); return _v_offset - _view->v_offset(); } +QRectF Trace::label_rect(int right) +{ + 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_y() + 0.5f - half_height, + label_size.width() + half_height, + label_size.height()); +} + +void Trace::hover_point_changed() +{ +} + QColor Trace::get_text_colour() const { return (_colour.lightness() > 64) ? Qt::black : Qt::white; @@ -224,6 +238,22 @@ void Trace::add_colour_option(QWidget *parent, QFormLayout *form) form->addRow(tr("Colour"), colour_button); } +void Trace::create_popup_form() +{ + // Clear the layout + + // Transfer the layout and the child widgets to a temporary widget + // which then goes out of scope destroying the layout and all the child + // widgets. + if (_popup_form) + QWidget().setLayout(_popup_form); + + // Repopulate the popup + _popup_form = new QFormLayout(_popup); + _popup->setLayout(_popup_form); + populate_popup_form(_popup, _popup_form); +} + void Trace::populate_popup_form(QWidget *parent, QFormLayout *form) { QLineEdit *const name_edit = new QLineEdit(parent); @@ -235,29 +265,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;