/*
* 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
using boost::mutex;
using boost::shared_ptr;
using std::map;
+using std::set;
using std::string;
using std::vector;
_sampling_thread.join();
}
-vector< shared_ptr<view::Signal> > SigSession::get_signals() const
+set< shared_ptr<data::SignalData> > SigSession::get_data() const
{
lock_guard<mutex> lock(_signals_mutex);
- return _signals;
+ set< shared_ptr<data::SignalData> > data;
+ BOOST_FOREACH(const shared_ptr<view::Signal> sig, _signals) {
+ assert(sig);
+ data.insert(sig->data());
+ }
+
+ return data;
}
-boost::shared_ptr<data::Logic> SigSession::get_data()
+vector< shared_ptr<view::Signal> > SigSession::get_signals() const
{
- return _logic_data;
+ lock_guard<mutex> lock(_signals_mutex);
+ return _signals;
}
#ifdef ENABLE_DECODE
{
assert(_capture_state == Stopped);
- shared_ptr<view::Signal> signal;
unsigned int logic_probe_count = 0;
- unsigned int analog_probe_count = 0;
// Clear the decode traces
_decode_traces.clear();
case SR_PROBE_LOGIC:
logic_probe_count++;
break;
-
- case SR_PROBE_ANALOG:
- analog_probe_count++;
- break;
}
}
}
- // Create data containers for the data snapshots
+ // Create data containers for the logic data snapshots
{
lock_guard<mutex> data_lock(_data_mutex);
logic_probe_count));
assert(_logic_data);
}
-
- _analog_data.reset();
- if (analog_probe_count != 0) {
- _analog_data.reset(new data::Analog());
- assert(_analog_data);
- }
}
// Make the Signals list
- {
+ do {
lock_guard<mutex> 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<view::Signal>(
- new view::LogicSignal(*this, probe,
- _logic_data));
- break;
-
- case SR_PROBE_ANALOG:
- signal = shared_ptr<view::Signal>(
- 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<view::Signal> signal;
+ sr_probe *const probe = (sr_probe *)l->data;
+ assert(probe);
+
+ switch(probe->type) {
+ case SR_PROBE_LOGIC:
+ signal = shared_ptr<view::Signal>(
+ new view::LogicSignal(*this, probe,
+ _logic_data));
+ break;
+
+ case SR_PROBE_ANALOG:
+ {
+ shared_ptr<data::Analog> data(
+ new data::Analog());
+ signal = shared_ptr<view::Signal>(
+ new view::AnalogSignal(*this, probe,
+ data));
+ break;
+ }
+
+ default:
+ assert(0);
+ break;
}
+
+ assert(signal);
+ _signals.push_back(signal);
}
- }
+
+ } while(0);
signals_changed();
}
return false;
}
+shared_ptr<view::Signal> SigSession::signal_from_probe(
+ const sr_probe *probe) const
+{
+ lock_guard<mutex> lock(_signals_mutex);
+ BOOST_FOREACH(shared_ptr<view::Signal> sig, _signals) {
+ assert(sig);
+ if (sig->probe() == probe)
+ return sig;
+ }
+ return shared_ptr<view::Signal>();
+}
+
void SigSession::read_sample_rate(const sr_dev_inst *const sdi)
{
GVariant *gvar;
g_variant_unref(gvar);
}
- if(_analog_data)
- _analog_data->set_samplerate(sample_rate);
- if(_logic_data)
- _logic_data->set_samplerate(sample_rate);
+ // Set the sample rate of all data
+ const set< shared_ptr<data::SignalData> > data_set = get_data();
+ BOOST_FOREACH(shared_ptr<data::SignalData> data, data_set) {
+ assert(data);
+ data->set_samplerate(sample_rate);
+ }
}
void SigSession::load_session_thread_proc(
// Confirm that SR_DF_END was received
assert(!_cur_logic_snapshot);
- assert(!_cur_analog_snapshot);
+ assert(_cur_analog_snapshots.empty());
}
void SigSession::load_input_thread_proc(const string name,
// Confirm that SR_DF_END was received
assert(!_cur_logic_snapshot);
- assert(!_cur_analog_snapshot);
+ assert(_cur_analog_snapshots.empty());
delete in;
}
set_capture_state(Stopped);
// Confirm that SR_DF_END was received
- assert(!_cur_logic_snapshot);
- assert(!_cur_analog_snapshot);
+ if (_cur_logic_snapshot)
+ {
+ qDebug("SR_DF_END was not received.");
+ assert(0);
+ }
}
void SigSession::feed_in_header(const sr_dev_inst *sdi)
if (!_cur_logic_snapshot)
{
+ // This could be the first packet after a trigger
set_capture_state(Running);
// Create a new data snapshot
{
lock_guard<mutex> lock(_data_mutex);
- if(!_analog_data)
- {
- qDebug() << "Unexpected analog packet";
- return; // This analog packet was not expected.
- }
+ const unsigned int probe_count = g_slist_length(analog.probes);
+ const size_t sample_count = analog.num_samples / probe_count;
+ const float *data = analog.data;
+ bool sweep_beginning = false;
- if (!_cur_analog_snapshot)
+ for (GSList *p = analog.probes; p; p = p->next)
{
- set_capture_state(Running);
+ shared_ptr<data::AnalogSnapshot> snapshot;
- // Create a new data snapshot
- _cur_analog_snapshot = shared_ptr<data::AnalogSnapshot>(
- new data::AnalogSnapshot(analog));
- _analog_data->push_snapshot(_cur_analog_snapshot);
+ sr_probe *const probe = (sr_probe*)p->data;
+ assert(probe);
+
+ // Try to get the snapshot of the probe
+ const map< const sr_probe*, shared_ptr<data::AnalogSnapshot> >::
+ iterator iter = _cur_analog_snapshots.find(probe);
+ if (iter != _cur_analog_snapshots.end())
+ snapshot = (*iter).second;
+ else
+ {
+ // If no snapshot was found, this means we havn't
+ // created one yet. i.e. this is the first packet
+ // in the sweep containing this snapshot.
+ sweep_beginning = true;
+
+ // Create a snapshot, keep it in the maps of probes
+ snapshot = shared_ptr<data::AnalogSnapshot>(
+ new data::AnalogSnapshot());
+ _cur_analog_snapshots[probe] = snapshot;
+
+ // Find the annalog data associated with the probe
+ shared_ptr<view::AnalogSignal> sig =
+ dynamic_pointer_cast<view::AnalogSignal>(
+ signal_from_probe(probe));
+ assert(sig);
+
+ shared_ptr<data::Analog> data(sig->analog_data());
+ assert(data);
+
+ // Push the snapshot into the analog data.
+ data->push_snapshot(snapshot);
+ }
+
+ assert(snapshot);
+
+ // Append the samples in the snapshot
+ snapshot->append_interleaved_samples(data++, sample_count,
+ probe_count);
}
- else
- {
- // Append to the existing data snapshot
- _cur_analog_snapshot->append_payload(analog);
+
+ if (sweep_beginning) {
+ // This could be the first packet after a trigger
+ set_capture_state(Running);
}
data_updated();
{
lock_guard<mutex> lock(_data_mutex);
_cur_logic_snapshot.reset();
- _cur_analog_snapshot.reset();
+ _cur_analog_snapshots.clear();
}
data_updated();
break;