X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=pv%2Fviews%2Fviewbase.cpp;h=7be8822263c12111ec1bb0a6bb2e78ef7c88e607;hb=8e168b23846653c087e46b6a63feffac48512ddb;hp=11ff7a273b6af3a2892fdfcf6c7287f2f99d12c6;hpb=7f894d958eb5221161f0c6f2abbb57d43bb6aae7;p=pulseview.git

diff --git a/pv/views/viewbase.cpp b/pv/views/viewbase.cpp
index 11ff7a27..7be88222 100644
--- a/pv/views/viewbase.cpp
+++ b/pv/views/viewbase.cpp
@@ -33,13 +33,21 @@ 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),
-	ruler_shift_(0),
-	current_segment_(0)
+	is_main_view_(is_main_view)
 {
 	(void)parent;
 
@@ -56,6 +64,16 @@ ViewBase::ViewBase(Session &session, bool is_main_view, QWidget *parent) :
 	delayed_view_updater_.setInterval(1000 / MaxViewAutoUpdateRate);
 }
 
+bool ViewBase::is_main_view() const
+{
+	return is_main_view_;
+}
+
+void ViewBase::reset_view_state()
+{
+	current_segment_ = 0;
+}
+
 Session& ViewBase::session()
 {
 	return session_;
@@ -68,16 +86,17 @@ const Session& ViewBase::session() const
 
 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_;
 }
 
 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(uint64_t, uint64_t, uint64_t)),
@@ -89,7 +108,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()));
@@ -100,16 +119,20 @@ void ViewBase::add_signalbase(const shared_ptr<data::SignalBase> signalbase)
 #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
 
@@ -123,6 +146,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;