Add metadata object handling

[pulseview.git] / pv / session.cpp

diff --git a/pv/session.cpp b/pv/session.cpp
index dc08afb245f8fc5e5ea54d3da40e745b0322d4a5..d50a9dd6a41420c16a92d70c3898104657004064 100644 (file)
--- a/pv/session.cpp
+++ b/pv/session.cpp
@@ -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;
@@ -235,7 +234,7 @@ void Session::save_setup(QSettings &settings) const
 
        int view_id = 0;
        i = 0;
-       for (const shared_ptr<views::ViewBase> vb : views_) {
+       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()) {
@@ -761,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(
@@ -906,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;
@@ -981,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()) {