X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=pv%2Fsigsession.cpp;h=ad0b5d298637b9eeaa58c7157e3654d78a456c5f;hb=3009b5b376efa81f56363a117df5797600301572;hp=24a059ea8a35f03340461aac434047231087ec05;hpb=b93295580db08d9008b9c9e49a3a3a86ef562f14;p=pulseview.git diff --git a/pv/sigsession.cpp b/pv/sigsession.cpp index 24a059ea..ad0b5d29 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,7 +18,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ +#ifdef ENABLE_DECODE #include +#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" @@ -44,8 +47,15 @@ #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 { @@ -82,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) @@ -117,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); @@ -131,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); @@ -188,27 +203,37 @@ 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; } +#ifdef ENABLE_DECODE bool SigSession::add_decoder(srd_decoder *const dec) { map > probes; + shared_ptr decoder_stack; try { lock_guard lock(_signals_mutex); // Create the decoder - shared_ptr decoder(new data::Decoder(dec)); + decoder_stack = shared_ptr( + new data::DecoderStack(dec)); // Auto select the initial probes for(const GSList *i = dec->probes; i; i = i->next) @@ -218,17 +243,21 @@ bool SigSession::add_decoder(srd_decoder *const dec) { shared_ptr l = dynamic_pointer_cast(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 d( - new view::DecodeTrace(*this, decoder, + new view::DecodeTrace(*this, decoder_stack, _decode_traces.size())); _decode_traces.push_back(d); } @@ -239,6 +268,9 @@ bool SigSession::add_decoder(srd_decoder *const dec) signals_changed(); + // Do an initial decode + decoder_stack->begin_decode(); + return true; } @@ -261,6 +293,7 @@ void SigSession::remove_decode_signal(view::DecodeTrace *signal) return; } } +#endif void SigSession::set_capture_state(capture_state state) { @@ -351,7 +384,6 @@ void SigSession::update_signals(const sr_dev_inst *const sdi) { assert(_capture_state == Stopped); - shared_ptr signal; unsigned int logic_probe_count = 0; unsigned int analog_probe_count = 0; @@ -396,34 +428,42 @@ void SigSession::update_signals(const sr_dev_inst *const sdi) } // Make the Signals list - { + do { lock_guard lock(_signals_mutex); _signals.clear(); - if(sdi) { - for (const GSList *l = sdi->probes; l; l = l->next) { - sr_probe *const probe = (sr_probe *)l->data; - assert(probe); - - switch(probe->type) { - case SR_PROBE_LOGIC: - signal = shared_ptr( - new view::LogicSignal(*this, probe, - _logic_data)); - break; - - case SR_PROBE_ANALOG: - signal = shared_ptr( - new view::AnalogSignal(*this, probe, - _analog_data)); - break; - } - - _signals.push_back(signal); + if(!sdi) + break; + + for (const GSList *l = sdi->probes; l; l = l->next) { + shared_ptr signal; + sr_probe *const probe = (sr_probe *)l->data; + assert(probe); + + switch(probe->type) { + case SR_PROBE_LOGIC: + signal = shared_ptr( + new view::LogicSignal(*this, probe, + _logic_data)); + break; + + case SR_PROBE_ANALOG: + signal = shared_ptr( + new view::AnalogSignal(*this, probe, + _analog_data)); + break; + + default: + assert(0); + break; } + + assert(signal); + _signals.push_back(signal); } - } + + } while(0); signals_changed(); } @@ -441,6 +481,18 @@ bool SigSession::is_trigger_enabled() const return false; } +shared_ptr SigSession::signal_from_probe( + const sr_probe *probe) const +{ + lock_guard lock(_signals_mutex); + BOOST_FOREACH(shared_ptr sig, _signals) { + assert(sig); + if (sig->probe() == probe) + return sig; + } + return shared_ptr(); +} + void SigSession::read_sample_rate(const sr_dev_inst *const sdi) { GVariant *gvar;