Integrated decode

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

diff --git a/pv/view/decodesignal.cpp b/pv/view/decodesignal.cpp
index 1e53427526361660461fb460f027513916b7372b..44144d1b8b8e31a37648e6d44fb03221e20e94bb 100644 (file)
--- a/pv/view/decodesignal.cpp
+++ b/pv/view/decodesignal.cpp
@@ -24,16 +24,22 @@ extern "C" {
 
 #include "decodesignal.h"
 
+#include <pv/data/decoder.h>
+#include <pv/view/view.h>
+
 using namespace boost;
 using namespace std;
 
 namespace pv {
 namespace view {
 
-DecodeSignal::DecodeSignal(pv::SigSession &session, srd_decoder *const dec) :
-       Trace(session, QString(dec->name)),
-       _decoder(dec)
+DecodeSignal::DecodeSignal(pv::SigSession &session,
+       boost::shared_ptr<pv::data::Decoder> decoder) :
+       Trace(session, QString(decoder->get_decoder()->name)),
+       _decoder(decoder)
 {
+       assert(_decoder);
+
        _colour = Qt::red;
 }
 
@@ -47,16 +53,17 @@ bool DecodeSignal::enabled() const
        return true;
 }
 
-void DecodeSignal::paint(QPainter &p, int y, int left, int right,
-       double scale, double offset)
+void DecodeSignal::set_view(pv::view::View *view)
+{
+       assert(view);
+       Trace::set_view(view);
+}
+
+void DecodeSignal::paint(QPainter &p, int left, int right)
 {
        (void)p;
-       (void)y;
        (void)left;
        (void)right;
-       (void)offset;
-
-       assert(scale > 0);
 }
 
 const list<QAction*> DecodeSignal::get_context_bar_actions()