X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fview%2Ftrace.cpp;h=df6bd63d041ec74a4228919ea4383afb2c982ae4;hp=d10448f3eac071b535df4c25148a42700eb70486;hb=b3f44329f5846bfb800ee53c15c65b2395d3ba0c;hpb=32d83ce1a26322a433785746ea7465f9bdf830b6 diff --git a/pv/view/trace.cpp b/pv/view/trace.cpp index d10448f3..df6bd63d 100644 --- a/pv/view/trace.cpp +++ b/pv/view/trace.cpp @@ -25,14 +25,15 @@ #include #include +#include #include -#include "trace.h" -#include "tracepalette.h" -#include "view.h" +#include "trace.hpp" +#include "tracepalette.hpp" +#include "view.hpp" -#include -#include +#include +#include namespace pv { namespace view { @@ -41,99 +42,58 @@ const QPen Trace::AxisPen(QColor(128, 128, 128, 64)); const int Trace::LabelHitPadding = 2; Trace::Trace(QString name) : - _name(name), - _v_offset(0), - _popup(NULL), - _popup_form(NULL) + name_(name), + popup_(NULL), + popup_form_(NULL) { } -QString Trace::get_name() const +QString Trace::name() const { - return _name; + return name_; } void Trace::set_name(QString name) { - _name = name; + name_ = name; } -QColor Trace::get_colour() const +QColor Trace::colour() const { - return _colour; + return colour_; } void Trace::set_colour(QColor colour) { - _colour = colour; + colour_ = colour; } -int Trace::get_v_offset() const +void Trace::paint_label(QPainter &p, const QRect &rect, bool hover) { - 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; -} + const int y = get_visual_y(); -void Trace::paint_label(QPainter &p, int right, bool hover) -{ - assert(_view); - const int y = _v_offset - _view->v_offset(); - - p.setBrush(_colour); + p.setBrush(colour_); if (!enabled()) return; - const QColor colour = get_colour(); - - const QRectF label_rect = get_label_rect(right); + const QRectF r = label_rect(rect); // 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,33 +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.setPen(select_text_colour(colour_)); p.setFont(QApplication::font()); - 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 enabled() && QRectF( - QPointF(label.left() - LabelHitPadding, - label.top() - LabelHitPadding), - QPointF(right, label.bottom() + LabelHitPadding) - ).contains(point); + 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,50 +133,39 @@ pv::widgets::Popup* Trace::create_popup(QWidget *parent) { using pv::widgets::Popup; - _popup = new Popup(parent); + popup_ = new Popup(parent); create_popup_form(); - connect(_popup, SIGNAL(closed()), + connect(popup_, SIGNAL(closed()), this, SLOT(on_popup_closed())); - return _popup; -} - -int Trace::get_y() const -{ - return _v_offset - _view->v_offset(); + return popup_; } -QRectF Trace::get_label_rect(int right) +QRectF Trace::label_rect(const QRectF &rect) const { using pv::view::View; - assert(_view); - QFontMetrics m(QApplication::font()); const QSize text_size( - m.boundingRect(QRect(), 0, _name).width(), + 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 label_arrow_length = label_size.height() / 2; + const float half_height = 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()); -} - -QColor Trace::get_text_colour() const -{ - return (_colour.lightness() > 64) ? Qt::black : Qt::white; + rect.right() - half_height - label_size.width() - 0.5, + get_visual_y() + 0.5f - half_height, + label_size.width() + half_height, + label_size.height()); } -void Trace::paint_axis(QPainter &p, int y, int left, int right) +void Trace::paint_axis(QPainter &p, const RowItemPaintParams &pp, int y) { p.setPen(AxisPen); - p.drawLine(QPointF(left, y + 0.5f), QPointF(right, y + 0.5f)); + p.drawLine(QPointF(pp.left(), y + 0.5f), QPointF(pp.right(), y + 0.5f)); } void Trace::add_colour_option(QWidget *parent, QFormLayout *form) @@ -236,7 +175,7 @@ void Trace::add_colour_option(QWidget *parent, QFormLayout *form) ColourButton *const colour_button = new ColourButton( TracePalette::Rows, TracePalette::Cols, parent); colour_button->set_palette(TracePalette::Colours); - colour_button->set_colour(_colour); + colour_button->set_colour(colour_); connect(colour_button, SIGNAL(selected(const QColor&)), this, SLOT(on_colour_changed(const QColor&))); @@ -250,19 +189,19 @@ void Trace::create_popup_form() // 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); + 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); + 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); - name_edit->setText(_name); + name_edit->setText(name_); connect(name_edit, SIGNAL(textChanged(const QString&)), this, SLOT(on_text_changed(const QString&))); form->addRow(tr("Name"), name_edit); @@ -272,20 +211,24 @@ void Trace::populate_popup_form(QWidget *parent, QFormLayout *form) void Trace::on_popup_closed() { - _popup = NULL; - _popup_form = NULL; + popup_ = NULL; + popup_form_ = NULL; } 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