X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fviews%2Fviewbase.cpp;h=ecdefdcde294a68f188336f8b47180155057ab9e;hp=8311f122faa54e253b62bc11aca652d196b7c1ec;hb=HEAD;hpb=ffc00fdd5946593ad2a587078fd4ee9ba0a507ec

diff --git a/pv/views/viewbase.cpp b/pv/views/viewbase.cpp
index 8311f122..ff3a4fdb 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,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_samples_added(QObject*, uint64_t, uint64_t)));
+		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();
@@ -89,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)),
-		this, SLOT(on_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
 
@@ -123,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;
 }
 
@@ -151,15 +188,13 @@ void ViewBase::perform_delayed_view_update()
 {
 }
 
-void ViewBase::on_samples_added(QObject* segment, uint64_t start_sample,
+void ViewBase::on_samples_added(uint64_t segment_id, uint64_t start_sample,
 	uint64_t end_sample)
 {
 	(void)start_sample;
 	(void)end_sample;
 
-	data::Segment* s = qobject_cast<data::Segment*>(segment);
-
-	if (s->segment_id() != current_segment_)
+	if (segment_id != current_segment_)
 		return;
 
 	if (!delayed_view_updater_.isActive())