X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fview%2Ftrace.cpp;h=aba51510db59ad964d9f4213b994c05caf5275d8;hp=ebf28b6224c69a5786a760333b34dd99ec6d1f10;hb=23935421086ebf58cfe68228971ded327a6155a1;hpb=68456dab5d519d886cf632cecc01373cc258d83c diff --git a/pv/view/trace.cpp b/pv/view/trace.cpp index ebf28b62..aba51510 100644 --- a/pv/view/trace.cpp +++ b/pv/view/trace.cpp @@ -23,12 +23,16 @@ #include #include -#include -#include +#include +#include +#include +#include #include "trace.h" +#include "tracepalette.h" #include "view.h" +#include #include namespace pv { @@ -37,10 +41,10 @@ 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) { } @@ -64,47 +68,9 @@ 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_y(); p.setBrush(_colour); @@ -113,24 +79,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()) { @@ -153,51 +118,50 @@ 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) { QMenu *const menu = SelectableItem::create_context_menu(parent); - QAction *const set_name = new QAction(tr("Set &Name..."), this); - connect(set_name, SIGNAL(triggered()), - this, SLOT(on_action_set_name_triggered())); - menu->addAction(set_name); - - QAction *const set_colour = new QAction(tr("Set &Colour..."), this); - connect(set_colour, SIGNAL(triggered()), - this, SLOT(on_action_set_colour_triggered())); - menu->addAction(set_colour); - return menu; } pv::widgets::Popup* Trace::create_popup(QWidget *parent) { using pv::widgets::Popup; - Popup *const popup = new Popup(parent); - QFormLayout *const form = new QFormLayout(popup); - popup->setLayout(form); - populate_popup_form(popup, form); - return popup; + + _popup = new Popup(parent); + + create_popup_form(); + + connect(_popup, SIGNAL(closed()), + this, SLOT(on_popup_closed())); + + return _popup; } -int Trace::get_y() const +QRectF Trace::label_rect(int right) { - 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_y() + 0.5f - half_height, + label_size.width() + half_height, + label_size.height()); } QColor Trace::get_text_colour() const @@ -211,57 +175,51 @@ void Trace::paint_axis(QPainter &p, int y, int left, int right) p.drawLine(QPointF(left, y + 0.5f), QPointF(right, y + 0.5f)); } -void Trace::populate_popup_form(QWidget *parent, QFormLayout *form) +void Trace::add_colour_option(QWidget *parent, QFormLayout *form) { - QLineEdit *const name_edit = new QLineEdit(parent); - name_edit->setText(_name); - connect(name_edit, SIGNAL(textChanged(const QString&)), - this, SLOT(on_text_changed(const QString&))); - form->addRow(tr("Name"), name_edit); -} + using pv::widgets::ColourButton; -void Trace::compute_text_size(QPainter &p) -{ - _text_size = QSize( - p.boundingRect(QRectF(), 0, _name).width(), - p.boundingRect(QRectF(), 0, "Tg").height()); + 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); } -QRectF Trace::get_label_rect(int right) +void Trace::create_popup_form() { - using pv::view::View; + // Clear the layout - assert(_view); + // 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); - 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()); + // Repopulate the popup + _popup_form = new QFormLayout(_popup); + _popup->setLayout(_popup_form); + populate_popup_form(_popup, _popup_form); } -void Trace::on_action_set_name_triggered() +void Trace::populate_popup_form(QWidget *parent, QFormLayout *form) { - bool ok = false; - - const QString new_label = QInputDialog::getText(_context_parent, - tr("Set Name"), tr("Name"), QLineEdit::Normal, get_name(), - &ok); + QLineEdit *const name_edit = new QLineEdit(parent); + name_edit->setText(_name); + connect(name_edit, SIGNAL(textChanged(const QString&)), + this, SLOT(on_text_changed(const QString&))); + form->addRow(tr("Name"), name_edit); - if (ok) - set_name(new_label); + add_colour_option(parent, form); } -void Trace::on_action_set_colour_triggered() +void Trace::on_popup_closed() { - const QColor new_colour = QColorDialog::getColor( - get_colour(), _context_parent, tr("Set Colour")); - - if (new_colour.isValid()) - set_colour(new_colour); + _popup = NULL; + _popup_form = NULL; } void Trace::on_text_changed(const QString &text) @@ -270,5 +228,11 @@ void Trace::on_text_changed(const QString &text) text_changed(); } +void Trace::on_colour_changed(const QColor &colour) +{ + set_colour(colour); + colour_changed(); +} + } // namespace view } // namespace pv