#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 {
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_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_visible_rows());
+ for (size_t i = 0; i < rows.size(); i++)
+ {
+ const Row &row = rows[i];
+ 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, i);
+ y += row_height;
+ }
+ }
+
+ // 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();
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
+ double pixels_offset, int y, unsigned int row_index) 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 fill = Colours[((row_index * 2 + a.format()) *
+ (countof(Colours) / 4 + 1)) % countof(Colours)];
const QColor outline(fill.darker());
if (start > right + DrawPadding || end < left - DrawPadding)
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);
_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