#include <pv/data/logic.hpp>
#include <pv/data/logicsegment.hpp>
#include <pv/data/decode/annotation.hpp>
-#include <pv/view/logicsignal.hpp>
#include <pv/view/view.hpp>
#include <pv/view/viewport.hpp>
#include <pv/widgets/decodergroupbox.hpp>
using std::vector;
namespace pv {
-namespace view {
+namespace views {
+namespace TraceView {
const QColor DecodeTrace::DecodeColours[4] = {
QColor(0xEF, 0x29, 0x29), // Red
};
DecodeTrace::DecodeTrace(pv::Session &session,
- std::shared_ptr<pv::data::DecoderStack> decoder_stack, int index) :
- Trace(QString::fromUtf8(
- decoder_stack->stack().front()->decoder()->name)),
+ shared_ptr<data::SignalBase> signalbase, int index) :
+ Trace(signalbase),
session_(session),
- decoder_stack_(decoder_stack),
+ signalbase_(signalbase),
row_height_(0),
max_visible_rows_(0),
delete_mapper_(this),
show_hide_mapper_(this)
{
- assert(decoder_stack_);
+ std::shared_ptr<pv::data::DecoderStack> decoder_stack =
+ signalbase_->decoder_stack();
// Determine shortest string we want to see displayed in full
QFontMetrics m(QApplication::font());
min_useful_label_width_ = m.width("XX"); // e.g. two hex characters
- set_colour(DecodeColours[index % countof(DecodeColours)]);
+ signalbase_->set_name(QString::fromUtf8(decoder_stack->stack().front()->decoder()->name));
+ signalbase_->set_colour(DecodeColours[index % countof(DecodeColours)]);
- connect(decoder_stack_.get(), SIGNAL(new_decode_data()),
+ connect(decoder_stack.get(), SIGNAL(new_decode_data()),
this, SLOT(on_new_decode_data()));
connect(&delete_mapper_, SIGNAL(mapped(int)),
this, SLOT(on_delete_decoder(int)));
return true;
}
-const std::shared_ptr<pv::data::DecoderStack>& DecodeTrace::decoder() const
+std::shared_ptr<data::SignalBase> DecodeTrace::base() const
{
- return decoder_stack_;
+ return base_;
}
pair<int, int> DecodeTrace::v_extents() const
{
using namespace pv::data::decode;
+ std::shared_ptr<pv::data::DecoderStack> decoder_stack =
+ signalbase_->decoder_stack();
+
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();
+ assert(decoder_stack);
+ const QString err = decoder_stack->error_message();
if (!err.isEmpty()) {
draw_unresolved_period(
p, annotation_height, pp.left(), pp.right());
pair<uint64_t, uint64_t> sample_range = get_sample_range(
pp.left(), pp.right());
- assert(decoder_stack_);
- const vector<Row> rows(decoder_stack_->get_visible_rows());
+ const vector<Row> rows(decoder_stack->get_visible_rows());
visible_rows_.clear();
for (const Row& row : rows) {
base_colour >>= 16;
vector<Annotation> annotations;
- decoder_stack_->get_annotation_subset(annotations, row,
+ decoder_stack->get_annotation_subset(annotations, row,
sample_range.first, sample_range.second);
if (!annotations.empty()) {
draw_annotations(annotations, p, annotation_height, pp, y,
// Draw the hatching
draw_unresolved_period(p, annotation_height, pp.left(), pp.right());
+ if ((int)visible_rows_.size() > max_visible_rows_)
+ owner_->extents_changed(false, true);
+
// Update the maximum row count if needed
max_visible_rows_ = std::max(max_visible_rows_, (int)visible_rows_.size());
}
{
using pv::data::decode::Decoder;
+ std::shared_ptr<pv::data::DecoderStack> decoder_stack =
+ signalbase_->decoder_stack();
+
assert(form);
assert(parent);
- assert(decoder_stack_);
+ assert(decoder_stack);
// Add the standard options
Trace::populate_popup_form(parent, form);
channel_selectors_.clear();
decoder_forms_.clear();
- const list< shared_ptr<Decoder> >& stack = decoder_stack_->stack();
+ const list< shared_ptr<Decoder> >& stack = decoder_stack->stack();
if (stack.empty()) {
QLabel *const l = new QLabel(
double samples_per_pixel, pixels_offset;
- assert(decoder_stack_);
+ std::shared_ptr<pv::data::DecoderStack> decoder_stack =
+ signalbase_->decoder_stack();
+
+ assert(decoder_stack);
shared_ptr<Logic> data;
- shared_ptr<LogicSignal> logic_signal;
+ shared_ptr<data::SignalBase> signalbase;
- const list< shared_ptr<Decoder> > &stack = decoder_stack_->stack();
+ const list< shared_ptr<Decoder> > &stack = decoder_stack->stack();
// 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/segment
for (const shared_ptr<Decoder> &dec : stack)
if (dec && !dec->channels().empty() &&
- ((logic_signal = (*dec->channels().begin()).second)) &&
- ((data = logic_signal->logic_data())))
+ ((signalbase = (*dec->channels().begin()).second)) &&
+ ((data = signalbase->logic_data())))
break;
if (!data || data->logic_segments().empty())
if (sample_count == 0)
return;
- const int64_t samples_decoded = decoder_stack_->samples_decoded();
+ const int64_t samples_decoded = decoder_stack->samples_decoded();
if (sample_count == samples_decoded)
return;
pair<double, double> DecodeTrace::get_pixels_offset_samples_per_pixel() const
{
+ std::shared_ptr<pv::data::DecoderStack> decoder_stack =
+ signalbase_->decoder_stack();
+
assert(owner_);
- assert(decoder_stack_);
+ assert(decoder_stack);
const View *view = owner_->view();
assert(view);
assert(scale > 0);
const double pixels_offset =
- ((view->offset() - decoder_stack_->start_time()) / scale).convert_to<double>();
+ ((view->offset() - decoder_stack->start_time()) / scale).convert_to<double>();
- double samplerate = decoder_stack_->samplerate();
+ double samplerate = decoder_stack->samplerate();
// Show sample rate as 1Hz when it is unknown
if (samplerate == 0.0)
vector<pv::data::decode::Annotation> annotations;
- assert(decoder_stack_);
- decoder_stack_->get_annotation_subset(annotations, visible_rows_[row],
+ std::shared_ptr<pv::data::DecoderStack> decoder_stack =
+ signalbase_->decoder_stack();
+
+ assert(decoder_stack);
+ decoder_stack->get_annotation_subset(annotations, visible_rows_[row],
sample_range.first, sample_range.second);
return (annotations.empty()) ?
channel_selectors_.push_back(s);
}
+ std::shared_ptr<pv::data::DecoderStack> decoder_stack =
+ signalbase_->decoder_stack();
+
// Add the options
shared_ptr<binding::Decoder> binding(
- new binding::Decoder(decoder_stack_, dec));
+ new binding::Decoder(decoder_stack, dec));
binding->add_properties_to_form(decoder_form, true);
bindings_.push_back(binding);
{
assert(dec);
- const auto sigs(session_.signals());
+ const auto sigs(session_.signalbases());
- vector< shared_ptr<Signal> > sig_list(sigs.begin(), sigs.end());
+ vector< shared_ptr<data::SignalBase> > sig_list(sigs.begin(), sigs.end());
std::sort(sig_list.begin(), sig_list.end(),
- [](const shared_ptr<Signal> &a, const shared_ptr<Signal> b) {
+ [](const shared_ptr<data::SignalBase> &a,
+ const shared_ptr<data::SignalBase> &b) {
return strnatcasecmp(a->name().toStdString(),
b->name().toStdString()) < 0; });
- assert(decoder_stack_);
const auto channel_iter = dec->channels().find(pdch);
QComboBox *selector = new QComboBox(parent);
if (channel_iter == dec->channels().end())
selector->setCurrentIndex(0);
- 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()));
+ for (const shared_ptr<data::SignalBase> &b : sig_list) {
+ assert(b);
+ if (b->type() == sigrok::ChannelType::LOGIC && b->enabled()) {
+ selector->addItem(b->name(),
+ qVariantFromValue((void*)b.get()));
if (channel_iter != dec->channels().end() &&
- (*channel_iter).second == s)
+ (*channel_iter).second == b)
selector->setCurrentIndex(
selector->count() - 1);
}
{
assert(dec);
- map<const srd_channel*, shared_ptr<LogicSignal> > channel_map;
+ map<const srd_channel*, shared_ptr<data::SignalBase> > channel_map;
- const unordered_set< shared_ptr<Signal> > sigs(session_.signals());
+ const unordered_set< shared_ptr<data::SignalBase> >
+ sigs(session_.signalbases());
for (const ChannelSelector &s : channel_selectors_) {
if (s.decoder_ != dec)
break;
- const LogicSignal *const selection =
- (LogicSignal*)s.combo_->itemData(
+ const data::SignalBase *const selection =
+ (data::SignalBase*)s.combo_->itemData(
s.combo_->currentIndex()).value<void*>();
- for (shared_ptr<Signal> sig : sigs)
+ for (shared_ptr<data::SignalBase> sig : sigs)
if (sig.get() == selection) {
- channel_map[s.pdch_] =
- dynamic_pointer_cast<LogicSignal>(sig);
+ channel_map[s.pdch_] = sig;
break;
}
}
void DecodeTrace::commit_channels()
{
- assert(decoder_stack_);
- for (shared_ptr<data::decode::Decoder> dec : decoder_stack_->stack())
+ std::shared_ptr<pv::data::DecoderStack> decoder_stack =
+ signalbase_->decoder_stack();
+
+ assert(decoder_stack);
+ for (shared_ptr<data::decode::Decoder> dec : decoder_stack->stack())
commit_decoder_channels(dec);
- decoder_stack_->begin_decode();
+ decoder_stack->begin_decode();
}
void DecodeTrace::on_new_decode_data()
void DecodeTrace::on_delete()
{
- session_.remove_decode_signal(this);
+ session_.remove_decode_signal(base_);
}
void DecodeTrace::on_channel_selected(int)
void DecodeTrace::on_stack_decoder(srd_decoder *decoder)
{
+ std::shared_ptr<pv::data::DecoderStack> decoder_stack =
+ signalbase_->decoder_stack();
+
assert(decoder);
- assert(decoder_stack_);
- decoder_stack_->push(shared_ptr<data::decode::Decoder>(
+ assert(decoder_stack);
+ decoder_stack->push(shared_ptr<data::decode::Decoder>(
new data::decode::Decoder(decoder)));
- decoder_stack_->begin_decode();
+ decoder_stack->begin_decode();
create_popup_form();
}
void DecodeTrace::on_delete_decoder(int index)
{
- decoder_stack_->remove(index);
+ std::shared_ptr<pv::data::DecoderStack> decoder_stack =
+ signalbase_->decoder_stack();
+
+ decoder_stack->remove(index);
// Update the popup
create_popup_form();
- decoder_stack_->begin_decode();
+ 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());
+ std::shared_ptr<pv::data::DecoderStack> decoder_stack =
+ signalbase_->decoder_stack();
+
+ const list< shared_ptr<Decoder> > stack(decoder_stack->stack());
// Find the decoder in the stack
auto iter = stack.cbegin();
owner_->row_item_appearance_changed(false, true);
}
-} // namespace view
+} // namespace TraceView
+} // namespace views
} // namespace pv
projects / pulseview.git / blobdiff