X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fviews%2Fviewbase.cpp;h=24e4bb9a8816b2dcf945907f297637b4d8e1ea07;hp=b35e27b9798604cfc5b1647282bacfaccfb0035c;hb=121307b3c50d981638cbe1e33ba5410bb2b11dd1;hpb=e77de61fbc19633c77cc196332ae79c26d9ca35d

diff --git a/pv/views/viewbase.cpp b/pv/views/viewbase.cpp
index b35e27b9..24e4bb9a 100644
--- a/pv/views/viewbase.cpp
+++ b/pv/views/viewbase.cpp
@@ -34,9 +34,9 @@ namespace pv {
 namespace views {
 
 const char* ViewTypeNames[ViewTypeCount] = {
-		"Trace View",
+	"Trace View",
 #ifdef ENABLE_DECODE
-		"Decoder Output View"
+	"Binary Decoder Output View"
 #endif
 };
 
@@ -63,6 +63,11 @@ ViewBase::ViewBase(Session &session, bool is_main_view, QMainWindow *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;
@@ -80,9 +85,10 @@ 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_;
 }
@@ -101,7 +107,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()));
@@ -117,12 +123,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