X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fview%2Fsignal.cpp;h=5cd5b183590af45dcd783dd948f3a0d81af84582;hp=48e47f27aa9a49304dddc6d1feef879463183cf4;hb=8c09273b13a10399e7f7d18dd446c2d13813e239;hpb=b47d951efad3b51674e5af2fcfc29526cad6697f diff --git a/pv/view/signal.cpp b/pv/view/signal.cpp index 48e47f27..5cd5b183 100644 --- a/pv/view/signal.cpp +++ b/pv/view/signal.cpp @@ -20,157 +20,146 @@ #include -#include +#include +#include #include +#include +#include +#include +#include -#include "signal.h" -#include "view.h" +#include -namespace pv { -namespace view { +#include "signal.hpp" +#include "view.hpp" -const int Signal::LabelHitPadding = 2; -const int Signal::LabelHighlightRadius = 6; +using std::shared_ptr; +using std::make_shared; -const QPen Signal::SignalAxisPen(QColor(128, 128, 128, 64)); +using sigrok::Channel; -Signal::Signal(QString name) : - _name(name), - _v_offset(0), - _selected(false) -{ -} +namespace pv { +namespace view { -QString Signal::get_name() const +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(QString::fromUtf8(channel->name().c_str())), + session_(session), + channel_(channel), + scale_handle_(make_shared(*this)), + items_({scale_handle_}), + name_widget_(nullptr) { - return _name; + assert(channel_); } 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); + + // Store the channel name in sigrok::Channel so that it + // will end up in the .sr file upon save. + channel_->set_name(name.toUtf8().constData()); } -void Signal::set_colour(QColor colour) +bool Signal::enabled() const { - _colour = colour; + return channel_->enabled(); } -int Signal::get_v_offset() const +void Signal::enable(bool enable) { - return _v_offset; + channel_->set_enabled(enable); + + if (owner_) + owner_->extents_changed(true, true); } -void Signal::set_v_offset(int v_offset) +shared_ptr Signal::channel() const { - _v_offset = v_offset; + return channel_; } -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 (channel_->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); - p.setPen(Qt::transparent); - p.setBrush(hover ? colour.lighter() : colour); - p.drawPolygon(points, countof(points)); + for (unsigned int i = 0; i < countof(ChannelNames); i++) + name_widget_->insertItem(i, ChannelNames[i]); - p.setPen(colour.lighter()); - p.setBrush(Qt::transparent); - p.drawPolygon(highlight_points, countof(highlight_points)); + const int index = name_widget_->findText(name_, Qt::MatchExactly); - p.setPen(colour.darker()); - p.setBrush(Qt::transparent); - p.drawPolygon(points, countof(points)); + if (index == -1) { + name_widget_->insertItem(0, name_); + name_widget_->setCurrentIndex(0); + } else { + name_widget_->setCurrentIndex(index); + } - // Paint the text - p.setPen((colour.lightness() > 64) ? Qt::black : Qt::white); - p.drawText(label_rect, Qt::AlignCenter | Qt::AlignVCenter, _name); -} + connect(name_widget_, SIGNAL(editTextChanged(const QString&)), + this, SLOT(on_text_changed(const QString&))); -bool Signal::pt_in_label_rect(int y, int left, int right, - const QPoint &point) -{ - (void)left; - - const QRectF label = get_label_rect(y, right); - return QRectF( - QPointF(label.left() - LabelHitPadding, - label.top() - LabelHitPadding), - QPointF(right, label.bottom() + LabelHitPadding) - ).contains(point); + form->addRow(tr("Name"), name_widget_); + + add_colour_option(parent, form); } -void Signal::paint_axis(QPainter &p, int y, int left, int right) +QMenu* Signal::create_context_menu(QWidget *parent) { - p.setPen(SignalAxisPen); - p.drawLine(QPointF(left, y + 0.5f), QPointF(right, y + 0.5f)); + QMenu *const menu = Trace::create_context_menu(parent); + + menu->addSeparator(); + + 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; } -void Signal::compute_text_size(QPainter &p) +void Signal::delete_pressed() { - _text_size = QSize( - p.boundingRect(QRectF(), 0, _name).width(), - p.boundingRect(QRectF(), 0, "Tg").height()); + on_disable(); } -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, - 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, - label_size.width(), label_size.height()); + enable(false); } } // namespace view