X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fview%2Ftrace.cpp;h=2e15ca958a1da81af2ebba507328da0b9cb801b6;hp=367891a22c67e72b21a68057ba553c9d0ba50e7a;hb=cbf0f87e496c9d9157591c94dc445aaa960fe79d;hpb=0a47889b01386b1e55c7df73ca301046a195ff97 diff --git a/pv/view/trace.cpp b/pv/view/trace.cpp index 367891a2..2e15ca95 100644 --- a/pv/view/trace.cpp +++ b/pv/view/trace.cpp @@ -21,19 +21,19 @@ #include #include -#include +#include #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 { @@ -42,44 +42,42 @@ const QPen Trace::AxisPen(QColor(128, 128, 128, 64)); const int Trace::LabelHitPadding = 2; Trace::Trace(QString name) : - _name(name), - _popup(NULL), - _popup_form(NULL) + name_(name), + popup_(nullptr), + popup_form_(nullptr) { } 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; } -void Trace::paint_label(QPainter &p, int right, bool hover) +void Trace::paint_label(QPainter &p, const QRect &rect, bool hover) { - const int y = get_y(); + const int y = get_visual_y(); - p.setBrush(_colour); + p.setBrush(colour_); if (!enabled()) return; - const QColor colour = get_colour(); - - const QRectF r = label_rect(right); + const QRectF r = label_rect(rect); // Paint the label const float label_arrow_length = r.height() / 2; @@ -105,28 +103,28 @@ 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(QRectF(r.x(), r.y(), r.width() - label_arrow_length, r.height()), - Qt::AlignCenter | Qt::AlignVCenter, _name); + Qt::AlignCenter | Qt::AlignVCenter, name_); } QMenu* Trace::create_context_menu(QWidget *parent) { - QMenu *const menu = SelectableItem::create_context_menu(parent); + QMenu *const menu = ViewItem::create_context_menu(parent); return menu; } @@ -135,44 +133,47 @@ pv::widgets::Popup* Trace::create_popup(QWidget *parent) { using pv::widgets::Popup; - _popup = new Popup(parent); + popup_ = new Popup(parent); + popup_->set_position(parent->mapToGlobal( + point(parent->rect())), Popup::Right); create_popup_form(); - connect(_popup, SIGNAL(closed()), + connect(popup_, SIGNAL(closed()), this, SLOT(on_popup_closed())); - return _popup; + return popup_; } -QRectF Trace::label_rect(int right) +QRectF Trace::label_rect(const QRectF &rect) const { using pv::view::View; QFontMetrics m(QApplication::font()); const QSize text_size( - m.boundingRect(QRect(), 0, _name).width(), - m.boundingRect(QRect(), 0, "Tg").height()); + m.boundingRect(QRect(), 0, name_).width(), m.height()); const QSizeF label_size( - text_size.width() + View::LabelPadding.width() * 2, - ceilf((text_size.height() + View::LabelPadding.height() * 2) / 2) * 2); + text_size.width() + LabelPadding.width() * 2, + ceilf((text_size.height() + 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, + rect.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 +QRectF Trace::hit_box_rect(const ViewItemPaintParams &pp) const { - return (_colour.lightness() > 64) ? Qt::black : Qt::white; + const float h = QFontMetrics(QApplication::font()).height(); + return QRectF(pp.left(), get_visual_y() - h / 2.0f, + pp.width(), h); } -void Trace::paint_axis(QPainter &p, int y, int left, int right) +void Trace::paint_axis(QPainter &p, const ViewItemPaintParams &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) @@ -182,7 +183,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&))); @@ -196,19 +197,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); @@ -218,20 +219,24 @@ void Trace::populate_popup_form(QWidget *parent, QFormLayout *form) void Trace::on_popup_closed() { - _popup = NULL; - _popup_form = NULL; + popup_ = nullptr; + popup_form_ = nullptr; } 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_->row_item_appearance_changed(true, false); } } // namespace view