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 30fd7cec7a59fddcf80ae729614cbe4f67161a9d..ff3a4fdbbb3e30be432667338dba559f0806e0bd 100644 (file)
--- a/pv/views/viewbase.cpp
+++ b/pv/views/viewbase.cpp
@@ -26,15 +26,26 @@
 
 #include "pv/session.hpp"
 #include "pv/util.hpp"
+#include "pv/data/segment.hpp"
 
 using std::shared_ptr;
 
 namespace pv {
 namespace views {
 
+const char* ViewTypeNames[ViewTypeCount] = {
+       "Trace View",
+#ifdef ENABLE_DECODE
+       "Binary Decoder Output View",
+       "Tabular Decoder Output View"
+#endif
+};
+
 const int ViewBase::MaxViewAutoUpdateRate = 25; // No more than 25 Hz
 
-ViewBase::ViewBase(Session &session, bool is_main_view, QWidget *parent) :
+ViewBase::ViewBase(Session &session, bool is_main_view, QMainWindow *parent) :
+       // Note: Place defaults in ViewBase::reset_view_state(), not here
+       QWidget(parent),
        session_(session),
        is_main_view_(is_main_view)
 {
@@ -53,32 +64,38 @@ ViewBase::ViewBase(Session &session, bool is_main_view, QWidget *parent) :
        delayed_view_updater_.setInterval(1000 / MaxViewAutoUpdateRate);
 }
 
-Session& ViewBase::session()
+bool ViewBase::is_main_view() const
 {
-       return session_;
+       return is_main_view_;
 }
 
-const Session& ViewBase::session() const
+void ViewBase::reset_view_state()
+{
+       current_segment_ = 0;
+}
+
+Session& ViewBase::session()
 {
        return session_;
 }
 
-void ViewBase::clear_signals()
+const Session& ViewBase::session() const
 {
+       return session_;
 }
 
-unordered_set< shared_ptr<data::SignalBase> > ViewBase::signalbases() const
+vector< shared_ptr<data::SignalBase> > ViewBase::signalbases() const
 {
        return signalbases_;
 }
 
 void ViewBase::clear_signalbases()
 {
-       for (shared_ptr<data::SignalBase> signalbase : signalbases_) {
+       for (const shared_ptr<data::SignalBase>& signalbase : signalbases_) {
                disconnect(signalbase.get(), SIGNAL(samples_cleared()),
                        this, SLOT(on_data_updated()));
-               disconnect(signalbase.get(), SIGNAL(samples_added(QObject*, uint64_t, uint64_t)),
-                       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_.clear();
@@ -86,27 +103,43 @@ 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()));
-       connect(signalbase.get(), SIGNAL(samples_added(QObject*, uint64_t, uint64_t)),
+       connect(signalbase.get(), SIGNAL(samples_added(uint64_t, uint64_t, uint64_t)),
+               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()
 {
+       decode_signals_.clear();
 }
 
 void ViewBase::add_decode_signal(shared_ptr<data::DecodeSignal> signal)
 {
-       (void)signal;
+       decode_signals_.push_back(signal);
 }
 
 void ViewBase::remove_decode_signal(shared_ptr<data::DecodeSignal> signal)
 {
-       (void)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
 
@@ -120,8 +153,15 @@ void ViewBase::restore_settings(QSettings &settings)
        (void)settings;
 }
 
-void ViewBase::trigger_event(util::Timestamp location)
+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;
        (void)location;
 }
 
@@ -134,6 +174,11 @@ void ViewBase::on_new_segment(int new_segment_id)
        (void)new_segment_id;
 }
 
+void ViewBase::on_segment_completed(int new_segment_id)
+{
+       (void)new_segment_id;
+}
+
 void ViewBase::capture_state_updated(int state)
 {
        (void)state;
@@ -143,6 +188,19 @@ void ViewBase::perform_delayed_view_update()
 {
 }
 
+void ViewBase::on_samples_added(uint64_t segment_id, uint64_t start_sample,
+       uint64_t end_sample)
+{
+       (void)start_sample;
+       (void)end_sample;
+
+       if (segment_id != current_segment_)
+               return;
+
+       if (!delayed_view_updater_.isActive())
+               delayed_view_updater_.start();
+}
+
 void ViewBase::on_data_updated()
 {
        if (!delayed_view_updater_.isActive())