X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fview%2Fdecodesignal.cpp;h=b151b3911d13ef6beb570cb092cefae115660ef1;hp=d27178920faae4190e4343f893387a1603af3d86;hb=f9abdc014adda6771828db4c8caa8f66e066b7a3;hpb=119aff65d8ad0c4cdaff32d9b68cee00d90a5f35

diff --git a/pv/view/decodesignal.cpp b/pv/view/decodesignal.cpp
index d2717892..b151b391 100644
--- a/pv/view/decodesignal.cpp
+++ b/pv/view/decodesignal.cpp
@@ -22,9 +22,16 @@ extern "C" {
 #include <libsigrokdecode/libsigrokdecode.h>
 }
 
+#include <extdef.h>
+
+#include <QAction>
+
 #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;
@@ -32,12 +39,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)
 {
-	_colour = Qt::red;
+	assert(_decoder);
+
+	_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)
@@ -50,16 +69,44 @@ 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, get_text_colour(), _text_size.height(),
+			left, right, samples_per_pixel, pixels_offset, y);
+	}
 }
 
 const list<QAction*> DecodeSignal::get_context_bar_actions()
@@ -68,5 +115,29 @@ const list<QAction*> DecodeSignal::get_context_bar_actions()
 	return actions;
 }
 
+QMenu* DecodeSignal::create_context_menu(QWidget *parent)
+{
+	QMenu *const menu = Trace::create_context_menu(parent);
+
+	menu->addSeparator();
+
+	QAction *const del = new QAction(tr("Delete"), this);
+	connect(del, SIGNAL(triggered()), this, SLOT(on_delete()));
+	menu->addAction(del);
+
+	return menu;
+}
+
+void DecodeSignal::on_new_decode_data()
+{
+	if (_view)
+		_view->update_viewport();
+}
+
+void DecodeSignal::on_delete()
+{
+	_session.remove_decode_signal(this);
+}
+
 } // namespace view
 } // namespace pv