X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fview%2Fsignal.cpp;h=a8de4d504aaa36b0fdb9960fb4f5b72c5b2391ae;hp=2469d981632b59d9f8eaadb0b8cc2248d41e831c;hb=04394ded8776d2163c1e815ccc8170b81d76b028;hpb=2658961bdef3601e07d494a8ed3d01a8101b68cd diff --git a/pv/view/signal.cpp b/pv/view/signal.cpp index 2469d981..a8de4d50 100644 --- a/pv/view/signal.cpp +++ b/pv/view/signal.cpp @@ -20,143 +20,149 @@ #include +#include +#include + #include +#include +#include +#include +#include -#include "signal.h" -#include "view.h" +#include -namespace pv { -namespace view { +#include "pv/data/signalbase.hpp" -const int Signal::LabelHitPadding = 2; -const int Signal::LabelHighlightRadius = 6; +#include "signal.hpp" +#include "view.hpp" -Signal::Signal(QString name) : - _name(name), - _v_offset(0), - _selected(false) -{ -} +using std::shared_ptr; +using std::make_shared; -QString Signal::get_name() const +namespace pv { +namespace view { + +const char *const ChannelNames[] = { + "CLK", + "DATA", + "IN", + "OUT", + "RST", + "TX", + "RX", + "EN", + "SCLK", + "MOSI", + "MISO", + "/SS", + "SDA", + "SCL" +}; + +Signal::Signal(pv::Session &session, + std::shared_ptr channel) : + Trace(channel), + session_(session), + scale_handle_(make_shared(*this)), + items_({scale_handle_}), + name_widget_(nullptr) { - return _name; + assert(base_); } void Signal::set_name(QString name) { - _name = name; -} + Trace::set_name(name); -QColor Signal::get_colour() const -{ - return _colour; + if (name != name_widget_->currentText()) + name_widget_->setEditText(name); } -void Signal::set_colour(QColor colour) +bool Signal::enabled() const { - _colour = colour; + return base_->enabled(); } -int Signal::get_v_offset() const +void Signal::enable(bool enable) { - return _v_offset; + base_->set_enabled(enable); + + if (owner_) + owner_->extents_changed(true, true); } -void Signal::set_v_offset(int v_offset) +shared_ptr Signal::base() const { - _v_offset = v_offset; + return base_; } -bool Signal::selected() const +const ViewItemOwner::item_list& Signal::child_items() const { - return _selected; + return items_; } -void Signal::select(bool select) +void Signal::paint_back(QPainter &p, const ViewItemPaintParams &pp) { - _selected = select; + if (base_->enabled()) + Trace::paint_back(p, pp); } -void Signal::paint_label(QPainter &p, int y, int right, bool hover) +void Signal::populate_popup_form(QWidget *parent, QFormLayout *form) { - p.setBrush(_colour); - - const QColor colour = get_colour(); - - compute_text_size(p); - const QRectF label_rect = get_label_rect(y, right); - - // Paint the label - const QPointF points[] = { - label_rect.topLeft(), - label_rect.topRight(), - QPointF(right, y), - label_rect.bottomRight(), - label_rect.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) - }; - - if (_selected) { - p.setPen(QPen(QApplication::palette().brush( - QPalette::Highlight), LabelHighlightRadius, - Qt::SolidLine, Qt::RoundCap, Qt::RoundJoin)); - p.setBrush(Qt::transparent); - p.drawPolygon(points, countof(points)); + name_widget_ = new QComboBox(parent); + name_widget_->setEditable(true); + name_widget_->setCompleter(nullptr); + + for (unsigned int i = 0; i < countof(ChannelNames); i++) + name_widget_->insertItem(i, ChannelNames[i]); + + const int index = name_widget_->findText(base_->name(), Qt::MatchExactly); + + if (index == -1) { + name_widget_->insertItem(0, base_->name()); + name_widget_->setCurrentIndex(0); + } else { + name_widget_->setCurrentIndex(index); } - p.setPen(Qt::transparent); - p.setBrush(hover ? colour.lighter() : colour); - p.drawPolygon(points, countof(points)); + connect(name_widget_, SIGNAL(editTextChanged(const QString&)), + this, SLOT(on_nameedit_changed(const QString&))); + + form->addRow(tr("Name"), name_widget_); - p.setPen(colour.lighter()); - p.setBrush(Qt::transparent); - p.drawPolygon(highlight_points, countof(highlight_points)); + add_colour_option(parent, form); +} + +QMenu* Signal::create_context_menu(QWidget *parent) +{ + QMenu *const menu = Trace::create_context_menu(parent); - p.setPen(colour.darker()); - p.setBrush(Qt::transparent); - p.drawPolygon(points, countof(points)); + menu->addSeparator(); - // Paint the text - p.setPen((colour.lightness() > 64) ? Qt::black : Qt::white); - p.drawText(label_rect, Qt::AlignCenter | Qt::AlignVCenter, _name); + QAction *const disable = new QAction(tr("Disable"), this); + disable->setShortcuts(QKeySequence::Delete); + connect(disable, SIGNAL(triggered()), this, SLOT(on_disable())); + menu->addAction(disable); + + return menu; } -bool Signal::pt_in_label_rect(int y, int left, int right, - const QPoint &point) +void Signal::delete_pressed() { - const QRectF label = get_label_rect(y, right); - return QRectF( - QPointF(label.left() - LabelHitPadding, - label.top() - LabelHitPadding), - QPointF(right, label.bottom() + LabelHitPadding) - ).contains(point); + on_disable(); } -void Signal::compute_text_size(QPainter &p) +void Signal::on_name_changed(const QString &text) { - _text_size = p.boundingRect(QRectF(), 0, _name).size(); + if (text != name_widget_->currentText()) + name_widget_->setEditText(text); + + Trace::on_name_changed(text); } -QRectF Signal::get_label_rect(int y, int right) +void Signal::on_disable() { - using pv::view::View; - - const QSizeF label_size( - _text_size.width() + View::LabelPadding.width() * 2, - _text_size.height() + View::LabelPadding.height() * 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, - label_size.width(), label_size.height()); + enable(false); } } // namespace view