X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fsigsession.cpp;h=82fa877065254cd05c38f82aa64c19c54063732e;hp=1099ad46704c77b1ba12fb38ad9a1d61cf645ee7;hb=02412f0b16cb5ad92654c92b472a84268e79bb54;hpb=aca00b1e0d3483926c53dfd856483a397f1c29a5 diff --git a/pv/sigsession.cpp b/pv/sigsession.cpp index 1099ad46..82fa8770 100644 --- 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 + * Copyright (C) 2012-14 Joel Holdsworth * * 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,44 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ +#ifdef ENABLE_DECODE +#include +#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 +#include + +#include + #include #include -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::set; +using std::string; +using std::vector; namespace pv { @@ -76,6 +92,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 +130,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 +145,7 @@ void SigSession::load_file(const string &name, error_handler))) return; + _decode_traces.clear(); update_signals(in->sdi); read_sample_rate(in->sdi); @@ -182,50 +203,86 @@ void SigSession::stop_capture() _sampling_thread.join(); } -vector< shared_ptr > SigSession::get_signals() const +set< shared_ptr > SigSession::get_data() const { lock_guard lock(_signals_mutex); - return _signals; + set< shared_ptr > data; + BOOST_FOREACH(const shared_ptr sig, _signals) { + assert(sig); + data.insert(sig->data()); + } + + return data; } -boost::shared_ptr SigSession::get_data() +vector< shared_ptr > SigSession::get_signals() const { - return _logic_data; + lock_guard lock(_signals_mutex); + return _signals; } -void SigSession::add_decoder(srd_decoder *const dec, - std::map > probes, - GHashTable *options) +#ifdef ENABLE_DECODE +bool SigSession::add_decoder(srd_decoder *const dec) { + map > probes; + shared_ptr decoder_stack; + + try { lock_guard 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( + 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 s, _signals) + { + shared_ptr l = + dynamic_pointer_cast(s); + if (l && QString::fromUtf8(probe->name). + toLower().contains( + l->get_name().toLower())) + probes[probe] = l; + } } - shared_ptr decoder( - new data::Decoder(dec, probes, options)); - shared_ptr 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 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 > SigSession::get_decode_signals() const +vector< shared_ptr > SigSession::get_decode_signals() const { lock_guard 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 >::iterator i = + for (vector< shared_ptr >::iterator i = _decode_traces.begin(); i != _decode_traces.end(); i++) @@ -236,6 +293,7 @@ void SigSession::remove_decode_signal(view::DecodeSignal *signal) return; } } +#endif void SigSession::set_capture_state(capture_state state) { @@ -424,8 +482,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; @@ -501,7 +559,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."));