#include "devicemanager.hpp"
#include "data/analog.hpp"
-#include "data/analogsnapshot.hpp"
+#include "data/analogsegment.hpp"
#include "data/decoderstack.hpp"
#include "data/logic.hpp"
-#include "data/logicsnapshot.hpp"
+#include "data/logicsegment.hpp"
#include "data/decode/decoder.hpp"
#include "view/analogsignal.hpp"
#include <QDebug>
-#include <libsigrok/libsigrok.hpp>
+#include <libsigrokcxx/libsigrokcxx.hpp>
using boost::shared_lock;
using boost::shared_mutex;
using std::set;
using std::shared_ptr;
using std::string;
+using std::unordered_set;
using std::vector;
using sigrok::Analog;
Session::Session(DeviceManager &device_manager) :
device_manager_(device_manager),
session_(device_manager.context()->create_session()),
- capture_state_(Stopped)
+ capture_state_(Stopped),
+ cur_samplerate_(0)
{
set_default_device();
}
stop_capture();
// Are we setting a session device?
- auto session_device = dynamic_pointer_cast<SessionDevice>(device);
+ const auto session_device =
+ dynamic_pointer_cast<SessionDevice>(device);
+
// Did we have a session device selected previously?
- auto prev_session_device = dynamic_pointer_cast<SessionDevice>(device_);
+ const auto prev_session_device =
+ dynamic_pointer_cast<SessionDevice>(device_);
if (device_) {
session_->remove_datafeed_callbacks();
(shared_ptr<Device> device, shared_ptr<Packet> packet) {
data_feed_in(device, packet);
});
+ device_manager_.update_display_name(device);
update_signals(device);
} else
device_ = nullptr;
device_selected();
}
-void Session::set_file(const string &name)
+void Session::set_session_file(const string &name)
{
- session_ = device_manager_.context()->load_session(name);
- device_ = session_->devices()[0];
- decode_traces_.clear();
- session_->add_datafeed_callback([=]
- (shared_ptr<Device> device, shared_ptr<Packet> packet) {
- data_feed_in(device, packet);
- });
- device_manager_.update_display_name(device_);
- update_signals(device_);
- device_selected();
+ const shared_ptr<sigrok::Session> session =
+ device_manager_.context()->load_session(name);
+ set_device(session->devices()[0]);
}
void Session::set_default_device()
return signals_mutex_;
}
-const vector< shared_ptr<view::Signal> >& Session::signals() const
+const unordered_set< shared_ptr<view::Signal> >& Session::signals() const
{
return signals_;
}
assert(device);
assert(capture_state_ == Stopped);
- // Clear the decode traces
- decode_traces_.clear();
-
// Detect what data types we will receive
auto channels = device->channels();
unsigned int logic_channel_count = std::count_if(
[] (shared_ptr<Channel> channel) {
return channel->type() == ChannelType::LOGIC; });
- // Create data containers for the logic data snapshots
+ // Create data containers for the logic data segments
{
lock_guard<mutex> data_lock(data_mutex_);
- logic_data_.reset();
- if (logic_channel_count != 0) {
+ if (logic_channel_count == 0) {
+ logic_data_.reset();
+ } else if (!logic_data_ ||
+ logic_data_->num_channels() != logic_channel_count) {
logic_data_.reset(new data::Logic(
logic_channel_count));
assert(logic_data_);
{
unique_lock<shared_mutex> lock(signals_mutex_);
+ unordered_set< shared_ptr<view::Signal> > prev_sigs(signals_);
signals_.clear();
for (auto channel : device->channels()) {
shared_ptr<view::Signal> signal;
- switch(channel->type()->id()) {
- case SR_CHANNEL_LOGIC:
- signal = shared_ptr<view::Signal>(
- new view::LogicSignal(*this, device,
- channel, logic_data_));
- break;
-
- case SR_CHANNEL_ANALOG:
- {
- shared_ptr<data::Analog> data(
- new data::Analog());
- signal = shared_ptr<view::Signal>(
- new view::AnalogSignal(
- *this, channel, data));
- break;
- }
-
- default:
- assert(0);
- break;
+ // Find the channel in the old signals
+ const auto iter = std::find_if(
+ prev_sigs.cbegin(), prev_sigs.cend(),
+ [&](const shared_ptr<view::Signal> &s) {
+ return s->channel() == channel;
+ });
+ if (iter != prev_sigs.end()) {
+ // Copy the signal from the old set to the new
+ signal = *iter;
+ auto logic_signal = dynamic_pointer_cast<
+ view::LogicSignal>(signal);
+ if (logic_signal)
+ logic_signal->set_logic_data(
+ logic_data_);
+ } else {
+ // Create a new signal
+ switch(channel->type()->id()) {
+ case SR_CHANNEL_LOGIC:
+ signal = shared_ptr<view::Signal>(
+ new view::LogicSignal(*this,
+ device, channel,
+ logic_data_));
+ break;
+
+ case SR_CHANNEL_ANALOG:
+ {
+ shared_ptr<data::Analog> data(
+ new data::Analog());
+ signal = shared_ptr<view::Signal>(
+ new view::AnalogSignal(
+ *this, channel, data));
+ break;
+ }
+
+ default:
+ assert(0);
+ break;
+ }
}
assert(signal);
- signals_.push_back(signal);
+ signals_.insert(signal);
}
-
}
signals_changed();
{
const auto keys = device_->config_keys(ConfigKey::DEVICE_OPTIONS);
const auto iter = keys.find(ConfigKey::SAMPLERATE);
- const uint64_t sample_rate = (iter != keys.end() &&
+ cur_samplerate_ = (iter != keys.end() &&
(*iter).second.find(sigrok::GET) != (*iter).second.end()) ?
VariantBase::cast_dynamic<Variant<guint64>>(
device->config_get(ConfigKey::SAMPLERATE)).get() : 0;
-
- // Set the sample rate of all data
- const set< shared_ptr<data::SignalData> > data_set = get_data();
- for (shared_ptr<data::SignalData> data : data_set) {
- assert(data);
- data->set_samplerate(sample_rate);
- }
}
void Session::sample_thread_proc(shared_ptr<Device> device,
set_capture_state(Stopped);
// Confirm that SR_DF_END was received
- if (cur_logic_snapshot_)
+ if (cur_logic_segment_)
{
qDebug("SR_DF_END was not received.");
assert(0);
void Session::feed_in_frame_begin()
{
- if (cur_logic_snapshot_ || !cur_analog_snapshots_.empty())
+ if (cur_logic_segment_ || !cur_analog_segments_.empty())
frame_began();
}
return;
}
- if (!cur_logic_snapshot_)
+ if (!cur_logic_segment_)
{
// This could be the first packet after a trigger
set_capture_state(Running);
VariantBase::cast_dynamic<Variant<guint64>>(
device_->config_get(ConfigKey::LIMIT_SAMPLES)).get() : 0;
- // Create a new data snapshot
- cur_logic_snapshot_ = shared_ptr<data::LogicSnapshot>(
- new data::LogicSnapshot(logic, sample_limit));
- logic_data_->push_snapshot(cur_logic_snapshot_);
+ // Create a new data segment
+ cur_logic_segment_ = shared_ptr<data::LogicSegment>(
+ new data::LogicSegment(
+ logic, cur_samplerate_, sample_limit));
+ logic_data_->push_segment(cur_logic_segment_);
// @todo Putting this here means that only listeners querying
// for logic will be notified. Currently the only user of
}
else
{
- // Append to the existing data snapshot
- cur_logic_snapshot_->append_payload(logic);
+ // Append to the existing data segment
+ cur_logic_segment_->append_payload(logic);
}
data_received();
for (auto channel : channels)
{
- shared_ptr<data::AnalogSnapshot> snapshot;
+ shared_ptr<data::AnalogSegment> segment;
- // Try to get the snapshot of the channel
- const map< shared_ptr<Channel>, shared_ptr<data::AnalogSnapshot> >::
- iterator iter = cur_analog_snapshots_.find(channel);
- if (iter != cur_analog_snapshots_.end())
- snapshot = (*iter).second;
+ // Try to get the segment of the channel
+ const map< shared_ptr<Channel>, shared_ptr<data::AnalogSegment> >::
+ iterator iter = cur_analog_segments_.find(channel);
+ if (iter != cur_analog_segments_.end())
+ segment = (*iter).second;
else
{
- // If no snapshot was found, this means we havn't
+ // If no segment was found, this means we havn't
// created one yet. i.e. this is the first packet
- // in the sweep containing this snapshot.
+ // in the sweep containing this segment.
sweep_beginning = true;
// Get sample limit.
sample_limit = 0;
}
- // Create a snapshot, keep it in the maps of channels
- snapshot = shared_ptr<data::AnalogSnapshot>(
- new data::AnalogSnapshot(sample_limit));
- cur_analog_snapshots_[channel] = snapshot;
+ // Create a segment, keep it in the maps of channels
+ segment = shared_ptr<data::AnalogSegment>(
+ new data::AnalogSegment(
+ cur_samplerate_, sample_limit));
+ cur_analog_segments_[channel] = segment;
// Find the annalog data associated with the channel
shared_ptr<view::AnalogSignal> sig =
shared_ptr<data::Analog> data(sig->analog_data());
assert(data);
- // Push the snapshot into the analog data.
- data->push_snapshot(snapshot);
+ // Push the segment into the analog data.
+ data->push_segment(segment);
}
- assert(snapshot);
+ assert(segment);
- // Append the samples in the snapshot
- snapshot->append_interleaved_samples(data++, sample_count,
+ // Append the samples in the segment
+ segment->append_interleaved_samples(data++, sample_count,
channel_count);
}
{
{
lock_guard<mutex> lock(data_mutex_);
- cur_logic_snapshot_.reset();
- cur_analog_snapshots_.clear();
+ cur_logic_segment_.reset();
+ cur_analog_segments_.clear();
}
frame_ended();
break;
projects / pulseview.git / blobdiff