Session: Fix issue #67 by improving error handling

[pulseview.git] / pv / views / viewbase.cpp

diff --git a/pv/views/viewbase.cpp b/pv/views/viewbase.cpp
index ecdefdcde294a68f188336f8b47180155057ab9e..ff3a4fdbbb3e30be432667338dba559f0806e0bd 100644 (file)
--- a/pv/views/viewbase.cpp
+++ b/pv/views/viewbase.cpp
@@ -36,7 +36,8 @@ namespace views {
 const char* ViewTypeNames[ViewTypeCount] = {
        "Trace View",
 #ifdef ENABLE_DECODE
-       "Decoder Output View"
+       "Binary Decoder Output View",
+       "Tabular Decoder Output View"
 #endif
 };
 
@@ -83,12 +84,7 @@ const Session& ViewBase::session() const
        return session_;
 }
 
-void ViewBase::clear_signals()
-{
-       clear_signalbases();
-}
-
-unordered_set< shared_ptr<data::SignalBase> > ViewBase::signalbases() const
+vector< shared_ptr<data::SignalBase> > ViewBase::signalbases() const
 {
        return signalbases_;
 }
@@ -107,7 +103,7 @@ void ViewBase::clear_signalbases()
 
 void ViewBase::add_signalbase(const shared_ptr<data::SignalBase> signalbase)
 {
-       signalbases_.insert(signalbase);
+       signalbases_.push_back(signalbase);
 
        connect(signalbase.get(), SIGNAL(samples_cleared()),
                this, SLOT(on_data_updated()));
@@ -115,6 +111,18 @@ void ViewBase::add_signalbase(const shared_ptr<data::SignalBase> signalbase)
                this, SLOT(on_samples_added(uint64_t, uint64_t, uint64_t)));
 }
 
+void ViewBase::remove_signalbase(const shared_ptr<data::SignalBase> signalbase)
+{
+       disconnect(signalbase.get(), SIGNAL(samples_cleared()),
+               this, SLOT(on_data_updated()));
+       disconnect(signalbase.get(), SIGNAL(samples_added(uint64_t, uint64_t, uint64_t)),
+               this, SLOT(on_samples_added(uint64_t, uint64_t, uint64_t)));
+
+       signalbases_.erase(std::remove_if(signalbases_.begin(), signalbases_.end(),
+               [&](shared_ptr<data::SignalBase> s) { return s == signalbase; }),
+               signalbases_.end());
+}
+
 #ifdef ENABLE_DECODE
 void ViewBase::clear_decode_signals()
 {
@@ -123,12 +131,15 @@ void ViewBase::clear_decode_signals()
 
 void ViewBase::add_decode_signal(shared_ptr<data::DecodeSignal> signal)
 {
-       decode_signals_.insert(signal);
+       decode_signals_.push_back(signal);
 }
 
 void ViewBase::remove_decode_signal(shared_ptr<data::DecodeSignal> signal)
 {
-       decode_signals_.erase(signal);
+       decode_signals_.erase(std::remove_if(
+               decode_signals_.begin(), decode_signals_.end(),
+               [&](shared_ptr<data::DecodeSignal> s) { return s == signal; }),
+               decode_signals_.end());
 }
 #endif
 
@@ -142,6 +153,12 @@ void ViewBase::restore_settings(QSettings &settings)
        (void)settings;
 }
 
+void ViewBase::focus_on_range(uint64_t start_sample, uint64_t end_sample)
+{
+       (void)start_sample;
+       (void)end_sample;
+}
+
 void ViewBase::trigger_event(int segment_id, util::Timestamp location)
 {
        (void)segment_id;