Added error handling to SigSession::add_decoder

[pulseview.git] / pv / sigsession.cpp

diff --git a/pv/sigsession.cpp b/pv/sigsession.cpp
index ffe37d2008e2ac626aa6c686434b284033872c25..e81d36051fa068e361eafb01c18ef3aeee02caaa 100644 (file)
--- a/pv/sigsession.cpp
+++ b/pv/sigsession.cpp
@@ -34,6 +34,8 @@
 
 #include <assert.h>
 
+#include <stdexcept>
+
 #include <sys/stat.h>
 
 #include <QDebug>
@@ -193,26 +195,30 @@ boost::shared_ptr<data::Logic> SigSession::get_data()
        return _logic_data;
 }
 
-void SigSession::add_decoder(srd_decoder *const dec,
+bool SigSession::add_decoder(srd_decoder *const dec,
        std::map<const srd_probe*,
-               boost::shared_ptr<view::Signal> > probes)
+               boost::shared_ptr<view::Signal> > probes,
+       GHashTable *options)
 {
+       try
        {
                lock_guard<mutex> lock(_signals_mutex);
 
-               if (!_decode_traces.empty()) {
-                       qDebug("Currently only one decode trace can be added "
-                               "at once");
-                       _decode_traces.clear();
-               }
-
                shared_ptr<data::Decoder> decoder(
-                       new data::Decoder(dec, probes));
+                       new data::Decoder(dec, probes, options));
                shared_ptr<view::DecodeSignal> d(
-                       new view::DecodeSignal(*this, decoder));
+                       new view::DecodeSignal(*this, decoder,
+                               _decode_traces.size()));
                _decode_traces.push_back(d);
        }
+       catch(std::runtime_error e)
+       {
+               return false;
+       }
+
        signals_changed();
+
+       return true;
 }
 
 vector< shared_ptr<view::DecodeSignal> > SigSession::get_decode_signals() const
@@ -221,6 +227,20 @@ vector< shared_ptr<view::DecodeSignal> > SigSession::get_decode_signals() const
        return _decode_traces;
 }
 
+void SigSession::remove_decode_signal(view::DecodeSignal *signal)
+{
+       for (vector< shared_ptr<view::DecodeSignal> >::iterator i =
+               _decode_traces.begin();
+               i != _decode_traces.end();
+               i++)
+               if ((*i).get() == signal)
+               {
+                       _decode_traces.erase(i);
+                       signals_changed();
+                       return;
+               }
+}
+
 void SigSession::set_capture_state(capture_state state)
 {
        lock_guard<mutex> lock(_sampling_mutex);
@@ -362,8 +382,7 @@ void SigSession::update_signals(const sr_dev_inst *const sdi)
 
                if(sdi) {
                        for (const GSList *l = sdi->probes; l; l = l->next) {
-                               const sr_probe *const probe =
-                                       (const sr_probe *)l->data;
+                               sr_probe *const probe = (sr_probe *)l->data;
                                assert(probe);
 
                                switch(probe->type) {