Improved annotation painting

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

diff --git a/pv/view/decodesignal.cpp b/pv/view/decodesignal.cpp
index d27178920faae4190e4343f893387a1603af3d86..f6611a0f05205c8e2f88c392a2b1f944ecc6abe1 100644 (file)
--- a/pv/view/decodesignal.cpp
+++ b/pv/view/decodesignal.cpp
@@ -25,6 +25,8 @@ extern "C" {
 #include "decodesignal.h"
 
 #include <pv/data/decoder.h>
+#include <pv/view/view.h>
+#include <pv/view/decode/annotation.h>
 
 using namespace boost;
 using namespace std;
@@ -37,6 +39,8 @@ DecodeSignal::DecodeSignal(pv::SigSession &session,
        Trace(session, QString(decoder->get_decoder()->name)),
        _decoder(decoder)
 {
+       assert(_decoder);
+
        _colour = Qt::red;
 }
 
@@ -50,16 +54,45 @@ 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_back(QPainter &p, int left, int right)
+{
+       paint_axis(p, get_y(), left, right);
+}
+
+void DecodeSignal::paint_mid(QPainter &p, int left, int right)
 {
-       (void)p;
-       (void)y;
-       (void)left;
-       (void)right;
-       (void)offset;
+       using namespace pv::view::decode;
+
+       assert(_view);
+       const int y = get_y();
 
+       const double scale = _view->scale();
        assert(scale > 0);
+
+       double samplerate = _decoder->get_samplerate();
+
+       // Show sample rate as 1Hz when it is unknown
+       if (samplerate == 0.0)
+               samplerate = 1.0;
+
+       const double pixels_offset = (_view->offset() -
+               _decoder->get_start_time()) / scale;
+       const double samples_per_pixel = samplerate * scale;
+
+       assert(_decoder);
+       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);
+       }
 }
 
 const list<QAction*> DecodeSignal::get_context_bar_actions()