Removed context bar

[pulseview.git] / pv / view / decodesignal.cpp

diff --git a/pv/view/decodesignal.cpp b/pv/view/decodesignal.cpp
index 33ea33f381e484391c82ec7cb83427b45d3a252f..bce58a1922751f145313bef0d53a39a992e92d61 100644 (file)
--- a/pv/view/decodesignal.cpp
+++ b/pv/view/decodesignal.cpp
@@ -22,8 +22,13 @@ extern "C" {
 #include <libsigrokdecode/libsigrokdecode.h>
 }
 
+#include <extdef.h>
+
+#include <QAction>
+
 #include "decodesignal.h"
 
+#include <pv/sigsession.h>
 #include <pv/data/decoder.h>
 #include <pv/view/view.h>
 #include <pv/view/decode/annotation.h>
@@ -34,19 +39,24 @@ using namespace std;
 namespace pv {
 namespace view {
 
+const QColor DecodeSignal::DecodeColours[4] = {
+       QColor(0xEF, 0x29, 0x29),       // Red
+       QColor(0xFC, 0xE9, 0x4F),       // Yellow
+       QColor(0x8A, 0xE2, 0x34),       // Green
+       QColor(0x72, 0x9F, 0xCF)        // Blue
+};
+
 DecodeSignal::DecodeSignal(pv::SigSession &session,
-       boost::shared_ptr<pv::data::Decoder> decoder) :
+       boost::shared_ptr<pv::data::Decoder> decoder, int index) :
        Trace(session, QString(decoder->get_decoder()->name)),
        _decoder(decoder)
 {
        assert(_decoder);
 
-       _colour = Qt::red;
-}
+       _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
@@ -60,12 +70,17 @@ void DecodeSignal::set_view(pv::view::View *view)
        Trace::set_view(view);
 }
 
-void DecodeSignal::paint(QPainter &p, int left, int right)
+void DecodeSignal::paint_back(QPainter &p, int left, int right)
+{
+       paint_axis(p, get_y(), left, right);
+}
+
+void DecodeSignal::paint_mid(QPainter &p, int left, int right)
 {
        using namespace pv::view::decode;
 
        assert(_view);
-       const int y = _v_offset - _view->v_offset();
+       const int y = get_y();
 
        const double scale = _view->scale();
        assert(scale > 0);
@@ -84,14 +99,33 @@ void DecodeSignal::paint(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, 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);
+       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::on_delete()
 {
-       list<QAction*> actions;
-       return actions;
+       _session.remove_decode_signal(this);
 }
 
 } // namespace view