Remove all decoder traces when loading a file

[pulseview.git] / pv / sigsession.cpp

diff --git a/pv/sigsession.cpp b/pv/sigsession.cpp
index aeb6d22072f55f6bc49c04dd389295fd852b5c6a..3213758ef263894c215cc83055849593700aa099 100644 (file)
--- a/pv/sigsession.cpp
+++ b/pv/sigsession.cpp
@@ -26,12 +26,13 @@
 
 #include "data/analog.h"
 #include "data/analogsnapshot.h"
 
 #include "data/analog.h"
 #include "data/analogsnapshot.h"

-#include "data/decoder.h"
+#include "data/decoderstack.h"

 #include "data/logic.h"
 #include "data/logicsnapshot.h"
 #include "data/logic.h"
 #include "data/logicsnapshot.h"

+#include "data/decode/decoder.h"

 
 #include "view/analogsignal.h"
 
 #include "view/analogsignal.h"

-#include "view/decodesignal.h"
+#include "view/decodetrace.h"

 #include "view/logicsignal.h"
 
 #include <assert.h>
 #include "view/logicsignal.h"
 
 #include <assert.h>


@@ -117,6 +118,7 @@ void SigSession::load_file(const string &name,
                sr_dev_inst *const sdi = (sr_dev_inst*)devlist->data;
                g_slist_free(devlist);
 
                sr_dev_inst *const sdi = (sr_dev_inst*)devlist->data;
                g_slist_free(devlist);
 

+               _decode_traces.clear();

                update_signals(sdi);
                read_sample_rate(sdi);
 
                update_signals(sdi);
                read_sample_rate(sdi);
 


@@ -131,6 +133,7 @@ void SigSession::load_file(const string &name,
                        error_handler)))
                        return;
 
                        error_handler)))
                        return;
 

+               _decode_traces.clear();

                update_signals(in->sdi);
                read_sample_rate(in->sdi);
 
                update_signals(in->sdi);
                read_sample_rate(in->sdi);
 


@@ -202,13 +205,15 @@ boost::shared_ptr<data::Logic> SigSession::get_data()
 bool SigSession::add_decoder(srd_decoder *const dec)
 {
        map<const srd_probe*, shared_ptr<view::LogicSignal> > probes;
 bool SigSession::add_decoder(srd_decoder *const dec)
 {
        map<const srd_probe*, shared_ptr<view::LogicSignal> > probes;

+       shared_ptr<data::DecoderStack> decoder_stack;

 
        try
        {
                lock_guard<mutex> lock(_signals_mutex);
 
                // Create the decoder
 
        try
        {
                lock_guard<mutex> lock(_signals_mutex);
 
                // Create the decoder

-               shared_ptr<data::Decoder> decoder(new data::Decoder(dec));
+               decoder_stack = shared_ptr<data::DecoderStack>(
+                       new data::DecoderStack(dec));

 
                // Auto select the initial probes
                for(const GSList *i = dec->probes; i; i = i->next)
 
                // Auto select the initial probes
                for(const GSList *i = dec->probes; i; i = i->next)


@@ -224,11 +229,14 @@ bool SigSession::add_decoder(srd_decoder *const dec)
                        }
                }
 
                        }
                }
 

-               decoder->set_probes(probes);
+               assert(decoder_stack);
+               assert(!decoder_stack->stack().empty());
+               assert(decoder_stack->stack().front());
+               decoder_stack->stack().front()->set_probes(probes);

 
                // Create the decode signal
 
                // Create the decode signal

-               shared_ptr<view::DecodeSignal> d(
-                       new view::DecodeSignal(*this, decoder,
+               shared_ptr<view::DecodeTrace> d(
+                       new view::DecodeTrace(*this, decoder_stack,

                                _decode_traces.size()));
                _decode_traces.push_back(d);
        }
                                _decode_traces.size()));
                _decode_traces.push_back(d);
        }


@@ -239,18 +247,21 @@ bool SigSession::add_decoder(srd_decoder *const dec)
 
        signals_changed();
 
 
        signals_changed();
 

+       // Do an initial decode
+       decoder_stack->begin_decode();
+

        return true;
 }
 
        return true;
 }
 

-vector< shared_ptr<view::DecodeSignal> > SigSession::get_decode_signals() const
+vector< shared_ptr<view::DecodeTrace> > SigSession::get_decode_signals() const

 {
        lock_guard<mutex> lock(_signals_mutex);
        return _decode_traces;
 }
 
 {
        lock_guard<mutex> lock(_signals_mutex);
        return _decode_traces;
 }
 

-void SigSession::remove_decode_signal(view::DecodeSignal *signal)
+void SigSession::remove_decode_signal(view::DecodeTrace *signal)

 {
 {

-       for (vector< shared_ptr<view::DecodeSignal> >::iterator i =
+       for (vector< shared_ptr<view::DecodeTrace> >::iterator i =

                _decode_traces.begin();
                i != _decode_traces.end();
                i++)
                _decode_traces.begin();
                i != _decode_traces.end();
                i++)