Added decode error display

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

diff --git a/pv/view/decodesignal.cpp b/pv/view/decodesignal.cpp
index b151b3911d13ef6beb570cb092cefae115660ef1..1cbce00d6be4843802132e961006603d89836061 100644 (file)
--- a/pv/view/decodesignal.cpp
+++ b/pv/view/decodesignal.cpp
@@ -24,7 +24,10 @@ extern "C" {
 
 #include <extdef.h>
 
+#include <boost/foreach.hpp>
+
 #include <QAction>
+#include <QMenu>
 
 #include "decodesignal.h"
 
@@ -46,6 +49,8 @@ const QColor DecodeSignal::DecodeColours[4] = {
        QColor(0x72, 0x9F, 0xCF)        // Blue
 };
 
+const QColor DecodeSignal::ErrorBgColour = QColor(0xEF, 0x29, 0x29);
+
 DecodeSignal::DecodeSignal(pv::SigSession &session,
        boost::shared_ptr<pv::data::Decoder> decoder, int index) :
        Trace(session, QString(decoder->get_decoder()->name)),
@@ -59,14 +64,14 @@ DecodeSignal::DecodeSignal(pv::SigSession &session,
                this, SLOT(on_new_decode_data()));
 }
 
-void DecodeSignal::init_context_bar_actions(QWidget *parent)
+bool DecodeSignal::enabled() const
 {
-       (void)parent;
+       return true;
 }
 
-bool DecodeSignal::enabled() const
+const boost::shared_ptr<pv::data::Decoder>& DecodeSignal::decoder() const
 {
-       return true;
+       return _decoder;
 }
 
 void DecodeSignal::set_view(pv::view::View *view)
@@ -84,6 +89,13 @@ void DecodeSignal::paint_mid(QPainter &p, int left, int right)
 {
        using namespace pv::view::decode;
 
+       assert(_decoder);
+       const QString err = _decoder->error_message();
+       if (!err.isEmpty()) {
+               draw_error(p, err, left, right);
+               return;
+       }
+
        assert(_view);
        const int y = get_y();
 
@@ -109,12 +121,6 @@ void DecodeSignal::paint_mid(QPainter &p, int left, int right)
        }
 }
 
-const list<QAction*> DecodeSignal::get_context_bar_actions()
-{
-       list<QAction*> actions;
-       return actions;
-}
-
 QMenu* DecodeSignal::create_context_menu(QWidget *parent)
 {
        QMenu *const menu = Trace::create_context_menu(parent);
@@ -122,18 +128,45 @@ QMenu* DecodeSignal::create_context_menu(QWidget *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::draw_error(QPainter &p, const QString &message,
+       int left, int right)
+{
+       const int y = get_y();
+
+       p.setPen(ErrorBgColour.darker());
+       p.setBrush(ErrorBgColour);
+
+       const QRectF bounding_rect =
+               QRectF(left, INT_MIN / 2 + y, right - left, INT_MAX);
+       const QRectF text_rect = p.boundingRect(bounding_rect,
+               Qt::AlignCenter, message);
+       const float r = text_rect.height() / 4;
+
+       p.drawRoundedRect(text_rect.adjusted(-r, -r, r, r), r, r,
+               Qt::AbsoluteSize);
+
+       p.setPen(get_text_colour());
+       p.drawText(text_rect, message);
+}
+
 void DecodeSignal::on_new_decode_data()
 {
        if (_view)
                _view->update_viewport();
 }
 
+void DecodeSignal::delete_pressed()
+{
+       on_delete();
+}
+
 void DecodeSignal::on_delete()
 {
        _session.remove_decode_signal(this);