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 514fbca339a0b07ca8f6349e0d1451b50c78647e..885312088c2ba11db0d6170687c294b837c06553 100644 (file)
--- a/pv/view/decodesignal.cpp
+++ b/pv/view/decodesignal.cpp
@@ -24,6 +24,11 @@ extern "C" {
 
 #include <extdef.h>
 
+#include <boost/foreach.hpp>
+
+#include <QAction>
+#include <QMenu>
+
 #include "decodesignal.h"
 
 #include <pv/sigsession.h>
@@ -52,11 +57,9 @@ DecodeSignal::DecodeSignal(pv::SigSession &session,
        assert(_decoder);
 
        _colour = DecodeColours[index % countof(DecodeColours)];
-}
 
-void DecodeSignal::init_context_bar_actions(QWidget *parent)
-{
-       (void)parent;
+       connect(_decoder.get(), SIGNAL(new_decode_data()),
+               this, SLOT(on_new_decode_data()));
 }
 
 bool DecodeSignal::enabled() const
@@ -64,6 +67,11 @@ bool DecodeSignal::enabled() const
        return true;
 }
 
+const boost::shared_ptr<pv::data::Decoder>& DecodeSignal::decoder() const
+{
+       return _decoder;
+}
+
 void DecodeSignal::set_view(pv::view::View *view)
 {
        assert(view);
@@ -99,16 +107,39 @@ void DecodeSignal::paint_mid(QPainter &p, int left, int right)
        vector< shared_ptr<Annotation> > annotations(_decoder->annotations());
        BOOST_FOREACH(shared_ptr<Annotation> a, annotations) {
                assert(a);
-               a->paint(p, _colour, _colour.darker(), get_text_colour(),
-                       _text_size.height(), left, right, samples_per_pixel,
-                       pixels_offset, y);
+               a->paint(p, get_text_colour(), _text_size.height(),
+                       left, right, samples_per_pixel, pixels_offset, y);
        }
 }
 
-const list<QAction*> DecodeSignal::get_context_bar_actions()
+QMenu* DecodeSignal::create_context_menu(QWidget *parent)
+{
+       QMenu *const menu = Trace::create_context_menu(parent);
+
+       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);
+
+       return menu;
+}
+
+void DecodeSignal::on_new_decode_data()
+{
+       if (_view)
+               _view->update_viewport();
+}
+
+void DecodeSignal::delete_pressed()
+{
+       on_delete();
+}
+
+void DecodeSignal::on_delete()
 {
-       list<QAction*> actions;
-       return actions;
+       _session.remove_decode_signal(this);
 }
 
 } // namespace view