X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=pv%2Fsession.cpp;h=b3f8ba87de7e31aa57bbc7dba5b4687fd45557f7;hb=e211a94560940c3842fe68a3877124823384d298;hp=6397416be03dd194735c3f26a4e1b0610dd9abdb;hpb=31d1aca6b7ab1b890b5ec7c05862e87986d5e6fd;p=pulseview.git
diff --git a/pv/session.cpp b/pv/session.cpp
index 6397416b..b3f8ba87 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,9 +24,13 @@
#include
+#include
+#include
+
#include "devicemanager.hpp"
#include "mainwindow.hpp"
#include "session.hpp"
+#include "util.hpp"
#include "data/analog.hpp"
#include "data/analogsegment.hpp"
@@ -105,6 +106,7 @@ using Gst::ElementFactory;
using Gst::Pipeline;
#endif
+using pv::util::Timestamp;
using pv::views::trace::Signal;
using pv::views::trace::AnalogSignal;
using pv::views::trace::LogicSignal;
@@ -193,13 +195,13 @@ bool Session::data_saved() const
void Session::save_setup(QSettings &settings) const
{
- int decode_signals = 0, views = 0;
+ int i = 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(i++));
base->save_settings(settings);
settings.endGroup();
} else
@@ -211,24 +213,54 @@ void Session::save_setup(QSettings &settings) const
}
}
- settings.setValue("decode_signals", decode_signals);
+ settings.setValue("decode_signals", i);
// 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);
+
+ i = 0;
+ shared_ptr tv = dynamic_pointer_cast(main_view_);
+ 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");
+ 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");
+ 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();
+ }
+
+ settings.setValue("meta_objs", i);
}
void Session::save_settings(QSettings &settings) const
@@ -324,13 +356,37 @@ void Session::restore_setup(QSettings &settings)
settings.endGroup();
}
+
+ // Restore meta objects like markers and cursors
+ int meta_objs = settings.value("meta_objs").toInt();
+
+ shared_ptr tv = dynamic_pointer_cast(main_view_);
+ for (int i = 0; i < meta_objs; i++) {
+ settings.beginGroup("meta_obj" + QString::number(i));
+ const QString type = settings.value("type").toString();
+
+ if (type == "time_marker") {
+ Timestamp ts = GlobalSettings::restore_timestamp(settings, "time");
+ shared_ptr flag = tv->add_flag(ts);
+ flag->set_text(settings.value("text").toString());
+ }
+
+ if (type == "selection") {
+ 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;
@@ -366,7 +422,7 @@ void Session::restore_settings(QSettings &settings)
if ((device_type == "sessionfile") || (device_type == "inputfile")) {
if (device_type == "sessionfile") {
settings.beginGroup("device");
- QString filename = settings.value("filename").toString();
+ const QString filename = settings.value("filename").toString();
settings.endGroup();
if (QFileInfo(filename).isReadable()) {
@@ -593,7 +649,7 @@ void Session::load_file(QString file_name, QString setup_file_name,
device_manager_.context(),
file_name.toStdString())));
} catch (Error& e) {
- MainWindow::show_session_error(tr("Failed to load ") + file_name, e.what());
+ MainWindow::show_session_error(tr("Failed to load %1").arg(file_name), e.what());
set_default_device();
main_bar_->update_device_list();
return;