X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=pv%2Fsession.cpp;h=d30dbc0697cfac67631ab7500028ebf21a4faef8;hb=e505bec82f581f838bdcaae3c75bce96676cc9fd;hp=0e071fbcdd9882d96ac7c4714ed3e969cf6e24b6;hpb=ed75426f60765fe965d8bfdd21eb904cccc92804;p=pulseview.git
diff --git a/pv/session.cpp b/pv/session.cpp
index 0e071fbc..d30dbc06 100644
--- a/pv/session.cpp
+++ b/pv/session.cpp
@@ -17,9 +17,6 @@
* along with this program; if not, see .
*/
-#include
-#include
-
#include
#include
#include
@@ -27,15 +24,21 @@
#include
+#include
+#include
+#include
+
#include "devicemanager.hpp"
#include "mainwindow.hpp"
#include "session.hpp"
+#include "util.hpp"
#include "data/analog.hpp"
#include "data/analogsegment.hpp"
#include "data/decode/decoder.hpp"
#include "data/logic.hpp"
#include "data/logicsegment.hpp"
+#include "data/mathsignal.hpp"
#include "data/signalbase.hpp"
#include "devices/hardwaredevice.hpp"
@@ -66,8 +69,8 @@ using std::bad_alloc;
using std::dynamic_pointer_cast;
using std::find_if;
using std::function;
-using std::lock_guard;
using std::list;
+using std::lock_guard;
using std::make_pair;
using std::make_shared;
using std::map;
@@ -83,7 +86,6 @@ using std::string;
using std::unique_lock;
#endif
using std::unique_ptr;
-using std::unordered_set;
using std::vector;
using sigrok::Analog;
@@ -105,11 +107,18 @@ using Gst::ElementFactory;
using Gst::Pipeline;
#endif
+using pv::data::SignalGroup;
+using pv::util::Timestamp;
+using pv::views::trace::Signal;
+using pv::views::trace::AnalogSignal;
+using pv::views::trace::LogicSignal;
+
namespace pv {
shared_ptr Session::sr_context;
Session::Session(DeviceManager &device_manager, QString name) :
+ shutting_down_(false),
device_manager_(device_manager),
default_name_(name),
name_(name),
@@ -121,8 +130,15 @@ Session::Session(DeviceManager &device_manager, QString name) :
Session::~Session()
{
+ shutting_down_ = true;
+
// Stop and join to the thread
stop_capture();
+
+ for (SignalGroup* group : signal_groups_) {
+ group->clear();
+ delete group;
+ }
}
DeviceManager& Session::device_manager()
@@ -162,7 +178,17 @@ void Session::set_name(QString name)
name_changed();
}
-const list< shared_ptr > Session::views() const
+QString Session::save_path() const
+{
+ return save_path_;
+}
+
+void Session::set_save_path(QString path)
+{
+ save_path_ = path;
+}
+
+const vector< shared_ptr > Session::views() const
{
return views_;
}
@@ -189,42 +215,89 @@ bool Session::data_saved() const
void Session::save_setup(QSettings &settings) const
{
- int decode_signals = 0, views = 0;
+ int i;
+ int decode_signal_count = 0;
+ int gen_signal_count = 0;
// Save channels and decoders
for (const shared_ptr& base : signalbases_) {
#ifdef ENABLE_DECODE
if (base->is_decode_signal()) {
- settings.beginGroup("decode_signal" + QString::number(decode_signals++));
+ settings.beginGroup("decode_signal" + QString::number(decode_signal_count++));
base->save_settings(settings);
settings.endGroup();
} else
#endif
- {
+ if (base->is_generated()) {
+ settings.beginGroup("generated_signal" + QString::number(gen_signal_count++));
+ settings.setValue("type", base->type());
+ base->save_settings(settings);
+ settings.endGroup();
+ } else {
settings.beginGroup(base->internal_name());
base->save_settings(settings);
settings.endGroup();
}
}
- settings.setValue("decode_signals", decode_signals);
+ settings.setValue("decode_signals", decode_signal_count);
+ settings.setValue("generated_signals", gen_signal_count);
// Save view states and their signal settings
// Note: main_view must be saved as view0
- settings.beginGroup("view" + QString::number(views++));
+ i = 0;
+ settings.beginGroup("view" + QString::number(i++));
main_view_->save_settings(settings);
settings.endGroup();
for (const shared_ptr& view : views_) {
if (view != main_view_) {
- settings.beginGroup("view" + QString::number(views++));
+ settings.beginGroup("view" + QString::number(i++));
settings.setValue("type", view->get_type());
view->save_settings(settings);
settings.endGroup();
}
}
- settings.setValue("views", views);
+ settings.setValue("views", i);
+
+ int view_id = 0;
+ i = 0;
+ for (const shared_ptr& vb : views_) {
+ shared_ptr tv = dynamic_pointer_cast(vb);
+ if (tv) {
+ for (const shared_ptr& time_item : tv->time_items()) {
+
+ const shared_ptr flag =
+ dynamic_pointer_cast(time_item);
+ if (flag) {
+ if (!flag->enabled())
+ continue;
+
+ settings.beginGroup("meta_obj" + QString::number(i++));
+ settings.setValue("type", "time_marker");
+ settings.setValue("assoc_view", view_id);
+ GlobalSettings::store_timestamp(settings, "time", flag->time());
+ settings.setValue("text", flag->get_text());
+ settings.endGroup();
+ }
+ }
+
+ if (tv->cursors_shown()) {
+ settings.beginGroup("meta_obj" + QString::number(i++));
+ settings.setValue("type", "selection");
+ settings.setValue("assoc_view", view_id);
+ const shared_ptr cp = tv->cursors();
+ GlobalSettings::store_timestamp(settings, "start_time", cp->first()->time());
+ GlobalSettings::store_timestamp(settings, "end_time", cp->second()->time());
+ settings.endGroup();
+ }
+ }
+
+ view_id++;
+ }
+
+ settings.setValue("meta_objs", i);
}
void Session::save_settings(QSettings &settings) const
@@ -259,25 +332,36 @@ void Session::save_settings(QSettings &settings) const
settings.endGroup();
}
- shared_ptr sessionfile_device =
- dynamic_pointer_cast(device_);
-
- if (sessionfile_device) {
+ // Having saved the data to srzip overrides the current device. This is
+ // a crappy hack around the fact that saving e.g. an imported file to
+ // srzip would require changing the underlying libsigrok device
+ if (!save_path_.isEmpty()) {
+ QFileInfo fi = QFileInfo(QDir(save_path_), name_);
settings.setValue("device_type", "sessionfile");
settings.beginGroup("device");
- settings.setValue("filename", QString::fromStdString(
- sessionfile_device->full_name()));
+ settings.setValue("filename", fi.absoluteFilePath());
settings.endGroup();
- }
+ } else {
+ shared_ptr sessionfile_device =
+ dynamic_pointer_cast(device_);
+
+ if (sessionfile_device) {
+ settings.setValue("device_type", "sessionfile");
+ settings.beginGroup("device");
+ settings.setValue("filename", QString::fromStdString(
+ sessionfile_device->full_name()));
+ settings.endGroup();
+ }
- shared_ptr inputfile_device =
- dynamic_pointer_cast(device_);
+ shared_ptr inputfile_device =
+ dynamic_pointer_cast(device_);
- if (inputfile_device) {
- settings.setValue("device_type", "inputfile");
- settings.beginGroup("device");
- inputfile_device->save_meta_to_settings(settings);
- settings.endGroup();
+ if (inputfile_device) {
+ settings.setValue("device_type", "inputfile");
+ settings.beginGroup("device");
+ inputfile_device->save_meta_to_settings(settings);
+ settings.endGroup();
+ }
}
save_setup(settings);
@@ -293,11 +377,34 @@ void Session::restore_setup(QSettings &settings)
settings.endGroup();
}
+ // Restore generated signals
+ int gen_signal_count = settings.value("generated_signals").toInt();
+
+ for (int i = 0; i < gen_signal_count; i++) {
+ settings.beginGroup("generated_signal" + QString::number(i));
+ SignalBase::ChannelType type = (SignalBase::ChannelType)settings.value("type").toInt();
+ shared_ptr signal;
+
+ if (type == SignalBase::MathChannel)
+ signal = make_shared(*this);
+ else
+ qWarning() << tr("Can't restore generated signal of unknown type %1 (%2)") \
+ .arg((int)type) \
+ .arg(settings.value("name").toString());
+
+ if (signal) {
+ add_generated_signal(signal);
+ signal->restore_settings(settings);
+ }
+
+ settings.endGroup();
+ }
+
// Restore decoders
#ifdef ENABLE_DECODE
- int decode_signals = settings.value("decode_signals").toInt();
+ int decode_signal_count = settings.value("decode_signals").toInt();
- for (int i = 0; i < decode_signals; i++) {
+ for (int i = 0; i < decode_signal_count; i++) {
settings.beginGroup("decode_signal" + QString::number(i));
shared_ptr signal = add_decode_signal();
signal->restore_settings(settings);
@@ -320,13 +427,45 @@ void Session::restore_setup(QSettings &settings)
settings.endGroup();
}
+
+ // Restore meta objects like markers and cursors
+ int meta_objs = settings.value("meta_objs").toInt();
+
+ for (int i = 0; i < meta_objs; i++) {
+ settings.beginGroup("meta_obj" + QString::number(i));
+
+ shared_ptr vb;
+ shared_ptr tv;
+ if (settings.contains("assoc_view"))
+ vb = views_.at(settings.value("assoc_view").toInt());
+
+ if (vb)
+ tv = dynamic_pointer_cast(vb);
+
+ const QString type = settings.value("type").toString();
+
+ if ((type == "time_marker") && tv) {
+ Timestamp ts = GlobalSettings::restore_timestamp(settings, "time");
+ shared_ptr flag = tv->add_flag(ts);
+ flag->set_text(settings.value("text").toString());
+ }
+
+ if ((type == "selection") && tv) {
+ Timestamp start = GlobalSettings::restore_timestamp(settings, "start_time");
+ Timestamp end = GlobalSettings::restore_timestamp(settings, "end_time");
+ tv->set_cursors(start, end);
+ tv->show_cursors();
+ }
+
+ settings.endGroup();
+ }
}
void Session::restore_settings(QSettings &settings)
{
shared_ptr device;
- QString device_type = settings.value("device_type").toString();
+ const QString device_type = settings.value("device_type").toString();
if (device_type == "hardware") {
map dev_info;
@@ -357,18 +496,21 @@ void Session::restore_settings(QSettings &settings)
set_device(device);
settings.endGroup();
+
+ if (device)
+ restore_setup(settings);
}
+ QString filename;
if ((device_type == "sessionfile") || (device_type == "inputfile")) {
if (device_type == "sessionfile") {
settings.beginGroup("device");
- QString filename = settings.value("filename").toString();
+ filename = settings.value("filename").toString();
settings.endGroup();
- if (QFileInfo(filename).isReadable()) {
+ if (QFileInfo(filename).isReadable())
device = make_shared(device_manager_.context(),
filename.toStdString());
- }
}
if (device_type == "inputfile") {
@@ -378,8 +520,10 @@ void Session::restore_settings(QSettings &settings)
settings.endGroup();
}
+
if (device) {
set_device(device);
+ restore_setup(settings);
start_capture([](QString infoMessage) {
// TODO Emulate noquote()
@@ -387,11 +531,16 @@ void Session::restore_settings(QSettings &settings)
set_name(QString::fromStdString(
dynamic_pointer_cast(device)->display_name(device_manager_)));
+
+ if (!filename.isEmpty()) {
+ // Only set the save path if we load an srzip file
+ if (device_type == "sessionfile")
+ set_save_path(QFileInfo(filename).absolutePath());
+
+ set_name(QFileInfo(filename).fileName());
+ }
}
}
-
- if (device)
- restore_setup(settings);
}
void Session::select_device(shared_ptr device)
@@ -424,14 +573,22 @@ void Session::set_device(shared_ptr device)
// Remove all stored data and reset all views
for (shared_ptr view : views_) {
- view->clear_signals();
+ view->clear_signalbases();
#ifdef ENABLE_DECODE
view->clear_decode_signals();
#endif
view->reset_view_state();
}
+
+ for (SignalGroup* group : signal_groups_) {
+ group->clear();
+ delete group;
+ }
+ signal_groups_.clear();
+
for (const shared_ptr& d : all_signal_data_)
d->clear();
+
all_signal_data_.clear();
signalbases_.clear();
cur_logic_segment_.reset();
@@ -481,6 +638,17 @@ void Session::set_default_device()
set_device((iter == devices.end()) ? devices.front() : *iter);
}
+bool Session::using_file_device() const
+{
+ shared_ptr sessionfile_device =
+ dynamic_pointer_cast(device_);
+
+ shared_ptr inputfile_device =
+ dynamic_pointer_cast(device_);
+
+ return (sessionfile_device || inputfile_device);
+}
+
/**
* Convert generic options to data types that are specific to InputFormat.
*
@@ -517,8 +685,12 @@ Session::input_format_options(vector user_spec,
* data type.
*/
auto found = fmt_opts.find(key);
- if (found == fmt_opts.end())
+ if (found == fmt_opts.end()) {
+ qCritical() << "Supplied input option" << QString::fromStdString(key) <<
+ "is not a valid option for this input module, it will be ignored!";
continue;
+ }
+
shared_ptr