X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fview%2Ftrace.cpp;h=f7e7ebf25b8ec00a351bb415f7fe696de155e8b6;hp=6c43c4c2238044c572fbe0edc4e7343449c06ba7;hb=0c2389230c90d8bf34b601c625bcf655b24e8f52;hpb=01fd32630269c1cfb99eb2b0d6060d7d19a42475 diff --git a/pv/view/trace.cpp b/pv/view/trace.cpp index 6c43c4c2..f7e7ebf2 100644 --- a/pv/view/trace.cpp +++ b/pv/view/trace.cpp @@ -21,89 +21,102 @@ #include #include -#include +#include -#include "trace.h" -#include "view.h" +#include +#include +#include +#include + +#include "trace.hpp" +#include "tracepalette.hpp" +#include "view.hpp" + +#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), - _name(name), - _v_offset(0) +const QColor Trace::DarkBGColour(235, 235, 235); // Quite light grey +const QColor Trace::BrightBGColour(245, 245, 245); // Very light grey + +Trace::Trace(QString name) : + name_(name), + coloured_bg_(true), // Default setting is set in MainWindow::setup_ui() + popup_(nullptr), + popup_form_(nullptr) { } -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 -{ - return _v_offset; + bgcolour_ = colour; + bgcolour_.setAlpha(20); } -void Trace::set_v_offset(int v_offset) +void Trace::set_coloured_bg(bool state) { - _v_offset = v_offset; + coloured_bg_ = state; } -void Trace::set_view(pv::view::View *view) +bool Trace::is_draggable() const { + const View *const view = owner_->view(); assert(view); - _view = view; + + QPoint cursor_pos = view->mapFromGlobal(QCursor::pos()); + + // The signal is draggable only in the header area + return (cursor_pos.x() <= view->header_size().width()); } -void Trace::paint_label(QPainter &p, int right, bool hover) +void Trace::paint_label(QPainter &p, const QRect &rect, bool hover) { - assert(_view); - const int y = _v_offset - _view->v_offset(); + const int y = get_visual_y(); - p.setBrush(_colour); + p.setBrush(colour_); if (!enabled()) return; - const QColor colour = get_colour(); - - compute_text_size(p); - 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()) { @@ -113,56 +126,159 @@ 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((colour.lightness() > 64) ? Qt::black : Qt::white); - p.drawText(label_rect, Qt::AlignCenter | Qt::AlignVCenter, _name); + 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_); } -bool Trace::pt_in_label_rect(int left, int right, const QPoint &point) +QMenu* Trace::create_context_menu(QWidget *parent) { - (void)left; + QMenu *const menu = ViewItem::create_context_menu(parent); - const QRectF label = get_label_rect(right); - return QRectF( - QPointF(label.left() - LabelHitPadding, - label.top() - LabelHitPadding), - QPointF(right, label.bottom() + LabelHitPadding) - ).contains(point); + return menu; } -void Trace::compute_text_size(QPainter &p) +pv::widgets::Popup* Trace::create_popup(QWidget *parent) { - _text_size = QSize( - p.boundingRect(QRectF(), 0, _name).width(), - p.boundingRect(QRectF(), 0, "Tg").height()); + using pv::widgets::Popup; + + popup_ = new Popup(parent); + popup_->set_position(parent->mapToGlobal( + point(parent->rect())), Popup::Right); + + create_popup_form(); + + connect(popup_, SIGNAL(closed()), + this, SLOT(on_popup_closed())); + + return popup_; } -QRectF Trace::get_label_rect(int right) +QRectF Trace::label_rect(const QRectF &rect) const { using pv::view::View; - assert(_view); - const int y = _v_offset - _view->v_offset(); - + QFontMetrics m(QApplication::font()); + const QSize text_size( + 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); - const float label_arrow_length = label_size.height() / 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 - label_arrow_length - label_size.width() - 0.5, - y + 0.5f - label_size.height() / 2, - label_size.width(), label_size.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()); +} + +QRectF Trace::hit_box_rect(const ViewItemPaintParams &pp) const +{ + const float h = QFontMetrics(QApplication::font()).height(); + return QRectF(pp.left(), get_visual_y() - h / 2.0f, + pp.width(), h); +} + +void Trace::paint_back(QPainter &p, const ViewItemPaintParams &pp) +{ + if (coloured_bg_) + p.setBrush(bgcolour_); + else + p.setBrush(bgcolour_state_ ? BrightBGColour : DarkBGColour); + + p.setPen(QPen(Qt::NoPen)); + + const std::pair extents = v_extents(); + + const int x = 0; + const int y = get_visual_y() + extents.first; + const int w = pp.right() - pp.left(); + const int h = extents.second - extents.first; + + p.drawRect(x, y, w, h); +} + +void Trace::paint_axis(QPainter &p, const ViewItemPaintParams &pp, int y) +{ + p.setPen(AxisPen); + p.drawLine(QPointF(pp.left(), y + 0.5f), QPointF(pp.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_); + 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_ = nullptr; + popup_form_ = nullptr; +} + +void Trace::on_text_changed(const QString &text) +{ + set_name(text); + + if (owner_) + owner_->extents_changed(true, false); +} + +void Trace::on_colour_changed(const QColor &colour) +{ + set_colour(colour); + + if (owner_) + owner_->row_item_appearance_changed(true, true); } } // namespace view