X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=pv%2Fviews%2Fviewbase.cpp;h=24e4bb9a8816b2dcf945907f297637b4d8e1ea07;hb=9e633bf3b6fa3d332119798c7b6325970b410be4;hp=ecdefdcde294a68f188336f8b47180155057ab9e;hpb=0a952555b9d153f42912e47f35fac5dd4643fca9;p=pulseview.git

diff --git a/pv/views/viewbase.cpp b/pv/views/viewbase.cpp
index ecdefdcd..24e4bb9a 100644
--- a/pv/views/viewbase.cpp
+++ b/pv/views/viewbase.cpp
@@ -36,7 +36,7 @@ namespace views {
 const char* ViewTypeNames[ViewTypeCount] = {
 	"Trace View",
 #ifdef ENABLE_DECODE
-	"Decoder Output View"
+	"Binary Decoder Output View"
 #endif
 };
 
@@ -88,7 +88,7 @@ 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 +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()));
@@ -123,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