X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=pv%2Fsession.cpp;h=fb8ee5fe9a3456dc2533078cdcbdad59b040e36a;hb=578d073553fa13c8f6939ad4bd7bd774950a33eb;hp=6397416be03dd194735c3f26a4e1b0610dd9abdb;hpb=31d1aca6b7ab1b890b5ec7c05862e87986d5e6fd;p=pulseview.git
diff --git a/pv/session.cpp b/pv/session.cpp
index 6397416b..fb8ee5fe 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"
@@ -66,8 +67,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 +84,6 @@ using std::string;
using std::unique_lock;
#endif
using std::unique_ptr;
-using std::unordered_set;
using std::vector;
using sigrok::Analog;
@@ -105,6 +105,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;
@@ -166,7 +167,7 @@ void Session::set_name(QString name)
name_changed();
}
-const list< shared_ptr > Session::views() const
+const vector< shared_ptr > Session::views() const
{
return views_;
}
@@ -193,13 +194,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 +212,63 @@ 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);
+
+ 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
@@ -324,13 +364,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;
@@ -366,7 +438,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()) {
@@ -428,7 +500,7 @@ 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
@@ -593,7 +665,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;
@@ -688,7 +760,7 @@ void Session::register_view(shared_ptr view)
update_signals();
// Add all other signals
- unordered_set< shared_ptr > view_signalbases = view->signalbases();
+ vector< shared_ptr > view_signalbases = view->signalbases();
for (const shared_ptr& signalbase : signalbases_) {
const int sb_exists = count_if(
@@ -718,7 +790,9 @@ void Session::register_view(shared_ptr view)
void Session::deregister_view(shared_ptr view)
{
- views_.remove_if([&](shared_ptr v) { return v == view; });
+ views_.erase(std::remove_if(views_.begin(), views_.end(),
+ [&](shared_ptr v) { return v == view; }),
+ views_.end());
if (views_.empty()) {
main_view_.reset();
@@ -778,7 +852,7 @@ vector Session::get_triggers(uint32_t segment_id) const
return result;
}
-const unordered_set< shared_ptr > Session::signalbases() const
+const vector< shared_ptr > Session::signalbases() const
{
return signalbases_;
}
@@ -803,7 +877,7 @@ shared_ptr Session::add_decode_signal()
// Create the decode signal
signal = make_shared(*this);
- signalbases_.insert(signal);
+ signalbases_.push_back(signal);
// Add the decode signal to all views
for (shared_ptr& view : views_)
@@ -820,7 +894,9 @@ shared_ptr Session::add_decode_signal()
void Session::remove_decode_signal(shared_ptr signal)
{
- signalbases_.erase(signal);
+ signalbases_.erase(std::remove_if(signalbases_.begin(), signalbases_.end(),
+ [&](shared_ptr s) { return s == signal; }),
+ signalbases_.end());
for (shared_ptr& view : views_)
view->remove_decode_signal(signal);
@@ -829,6 +905,11 @@ void Session::remove_decode_signal(shared_ptr signal)
}
#endif
+MetadataObjManager* Session::metadata_obj_manager()
+{
+ return &metadata_obj_manager_;
+}
+
void Session::set_capture_state(capture_state state)
{
bool changed;
@@ -854,7 +935,7 @@ void Session::update_signals()
signalbases_.clear();
logic_data_.reset();
for (shared_ptr& view : views_) {
- view->clear_signals();
+ view->clear_signalbases();
#ifdef ENABLE_DECODE
view->clear_decode_signals();
#endif
@@ -869,7 +950,7 @@ void Session::update_signals()
signalbases_.clear();
logic_data_.reset();
for (shared_ptr& view : views_) {
- view->clear_signals();
+ view->clear_signalbases();
#ifdef ENABLE_DECODE
view->clear_decode_signals();
#endif
@@ -884,7 +965,7 @@ void Session::update_signals()
[] (shared_ptr channel) {
return channel->type() == sigrok::ChannelType::LOGIC; });
- // Create data containers for the logic data segments
+ // Create a common data container for the logic signalbases
{
lock_guard data_lock(data_mutex_);
@@ -892,100 +973,77 @@ void Session::update_signals()
logic_data_.reset();
} else if (!logic_data_ ||
logic_data_->num_channels() != logic_channel_count) {
- logic_data_.reset(new data::Logic(
- logic_channel_count));
+ logic_data_.reset(new data::Logic(logic_channel_count));
assert(logic_data_);
}
}
- // Make the signals list
- for (shared_ptr& viewbase : views_) {
- views::trace::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 = 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;
-
- shared_ptr signal;
-
- switch(channel->type()->id()) {
- case SR_CHANNEL_LOGIC:
- if (!signalbase) {
- signalbase = make_shared(channel,
- data::SignalBase::LogicChannel);
- signalbases_.insert(signalbase);
-
- all_signal_data_.insert(logic_data_);
- signalbase->set_data(logic_data_);
-
- connect(this, SIGNAL(capture_state_changed(int)),
- signalbase.get(), SLOT(on_capture_state_changed(int)));
- }
-
- signal = shared_ptr(new LogicSignal(*this, device_, signalbase));
- break;
-
- case SR_CHANNEL_ANALOG:
- {
- if (!signalbase) {
- signalbase = make_shared(channel,
- data::SignalBase::AnalogChannel);
- signalbases_.insert(signalbase);
-
- shared_ptr data(new data::Analog());
- all_signal_data_.insert(data);
- signalbase->set_data(data);
-
- connect(this, SIGNAL(capture_state_changed(int)),
- signalbase.get(), SLOT(on_capture_state_changed(int)));
- }
-
- signal = shared_ptr(new AnalogSignal(*this, signalbase));
- break;
- }
-
- default:
- assert(false);
- break;
- }
-
- // New views take their signal settings from the main view
- if (!viewbase->is_main_view()) {
- shared_ptr main_tv =
- dynamic_pointer_cast(main_view_);
- shared_ptr main_signal =
- main_tv->get_signal_by_signalbase(signalbase);
- signal->restore_settings(main_signal->save_settings());
- }
-
- trace_view->add_signal(signal);
- }
+ // Create signalbases if necessary
+ for (auto channel : sr_dev->channels()) {
+
+ // Try to find the channel in the list of existing signalbases
+ const auto iter = find_if(signalbases_.cbegin(), signalbases_.cend(),
+ [&](const shared_ptr &sb) { return sb->channel() == channel; });
+
+ // Not found, let's make a signalbase for it
+ if (iter == signalbases_.cend()) {
+ shared_ptr signalbase;
+ switch(channel->type()->id()) {
+ case SR_CHANNEL_LOGIC:
+ signalbase = make_shared(channel, data::SignalBase::LogicChannel);
+ signalbases_.push_back(signalbase);
+
+ all_signal_data_.insert(logic_data_);
+ signalbase->set_data(logic_data_);
+
+ connect(this, SIGNAL(capture_state_changed(int)),
+ signalbase.get(), SLOT(on_capture_state_changed(int)));
+ break;
+
+ case SR_CHANNEL_ANALOG:
+ signalbase = make_shared(channel, data::SignalBase::AnalogChannel);
+ signalbases_.push_back(signalbase);
+
+ shared_ptr data(new data::Analog());
+ all_signal_data_.insert(data);
+ signalbase->set_data(data);
+
+ connect(this, SIGNAL(capture_state_changed(int)),
+ signalbase.get(), SLOT(on_capture_state_changed(int)));
+ break;
}
}
}
+ for (shared_ptr& viewbase : views_) {
+ vector< shared_ptr > view_signalbases =
+ viewbase->signalbases();
+
+ // Add all non-decode signalbases that don't yet exist in the view
+ for (shared_ptr& session_sb : signalbases_) {
+ if (session_sb->type() == SignalBase::DecodeChannel)
+ continue;
+
+ const auto iter = find_if(view_signalbases.cbegin(), view_signalbases.cend(),
+ [&](const shared_ptr &sb) { return sb == session_sb; });
+
+ if (iter == view_signalbases.cend())
+ viewbase->add_signalbase(session_sb);
+ }
+
+ // Remove all non-decode signalbases that no longer exist
+ for (shared_ptr& view_sb : view_signalbases) {
+ if (view_sb->type() == SignalBase::DecodeChannel)
+ continue;
+
+ const auto iter = find_if(signalbases_.cbegin(), signalbases_.cend(),
+ [&](const shared_ptr &sb) { return sb == view_sb; });
+
+ if (iter == signalbases_.cend())
+ viewbase->remove_signalbase(view_sb);
+ }
+ }
+
signals_changed();
}