X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fview%2Ftrace.cpp;h=7aa199c6ec1ca89acd3cbff98c247f755ae5fe95;hp=4de3f141cc87438bcf6f3d9b2ea1ef1b43822888;hb=0715fb8c638b53ac25590841fcbf3a1da3546b68;hpb=931f20b0dbd480153611493f51fee68f9d29be74 diff --git a/pv/view/trace.cpp b/pv/view/trace.cpp index 4de3f141..7aa199c6 100644 --- a/pv/view/trace.cpp +++ b/pv/view/trace.cpp @@ -23,18 +23,29 @@ #include #include +#include +#include +#include +#include + #include "trace.h" +#include "tracepalette.h" #include "view.h" +#include +#include + namespace pv { 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) + _v_offset(0), + _popup(NULL), + _popup_form(NULL) { } @@ -68,8 +79,38 @@ void Trace::set_v_offset(int v_offset) _v_offset = v_offset; } -void Trace::paint_label(QPainter &p, int y, int right, bool hover) +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(); + p.setBrush(_colour); if (!enabled()) @@ -77,8 +118,7 @@ void Trace::paint_label(QPainter &p, int y, int right, bool hover) const QColor colour = get_colour(); - compute_text_size(p); - const QRectF label_rect = get_label_rect(y, right); + const QRectF label_rect = get_label_rect(right); // Paint the label const QPointF points[] = { @@ -116,43 +156,140 @@ void Trace::paint_label(QPainter &p, int y, int right, bool hover) p.drawPolygon(points, countof(points)); // Paint the text - p.setPen((colour.lightness() > 64) ? Qt::black : Qt::white); + p.setPen(get_text_colour()); + p.setFont(QApplication::font()); p.drawText(label_rect, Qt::AlignCenter | Qt::AlignVCenter, _name); } -bool Trace::pt_in_label_rect(int y, int left, int right, - const QPoint &point) +bool Trace::pt_in_label_rect(int left, int right, const QPoint &point) { (void)left; - const QRectF label = get_label_rect(y, right); - return QRectF( + const QRectF label = get_label_rect(right); + return enabled() && QRectF( QPointF(label.left() - LabelHitPadding, label.top() - LabelHitPadding), QPointF(right, label.bottom() + LabelHitPadding) ).contains(point); } -void Trace::compute_text_size(QPainter &p) +QMenu* Trace::create_context_menu(QWidget *parent) +{ + QMenu *const menu = SelectableItem::create_context_menu(parent); + + return menu; +} + +pv::widgets::Popup* Trace::create_popup(QWidget *parent) +{ + using pv::widgets::Popup; + + _popup = new Popup(parent); + + create_popup_form(); + + connect(_popup, SIGNAL(closed()), + this, SLOT(on_popup_closed())); + + return _popup; +} + +int Trace::get_y() const { - _text_size = QSize( - p.boundingRect(QRectF(), 0, _name).width(), - p.boundingRect(QRectF(), 0, "Tg").height()); + return _v_offset - _view->v_offset(); } -QRectF Trace::get_label_rect(int y, int right) +QRectF Trace::get_label_rect(int right) { using pv::view::View; + assert(_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); + 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, - y + 0.5f - label_size.height() / 2, + 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; +} + +void Trace::paint_axis(QPainter &p, int y, int left, int right) +{ + p.setPen(AxisPen); + p.drawLine(QPointF(left, y + 0.5f), QPointF(right, y + 0.5f)); +} + +void Trace::add_colour_option(QWidget *parent, QFormLayout *form) +{ + using pv::widgets::ColourButton; + + ColourButton *const colour_button = new ColourButton( + TracePalette::Rows, TracePalette::Cols, parent); + colour_button->set_palette(TracePalette::Colours); + colour_button->set_colour(_colour); + connect(colour_button, SIGNAL(selected(const QColor&)), + this, SLOT(on_colour_changed(const QColor&))); + + 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); + name_edit->setText(_name); + name_edit->selectAll(); + name_edit->setFocus(); + connect(name_edit, SIGNAL(textChanged(const QString&)), + this, SLOT(on_text_changed(const QString&))); + form->addRow(tr("Name"), name_edit); + + add_colour_option(parent, form); +} + +void Trace::on_popup_closed() +{ + _popup = NULL; + _popup_form = NULL; +} + +void Trace::on_text_changed(const QString &text) +{ + set_name(text); + text_changed(); +} + +void Trace::on_colour_changed(const QColor &colour) +{ + set_colour(colour); + colour_changed(); +} + } // namespace view } // namespace pv