Add metadata object handling

[pulseview.git] / pv / session.cpp

diff --git a/pv/session.cpp b/pv/session.cpp
index b3f8ba87de7e31aa57bbc7dba5b4687fd45557f7..d50a9dd6a41420c16a92d70c3898104657004064 100644 (file)
--- a/pv/session.cpp
+++ b/pv/session.cpp
@@ -67,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;
@@ -84,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;
@@ -168,7 +167,7 @@ void Session::set_name(QString name)
        name_changed();
 }
 
-const list< shared_ptr<views::ViewBase> > Session::views() const
+const vector< shared_ptr<views::ViewBase> > Session::views() const
 {
        return views_;
 }
@@ -233,31 +232,40 @@ void Session::save_setup(QSettings &settings) const
 
        settings.setValue("views", i);
 
+       int view_id = 0;
        i = 0;
-       shared_ptr<views::trace::View> tv = dynamic_pointer_cast<views::trace::View>(main_view_);
-       for (const shared_ptr<views::trace::TimeItem>& time_item : tv->time_items()) {
-
-               const shared_ptr<views::trace::Flag> flag =
-                       dynamic_pointer_cast<views::trace::Flag>(time_item);
-               if (flag) {
-                       if (!flag->enabled())
-                               continue;
+       for (const shared_ptr<views::ViewBase>& vb : views_) {
+               shared_ptr<views::trace::View> tv = dynamic_pointer_cast<views::trace::View>(vb);
+               if (tv) {
+                       for (const shared_ptr<views::trace::TimeItem>& time_item : tv->time_items()) {
+
+                               const shared_ptr<views::trace::Flag> flag =
+                                       dynamic_pointer_cast<views::trace::Flag>(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();
+                               }
+                       }
 
-                       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");
+                               settings.setValue("assoc_view", view_id);
+                               const shared_ptr<views::trace::CursorPair> cp = tv->cursors();
+                               GlobalSettings::store_timestamp(settings, "start_time", cp->first()->time());
+                               GlobalSettings::store_timestamp(settings, "end_time", cp->second()->time());
+                               settings.endGroup();
+                       }
                }
-       }
 
-       if (tv->cursors_shown()) {
-               settings.beginGroup("meta_obj" + QString::number(i++));
-               settings.setValue("type", "selection");
-               const shared_ptr<views::trace::CursorPair> 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);
@@ -360,18 +368,26 @@ void Session::restore_setup(QSettings &settings)
        // Restore meta objects like markers and cursors
        int meta_objs = settings.value("meta_objs").toInt();
 
-       shared_ptr<views::trace::View> tv = dynamic_pointer_cast<views::trace::View>(main_view_);
        for (int i = 0; i < meta_objs; i++) {
                settings.beginGroup("meta_obj" + QString::number(i));
+
+               shared_ptr<views::ViewBase> vb;
+               shared_ptr<views::trace::View> tv;
+               if (settings.contains("assoc_view"))
+                       vb = views_.at(settings.value("assoc_view").toInt());
+
+               if (vb)
+                       tv = dynamic_pointer_cast<views::trace::View>(vb);
+
                const QString type = settings.value("type").toString();
 
-               if (type == "time_marker") {
+               if ((type == "time_marker") && tv) {
                        Timestamp ts = GlobalSettings::restore_timestamp(settings, "time");
                        shared_ptr<views::trace::Flag> flag = tv->add_flag(ts);
                        flag->set_text(settings.value("text").toString());
                }
 
-               if (type == "selection") {
+               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);
@@ -744,7 +760,7 @@ void Session::register_view(shared_ptr<views::ViewBase> view)
        update_signals();
 
        // Add all other signals
-       unordered_set< shared_ptr<data::SignalBase> > view_signalbases = view->signalbases();
+       vector< shared_ptr<data::SignalBase> > view_signalbases = view->signalbases();
 
        for (const shared_ptr<data::SignalBase>& signalbase : signalbases_) {
                const int sb_exists = count_if(
@@ -774,7 +790,9 @@ void Session::register_view(shared_ptr<views::ViewBase> view)
 
 void Session::deregister_view(shared_ptr<views::ViewBase> view)
 {
-       views_.remove_if([&](shared_ptr<views::ViewBase> v) { return v == view; });
+       views_.erase(std::remove_if(views_.begin(), views_.end(),
+               [&](shared_ptr<views::ViewBase> v) { return v == view; }),
+               views_.end());
 
        if (views_.empty()) {
                main_view_.reset();
@@ -834,7 +852,7 @@ vector<util::Timestamp> Session::get_triggers(uint32_t segment_id) const
        return result;
 }
 
-const unordered_set< shared_ptr<data::SignalBase> > Session::signalbases() const
+const vector< shared_ptr<data::SignalBase> > Session::signalbases() const
 {
        return signalbases_;
 }
@@ -859,7 +877,7 @@ shared_ptr<data::DecodeSignal> Session::add_decode_signal()
                // Create the decode signal
                signal = make_shared<data::DecodeSignal>(*this);
 
-               signalbases_.insert(signal);
+               signalbases_.push_back(signal);
 
                // Add the decode signal to all views
                for (shared_ptr<views::ViewBase>& view : views_)
@@ -876,7 +894,9 @@ shared_ptr<data::DecodeSignal> Session::add_decode_signal()
 
 void Session::remove_decode_signal(shared_ptr<data::DecodeSignal> signal)
 {
-       signalbases_.erase(signal);
+       signalbases_.erase(std::remove_if(signalbases_.begin(), signalbases_.end(),
+               [&](shared_ptr<data::SignalBase> s) { return s == signal; }),
+               signalbases_.end());
 
        for (shared_ptr<views::ViewBase>& view : views_)
                view->remove_decode_signal(signal);
@@ -885,6 +905,11 @@ void Session::remove_decode_signal(shared_ptr<data::DecodeSignal> signal)
 }
 #endif
 
+MetadataObjManager* Session::metadata_obj_manager()
+{
+       return &metadata_obj_manager_;
+}
+
 void Session::set_capture_state(capture_state state)
 {
        bool changed;
@@ -960,7 +985,7 @@ void Session::update_signals()
                        qobject_cast<views::trace::View*>(viewbase.get());
 
                if (trace_view) {
-                       unordered_set< shared_ptr<Signal> > prev_sigs(trace_view->signals());
+                       vector< shared_ptr<Signal> > prev_sigs(trace_view->signals());
                        trace_view->clear_signals();
 
                        for (auto channel : sr_dev->channels()) {
@@ -991,7 +1016,7 @@ void Session::update_signals()
                                                if (!signalbase) {
                                                        signalbase = make_shared<data::SignalBase>(channel,
                                                                data::SignalBase::LogicChannel);
-                                                       signalbases_.insert(signalbase);
+                                                       signalbases_.push_back(signalbase);
 
                                                        all_signal_data_.insert(logic_data_);
                                                        signalbase->set_data(logic_data_);
@@ -1008,7 +1033,7 @@ void Session::update_signals()
                                                if (!signalbase) {
                                                        signalbase = make_shared<data::SignalBase>(channel,
                                                                data::SignalBase::AnalogChannel);
-                                                       signalbases_.insert(signalbase);
+                                                       signalbases_.push_back(signalbase);
 
                                                        shared_ptr<data::Analog> data(new data::Analog());
                                                        all_signal_data_.insert(data);