X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fview%2Fdecodesignal.cpp;h=89d2c3212774cd229d72666a32cdd73f72e5ae8f;hp=44144d1b8b8e31a37648e6d44fb03221e20e94bb;hb=9cef95672622f4ecdb21edef9d81a10c789daf1e;hpb=e0fc58100fbcd6c3bfd5aecb213d7541a3436622

diff --git a/pv/view/decodesignal.cpp b/pv/view/decodesignal.cpp
index 44144d1b..89d2c321 100644
--- a/pv/view/decodesignal.cpp
+++ b/pv/view/decodesignal.cpp
@@ -22,10 +22,14 @@ extern "C" {
 #include <libsigrokdecode/libsigrokdecode.h>
 }
 
+#include <extdef.h>
+
 #include "decodesignal.h"
 
+#include <pv/sigsession.h>
 #include <pv/data/decoder.h>
 #include <pv/view/view.h>
+#include <pv/view/decode/annotation.h>
 
 using namespace boost;
 using namespace std;
@@ -33,14 +37,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)];
+
+	connect(_decoder.get(), SIGNAL(new_decode_data()),
+		this, SLOT(on_new_decode_data()));
 }
 
 void DecodeSignal::init_context_bar_actions(QWidget *parent)
@@ -59,11 +73,39 @@ 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)
 {
-	(void)p;
-	(void)left;
-	(void)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, _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()
@@ -72,5 +114,11 @@ const list<QAction*> DecodeSignal::get_context_bar_actions()
 	return actions;
 }
 
+void DecodeSignal::on_new_decode_data()
+{
+	if (_view)
+		_view->update_viewport();
+}
+
 } // namespace view
 } // namespace pv