projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Make traces only selectable in the header area
[pulseview.git]
/
pv
/
view
/
signal.cpp
diff --git
a/pv/view/signal.cpp
b/pv/view/signal.cpp
index 7348d25b2d44bea1d974d05bda84d181102dfdbf..09a6da8f17a3d7b9b2377cfa0dc1a251e454edde 100644
(file)
--- a/
pv/view/signal.cpp
+++ b/
pv/view/signal.cpp
@@
-29,12
+29,13
@@
#include <QLineEdit>
#include <QMenu>
#include <QLineEdit>
#include <QMenu>
-#include <libsigrok
/libsigrok
.hpp>
+#include <libsigrok
cxx/libsigrokcxx
.hpp>
#include "signal.hpp"
#include "view.hpp"
using std::shared_ptr;
#include "signal.hpp"
#include "view.hpp"
using std::shared_ptr;
+using std::make_shared;
using sigrok::Channel;
using sigrok::Channel;
@@
-63,7
+64,9
@@
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),
- name_widget_(NULL),
+ scale_handle_(make_shared<SignalScaleHandle>(*this)),
+ items_({scale_handle_}),
+ name_widget_(nullptr),
updating_name_widget_(false)
{
assert(channel_);
updating_name_widget_(false)
{
assert(channel_);
@@
-99,17
+102,27
@@
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::paint_back(QPainter &p, const ViewItemPaintParams &pp)
+{
+ if (channel_->enabled())
+ Trace::paint_back(p, pp);
+}
+
+void Signal::populate_popup_form(QWidget *parent, QFormLayout *form)
+{
name_widget_ = new QComboBox(parent);
name_widget_->setEditable(true);
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_);