X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=pv%2Fview%2Fdecodetrace.cpp;h=e4f02760eaa0b6b1719cdeb8bb323be3bd10a512;hb=0f290e9b8109cc5324706fa029ed7f28f462d754;hp=22d8f2dce06ceff5b0c46e8a185550ce52fc81ba;hpb=dd048a7ec035447c051c7937ce04aca5be065b4e;p=pulseview.git diff --git a/pv/view/decodetrace.cpp b/pv/view/decodetrace.cpp index 22d8f2dc..e4f02760 100644 --- a/pv/view/decodetrace.cpp +++ b/pv/view/decodetrace.cpp @@ -25,6 +25,7 @@ extern "C" { #include #include +#include #include #include @@ -68,23 +69,53 @@ 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; -const QColor DecodeTrace::Colours[7] = { - QColor(0xFC, 0xE9, 0x4F), // Light Butter - QColor(0xFC, 0xAF, 0x3E), // Light Orange - QColor(0xE9, 0xB9, 0x6E), // Light Chocolate - QColor(0x8A, 0xE2, 0x34), // Light Green - QColor(0x72, 0x9F, 0xCF), // Light Blue - QColor(0xAD, 0x7F, 0xA8), // Light Plum - QColor(0xEF, 0x29, 0x29) // Light Red +const QColor DecodeTrace::Colours[16] = { + QColor(0xEF, 0x29, 0x29), + QColor(0xF6, 0x6A, 0x32), + QColor(0xFC, 0xAE, 0x3E), + QColor(0xFB, 0xCA, 0x47), + QColor(0xFC, 0xE9, 0x4F), + QColor(0xCD, 0xF0, 0x40), + QColor(0x8A, 0xE2, 0x34), + QColor(0x4E, 0xDC, 0x44), + QColor(0x55, 0xD7, 0x95), + QColor(0x64, 0xD1, 0xD2), + QColor(0x72, 0x9F, 0xCF), + QColor(0xD4, 0x76, 0xC4), + QColor(0x9D, 0x79, 0xB9), + QColor(0xAD, 0x7F, 0xA8), + QColor(0xC2, 0x62, 0x9B), + QColor(0xD7, 0x47, 0x6F) +}; + +const QColor DecodeTrace::OutlineColours[16] = { + QColor(0x77, 0x14, 0x14), + QColor(0x7B, 0x35, 0x19), + QColor(0x7E, 0x57, 0x1F), + QColor(0x7D, 0x65, 0x23), + QColor(0x7E, 0x74, 0x27), + QColor(0x66, 0x78, 0x20), + QColor(0x45, 0x71, 0x1A), + QColor(0x27, 0x6E, 0x22), + QColor(0x2A, 0x6B, 0x4A), + QColor(0x32, 0x68, 0x69), + QColor(0x39, 0x4F, 0x67), + QColor(0x6A, 0x3B, 0x62), + QColor(0x4E, 0x3C, 0x5C), + QColor(0x56, 0x3F, 0x54), + QColor(0x61, 0x31, 0x4D), + QColor(0x6B, 0x23, 0x37) }; DecodeTrace::DecodeTrace(pv::SigSession &session, boost::shared_ptr 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) @@ -132,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; @@ -154,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; } @@ -170,6 +203,13 @@ void DecodeTrace::paint_mid(QPainter &p, int left, int right) for (size_t i = 0; i < rows.size(); i++) { const Row &row = rows[i]; + + size_t base_colour = 0x13579BDF; + boost::hash_combine(base_colour, this); + boost::hash_combine(base_colour, row.decoder()); + boost::hash_combine(base_colour, row.row()); + base_colour >>= 16; + vector annotations; _decoder_stack->get_annotation_subset(annotations, row, start_sample, end_sample); @@ -177,8 +217,11 @@ void DecodeTrace::paint_mid(QPainter &p, int left, int right) BOOST_FOREACH(const Annotation &a, annotations) draw_annotation(a, p, get_text_colour(), annotation_height, left, right, - samples_per_pixel, pixels_offset, y, i); + samples_per_pixel, pixels_offset, y, + base_colour); y += row_height; + + _cur_row_headings.push_back(row.title()); } } @@ -187,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; @@ -254,17 +343,19 @@ QMenu* DecodeTrace::create_context_menu(QWidget *parent) return menu; } -void DecodeTrace::draw_annotation(const pv::data::decode::Annotation &a, QPainter &p, - QColor text_color, int h, int left, int right, double samples_per_pixel, - double pixels_offset, int y, unsigned int row_index) const +void DecodeTrace::draw_annotation(const pv::data::decode::Annotation &a, + QPainter &p, QColor text_color, int h, int left, int right, + double samples_per_pixel, double pixels_offset, int y, + size_t base_colour) const { const double start = a.start_sample() / samples_per_pixel - pixels_offset; const double end = a.end_sample() / samples_per_pixel - pixels_offset; - const QColor fill = Colours[((row_index * 2 + a.format()) * - (countof(Colours) / 4 + 1)) % countof(Colours)]; - const QColor outline(fill.darker()); + + const size_t colour = (base_colour + a.format()) % countof(Colours); + const QColor &fill = Colours[colour]; + const QColor &outline = OutlineColours[colour]; if (start > right + DrawPadding || end < left - DrawPadding) return; @@ -330,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 @@ -456,7 +550,8 @@ void DecodeTrace::create_decoder_form(int index, connect(combo, SIGNAL(currentIndexChanged(int)), this, SLOT(on_probe_selected(int))); decoder_form->addRow(tr("%1 (%2) *") - .arg(p->name).arg(p->desc), combo); + .arg(QString::fromUtf8(p->name)) + .arg(QString::fromUtf8(p->desc)), combo); const ProbeSelector s = {combo, dec, p}; _probe_selectors.push_back(s); @@ -470,7 +565,8 @@ void DecodeTrace::create_decoder_form(int index, connect(combo, SIGNAL(currentIndexChanged(int)), this, SLOT(on_probe_selected(int))); decoder_form->addRow(tr("%1 (%2)") - .arg(p->name).arg(p->desc), combo); + .arg(QString::fromUtf8(p->name)) + .arg(QString::fromUtf8(p->desc)), combo); const ProbeSelector s = {combo, dec, p}; _probe_selectors.push_back(s);