projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Change QApplication::translate to tr, removing deprecated UTF8 parameter
[pulseview.git]
/
pv
/
view
/
signal.cpp
diff --git
a/pv/view/signal.cpp
b/pv/view/signal.cpp
index 44341aeab5cfa406dd3fa65390169907e2089248..48b400d1081d843bff33859ae0b5c6570adecd3c 100644
(file)
--- a/
pv/view/signal.cpp
+++ b/
pv/view/signal.cpp
@@
-24,10
+24,18
@@
#include <math.h>
#include <QApplication>
#include <math.h>
#include <QApplication>
+#include <QFormLayout>
+#include <QMenu>
+
+#include <libsigrok/libsigrok.h>
#include "signal.h"
#include "view.h"
#include "signal.h"
#include "view.h"
+#include <pv/device/devinst.h>
+
+using std::shared_ptr;
+
namespace pv {
namespace view {
namespace pv {
namespace view {
@@
-48,8
+56,10
@@
const char *const ProbeNames[] = {
"SCL"
};
"SCL"
};
-Signal::Signal(pv::SigSession &session, sr_probe *const probe) :
- Trace(session, probe->name),
+Signal::Signal(shared_ptr<pv::device::DevInst> dev_inst,
+ const sr_channel *const probe) :
+ Trace(probe->name),
+ _dev_inst(dev_inst),
_probe(probe),
_name_widget(NULL),
_updating_name_widget(false)
_probe(probe),
_name_widget(NULL),
_updating_name_widget(false)
@@
-72,11
+82,11
@@
bool Signal::enabled() const
void Signal::enable(bool enable)
{
void Signal::enable(bool enable)
{
- _
probe->enabled = enable
;
+ _
dev_inst->enable_probe(_probe, enable)
;
visibility_changed();
}
visibility_changed();
}
-const sr_
probe
* Signal::probe() const
+const sr_
channel
* Signal::probe() const
{
return _probe;
}
{
return _probe;
}
@@
-105,12
+115,18
@@
QMenu* Signal::create_context_menu(QWidget *parent)
menu->addSeparator();
QAction *const disable = new QAction(tr("Disable"), this);
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;
}
connect(disable, SIGNAL(triggered()), this, SLOT(on_disable()));
menu->addAction(disable);
return menu;
}
+void Signal::delete_pressed()
+{
+ on_disable();
+}
+
void Signal::on_disable()
{
enable(false);
void Signal::on_disable()
{
enable(false);