X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fview%2Fdecodesignal.cpp;h=bc37b2019819c8c54b046467da6fc1a239b24a8e;hb=fe08b6e8a85c80ae738757f7d85aa38ef7c4bdc3;hp=3e28d493d238a6b7a50a12fcc58f145fd39b66b7;hpb=55d3603d6a81995e613535a18a0949b3c469ac8a;p=pulseview.git

diff --git a/pv/view/decodesignal.cpp b/pv/view/decodesignal.cpp
index 3e28d49..bc37b20 100644
--- a/pv/view/decodesignal.cpp
+++ b/pv/view/decodesignal.cpp
@@ -24,34 +24,73 @@ 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;
 
 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;
 }
 
+void DecodeSignal::init_context_bar_actions(QWidget *parent)
+{
+	(void)parent;
+}
+
 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)
 {
-	(void)p;
-	(void)y;
-	(void)left;
-	(void)right;
-	(void)offset;
+	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 = 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, left, right, samples_per_pixel, pixels_offset, y);
+	}
 }
 
 const list<QAction*> DecodeSignal::get_context_bar_actions()