projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Moved all srd commands into decode thread, implemented error messages
[pulseview.git]
/
pv
/
view
/
decodesignal.cpp
diff --git
a/pv/view/decodesignal.cpp
b/pv/view/decodesignal.cpp
index bce58a1922751f145313bef0d53a39a992e92d61..885312088c2ba11db0d6170687c294b837c06553 100644
(file)
--- a/
pv/view/decodesignal.cpp
+++ b/
pv/view/decodesignal.cpp
@@
-24,7
+24,10
@@
extern "C" {
#include <extdef.h>
#include <extdef.h>
+#include <boost/foreach.hpp>
+
#include <QAction>
#include <QAction>
+#include <QMenu>
#include "decodesignal.h"
#include "decodesignal.h"
@@
-64,6
+67,11
@@
bool DecodeSignal::enabled() const
return true;
}
return true;
}
+const boost::shared_ptr<pv::data::Decoder>& DecodeSignal::decoder() const
+{
+ return _decoder;
+}
+
void DecodeSignal::set_view(pv::view::View *view)
{
assert(view);
void DecodeSignal::set_view(pv::view::View *view)
{
assert(view);
@@
-111,6
+119,7
@@
QMenu* DecodeSignal::create_context_menu(QWidget *parent)
menu->addSeparator();
QAction *const del = new QAction(tr("Delete"), this);
menu->addSeparator();
QAction *const del = new QAction(tr("Delete"), this);
+ del->setShortcuts(QKeySequence::Delete);
connect(del, SIGNAL(triggered()), this, SLOT(on_delete()));
menu->addAction(del);
connect(del, SIGNAL(triggered()), this, SLOT(on_delete()));
menu->addAction(del);
@@
-123,6
+132,11
@@
void DecodeSignal::on_new_decode_data()
_view->update_viewport();
}
_view->update_viewport();
}
+void DecodeSignal::delete_pressed()
+{
+ on_delete();
+}
+
void DecodeSignal::on_delete()
{
_session.remove_decode_signal(this);
void DecodeSignal::on_delete()
{
_session.remove_decode_signal(this);