#include <pv/data/decoderstack.hpp>
#include <pv/data/decode/decoder.hpp>
#include <pv/data/logic.hpp>
-#include <pv/data/logicsnapshot.hpp>
+#include <pv/data/logicsegment.hpp>
#include <pv/data/decode/annotation.hpp>
#include <pv/view/logicsignal.hpp>
#include <pv/view/view.hpp>
using std::pair;
using std::shared_ptr;
using std::tie;
+using std::unordered_set;
using std::vector;
namespace pv {
decoder_stack->stack().front()->decoder()->name)),
session_(session),
decoder_stack_(decoder_stack),
- text_height_(0),
row_height_(0),
delete_mapper_(this),
show_hide_mapper_(this)
{
/// @todo Replace this with an implementation that knows the true
/// height of the trace
- const int row_height = (RowItemPaintParams::text_height() * 6) / 4;
+ const int row_height = (ViewItemPaintParams::text_height() * 6) / 4;
return make_pair(-row_height / 2, row_height * 7 / 2);
}
-void DecodeTrace::paint_back(QPainter &p, const RowItemPaintParams &pp)
+void DecodeTrace::paint_back(QPainter &p, const ViewItemPaintParams &pp)
{
Trace::paint_back(p, pp);
paint_axis(p, pp, get_visual_y());
}
-void DecodeTrace::paint_mid(QPainter &p, const RowItemPaintParams &pp)
+void DecodeTrace::paint_mid(QPainter &p, const ViewItemPaintParams &pp)
{
using namespace pv::data::decode;
- text_height_ = RowItemPaintParams::text_height();
- row_height_ = (text_height_ * 6) / 4;
- const int annotation_height = (text_height_ * 5) / 4;
+ const int text_height = ViewItemPaintParams::text_height();
+ row_height_ = (text_height * 6) / 4;
+ const int annotation_height = (text_height * 5) / 4;
assert(decoder_stack_);
const QString err = decoder_stack_->error_message();
sample_range.first, sample_range.second);
if (!annotations.empty()) {
for (const Annotation &a : annotations)
- draw_annotation(a, p, get_text_colour(),
- annotation_height, pp, y, base_colour);
+ draw_annotation(a, p, annotation_height,
+ pp, y, base_colour);
y += row_height_;
visible_rows_.push_back(rows[i]);
draw_unresolved_period(p, annotation_height, pp.left(), pp.right());
}
-void DecodeTrace::paint_fore(QPainter &p, const RowItemPaintParams &pp)
+void DecodeTrace::paint_fore(QPainter &p, const ViewItemPaintParams &pp)
{
using namespace pv::data::decode;
}
void DecodeTrace::draw_annotation(const pv::data::decode::Annotation &a,
- QPainter &p, QColor text_color, int h, const RowItemPaintParams &pp, int y,
+ QPainter &p, int h, const ViewItemPaintParams &pp, int y,
size_t base_colour) const
{
double samples_per_pixel, pixels_offset;
return;
if (a.start_sample() == a.end_sample())
- draw_instant(a, p, fill, outline, text_color, h,
- start, y);
+ draw_instant(a, p, fill, outline, h, start, y);
else
- draw_range(a, p, fill, outline, text_color, h,
- start, end, y);
+ draw_range(a, p, fill, outline, h, start, end, y);
}
void DecodeTrace::draw_instant(const pv::data::decode::Annotation &a, QPainter &p,
- QColor fill, QColor outline, QColor text_color, int h, double x, int y) const
+ QColor fill, QColor outline, int h, double x, int y) const
{
const QString text = a.annotations().empty() ?
QString() : a.annotations().back();
p.setBrush(fill);
p.drawRoundedRect(rect, h / 2, h / 2);
- p.setPen(text_color);
+ p.setPen(Qt::black);
p.drawText(rect, Qt::AlignCenter | Qt::AlignVCenter, text);
}
void DecodeTrace::draw_range(const pv::data::decode::Annotation &a, QPainter &p,
- QColor fill, QColor outline, QColor text_color, int h, double start,
+ QColor fill, QColor outline, int h, double start,
double end, int y) const
{
const double top = y + .5 - h / 2;
if (rect.width() <= 4)
return;
- p.setPen(text_color);
+ p.setPen(Qt::black);
// Try to find an annotation that will fit
QString best_annotation;
}
void DecodeTrace::draw_error(QPainter &p, const QString &message,
- const RowItemPaintParams &pp)
+ const ViewItemPaintParams &pp)
{
const int y = get_visual_y();
p.drawRoundedRect(text_rect.adjusted(-r, -r, r, r), r, r,
Qt::AbsoluteSize);
- p.setPen(get_text_colour());
+ p.setPen(Qt::black);
p.drawText(text_rect, message);
}
// We get the logic data of the first channel in the list.
// This works because we are currently assuming all
- // LogicSignals have the same data/snapshot
+ // LogicSignals have the same data/segment
for (const shared_ptr<Decoder> &dec : stack)
if (dec && !dec->channels().empty() &&
((logic_signal = (*dec->channels().begin()).second)) &&
((data = logic_signal->logic_data())))
break;
- if (!data || data->get_snapshots().empty())
+ if (!data || data->logic_segments().empty())
return;
- const shared_ptr<LogicSnapshot> snapshot =
- data->get_snapshots().front();
- assert(snapshot);
- const int64_t sample_count = (int64_t)snapshot->get_sample_count();
+ const shared_ptr<LogicSegment> segment =
+ data->logic_segments().front();
+ assert(segment);
+ const int64_t sample_count = (int64_t)segment->get_sample_count();
if (sample_count == 0)
return;
assert(scale > 0);
const double pixels_offset =
- (view->offset() - decoder_stack_->get_start_time()) / scale;
+ (view->offset() - decoder_stack_->start_time()) / scale;
double samplerate = decoder_stack_->samplerate();
if (!row_height_)
return -1;
- const int row = (point.y() - get_visual_y() + row_height_ / 2) /
- row_height_;
- if (row < 0 || row >= (int)visible_rows_.size())
+ const int y = (point.y() - get_visual_y() + row_height_ / 2);
+
+ /* Integer divison of (x-1)/x would yield 0, so we check for this. */
+ if (y < 0)
+ return -1;
+
+ const int row = y / row_height_;
+
+ if (row >= (int)visible_rows_.size())
return -1;
return row;
QString() : annotations[0].annotations().front();
}
-void DecodeTrace::hide_hover_annotation()
-{
- QToolTip::hideText();
-}
-
void DecodeTrace::hover_point_changed()
{
assert(owner_);
assert(view);
if (!row_height_ || ann.isEmpty()) {
- hide_hover_annotation();
+ QToolTip::hideText();
return;
}
hp.setY(get_visual_y() - (row_height_ / 2) +
(hover_row * row_height_) -
- row_height_ - text_size.height());
+ row_height_ - text_size.height() - padding);
QToolTip::showText(view->viewport()->mapToGlobal(hp), ann);
}
}
// Add the options
- shared_ptr<prop::binding::DecoderOptions> binding(
- new prop::binding::DecoderOptions(decoder_stack_, dec));
+ shared_ptr<binding::Decoder> binding(
+ new binding::Decoder(decoder_stack_, dec));
binding->add_properties_to_form(decoder_form, true);
bindings_.push_back(binding);
assert(dec);
shared_lock<shared_mutex> lock(session_.signals_mutex());
- const vector< shared_ptr<Signal> > &sigs(session_.signals());
+ const auto &sigs(session_.signals());
+
+ vector< shared_ptr<Signal> > sig_list(sigs.begin(), sigs.end());
+ std::sort(sig_list.begin(), sig_list.end(),
+ [](const shared_ptr<Signal> &a, const shared_ptr<Signal> b) {
+ return a->name().compare(b->name()) < 0; });
assert(decoder_stack_);
const auto channel_iter = dec->channels().find(pdch);
if (channel_iter == dec->channels().end())
selector->setCurrentIndex(0);
- for(size_t i = 0; i < sigs.size(); i++) {
- const shared_ptr<view::Signal> s(sigs[i]);
+ for (const shared_ptr<view::Signal> &s : sig_list) {
assert(s);
-
if (dynamic_pointer_cast<LogicSignal>(s) && s->enabled())
{
selector->addItem(s->name(),
qVariantFromValue((void*)s.get()));
if ((*channel_iter).second == s)
- selector->setCurrentIndex(i + 1);
+ selector->setCurrentIndex(
+ selector->count() - 1);
}
}
map<const srd_channel*, shared_ptr<LogicSignal> > channel_map;
shared_lock<shared_mutex> lock(session_.signals_mutex());
- const vector< shared_ptr<Signal> > &sigs(session_.signals());
+ const unordered_set< shared_ptr<Signal> > &sigs(session_.signals());
for (const ChannelSelector &s : channel_selectors_)
{
void DecodeTrace::on_new_decode_data()
{
if (owner_)
- owner_->appearance_changed(false, true);
+ owner_->row_item_appearance_changed(false, true);
}
void DecodeTrace::delete_pressed()
decoder_forms_[index]->set_decoder_visible(show);
if (owner_)
- owner_->appearance_changed(false, true);
+ owner_->row_item_appearance_changed(false, true);
}
} // namespace view