Refactoring in View and SigSession

[pulseview.git] / pv / sigsession.cpp

diff --git a/pv/sigsession.cpp b/pv/sigsession.cpp
index dacf65e56b55df4c8266d603928c86c0ce02a6fc..a582122c15d3cdb353551c209c2c388835d397de 100644 (file)
--- a/pv/sigsession.cpp
+++ b/pv/sigsession.cpp
@@ -1,7 +1,7 @@
 /*
  * This file is part of the PulseView project.
  *
- * Copyright (C) 2012 Joel Holdsworth <joel@airwebreathe.org.uk>
+ * Copyright (C) 2012-14 Joel Holdsworth <joel@airwebreathe.org.uk>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -18,28 +18,43 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
+#ifdef ENABLE_DECODE
+#include <libsigrokdecode/libsigrokdecode.h>
+#endif
+
 #include "sigsession.h"
 
 #include "devicemanager.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/decode/decoder.h"
 
 #include "view/analogsignal.h"
-#include "view/decodesignal.h"
+#include "view/decodetrace.h"
 #include "view/logicsignal.h"
 
 #include <assert.h>
 
+#include <stdexcept>
+
+#include <boost/foreach.hpp>
+
 #include <sys/stat.h>
 
 #include <QDebug>
 
-using namespace boost;
-using namespace std;
+using boost::dynamic_pointer_cast;
+using boost::function;
+using boost::lock_guard;
+using boost::mutex;
+using boost::shared_ptr;
+using std::map;
+using std::string;
+using std::vector;
 
 namespace pv {
 
@@ -76,6 +91,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)
@@ -111,6 +129,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);
 
@@ -125,6 +144,7 @@ void SigSession::load_file(const string &name,
                        error_handler)))
                        return;
 
+               _decode_traces.clear();
                update_signals(in->sdi);
                read_sample_rate(in->sdi);
 
@@ -188,44 +208,68 @@ vector< shared_ptr<view::Signal> > SigSession::get_signals() const
        return _signals;
 }
 
-boost::shared_ptr<data::Logic> SigSession::get_data()
+#ifdef ENABLE_DECODE
+bool SigSession::add_decoder(srd_decoder *const dec)
 {
-       return _logic_data;
-}
+       map<const srd_probe*, shared_ptr<view::LogicSignal> > probes;
+       shared_ptr<data::DecoderStack> decoder_stack;
 
-void SigSession::add_decoder(srd_decoder *const dec,
-       std::map<const srd_probe*,
-               boost::shared_ptr<view::Signal> > probes,
-       GHashTable *options)
-{
+       try
        {
                lock_guard<mutex> lock(_signals_mutex);
 
-               if (!_decode_traces.empty()) {
-                       qDebug("Currently only one decode trace can be added "
-                               "at once");
-                       _decode_traces.clear();
+               // Create the decoder
+               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)
+               {
+                       const srd_probe *const probe = (const srd_probe*)i->data;
+                       BOOST_FOREACH(shared_ptr<view::Signal> s, _signals)
+                       {
+                               shared_ptr<view::LogicSignal> l =
+                                       dynamic_pointer_cast<view::LogicSignal>(s);
+                               if (l && QString::fromUtf8(probe->name).
+                                       toLower().contains(
+                                       l->get_name().toLower()))
+                                       probes[probe] = l;
+                       }
                }
 
-               shared_ptr<data::Decoder> decoder(
-                       new data::Decoder(dec, probes, options));
-               shared_ptr<view::DecodeSignal> d(
-                       new view::DecodeSignal(*this, decoder,
+               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_stack,
                                _decode_traces.size()));
                _decode_traces.push_back(d);
        }
+       catch(std::runtime_error e)
+       {
+               return false;
+       }
+
        signals_changed();
+
+       // Do an initial decode
+       decoder_stack->begin_decode();
+
+       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;
 }
 
-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++)
@@ -236,6 +280,7 @@ void SigSession::remove_decode_signal(view::DecodeSignal *signal)
                        return;
                }
 }
+#endif
 
 void SigSession::set_capture_state(capture_state state)
 {
@@ -378,8 +423,7 @@ void SigSession::update_signals(const sr_dev_inst *const sdi)
 
                if(sdi) {
                        for (const GSList *l = sdi->probes; l; l = l->next) {
-                               const sr_probe *const probe =
-                                       (const sr_probe *)l->data;
+                               sr_probe *const probe = (sr_probe *)l->data;
                                assert(probe);
 
                                switch(probe->type) {
@@ -425,8 +469,8 @@ void SigSession::read_sample_rate(const sr_dev_inst *const sdi)
        // Read out the sample rate
        if(sdi->driver)
        {
-               const int ret = sr_config_get(sdi->driver,
-                       SR_CONF_SAMPLERATE, &gvar, sdi);
+               const int ret = sr_config_get(sdi->driver, sdi, NULL,
+                       SR_CONF_SAMPLERATE, &gvar);
                if (ret != SR_OK) {
                        qDebug("Failed to get samplerate\n");
                        return;
@@ -502,7 +546,7 @@ void SigSession::sample_thread_proc(struct sr_dev_inst *sdi,
        }
 
        // Set the sample limit
-       if (sr_config_set(sdi, SR_CONF_LIMIT_SAMPLES,
+       if (sr_config_set(sdi, NULL, SR_CONF_LIMIT_SAMPLES,
                g_variant_new_uint64(record_length)) != SR_OK) {
                error_handler(tr("Failed to configure "
                        "time-based sample limit."));