X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fview%2Fdecodetrace.cpp;h=161eb9668bdd2217a43e8173d396138ea2908c6e;hb=f9101a91fc942a28515872ae6c7285973bd54b91;hp=e275a112ba82d889c0f5b0a51613e2f6b4c91d5d;hpb=06e810f29b6e9e3fe8ba8aba5d3823375da9bbb2;p=pulseview.git

diff --git a/pv/view/decodetrace.cpp b/pv/view/decodetrace.cpp
index e275a11..161eb96 100644
--- a/pv/view/decodetrace.cpp
+++ b/pv/view/decodetrace.cpp
@@ -47,8 +47,13 @@ extern "C" {
 #include <pv/widgets/decodergroupbox.h>
 #include <pv/widgets/decodermenu.h>
 
-using namespace boost;
-using namespace std;
+using boost::dynamic_pointer_cast;
+using boost::shared_ptr;
+using std::list;
+using std::max;
+using std::map;
+using std::min;
+using std::vector;
 
 namespace pv {
 namespace view {
@@ -78,7 +83,8 @@ const QColor DecodeTrace::Colours[7] = {
 
 DecodeTrace::DecodeTrace(pv::SigSession &session,
 	boost::shared_ptr<pv::data::DecoderStack> decoder_stack, int index) :
-	Trace(session, QString(decoder_stack->stack().front()->decoder()->name)),
+	Trace(session, QString::fromUtf8(
+		decoder_stack->stack().front()->decoder()->name)),
 	_decoder_stack(decoder_stack),
 	_delete_mapper(this)
 {
@@ -116,7 +122,7 @@ void DecodeTrace::paint_back(QPainter &p, int left, int right)
 
 void DecodeTrace::paint_mid(QPainter &p, int left, int right)
 {
-	using pv::data::decode::Annotation;
+	using namespace pv::data::decode;
 
 	const double scale = _view->scale();
 	assert(scale > 0);
@@ -131,29 +137,49 @@ void DecodeTrace::paint_mid(QPainter &p, int left, int right)
 		_decoder_stack->get_start_time()) / scale;
 	const double samples_per_pixel = samplerate * scale;
 
+	const uint64_t start_sample = (uint64_t)max((left + pixels_offset) *
+		samples_per_pixel, 0.0);
+	const uint64_t end_sample = (uint64_t)max((right + pixels_offset) *
+		samples_per_pixel, 0.0);
+
 	QFontMetrics m(QApplication::font());
-	const int h = (m.boundingRect(QRect(), 0, "Tg").height() * 5) / 4;
+	const int text_height =  m.boundingRect(QRect(), 0, "Tg").height();
+	const int annotation_height = (text_height * 5) / 4;
+	const int row_height = (text_height * 6) / 4;
 
 	assert(_decoder_stack);
 	const QString err = _decoder_stack->error_message();
 	if (!err.isEmpty())
 	{
 		draw_error(p, err, left, right);
-		draw_unresolved_period(p, h, left, right, samples_per_pixel,
-			pixels_offset);
+		draw_unresolved_period(p, annotation_height, left, right,
+			samples_per_pixel, pixels_offset);
 		return;
 	}
 
+	// Iterate through the rows
 	assert(_view);
-	const int y = get_y();
+	int y = get_y();
 
 	assert(_decoder_stack);
-	vector<Annotation> annotations(_decoder_stack->annotations());
-	BOOST_FOREACH(const Annotation &a, annotations)
-		draw_annotation(a, p, get_text_colour(), h, left, right,
-			samples_per_pixel, pixels_offset, y);
 
-	draw_unresolved_period(p, h, left, right,
+	const vector<Row> rows(_decoder_stack->get_rows());
+	BOOST_FOREACH (const Row &row, rows)
+	{
+		vector<Annotation> annotations;
+		_decoder_stack->get_annotation_subset(annotations, row,
+			start_sample, end_sample);
+		if (!annotations.empty()) {
+			BOOST_FOREACH(const Annotation &a, annotations)
+				draw_annotation(a, p, get_text_colour(),
+					annotation_height, left, right,
+					samples_per_pixel, pixels_offset, y);
+			y += row_height;
+		}
+	}
+
+	// Draw the hatching
+	draw_unresolved_period(p, annotation_height, left, right,
 		samples_per_pixel, pixels_offset);
 }
 
@@ -403,7 +429,8 @@ void DecodeTrace::create_decoder_form(int index,
 	assert(decoder);
 
 	pv::widgets::DecoderGroupBox *const group =
-		new pv::widgets::DecoderGroupBox(decoder->name);
+		new pv::widgets::DecoderGroupBox(
+			QString::fromUtf8(decoder->name));
 
 	_delete_mapper.setMapping(group, index);
 	connect(group, SIGNAL(delete_decoder()), &_delete_mapper, SLOT(map()));