X-Git-Url: http://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fviews%2Ftrace%2Fdecodetrace.cpp;fp=pv%2Fviews%2Ftrace%2Fdecodetrace.cpp;h=8ff00cd296ecb005a99dcbcc69219ee5023c67de;hp=65a2bf6c6a72f3e773b837e1941565bd7378012a;hb=cf0a3c9c7a8763eeb4427e4fb6fe2c921ae38f09;hpb=ac91f7ad5b49267a072f83fcacfe3a695d37cd7c

diff --git a/pv/views/trace/decodetrace.cpp b/pv/views/trace/decodetrace.cpp
index 65a2bf6c..8ff00cd2 100644
--- a/pv/views/trace/decodetrace.cpp
+++ b/pv/views/trace/decodetrace.cpp
@@ -263,6 +263,31 @@ void DecodeTrace::paint_fore(QPainter &p, ViewItemPaintParams &pp)
 		paint_hover_marker(p);
 }
 
+void DecodeTrace::update_stack_button()
+{
+	const vector< shared_ptr<data::decode::Decoder> > &stack = decode_signal_->decoder_stack();
+
+	// Only show decoders in the menu that can be stacked onto the last one in the stack
+	if (!stack.empty()) {
+		const srd_decoder* d = stack.back()->decoder();
+
+		if (d->outputs) {
+			pv::widgets::DecoderMenu *const decoder_menu =
+				new pv::widgets::DecoderMenu(stack_button_, (const char*)(d->outputs->data));
+			connect(decoder_menu, SIGNAL(decoder_selected(srd_decoder*)),
+				this, SLOT(on_stack_decoder(srd_decoder*)));
+
+			stack_button_->setMenu(decoder_menu);
+			stack_button_->show();
+			return;
+		}
+	}
+
+	// No decoders available for stacking
+	stack_button_->setMenu(nullptr);
+	stack_button_->hide();
+}
+
 void DecodeTrace::populate_popup_form(QWidget *parent, QFormLayout *form)
 {
 	using pv::data::decode::Decoder;
@@ -297,18 +322,12 @@ void DecodeTrace::populate_popup_form(QWidget *parent, QFormLayout *form)
 	}
 
 	// Add stacking button
-	pv::widgets::DecoderMenu *const decoder_menu =
-		new pv::widgets::DecoderMenu(parent);
-	connect(decoder_menu, SIGNAL(decoder_selected(srd_decoder*)),
-		this, SLOT(on_stack_decoder(srd_decoder*)));
-
-	QPushButton *const stack_button =
-		new QPushButton(tr("Stack Decoder"), parent);
-	stack_button->setMenu(decoder_menu);
-	stack_button->setToolTip(tr("Stack a higher-level decoder on top of this one"));
+	stack_button_ = new QPushButton(tr("Stack Decoder"), parent);
+	stack_button_->setToolTip(tr("Stack a higher-level decoder on top of this one"));
+	update_stack_button();
 
 	QHBoxLayout *stack_button_box = new QHBoxLayout;
-	stack_button_box->addWidget(stack_button, 0, Qt::AlignRight);
+	stack_button_box->addWidget(stack_button_, 0, Qt::AlignRight);
 	form->addRow(stack_button_box);
 }