Merge DecoderStack into DecodeSignal

[pulseview.git] / pv / views / trace / decodetrace.cpp

diff --git a/pv/views/trace/decodetrace.cpp b/pv/views/trace/decodetrace.cpp
index a4628eab9fbfdac55c9125e765f5c6cc0976ebcd..d8f04c582ef5a6c9c76696e344e034a52db6bace 100644 (file)
--- a/pv/views/trace/decodetrace.cpp
+++ b/pv/views/trace/decodetrace.cpp
@@ -54,10 +54,8 @@ extern "C" {
 #include <pv/widgets/decodermenu.hpp>
 
 using std::all_of;
-using std::list;
 using std::make_pair;
 using std::max;
-using std::make_pair;
 using std::map;
 using std::min;
 using std::out_of_range;
@@ -304,8 +302,7 @@ void DecodeTrace::populate_popup_form(QWidget *parent, QFormLayout *form)
        init_state_map_.clear();
        decoder_forms_.clear();
 
-       const list< shared_ptr<Decoder> > &stack =
-               decode_signal_->decoder_stack_list();
+       const vector< shared_ptr<Decoder> > &stack = decode_signal_->decoder_stack();
 
        if (stack.empty()) {
                QLabel *const l = new QLabel(
@@ -600,11 +597,11 @@ void DecodeTrace::draw_unresolved_period(QPainter &p, int h, int left, int right
 
        double samples_per_pixel, pixels_offset;
 
-       const int64_t sample_count = decode_signal_->sample_count();
+       const int64_t sample_count = decode_signal_->get_working_sample_count();
        if (sample_count == 0)
                return;
 
-       const int64_t samples_decoded = decode_signal_->samples_decoded();
+       const int64_t samples_decoded = decode_signal_->get_decoded_sample_count();
        if (sample_count == samples_decoded)
                return;
 
@@ -776,7 +773,7 @@ void DecodeTrace::create_decoder_form(int index,
        QFormLayout *const decoder_form = new QFormLayout;
        group->add_layout(decoder_form);
 
-       const list<DecodeChannel> channels = decode_signal_->get_channels();
+       const vector<DecodeChannel> channels = decode_signal_->get_channels();
 
        // Add the channels
        for (DecodeChannel ch : channels) {
@@ -807,11 +804,9 @@ void DecodeTrace::create_decoder_form(int index,
                        .arg(ch.name, ch.desc, required_flag), hlayout);
        }
 
-       shared_ptr<pv::data::DecoderStack> decoder_stack = base_->decoder_stack();
-
        // Add the options
        shared_ptr<binding::Decoder> binding(
-               new binding::Decoder(decoder_stack, dec));
+               new binding::Decoder(decode_signal_, dec));
        binding->add_properties_to_form(decoder_form, true);
 
        bindings_.push_back(binding);