X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=pv%2Fview%2Fdecodetrace.cpp;h=e4f02760eaa0b6b1719cdeb8bb323be3bd10a512;hb=0f290e9b8109cc5324706fa029ed7f28f462d754;hp=d27f1ae01796a06c20e82eeba18ef3005f69ab3d;hpb=636782c1f942d1acdb56a0561c2e0fd52cc39ddb;p=pulseview.git

diff --git a/pv/view/decodetrace.cpp b/pv/view/decodetrace.cpp
index d27f1ae0..e4f02760 100644
--- a/pv/view/decodetrace.cpp
+++ b/pv/view/decodetrace.cpp
@@ -25,6 +25,7 @@ extern "C" {
 #include <extdef.h>
 
 #include <boost/foreach.hpp>
+#include <boost/functional/hash.hpp>
 
 #include <QAction>
 #include <QApplication>
@@ -68,6 +69,7 @@ const QColor DecodeTrace::DecodeColours[4] = {
 const QColor DecodeTrace::ErrorBgColour = QColor(0xEF, 0x29, 0x29);
 const QColor DecodeTrace::NoDecodeColour = QColor(0x88, 0x8A, 0x85);
 
+const int DecodeTrace::ArrowSize = 4;
 const double DecodeTrace::EndCapWidth = 5;
 const int DecodeTrace::DrawPadding = 100;
 
@@ -111,8 +113,9 @@ const QColor DecodeTrace::OutlineColours[16] = {
 
 DecodeTrace::DecodeTrace(pv::SigSession &session,
 	boost::shared_ptr<pv::data::DecoderStack> decoder_stack, int index) :
-	Trace(session, QString::fromUtf8(
+	Trace(QString::fromUtf8(
 		decoder_stack->stack().front()->decoder()->name)),
+	_session(session),
 	_decoder_stack(decoder_stack),
 	_delete_mapper(this),
 	_show_hide_mapper(this)
@@ -160,6 +163,8 @@ void DecodeTrace::paint_mid(QPainter &p, int left, int right)
 
 	double samplerate = _decoder_stack->samplerate();
 
+	_cur_row_headings.clear();
+
 	// Show sample rate as 1Hz when it is unknown
 	if (samplerate == 0.0)
 		samplerate = 1.0;
@@ -182,9 +187,9 @@ void DecodeTrace::paint_mid(QPainter &p, int left, int right)
 	const QString err = _decoder_stack->error_message();
 	if (!err.isEmpty())
 	{
-		draw_error(p, err, left, right);
 		draw_unresolved_period(p, annotation_height, left, right,
 			samples_per_pixel, pixels_offset);
+		draw_error(p, err, left, right);
 		return;
 	}
 
@@ -215,6 +220,8 @@ void DecodeTrace::paint_mid(QPainter &p, int left, int right)
 					samples_per_pixel, pixels_offset, y,
 					base_colour);
 			y += row_height;
+
+			_cur_row_headings.push_back(row.title());
 		}
 	}
 
@@ -223,6 +230,52 @@ void DecodeTrace::paint_mid(QPainter &p, int left, int right)
 		samples_per_pixel, pixels_offset);
 }
 
+void DecodeTrace::paint_fore(QPainter &p, int left, int right)
+{
+	using namespace pv::data::decode;
+
+	(void)right;
+
+	QFontMetrics m(QApplication::font());
+	const int text_height =  m.boundingRect(QRect(), 0, "Tg").height();
+	const int row_height = (text_height * 6) / 4;
+
+	for (size_t i = 0; i < _cur_row_headings.size(); i++)
+	{
+		const int y = i * row_height + get_y();
+
+		p.setPen(QPen(Qt::NoPen));
+		p.setBrush(QApplication::palette().brush(QPalette::WindowText));
+
+		if (i != 0)
+		{
+			const QPointF points[] = {
+				QPointF(left, y - ArrowSize),
+				QPointF(left + ArrowSize, y),
+				QPointF(left, y + ArrowSize)
+			};
+			p.drawPolygon(points, countof(points));
+		}
+
+		const QRect r(left + ArrowSize * 2, y - row_height / 2,
+			right - left, row_height);
+		const QString h(_cur_row_headings[i]);
+		const int f = Qt::AlignLeft | Qt::AlignVCenter |
+			Qt::TextDontClip;
+
+		// Draw the outline
+		p.setPen(QApplication::palette().color(QPalette::Base));
+		for (int dx = -1; dx <= 1; dx++)
+			for (int dy = -1; dy <= 1; dy++)
+				if (dx != 0 && dy != 0)
+					p.drawText(r.translated(dx, dy), f, h);
+
+		// Draw the text
+		p.setPen(QApplication::palette().color(QPalette::WindowText));
+		p.drawText(r, f, h);
+	}
+}
+
 void DecodeTrace::populate_popup_form(QWidget *parent, QFormLayout *form)
 {
 	using pv::data::decode::Decoder;
@@ -368,6 +421,9 @@ void DecodeTrace::draw_range(const pv::data::decode::Annotation &a, QPainter &p,
 
 	QRectF rect(start + cap_width, y - h / 2,
 		end - start - cap_width * 2, h);
+	if (rect.width() <= 4)
+		return;
+
 	p.setPen(text_color);
 
 	// Try to find an annotation that will fit