Added AnalogSignal::analog_data accessor function

[pulseview.git] / pv / sigsession.cpp

diff --git a/pv/sigsession.cpp b/pv/sigsession.cpp
index 719f9ded3610b948438c65a2ebda098d76555f53..ad0b5d298637b9eeaa58c7157e3654d78a456c5f 100644 (file)
--- a/pv/sigsession.cpp
+++ b/pv/sigsession.cpp
@@ -1,7 +1,7 @@
 /*
  * This file is part of the PulseView project.
  *
- * Copyright (C) 2012 Joel Holdsworth <joel@airwebreathe.org.uk>
+ * Copyright (C) 2012-14 Joel Holdsworth <joel@airwebreathe.org.uk>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -53,6 +53,7 @@ using boost::lock_guard;
 using boost::mutex;
 using boost::shared_ptr;
 using std::map;
+using std::set;
 using std::string;
 using std::vector;
 
@@ -202,15 +203,22 @@ void SigSession::stop_capture()
        _sampling_thread.join();
 }
 
-vector< shared_ptr<view::Signal> > SigSession::get_signals() const
+set< shared_ptr<data::SignalData> > SigSession::get_data() const
 {
        lock_guard<mutex> lock(_signals_mutex);
-       return _signals;
+       set< shared_ptr<data::SignalData> > data;
+       BOOST_FOREACH(const shared_ptr<view::Signal> sig, _signals) {
+               assert(sig);
+               data.insert(sig->data());
+       }
+
+       return data;
 }
 
-boost::shared_ptr<data::Logic> SigSession::get_data()
+vector< shared_ptr<view::Signal> > SigSession::get_signals() const
 {
-       return _logic_data;
+       lock_guard<mutex> lock(_signals_mutex);
+       return _signals;
 }
 
 #ifdef ENABLE_DECODE
@@ -376,7 +384,6 @@ void SigSession::update_signals(const sr_dev_inst *const sdi)
 {
        assert(_capture_state == Stopped);
 
-       shared_ptr<view::Signal> signal;
        unsigned int logic_probe_count = 0;
        unsigned int analog_probe_count = 0;
 
@@ -421,34 +428,42 @@ void SigSession::update_signals(const sr_dev_inst *const sdi)
        }
 
        // Make the Signals list
-       {
+       do {
                lock_guard<mutex> lock(_signals_mutex);
 
                _signals.clear();
 
-               if(sdi) {
-                       for (const GSList *l = sdi->probes; l; l = l->next) {
-                               sr_probe *const probe = (sr_probe *)l->data;
-                               assert(probe);
-
-                               switch(probe->type) {
-                               case SR_PROBE_LOGIC:
-                                       signal = shared_ptr<view::Signal>(
-                                               new view::LogicSignal(*this, probe,
-                                                       _logic_data));
-                                       break;
-
-                               case SR_PROBE_ANALOG:
-                                       signal = shared_ptr<view::Signal>(
-                                               new view::AnalogSignal(*this, probe,
-                                                       _analog_data));
-                                       break;
-                               }
-
-                               _signals.push_back(signal);
+               if(!sdi)
+                       break;
+
+               for (const GSList *l = sdi->probes; l; l = l->next) {
+                       shared_ptr<view::Signal> signal;
+                       sr_probe *const probe = (sr_probe *)l->data;
+                       assert(probe);
+
+                       switch(probe->type) {
+                       case SR_PROBE_LOGIC:
+                               signal = shared_ptr<view::Signal>(
+                                       new view::LogicSignal(*this, probe,
+                                               _logic_data));
+                               break;
+
+                       case SR_PROBE_ANALOG:
+                               signal = shared_ptr<view::Signal>(
+                                       new view::AnalogSignal(*this, probe,
+                                               _analog_data));
+                               break;
+
+                       default:
+                               assert(0);
+                               break;
                        }
+
+                       assert(signal);
+                       _signals.push_back(signal);
                }
-       }
+
+       } while(0);
 
        signals_changed();
 }
@@ -466,6 +481,18 @@ bool SigSession::is_trigger_enabled() const
        return false;
 }
 
+shared_ptr<view::Signal> SigSession::signal_from_probe(
+       const sr_probe *probe) const
+{
+       lock_guard<mutex> lock(_signals_mutex);
+       BOOST_FOREACH(shared_ptr<view::Signal> sig, _signals) {
+               assert(sig);
+               if (sig->probe() == probe)
+                       return sig;
+       }
+       return shared_ptr<view::Signal>();
+}
+
 void SigSession::read_sample_rate(const sr_dev_inst *const sdi)
 {
        GVariant *gvar;