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,
Trace(session, QString::fromUtf8(
decoder_stack->stack().front()->decoder()->name)),
_decoder_stack(decoder_stack),
- _delete_mapper(this)
+ _delete_mapper(this),
+ _show_hide_mapper(this)
{
assert(_decoder_stack);
this, SLOT(on_new_decode_data()));
connect(&_delete_mapper, SIGNAL(mapped(int)),
this, SLOT(on_delete_decoder(int)));
+ connect(&_show_hide_mapper, SIGNAL(mapped(int)),
+ this, SLOT(on_show_hide_decoder(int)));
}
bool DecodeTrace::enabled() const
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);
_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_unresolved_period(p, annotation_height, left, right,
+ samples_per_pixel, pixels_offset);
draw_error(p, err, left, right);
- draw_unresolved_period(p, h, 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) {
- // Every stacked PD is 60 pixels further down.
- int y_stack_offset = a.pd_index() * 60;
-
- // Every annotation row is 20 pixels further down.
- int y_ann_row_offset = a.row() * 20;
- draw_annotation(a, p, get_text_colour(), h, left, right,
- samples_per_pixel, pixels_offset,
- y + y_stack_offset + y_ann_row_offset);
+ const vector<Row> rows(_decoder_stack->get_visible_rows());
+ 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<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,
+ base_colour);
+ y += row_height;
+ }
}
- draw_unresolved_period(p, h, left, right,
+ // Draw the hatching
+ draw_unresolved_period(p, annotation_height, left, right,
samples_per_pixel, pixels_offset);
}
// Add the decoder options
_bindings.clear();
_probe_selectors.clear();
+ _decoder_forms.clear();
const list< shared_ptr<Decoder> >& stack = _decoder_stack->stack();
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) 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[(a.format() * (countof(Colours) / 2 + 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;
pv::widgets::DecoderGroupBox *const group =
new pv::widgets::DecoderGroupBox(
QString::fromUtf8(decoder->name));
+ group->set_decoder_visible(dec->shown());
_delete_mapper.setMapping(group, index);
connect(group, SIGNAL(delete_decoder()), &_delete_mapper, SLOT(map()));
+ _show_hide_mapper.setMapping(group, index);
+ connect(group, SIGNAL(show_hide_decoder()),
+ &_show_hide_mapper, SLOT(map()));
+
QFormLayout *const decoder_form = new QFormLayout;
group->add_layout(decoder_form);
connect(combo, SIGNAL(currentIndexChanged(int)),
this, SLOT(on_probe_selected(int)));
decoder_form->addRow(tr("<b>%1</b> (%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);
connect(combo, SIGNAL(currentIndexChanged(int)),
this, SLOT(on_probe_selected(int)));
decoder_form->addRow(tr("<b>%1</b> (%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);
_bindings.push_back(binding);
form->addRow(group);
+ _decoder_forms.push_back(group);
}
QComboBox* DecodeTrace::create_probe_selector(
_decoder_stack->begin_decode();
}
+void DecodeTrace::on_show_hide_decoder(int index)
+{
+ using pv::data::decode::Decoder;
+
+ const list< shared_ptr<Decoder> > stack(_decoder_stack->stack());
+
+ // Find the decoder in the stack
+ list< shared_ptr<Decoder> >::const_iterator iter = stack.begin();
+ for(int i = 0; i < index; i++, iter++)
+ assert(iter != stack.end());
+
+ shared_ptr<Decoder> dec = *iter;
+ assert(dec);
+
+ const bool show = !dec->shown();
+ dec->show(show);
+
+ assert(index < (int)_decoder_forms.size());
+ _decoder_forms[index]->set_decoder_visible(show);
+
+ _view->update_viewport();
+}
+
} // namespace view
} // namespace pv