X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fsession.cpp;h=97741ebf7b944a4c6507bd1a4e64c1d8128a5d5b;hp=45c4e98790843dc67bef475a6be0594b265017b4;hb=26a883ede0bcf68d087eda5dd2082890d36c7aef;hpb=bf9146988d2298e1750142dccdcf597ef13d6606
diff --git a/pv/session.cpp b/pv/session.cpp
index 45c4e987..97741ebf 100644
--- a/pv/session.cpp
+++ b/pv/session.cpp
@@ -14,19 +14,26 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ * along with this program; if not, see .
*/
+#ifdef _WIN32
+// Windows: Avoid boost/thread namespace pollution (which includes windows.h).
+#define NOGDI
+#define NORESOURCE
+#endif
#include
#include
-#ifdef ENABLE_DECODE
-#include
-#endif
+#include
-#include "session.hpp"
+#include
+#include
+#include
+#include
+
+#include "session.hpp"
#include "devicemanager.hpp"
#include "data/analog.hpp"
@@ -34,25 +41,27 @@
#include "data/decoderstack.hpp"
#include "data/logic.hpp"
#include "data/logicsegment.hpp"
+#include "data/signalbase.hpp"
#include "data/decode/decoder.hpp"
#include "devices/hardwaredevice.hpp"
+#include "devices/inputfile.hpp"
#include "devices/sessionfile.hpp"
+#include "toolbars/mainbar.hpp"
+
#include "view/analogsignal.hpp"
#include "view/decodetrace.hpp"
#include "view/logicsignal.hpp"
-
-#include
-#include
-#include
-
-#include
-
-#include
+#include "view/signal.hpp"
+#include "view/view.hpp"
#include
+#ifdef ENABLE_DECODE
+#include
+#endif
+
using boost::shared_lock;
using boost::shared_mutex;
using boost::unique_lock;
@@ -63,6 +72,7 @@ using std::lock_guard;
using std::list;
using std::map;
using std::mutex;
+using std::pair;
using std::recursive_mutex;
using std::set;
using std::shared_ptr;
@@ -77,8 +87,10 @@ using sigrok::ConfigKey;
using sigrok::DatafeedCallbackFunction;
using sigrok::Error;
using sigrok::Header;
+using sigrok::InputFormat;
using sigrok::Logic;
using sigrok::Meta;
+using sigrok::OutputFormat;
using sigrok::Packet;
using sigrok::PacketPayload;
using sigrok::Session;
@@ -88,10 +100,13 @@ using Glib::VariantBase;
using Glib::Variant;
namespace pv {
-Session::Session(DeviceManager &device_manager) :
+Session::Session(DeviceManager &device_manager, QString name) :
device_manager_(device_manager),
+ default_name_(name),
+ name_(name),
capture_state_(Stopped),
- cur_samplerate_(0)
+ cur_samplerate_(0),
+ data_saved_(true)
{
}
@@ -123,6 +138,239 @@ shared_ptr Session::device() const
return device_;
}
+QString Session::name() const
+{
+ return name_;
+}
+
+void Session::set_name(QString name)
+{
+ if (default_name_.isEmpty())
+ default_name_ = name;
+
+ name_ = name;
+
+ name_changed();
+}
+
+const std::list< std::shared_ptr > Session::views() const
+{
+ return views_;
+}
+
+std::shared_ptr Session::main_view() const
+{
+ return main_view_;
+}
+
+void Session::set_main_bar(std::shared_ptr main_bar)
+{
+ main_bar_ = main_bar;
+}
+
+shared_ptr Session::main_bar() const
+{
+ return main_bar_;
+}
+
+bool Session::data_saved() const
+{
+ return data_saved_;
+}
+
+void Session::save_settings(QSettings &settings) const
+{
+ map dev_info;
+ list key_list;
+ int stacks = 0, views = 0;
+
+ if (device_) {
+ shared_ptr hw_device =
+ dynamic_pointer_cast< devices::HardwareDevice >(device_);
+
+ if (hw_device) {
+ settings.setValue("device_type", "hardware");
+ settings.beginGroup("device");
+
+ key_list.push_back("vendor");
+ key_list.push_back("model");
+ key_list.push_back("version");
+ key_list.push_back("serial_num");
+ key_list.push_back("connection_id");
+
+ dev_info = device_manager_.get_device_info(device_);
+
+ for (string key : key_list) {
+ if (dev_info.count(key))
+ settings.setValue(QString::fromUtf8(key.c_str()),
+ QString::fromUtf8(dev_info.at(key).c_str()));
+ else
+ settings.remove(QString::fromUtf8(key.c_str()));
+ }
+
+ settings.endGroup();
+ }
+
+ shared_ptr sessionfile_device =
+ dynamic_pointer_cast< devices::SessionFile >(device_);
+
+ if (sessionfile_device) {
+ settings.setValue("device_type", "sessionfile");
+ settings.beginGroup("device");
+ settings.setValue("filename", QString::fromStdString(
+ sessionfile_device->full_name()));
+ settings.endGroup();
+ }
+
+ // Save channels and decoders
+ for (shared_ptr base : signalbases_) {
+#ifdef ENABLE_DECODE
+ if (base->is_decode_signal()) {
+ shared_ptr decoder_stack =
+ base->decoder_stack();
+ std::shared_ptr top_decoder =
+ decoder_stack->stack().front();
+
+ settings.beginGroup("decoder_stack" + QString::number(stacks++));
+ settings.setValue("id", top_decoder->decoder()->id);
+ settings.setValue("name", top_decoder->decoder()->name);
+ settings.endGroup();
+ } else
+#endif
+ {
+ settings.beginGroup(base->internal_name());
+ base->save_settings(settings);
+ settings.endGroup();
+ }
+ }
+
+ settings.setValue("decoder_stacks", stacks);
+
+ // Save view states and their signal settings
+ // Note: main_view must be saved as view0
+ settings.beginGroup("view" + QString::number(views++));
+ main_view_->save_settings(settings);
+ settings.endGroup();
+
+ for (shared_ptr view : views_) {
+ if (view != main_view_) {
+ settings.beginGroup("view" + QString::number(views++));
+ view->save_settings(settings);
+ settings.endGroup();
+ }
+ }
+
+ settings.setValue("views", views);
+ }
+}
+
+void Session::restore_settings(QSettings &settings)
+{
+ shared_ptr device;
+
+ QString device_type = settings.value("device_type").toString();
+
+ if (device_type == "hardware") {
+ map dev_info;
+ list key_list;
+
+ // Re-select last used device if possible but only if it's not demo
+ settings.beginGroup("device");
+ key_list.push_back("vendor");
+ key_list.push_back("model");
+ key_list.push_back("version");
+ key_list.push_back("serial_num");
+ key_list.push_back("connection_id");
+
+ for (string key : key_list) {
+ const QString k = QString::fromStdString(key);
+ if (!settings.contains(k))
+ continue;
+
+ const string value = settings.value(k).toString().toStdString();
+ if (!value.empty())
+ dev_info.insert(std::make_pair(key, value));
+ }
+
+ if (dev_info.count("model") > 0)
+ device = device_manager_.find_device_from_info(dev_info);
+
+ if (device)
+ set_device(device);
+
+ settings.endGroup();
+ }
+
+ if (device_type == "sessionfile") {
+ settings.beginGroup("device");
+ QString filename = settings.value("filename").toString();
+ settings.endGroup();
+
+ if (QFileInfo(filename).isReadable()) {
+ device = std::make_shared(device_manager_.context(),
+ filename.toStdString());
+ set_device(device);
+
+ // TODO Perform error handling
+ start_capture([](QString infoMessage) { (void)infoMessage; });
+
+ set_name(QFileInfo(filename).fileName());
+ }
+ }
+
+ if (device) {
+ // Restore channels
+ for (shared_ptr base : signalbases_) {
+ settings.beginGroup(base->internal_name());
+ base->restore_settings(settings);
+ settings.endGroup();
+ }
+
+ // Restore decoders
+#ifdef ENABLE_DECODE
+ int stacks = settings.value("decoder_stacks").toInt();
+
+ for (int i = 0; i < stacks; i++) {
+ settings.beginGroup("decoder_stack" + QString::number(i++));
+
+ QString id = settings.value("id").toString();
+ add_decoder(srd_decoder_get_by_id(id.toStdString().c_str()));
+
+ settings.endGroup();
+ }
+#endif
+
+ // Restore views
+ int views = settings.value("views").toInt();
+
+ for (int i = 0; i < views; i++) {
+ settings.beginGroup("view" + QString::number(i));
+
+ if (i > 0) {
+ views::ViewType type = (views::ViewType)settings.value("type").toInt();
+ add_view(name_, type, this);
+ views_.back()->restore_settings(settings);
+ } else
+ main_view_->restore_settings(settings);
+
+ settings.endGroup();
+ }
+ }
+}
+
+void Session::select_device(shared_ptr device)
+{
+ try {
+ if (device)
+ set_device(device);
+ else
+ set_default_device();
+ } catch (const QString &e) {
+ main_bar_->session_error(tr("Failed to Select Device"),
+ tr("Failed to Select Device"));
+ }
+}
+
void Session::set_device(shared_ptr device)
{
assert(device);
@@ -133,17 +381,51 @@ void Session::set_device(shared_ptr device)
if (device_)
device_->close();
+ device_.reset();
+
+ // Revert name back to default name (e.g. "Untitled-1") as the data is gone
+ name_ = default_name_;
+ name_changed();
+
+ // Remove all stored data
+ for (std::shared_ptr view : views_) {
+ view->clear_signals();
+#ifdef ENABLE_DECODE
+ view->clear_decode_signals();
+#endif
+ }
+ for (const shared_ptr d : all_signal_data_)
+ d->clear();
+ all_signal_data_.clear();
+ signalbases_.clear();
+ cur_logic_segment_.reset();
+
+ for (auto entry : cur_analog_segments_) {
+ shared_ptr(entry.first).reset();
+ shared_ptr(entry.second).reset();
+ }
+
+ logic_data_.reset();
+
+ signals_changed();
+
device_ = std::move(device);
- device_->open();
+
+ try {
+ device_->open();
+ } catch (const QString &e) {
+ device_.reset();
+ device_changed();
+ throw;
+ }
+
device_->session()->add_datafeed_callback([=]
(shared_ptr device, shared_ptr packet) {
data_feed_in(device, packet);
});
- update_signals();
-
- decode_traces_.clear();
- device_selected();
+ update_signals();
+ device_changed();
}
void Session::set_default_device()
@@ -162,6 +444,63 @@ void Session::set_default_device()
set_device((iter == devices.end()) ? devices.front() : *iter);
}
+void Session::load_init_file(const std::string &file_name,
+ const std::string &format)
+{
+ shared_ptr input_format;
+
+ if (!format.empty()) {
+ const map > formats =
+ device_manager_.context()->input_formats();
+ const auto iter = find_if(formats.begin(), formats.end(),
+ [&](const pair > f) {
+ return f.first == format; });
+ if (iter == formats.end()) {
+ main_bar_->session_error(tr("Error"),
+ tr("Unexpected input format: %s").arg(QString::fromStdString(format)));
+ return;
+ }
+
+ input_format = (*iter).second;
+ }
+
+ load_file(QString::fromStdString(file_name), input_format);
+}
+
+void Session::load_file(QString file_name,
+ std::shared_ptr format,
+ const std::map &options)
+{
+ const QString errorMessage(
+ QString("Failed to load file %1").arg(file_name));
+
+ try {
+ if (format)
+ set_device(shared_ptr(
+ new devices::InputFile(
+ device_manager_.context(),
+ file_name.toStdString(),
+ format, options)));
+ else
+ set_device(shared_ptr(
+ new devices::SessionFile(
+ device_manager_.context(),
+ file_name.toStdString())));
+ } catch (Error e) {
+ main_bar_->session_error(tr("Failed to load ") + file_name, e.what());
+ set_default_device();
+ main_bar_->update_device_list();
+ return;
+ }
+
+ main_bar_->update_device_list();
+
+ start_capture([&, errorMessage](QString infoMessage) {
+ main_bar_->session_error(errorMessage, infoMessage); });
+
+ set_name(QFileInfo(file_name).fileName());
+}
+
Session::capture_state Session::get_capture_state() const
{
lock_guard lock(sampling_mutex_);
@@ -170,10 +509,14 @@ Session::capture_state Session::get_capture_state() const
void Session::start_capture(function error_handler)
{
+ if (!device_) {
+ error_handler(tr("No active device set, can't start acquisition."));
+ return;
+ }
+
stop_capture();
// Check that at least one channel is enabled
- assert(device_);
const shared_ptr sr_dev = device_->device();
if (sr_dev) {
const auto channels = sr_dev->channels();
@@ -186,13 +529,16 @@ void Session::start_capture(function error_handler)
}
// Clear signal data
- for (const shared_ptr d : get_data())
+ for (const shared_ptr d : all_signal_data_)
d->clear();
+ // Revert name back to default name (e.g. "Untitled-1") as the data is gone
+ name_ = default_name_;
+ name_changed();
+
// Begin the session
sampling_thread_ = std::thread(
- &Session::sample_thread_proc, this, device_,
- error_handler);
+ &Session::sample_thread_proc, this, error_handler);
}
void Session::stop_capture()
@@ -205,34 +551,70 @@ void Session::stop_capture()
sampling_thread_.join();
}
-set< shared_ptr > Session::get_data() const
+void Session::register_view(std::shared_ptr view)
{
- shared_lock lock(signals_mutex_);
- set< shared_ptr > data;
- for (const shared_ptr sig : signals_) {
- assert(sig);
- data.insert(sig->data());
+ if (views_.empty()) {
+ main_view_ = view;
}
- return data;
+ views_.push_back(view);
+
+ update_signals();
}
-const unordered_set< shared_ptr > Session::signals() const
+void Session::deregister_view(std::shared_ptr view)
{
- shared_lock lock(signals_mutex_);
- return signals_;
+ views_.remove_if([&](std::shared_ptr v) {
+ return v == view; });
+
+ if (views_.empty()) {
+ main_view_.reset();
+
+ // Without a view there can be no main bar
+ main_bar_.reset();
+ }
+}
+
+bool Session::has_view(std::shared_ptr view)
+{
+ for (std::shared_ptr v : views_)
+ if (v == view)
+ return true;
+
+ return false;
+}
+
+double Session::get_samplerate() const
+{
+ double samplerate = 0.0;
+
+ for (const shared_ptr d : all_signal_data_) {
+ assert(d);
+ const vector< shared_ptr > segments =
+ d->segments();
+ for (const shared_ptr &s : segments)
+ samplerate = std::max(samplerate, s->samplerate());
+ }
+ // If there is no sample rate given we use samples as unit
+ if (samplerate == 0.0)
+ samplerate = 1.0;
+
+ return samplerate;
+}
+
+const std::unordered_set< std::shared_ptr >
+ Session::signalbases() const
+{
+ return signalbases_;
}
#ifdef ENABLE_DECODE
bool Session::add_decoder(srd_decoder *const dec)
{
- map > channels;
+ map > channels;
shared_ptr decoder_stack;
- try
- {
- lock_guard lock(signals_mutex_);
-
+ try {
// Create the decoder
decoder_stack = shared_ptr(
new data::DecoderStack(*this, dec));
@@ -246,14 +628,12 @@ bool Session::add_decoder(srd_decoder *const dec)
// Auto select the initial channels
for (const srd_channel *pdch : all_channels)
- for (shared_ptr s : signals_)
- {
- shared_ptr l =
- dynamic_pointer_cast(s);
- if (l && QString::fromUtf8(pdch->name).
- toLower().contains(
- l->name().toLower()))
- channels[pdch] = l;
+ for (shared_ptr b : signalbases_) {
+ if (b->type() == ChannelType::LOGIC) {
+ if (QString::fromUtf8(pdch->name).toLower().
+ contains(b->name().toLower()))
+ channels[pdch] = b;
+ }
}
assert(decoder_stack);
@@ -262,13 +642,15 @@ bool Session::add_decoder(srd_decoder *const dec)
decoder_stack->stack().front()->set_channels(channels);
// 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)
- {
+ shared_ptr signalbase =
+ shared_ptr(new data::SignalBase(nullptr));
+
+ signalbase->set_decoder_stack(decoder_stack);
+ signalbases_.insert(signalbase);
+
+ for (std::shared_ptr view : views_)
+ view->add_decode_signal(signalbase);
+ } catch (std::runtime_error e) {
return false;
}
@@ -280,43 +662,57 @@ bool Session::add_decoder(srd_decoder *const dec)
return true;
}
-vector< shared_ptr > Session::get_decode_signals() const
+void Session::remove_decode_signal(shared_ptr signalbase)
{
- shared_lock lock(signals_mutex_);
- return decode_traces_;
-}
+ signalbases_.erase(signalbase);
-void Session::remove_decode_signal(view::DecodeTrace *signal)
-{
- for (auto i = decode_traces_.begin(); i != decode_traces_.end(); i++)
- if ((*i).get() == signal)
- {
- decode_traces_.erase(i);
- signals_changed();
- return;
- }
+ for (std::shared_ptr view : views_)
+ view->remove_decode_signal(signalbase);
+
+ signals_changed();
}
#endif
void Session::set_capture_state(capture_state state)
{
- lock_guard lock(sampling_mutex_);
- const bool changed = capture_state_ != state;
- capture_state_ = state;
+ bool changed;
+
+ {
+ lock_guard lock(sampling_mutex_);
+ changed = capture_state_ != state;
+ capture_state_ = state;
+ }
+
if (changed)
capture_state_changed(state);
}
void Session::update_signals()
{
- assert(device_);
+ if (!device_) {
+ signalbases_.clear();
+ logic_data_.reset();
+ for (std::shared_ptr view : views_) {
+ view->clear_signals();
+#ifdef ENABLE_DECODE
+ view->clear_decode_signals();
+#endif
+ }
+ return;
+ }
lock_guard lock(data_mutex_);
const shared_ptr sr_dev = device_->device();
if (!sr_dev) {
- signals_.clear();
+ signalbases_.clear();
logic_data_.reset();
+ for (std::shared_ptr view : views_) {
+ view->clear_signals();
+#ifdef ENABLE_DECODE
+ view->clear_decode_signals();
+#endif
+ }
return;
}
@@ -341,83 +737,102 @@ void Session::update_signals()
}
}
- // Make the Signals list
- {
- unique_lock lock(signals_mutex_);
-
- unordered_set< shared_ptr > prev_sigs(signals_);
- signals_.clear();
-
- for (auto channel : sr_dev->channels()) {
- shared_ptr signal;
-
- // Find the channel in the old signals
- const auto iter = std::find_if(
- prev_sigs.cbegin(), prev_sigs.cend(),
- [&](const shared_ptr &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(
- new view::LogicSignal(*this,
- device_, channel,
- logic_data_));
- break;
-
- case SR_CHANNEL_ANALOG:
- {
- shared_ptr data(
- new data::Analog());
- signal = shared_ptr(
- new view::AnalogSignal(
- *this, channel, data));
- break;
- }
-
- default:
- assert(0);
- break;
+ // Make the signals list
+ for (std::shared_ptr viewbase : views_) {
+ views::TraceView::View *trace_view =
+ qobject_cast(viewbase.get());
+
+ if (trace_view) {
+ unordered_set< shared_ptr >
+ prev_sigs(trace_view->signals());
+ trace_view->clear_signals();
+
+ for (auto channel : sr_dev->channels()) {
+ shared_ptr signalbase;
+ shared_ptr signal;
+
+ // Find the channel in the old signals
+ const auto iter = std::find_if(
+ prev_sigs.cbegin(), prev_sigs.cend(),
+ [&](const shared_ptr &s) {
+ return s->base()->channel() == channel;
+ });
+ if (iter != prev_sigs.end()) {
+ // Copy the signal from the old set to the new
+ signal = *iter;
+ trace_view->add_signal(signal);
+ } else {
+ // Find the signalbase for this channel if possible
+ signalbase.reset();
+ for (const shared_ptr b : signalbases_)
+ if (b->channel() == channel)
+ signalbase = b;
+
+ switch(channel->type()->id()) {
+ case SR_CHANNEL_LOGIC:
+ if (!signalbase) {
+ signalbase = shared_ptr(
+ new data::SignalBase(channel));
+ signalbases_.insert(signalbase);
+
+ all_signal_data_.insert(logic_data_);
+ signalbase->set_data(logic_data_);
+ }
+
+ signal = shared_ptr(
+ new views::TraceView::LogicSignal(*this,
+ device_, signalbase));
+ trace_view->add_signal(signal);
+ break;
+
+ case SR_CHANNEL_ANALOG:
+ {
+ if (!signalbase) {
+ signalbase = shared_ptr(
+ new data::SignalBase(channel));
+ signalbases_.insert(signalbase);
+
+ shared_ptr data(new data::Analog());
+ all_signal_data_.insert(data);
+ signalbase->set_data(data);
+ }
+
+ signal = shared_ptr(
+ new views::TraceView::AnalogSignal(
+ *this, signalbase));
+ trace_view->add_signal(signal);
+ break;
+ }
+
+ default:
+ assert(0);
+ break;
+ }
}
}
-
- assert(signal);
- signals_.insert(signal);
}
}
signals_changed();
}
-shared_ptr Session::signal_from_channel(
- shared_ptr channel) const
+shared_ptr Session::signalbase_from_channel(
+ shared_ptr channel) const
{
- lock_guard lock(signals_mutex_);
- for (shared_ptr sig : signals_) {
+ for (shared_ptr sig : signalbases_) {
assert(sig);
if (sig->channel() == channel)
return sig;
}
- return shared_ptr();
+ return shared_ptr();
}
-void Session::sample_thread_proc(shared_ptr device,
- function error_handler)
+void Session::sample_thread_proc(function error_handler)
{
- assert(device);
assert(error_handler);
- (void)device;
+ if (!device_)
+ return;
cur_samplerate_ = device_->read_config(ConfigKey::SAMPLERATE);
@@ -425,7 +840,7 @@ void Session::sample_thread_proc(shared_ptr device,
try {
device_->start();
- } catch(Error e) {
+ } catch (Error e) {
error_handler(e.what());
return;
}
@@ -437,12 +852,18 @@ void Session::sample_thread_proc(shared_ptr device,
set_capture_state(Stopped);
// Confirm that SR_DF_END was received
- if (cur_logic_segment_)
- {
+ if (cur_logic_segment_) {
qDebug("SR_DF_END was not received.");
assert(0);
}
+ // We now have unsaved data unless we just "captured" from a file
+ shared_ptr file_device =
+ dynamic_pointer_cast(device_);
+
+ if (!file_device)
+ data_saved_ = false;
+
if (out_of_memory_)
error_handler(tr("Out of memory, acquisition stopped."));
}
@@ -457,6 +878,11 @@ void Session::feed_in_meta(shared_ptr meta)
for (auto entry : meta->config()) {
switch (entry.first->id()) {
case SR_CONF_SAMPLERATE:
+ // We can't rely on the header to always contain the sample rate,
+ // so in case it's supplied via a meta packet, we use it.
+ if (!cur_samplerate_)
+ cur_samplerate_ = g_variant_get_uint64(entry.second.gobj());
+
/// @todo handle samplerate changes
break;
default:
@@ -468,6 +894,29 @@ void Session::feed_in_meta(shared_ptr meta)
signals_changed();
}
+void Session::feed_in_trigger()
+{
+ // The channel containing most samples should be most accurate
+ uint64_t sample_count = 0;
+
+ {
+ for (const shared_ptr d : all_signal_data_) {
+ assert(d);
+ uint64_t temp_count = 0;
+
+ const vector< shared_ptr > segments =
+ d->segments();
+ for (const shared_ptr &s : segments)
+ temp_count += s->get_sample_count();
+
+ if (temp_count > sample_count)
+ sample_count = temp_count;
+ }
+ }
+
+ trigger_event(sample_count / get_samplerate());
+}
+
void Session::feed_in_frame_begin()
{
if (cur_logic_segment_ || !cur_analog_segments_.empty())
@@ -478,25 +927,20 @@ void Session::feed_in_logic(shared_ptr logic)
{
lock_guard lock(data_mutex_);
- const size_t sample_count = logic->data_length() / logic->unit_size();
-
- if (!logic_data_)
- {
+ if (!logic_data_) {
// The only reason logic_data_ would not have been created is
// if it was not possible to determine the signals when the
// device was created.
update_signals();
}
- if (!cur_logic_segment_)
- {
+ if (!cur_logic_segment_) {
// This could be the first packet after a trigger
set_capture_state(Running);
// Create a new data segment
cur_logic_segment_ = shared_ptr(
- new data::LogicSegment(
- logic, cur_samplerate_, sample_count));
+ new data::LogicSegment(logic, cur_samplerate_));
logic_data_->push_segment(cur_logic_segment_);
// @todo Putting this here means that only listeners querying
@@ -504,9 +948,7 @@ void Session::feed_in_logic(shared_ptr logic)
// frame_began is DecoderStack, but in future we need to signal
// this after both analog and logic sweeps have begun.
frame_began();
- }
- else
- {
+ } else {
// Append to the existing data segment
cur_logic_segment_->append_payload(logic);
}
@@ -521,11 +963,13 @@ void Session::feed_in_analog(shared_ptr analog)
const vector> channels = analog->channels();
const unsigned int channel_count = channels.size();
const size_t sample_count = analog->num_samples() / channel_count;
- const float *data = analog->data_pointer();
+ const float *data = static_cast(analog->data_pointer());
bool sweep_beginning = false;
- for (auto channel : channels)
- {
+ if (signalbases_.empty())
+ update_signals();
+
+ for (auto channel : channels) {
shared_ptr segment;
// Try to get the segment of the channel
@@ -533,26 +977,22 @@ void Session::feed_in_analog(shared_ptr analog)
iterator iter = cur_analog_segments_.find(channel);
if (iter != cur_analog_segments_.end())
segment = (*iter).second;
- else
- {
- // If no segment was found, this means we havn't
+ else {
+ // If no segment was found, this means we haven't
// created one yet. i.e. this is the first packet
// in the sweep containing this segment.
sweep_beginning = true;
// Create a segment, keep it in the maps of channels
segment = shared_ptr(
- new data::AnalogSegment(
- cur_samplerate_, sample_count));
+ new data::AnalogSegment(cur_samplerate_));
cur_analog_segments_[channel] = segment;
// Find the analog data associated with the channel
- shared_ptr sig =
- dynamic_pointer_cast(
- signal_from_channel(channel));
- assert(sig);
+ shared_ptr base = signalbase_from_channel(channel);
+ assert(base);
- shared_ptr data(sig->analog_data());
+ shared_ptr data(base->analog_data());
assert(data);
// Push the segment into the analog data.
@@ -592,6 +1032,10 @@ void Session::data_feed_in(shared_ptr device,
feed_in_meta(dynamic_pointer_cast(packet->payload()));
break;
+ case SR_DF_TRIGGER:
+ feed_in_trigger();
+ break;
+
case SR_DF_FRAME_BEGIN:
feed_in_frame_begin();
break;
@@ -629,4 +1073,9 @@ void Session::data_feed_in(shared_ptr device,
}
}
+void Session::on_data_saved()
+{
+ data_saved_ = true;
+}
+
} // namespace pv