X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fviews%2Ftrace%2Ftrace.cpp;h=5c854aed17e2aa3db35f4b668ec6d5ad4b09662d;hp=cc91fff5a5aa43de401ec6b64cc4f1cc48d61090;hb=7a0d99e6d48870c51d00c25617eb309181dc2a60;hpb=641574bcc118be0b6dc3a65039ab3497f9d7241a diff --git a/pv/views/trace/trace.cpp b/pv/views/trace/trace.cpp index cc91fff5..5c854aed 100644 --- a/pv/views/trace/trace.cpp +++ b/pv/views/trace/trace.cpp @@ -26,7 +26,9 @@ #include #include #include +#include +#include "ruler.hpp" #include "trace.hpp" #include "tracepalette.hpp" #include "view.hpp" @@ -60,6 +62,17 @@ Trace::Trace(shared_ptr channel) : this, SLOT(on_name_changed(const QString&))); connect(channel.get(), SIGNAL(color_changed(const QColor&)), this, SLOT(on_color_changed(const QColor&))); + + GlobalSettings::add_change_handler(this); + + GlobalSettings settings; + show_hover_marker_ = + settings.value(GlobalSettings::Key_View_ShowHoverMarker).toBool(); +} + +Trace::~Trace() +{ + GlobalSettings::remove_change_handler(this); } shared_ptr Trace::base() const @@ -67,6 +80,44 @@ shared_ptr Trace::base() const return base_; } +bool Trace::is_selectable(QPoint pos) const +{ + // True if the header was clicked, false if the trace area was clicked + const View *view = owner_->view(); + assert(view); + + return (pos.x() <= view->header_width()); +} + +bool Trace::is_draggable(QPoint pos) const +{ + // While the header label that belongs to this trace is draggable, + // the trace itself shall not be. Hence we return true if the header + // was clicked and false if the trace area was clicked + const View *view = owner_->view(); + assert(view); + + return (pos.x() <= view->header_width()); +} + +void Trace::set_segment_display_mode(SegmentDisplayMode mode) +{ + segment_display_mode_ = mode; + + if (owner_) + owner_->row_item_appearance_changed(true, true); +} + +void Trace::on_setting_changed(const QString &key, const QVariant &value) +{ + if (key == GlobalSettings::Key_View_ShowHoverMarker) + show_hover_marker_ = value.toBool(); + + // Force a repaint since many options alter the way traces look + if (owner_) + owner_->row_item_appearance_changed(false, true); +} + void Trace::paint_label(QPainter &p, const QRect &rect, bool hover) { const int y = get_visual_y(); @@ -124,9 +175,37 @@ void Trace::paint_label(QPainter &p, const QRect &rect, bool hover) Qt::AlignCenter | Qt::AlignVCenter, base_->name()); } -QMenu* Trace::create_context_menu(QWidget *parent) +QMenu* Trace::create_header_context_menu(QWidget *parent) +{ + QMenu *const menu = ViewItem::create_header_context_menu(parent); + + return menu; +} + +QMenu* Trace::create_view_context_menu(QWidget *parent, QPoint &click_pos) { - QMenu *const menu = ViewItem::create_context_menu(parent); + context_menu_x_pos_ = click_pos.x(); + + // Get entries from default menu before adding our own + QMenu *const menu = new QMenu(parent); + + QMenu* default_menu = TraceTreeItem::create_view_context_menu(parent, click_pos); + if (default_menu) { + for (QAction *action : default_menu->actions()) { // clazy:exclude=range-loop + menu->addAction(action); + if (action->parent() == default_menu) + action->setParent(menu); + } + delete default_menu; + + // Add separator if needed + if (menu->actions().length() > 0) + menu->addSeparator(); + } + + QAction *const create_marker_here = new QAction(tr("Create marker here"), this); + connect(create_marker_here, SIGNAL(triggered()), this, SLOT(on_create_marker_here())); + menu->addAction(create_marker_here); return menu; } @@ -162,6 +241,20 @@ QRectF Trace::label_rect(const QRectF &rect) const label_size.height()); } +QRectF Trace::hit_box_rect(const ViewItemPaintParams &pp) const +{ + // This one is only for the trace itself, excluding the header area + const View *view = owner_->view(); + assert(view); + + pair extents = v_extents(); + const int top = pp.top() + get_visual_y() + extents.first; + const int height = extents.second - extents.first; + + return QRectF(pp.left() + view->header_width(), top, + pp.width() - view->header_width(), height); +} + void Trace::set_current_segment(const int segment) { current_segment_ = segment; @@ -172,6 +265,14 @@ int Trace::get_current_segment() const return current_segment_; } +void Trace::hover_point_changed(const QPoint &hp) +{ + (void)hp; + + if (owner_) + owner_->row_item_appearance_changed(false, true); +} + void Trace::paint_back(QPainter &p, ViewItemPaintParams &pp) { const View *view = owner_->view(); @@ -213,6 +314,26 @@ void Trace::add_color_option(QWidget *parent, QFormLayout *form) form->addRow(tr("Color"), color_button); } +void Trace::paint_hover_marker(QPainter &p) +{ + const View *view = owner_->view(); + assert(view); + + const int x = view->hover_point().x(); + + if (x == -1) + return; + + p.setPen(QPen(QColor(Qt::lightGray))); + + const pair extents = v_extents(); + + p.setRenderHint(QPainter::Antialiasing, false); + p.drawLine(x, get_visual_y() + extents.first, + x, get_visual_y() + extents.second); + p.setRenderHint(QPainter::Antialiasing, true); +} + void Trace::create_popup_form() { // Clear the layout @@ -244,24 +365,6 @@ void Trace::populate_popup_form(QWidget *parent, QFormLayout *form) add_color_option(parent, form); } -void Trace::set_name(QString name) -{ - base_->set_name(name); -} - -void Trace::set_color(QColor color) -{ - base_->set_color(color); -} - -void Trace::set_segment_display_mode(SegmentDisplayMode mode) -{ - segment_display_mode_ = mode; - - if (owner_) - owner_->row_item_appearance_changed(true, true); -} - void Trace::on_name_changed(const QString &text) { /* This event handler is called by SignalBase when the name was changed there */ @@ -291,13 +394,24 @@ void Trace::on_popup_closed() void Trace::on_nameedit_changed(const QString &name) { /* This event handler notifies SignalBase that the name changed */ - set_name(name); + base_->set_name(name); } void Trace::on_coloredit_changed(const QColor &color) { /* This event handler notifies SignalBase that the color changed */ - set_color(color); + base_->set_color(color); +} + +void Trace::on_create_marker_here() const +{ + View *view = owner_->view(); + assert(view); + + const Ruler *ruler = view->ruler(); + QPoint p = ruler->mapFrom(view, QPoint(context_menu_x_pos_, 0)); + + view->add_flag(ruler->get_time_from_x_pos(p.x())); } } // namespace trace