X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fview%2Fsignal.cpp;h=57d788343e2c429471af950597655c471226a2eb;hb=4b5782e1c7b6fec1f9c4ff2ba6f282cadecd70cd;hp=bbabcc1b7709d62818a280d76c5f5ee887f95e4f;hpb=fe3a1c218407f6b8a0d7ac7c454593809212ea9e;p=pulseview.git diff --git a/pv/view/signal.cpp b/pv/view/signal.cpp index bbabcc1..57d7883 100644 --- a/pv/view/signal.cpp +++ b/pv/view/signal.cpp @@ -63,7 +63,8 @@ Signal::Signal(pv::Session &session, Trace(QString::fromUtf8(channel->name().c_str())), session_(session), channel_(channel), - name_widget_(NULL), + items_(), + name_widget_(nullptr), updating_name_widget_(false) { assert(channel_); @@ -99,17 +100,21 @@ shared_ptr Signal::channel() const return channel_; } -void Signal::populate_popup_form(QWidget *parent, QFormLayout *form) +const ViewItemOwner::item_list& Signal::child_items() const { - int index; + return items_; +} +void Signal::populate_popup_form(QWidget *parent, QFormLayout *form) +{ name_widget_ = new QComboBox(parent); name_widget_->setEditable(true); + name_widget_->setCompleter(0); - for(unsigned int i = 0; i < countof(ChannelNames); i++) + for (unsigned int i = 0; i < countof(ChannelNames); i++) name_widget_->insertItem(i, ChannelNames[i]); - index = name_widget_->findText(name_, Qt::MatchExactly); + const int index = name_widget_->findText(name_, Qt::MatchExactly); if (index == -1) { name_widget_->insertItem(0, name_);