#include <boost/thread/locks.hpp>
#include <boost/thread/shared_mutex.hpp>
-#ifdef ENABLE_DECODE
-#include <libsigrokdecode/libsigrokdecode.h>
-#endif
+#include <cassert>
+#include <mutex>
+#include <stdexcept>
-#include "session.hpp"
+#include <sys/stat.h>
+#include "session.hpp"
#include "devicemanager.hpp"
#include "data/analog.hpp"
#include "devices/hardwaredevice.hpp"
#include "devices/sessionfile.hpp"
+#include "toolbars/mainbar.hpp"
+
#include "view/analogsignal.hpp"
#include "view/decodetrace.hpp"
#include "view/logicsignal.hpp"
-
-#include <cassert>
-#include <mutex>
-#include <stdexcept>
-
-#include <sys/stat.h>
-
-#include <QDebug>
+#include "view/signal.hpp"
+#include "view/view.hpp"
#include <libsigrokcxx/libsigrokcxx.hpp>
+#ifdef ENABLE_DECODE
+#include <libsigrokdecode/libsigrokdecode.h>
+#endif
+
using boost::shared_lock;
using boost::shared_mutex;
using boost::unique_lock;
using Glib::Variant;
namespace pv {
-Session::Session(DeviceManager &device_manager) :
+Session::Session(DeviceManager &device_manager, QString name) :
device_manager_(device_manager),
+ name_(name),
capture_state_(Stopped),
cur_samplerate_(0)
{
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();
+}
+
+std::shared_ptr<pv::view::View> Session::main_view() const
+{
+ return main_view_;
+}
+
+void Session::set_main_bar(std::shared_ptr<pv::toolbars::MainBar> main_bar)
+{
+ main_bar_ = main_bar;
+}
+
+shared_ptr<pv::toolbars::MainBar> Session::main_bar() const
+{
+ return main_bar_;
+}
+
+void Session::save_settings(QSettings &settings) const
+{
+ map<string, string> dev_info;
+ list<string> key_list;
+
+ if (device_) {
+ 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()));
+ }
+
+ // TODO Save channel settings and decoders
+
+ settings.endGroup();
+ }
+}
+
+void Session::restore_settings(QSettings &settings)
+{
+ map<string, string> dev_info;
+ list<string> key_list;
+ shared_ptr<devices::HardwareDevice> device;
+
+ // 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);
+
+ // TODO Restore channel settings and decoders
+ }
+
+ settings.endGroup();
+}
+
void Session::set_device(shared_ptr<devices::Device> device)
{
assert(device);
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
- signals_.clear();
- {
- shared_lock<shared_mutex> lock(signals_mutex_);
- for (const shared_ptr<data::SignalData> d : all_signal_data_)
- d->clear();
+ for (std::shared_ptr<pv::view::View> view : views_) {
+ view->clear_signals();
+#ifdef ENABLE_DECODE
+ view->clear_decode_traces();
+#endif
}
+ for (const shared_ptr<data::SignalData> d : all_signal_data_)
+ d->clear();
all_signal_data_.clear();
+ signalbases_.clear();
cur_logic_segment_.reset();
for (auto entry : cur_analog_segments_) {
}
logic_data_.reset();
- decode_traces_.clear();
signals_changed();
}
// Clear signal data
- {
- shared_lock<shared_mutex> lock(signals_mutex_);
- for (const shared_ptr<data::SignalData> d : all_signal_data_)
- d->clear();
- }
+ for (const shared_ptr<data::SignalData> 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(
sampling_thread_.join();
}
+void Session::register_view(std::shared_ptr<pv::view::View> view)
+{
+ if (views_.empty()) {
+ main_view_ = view;
+ }
+
+ views_.insert(view);
+}
+
+void Session::deregister_view(std::shared_ptr<pv::view::View> view)
+{
+ views_.erase(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<pv::view::View> view)
+{
+ return views_.find(view) != views_.end();
+}
+
double Session::get_samplerate() const
{
double samplerate = 0.0;
- {
- shared_lock<shared_mutex> lock(signals_mutex_);
- for (const shared_ptr<pv::data::SignalData> d : all_signal_data_) {
- assert(d);
- const vector< shared_ptr<pv::data::Segment> > segments =
- d->segments();
- for (const shared_ptr<pv::data::Segment> &s : segments)
- samplerate = std::max(samplerate, s->samplerate());
- }
+ for (const shared_ptr<pv::data::SignalData> d : all_signal_data_) {
+ assert(d);
+ const vector< shared_ptr<pv::data::Segment> > segments =
+ d->segments();
+ for (const shared_ptr<pv::data::Segment> &s : segments)
+ samplerate = std::max(samplerate, s->samplerate());
}
// If there is no sample rate given we use samples as unit
if (samplerate == 0.0)
return samplerate;
}
-const unordered_set< shared_ptr<view::Signal> > Session::signals() const
+const std::unordered_set< std::shared_ptr<data::SignalBase> >
+ Session::signalbases() const
{
- shared_lock<shared_mutex> lock(signals_mutex_);
- return signals_;
+ return signalbases_;
}
#ifdef ENABLE_DECODE
bool Session::add_decoder(srd_decoder *const dec)
{
- map<const srd_channel*, shared_ptr<view::LogicSignal> > channels;
+ map<const srd_channel*, shared_ptr<data::SignalBase> > channels;
shared_ptr<data::DecoderStack> decoder_stack;
try {
- lock_guard<boost::shared_mutex> lock(signals_mutex_);
-
// Create the decoder
decoder_stack = shared_ptr<data::DecoderStack>(
new data::DecoderStack(*this, dec));
// Auto select the initial channels
for (const srd_channel *pdch : all_channels)
- for (shared_ptr<view::Signal> s : signals_) {
- shared_ptr<view::LogicSignal> l =
- dynamic_pointer_cast<view::LogicSignal>(s);
- if (l && QString::fromUtf8(pdch->name).
- toLower().contains(
- s->base()->name().toLower()))
- channels[pdch] = l;
+ for (shared_ptr<data::SignalBase> b : signalbases_) {
+ if (b->type() == ChannelType::LOGIC) {
+ if (QString::fromUtf8(pdch->name).toLower().
+ contains(b->name().toLower()))
+ channels[pdch] = b;
+ }
}
assert(decoder_stack);
shared_ptr<data::SignalBase> signalbase =
shared_ptr<data::SignalBase>(new data::SignalBase(nullptr));
- shared_ptr<view::DecodeTrace> d(
- new view::DecodeTrace(*this, signalbase, decoder_stack,
- decode_traces_.size()));
- decode_traces_.push_back(d);
+ signalbase->set_decoder_stack(decoder_stack);
+
+ for (std::shared_ptr<pv::view::View> view : views_)
+ view->add_decode_trace(signalbase);
} catch (std::runtime_error e) {
return false;
}
return true;
}
-vector< shared_ptr<view::DecodeTrace> > Session::get_decode_signals() const
+void Session::remove_decode_signal(shared_ptr<data::SignalBase> signalbase)
{
- shared_lock<shared_mutex> lock(signals_mutex_);
- return decode_traces_;
-}
-
-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<pv::view::View> view : views_)
+ view->remove_decode_trace(signalbase);
}
#endif
void Session::update_signals()
{
if (!device_) {
- signals_.clear();
+ signalbases_.clear();
logic_data_.reset();
+ for (std::shared_ptr<pv::view::View> view : views_) {
+ view->clear_signals();
+#ifdef ENABLE_DECODE
+ view->clear_decode_traces();
+#endif
+ }
return;
}
const shared_ptr<sigrok::Device> sr_dev = device_->device();
if (!sr_dev) {
- signals_.clear();
+ signalbases_.clear();
logic_data_.reset();
+ for (std::shared_ptr<pv::view::View> view : views_) {
+ view->clear_signals();
+#ifdef ENABLE_DECODE
+ view->clear_decode_traces();
+#endif
+ }
return;
}
}
}
- // Make the Signals list
- {
- unique_lock<shared_mutex> lock(signals_mutex_);
-
- unordered_set< shared_ptr<view::Signal> > prev_sigs(signals_);
- signals_.clear();
+ // Make the signals list
+ for (std::shared_ptr<pv::view::View> view : views_) {
+ unordered_set< shared_ptr<view::Signal> > prev_sigs(view->signals());
+ view->clear_signals();
for (auto channel : sr_dev->channels()) {
shared_ptr<data::SignalBase> signalbase;
// Copy the signal from the old set to the new
signal = *iter;
} else {
- // Create a new signal
- signalbase = shared_ptr<data::SignalBase>(
- new data::SignalBase(channel));
+ // Find the signalbase for this channel if possible
+ signalbase.reset();
+ for (const shared_ptr<data::SignalBase> b : signalbases_)
+ if (b->channel() == channel)
+ signalbase = b;
switch(channel->type()->id()) {
case SR_CHANNEL_LOGIC:
- signalbase->set_data(logic_data_);
+ if (!signalbase) {
+ signalbase = shared_ptr<data::SignalBase>(
+ new data::SignalBase(channel));
+ signalbases_.insert(signalbase);
+
+ all_signal_data_.insert(logic_data_);
+ signalbase->set_data(logic_data_);
+ }
+
signal = shared_ptr<view::Signal>(
new view::LogicSignal(*this,
device_, signalbase));
- all_signal_data_.insert(logic_data_);
- signalbases_.insert(signalbase);
+ view->add_signal(signal);
break;
case SR_CHANNEL_ANALOG:
{
- shared_ptr<data::Analog> data(new data::Analog());
- signalbase->set_data(data);
+ if (!signalbase) {
+ signalbase = shared_ptr<data::SignalBase>(
+ new data::SignalBase(channel));
+ signalbases_.insert(signalbase);
+
+ shared_ptr<data::Analog> data(new data::Analog());
+ all_signal_data_.insert(data);
+ signalbase->set_data(data);
+ }
+
signal = shared_ptr<view::Signal>(
new view::AnalogSignal(
*this, signalbase));
- all_signal_data_.insert(data);
- signalbases_.insert(signalbase);
+ view->add_signal(signal);
break;
}
break;
}
}
-
- assert(signal);
- signals_.insert(signal);
}
}
uint64_t sample_count = 0;
{
- shared_lock<shared_mutex> lock(signals_mutex_);
for (const shared_ptr<pv::data::SignalData> d : all_signal_data_) {
assert(d);
uint64_t temp_count = 0;
const float *data = static_cast<const float *>(analog->data_pointer());
bool sweep_beginning = false;
- if (signals_.empty())
+ if (signalbases_.empty())
update_signals();
for (auto channel : channels) {
projects / pulseview.git / blobdiff