X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fviews%2Ftrace%2Fdecodetrace.cpp;h=21d88923ef1c5732f3a0f3ef1394219c2ead7907;hp=a4628eab9fbfdac55c9125e765f5c6cc0976ebcd;hb=1b56c646e7dd253775b4d6cfceaf327fd8ffd297;hpb=ff83d98059f06ac8f57be080ab53e7095aa4748b

diff --git a/pv/views/trace/decodetrace.cpp b/pv/views/trace/decodetrace.cpp
index a4628eab..21d88923 100644
--- a/pv/views/trace/decodetrace.cpp
+++ b/pv/views/trace/decodetrace.cpp
@@ -54,10 +54,8 @@ extern "C" {
 #include <pv/widgets/decodermenu.hpp>
 
 using std::all_of;
-using std::list;
 using std::make_pair;
 using std::max;
-using std::make_pair;
 using std::map;
 using std::min;
 using std::out_of_range;
@@ -92,6 +90,8 @@ const double DecodeTrace::EndCapWidth = 5;
 const int DecodeTrace::RowTitleMargin = 10;
 const int DecodeTrace::DrawPadding = 100;
 
+const int DecodeTrace::MaxTraceUpdateRate = 1; // No more than 1 Hz
+
 const QColor DecodeTrace::Colours[16] = {
 	QColor(0xEF, 0x29, 0x29),
 	QColor(0xF6, 0x6A, 0x32),
@@ -149,6 +149,8 @@ DecodeTrace::DecodeTrace(pv::Session &session,
 
 	connect(decode_signal_.get(), SIGNAL(new_annotations()),
 		this, SLOT(on_new_annotations()));
+	connect(decode_signal_.get(), SIGNAL(decode_finished()),
+		this, SLOT(on_decode_finished()));
 	connect(decode_signal_.get(), SIGNAL(channels_updated()),
 		this, SLOT(on_channels_updated()));
 
@@ -156,6 +158,11 @@ DecodeTrace::DecodeTrace(pv::Session &session,
 		this, SLOT(on_delete_decoder(int)));
 	connect(&show_hide_mapper_, SIGNAL(mapped(int)),
 		this, SLOT(on_show_hide_decoder(int)));
+
+	connect(&delayed_trace_updater_, SIGNAL(timeout()),
+		this, SLOT(on_delayed_trace_update()));
+	delayed_trace_updater_.setSingleShot(true);
+	delayed_trace_updater_.setInterval(1000 / MaxTraceUpdateRate);
 }
 
 bool DecodeTrace::enabled() const
@@ -304,8 +311,7 @@ void DecodeTrace::populate_popup_form(QWidget *parent, QFormLayout *form)
 	init_state_map_.clear();
 	decoder_forms_.clear();
 
-	const list< shared_ptr<Decoder> > &stack =
-		decode_signal_->decoder_stack_list();
+	const vector< shared_ptr<Decoder> > &stack = decode_signal_->decoder_stack();
 
 	if (stack.empty()) {
 		QLabel *const l = new QLabel(
@@ -600,11 +606,11 @@ void DecodeTrace::draw_unresolved_period(QPainter &p, int h, int left, int right
 
 	double samples_per_pixel, pixels_offset;
 
-	const int64_t sample_count = decode_signal_->sample_count();
+	const int64_t sample_count = decode_signal_->get_working_sample_count();
 	if (sample_count == 0)
 		return;
 
-	const int64_t samples_decoded = decode_signal_->samples_decoded();
+	const int64_t samples_decoded = decode_signal_->get_decoded_sample_count();
 	if (sample_count == samples_decoded)
 		return;
 
@@ -776,7 +782,7 @@ void DecodeTrace::create_decoder_form(int index,
 	QFormLayout *const decoder_form = new QFormLayout;
 	group->add_layout(decoder_form);
 
-	const list<DecodeChannel> channels = decode_signal_->get_channels();
+	const vector<DecodeChannel> channels = decode_signal_->get_channels();
 
 	// Add the channels
 	for (DecodeChannel ch : channels) {
@@ -807,11 +813,9 @@ void DecodeTrace::create_decoder_form(int index,
 			.arg(ch.name, ch.desc, required_flag), hlayout);
 	}
 
-	shared_ptr<pv::data::DecoderStack> decoder_stack = base_->decoder_stack();
-
 	// Add the options
 	shared_ptr<binding::Decoder> binding(
-		new binding::Decoder(decoder_stack, dec));
+		new binding::Decoder(decode_signal_, dec));
 	binding->add_properties_to_form(decoder_form, true);
 
 	bindings_.push_back(binding);
@@ -870,6 +874,18 @@ QComboBox* DecodeTrace::create_channel_selector_init_state(QWidget *parent,
 }
 
 void DecodeTrace::on_new_annotations()
+{
+	if (!delayed_trace_updater_.isActive())
+		delayed_trace_updater_.start();
+}
+
+void DecodeTrace::on_delayed_trace_update()
+{
+	if (owner_)
+		owner_->row_item_appearance_changed(false, true);
+}
+
+void DecodeTrace::on_decode_finished()
 {
 	if (owner_)
 		owner_->row_item_appearance_changed(false, true);