projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
LogicSignal: Put all trigger matches into a single trigger stage.
[pulseview.git]
/
pv
/
view
/
signal.cpp
diff --git
a/pv/view/signal.cpp
b/pv/view/signal.cpp
index 018b68f218fbbb3ae2bdac17c21e9c853ca23538..47e91f4b9a67f9a904d0b059e3da5cee543a35ab 100644
(file)
--- a/
pv/view/signal.cpp
+++ b/
pv/view/signal.cpp
@@
-35,6
+35,7
@@
#include "view.hpp"
using std::shared_ptr;
#include "view.hpp"
using std::shared_ptr;
+using std::make_shared;
using sigrok::Channel;
using sigrok::Channel;
@@
-63,6
+64,8
@@
Signal::Signal(pv::Session &session,
Trace(QString::fromUtf8(channel->name().c_str())),
session_(session),
channel_(channel),
Trace(QString::fromUtf8(channel->name().c_str())),
session_(session),
channel_(channel),
+ scale_handle_(make_shared<SignalScaleHandle>(*this)),
+ items_({scale_handle_}),
name_widget_(nullptr),
updating_name_widget_(false)
{
name_widget_(nullptr),
updating_name_widget_(false)
{
@@
-99,18
+102,21
@@
shared_ptr<Channel> Signal::channel() const
return channel_;
}
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);
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]);
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_);
if (index == -1) {
name_widget_->insertItem(0, name_);