Display cursor popup time value correctly.

[pulseview.git] / pv / sigsession.cpp

diff --git a/pv/sigsession.cpp b/pv/sigsession.cpp
index 24a059ea8a35f03340461aac434047231087ec05..6c9b57f84ac1e9492d321b606144643dc1acad3e 100644 (file)
--- a/pv/sigsession.cpp
+++ b/pv/sigsession.cpp
@@ -18,7 +18,9 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
+#ifdef ENABLE_DECODE
 #include <libsigrokdecode/libsigrokdecode.h>
+#endif
 
 #include "sigsession.h"
 
@@ -26,9 +28,10 @@
 
 #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/decode/decoder.h"
 
 #include "view/analogsignal.h"
 #include "view/decodetrace.h"
@@ -82,6 +85,9 @@ struct sr_dev_inst* SigSession::get_device() const
 
 void SigSession::set_device(struct sr_dev_inst *sdi)
 {
+       // Ensure we are not capturing before setting the device
+       stop_capture();
+
        if (_sdi)
                _device_manager.release_device(_sdi);
        if (sdi)
@@ -117,6 +123,7 @@ void SigSession::load_file(const string &name,
                sr_dev_inst *const sdi = (sr_dev_inst*)devlist->data;
                g_slist_free(devlist);
 
+               _decode_traces.clear();
                update_signals(sdi);
                read_sample_rate(sdi);
 
@@ -131,6 +138,7 @@ void SigSession::load_file(const string &name,
                        error_handler)))
                        return;
 
+               _decode_traces.clear();
                update_signals(in->sdi);
                read_sample_rate(in->sdi);
 
@@ -199,16 +207,19 @@ boost::shared_ptr<data::Logic> SigSession::get_data()
        return _logic_data;
 }
 
+#ifdef ENABLE_DECODE
 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
-               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)
@@ -218,17 +229,21 @@ bool SigSession::add_decoder(srd_decoder *const dec)
                        {
                                shared_ptr<view::LogicSignal> l =
                                        dynamic_pointer_cast<view::LogicSignal>(s);
-                               if (l && QString(probe->name).toLower().contains(
+                               if (l && QString::fromUtf8(probe->name).
+                                       toLower().contains(
                                        l->get_name().toLower()))
                                        probes[probe] = l;
                        }
                }
 
-               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
                shared_ptr<view::DecodeTrace> d(
-                       new view::DecodeTrace(*this, decoder,
+                       new view::DecodeTrace(*this, decoder_stack,
                                _decode_traces.size()));
                _decode_traces.push_back(d);
        }
@@ -239,6 +254,9 @@ bool SigSession::add_decoder(srd_decoder *const dec)
 
        signals_changed();
 
+       // Do an initial decode
+       decoder_stack->begin_decode();
+
        return true;
 }
 
@@ -261,6 +279,7 @@ void SigSession::remove_decode_signal(view::DecodeTrace *signal)
                        return;
                }
 }
+#endif
 
 void SigSession::set_capture_state(capture_state state)
 {