X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fview%2Fdecodetrace.cpp;h=020ce77090acd4d86bc06ba49185be1282106a02;hp=8674f40ca405ca2c5833cc708e278015839b2811;hb=5da5d0813b0253fbe430d3a0b7cb780df1dcb72a;hpb=4c60462b00cc329e61daedd1c2e66724077bd412

diff --git a/pv/view/decodetrace.cpp b/pv/view/decodetrace.cpp
index 8674f40c..020ce770 100644
--- a/pv/view/decodetrace.cpp
+++ b/pv/view/decodetrace.cpp
@@ -29,6 +29,8 @@ extern "C" {
 #include <tuple>
 
 #include <boost/functional/hash.hpp>
+#include <boost/thread/locks.hpp>
+#include <boost/thread/shared_mutex.hpp>
 
 #include <QAction>
 #include <QApplication>
@@ -525,7 +527,7 @@ pair<double, double> DecodeTrace::get_pixels_offset_samples_per_pixel() const
 	assert(scale > 0);
 
 	const double pixels_offset =
-		(view->offset() - decoder_stack_->start_time()) / scale;
+		((view->offset() - decoder_stack_->start_time()) / scale).convert_to<double>();
 
 	double samplerate = decoder_stack_->samplerate();
 
@@ -642,13 +644,17 @@ void DecodeTrace::create_decoder_form(int index,
 	const srd_decoder *const decoder = dec->decoder();
 	assert(decoder);
 
+	const bool decoder_deletable = index > 0;
+
 	pv::widgets::DecoderGroupBox *const group =
 		new pv::widgets::DecoderGroupBox(
-			QString::fromUtf8(decoder->name));
+			QString::fromUtf8(decoder->name), nullptr, decoder_deletable);
 	group->set_decoder_visible(dec->shown());
 
-	delete_mapper_.setMapping(group, index);
-	connect(group, SIGNAL(delete_decoder()), &delete_mapper_, SLOT(map()));
+	if (decoder_deletable) {
+		delete_mapper_.setMapping(group, index);
+		connect(group, SIGNAL(delete_decoder()), &delete_mapper_, SLOT(map()));
+	}
 
 	show_hide_mapper_.setMapping(group, index);
 	connect(group, SIGNAL(show_hide_decoder()),
@@ -658,7 +664,7 @@ void DecodeTrace::create_decoder_form(int index,
 	group->add_layout(decoder_form);
 
 	// Add the mandatory channels
-	for(l = decoder->channels; l; l = l->next) {
+	for (l = decoder->channels; l; l = l->next) {
 		const struct srd_channel *const pdch =
 			(struct srd_channel *)l->data;
 		QComboBox *const combo = create_channel_selector(parent, dec, pdch);
@@ -673,7 +679,7 @@ void DecodeTrace::create_decoder_form(int index,
 	}
 
 	// Add the optional channels
-	for(l = decoder->opt_channels; l; l = l->next) {
+	for (l = decoder->opt_channels; l; l = l->next) {
 		const struct srd_channel *const pdch =
 			(struct srd_channel *)l->data;
 		QComboBox *const combo = create_channel_selector(parent, dec, pdch);
@@ -704,8 +710,7 @@ QComboBox* DecodeTrace::create_channel_selector(
 {
 	assert(dec);
 
-	shared_lock<shared_mutex> lock(session_.signals_mutex());
-	const auto &sigs(session_.signals());
+	const auto sigs(session_.signals());
 
 	vector< shared_ptr<Signal> > sig_list(sigs.begin(), sigs.end());
 	std::sort(sig_list.begin(), sig_list.end(),
@@ -728,7 +733,9 @@ QComboBox* DecodeTrace::create_channel_selector(
 		{
 			selector->addItem(s->name(),
 				qVariantFromValue((void*)s.get()));
-			if ((*channel_iter).second == s)
+
+			if (channel_iter != dec->channels().end() &&
+				(*channel_iter).second == s)
 				selector->setCurrentIndex(
 					selector->count() - 1);
 		}
@@ -743,12 +750,11 @@ void DecodeTrace::commit_decoder_channels(shared_ptr<data::decode::Decoder> &dec
 
 	map<const srd_channel*, shared_ptr<LogicSignal> > channel_map;
 
-	shared_lock<shared_mutex> lock(session_.signals_mutex());
-	const unordered_set< shared_ptr<Signal> > &sigs(session_.signals());
+	const unordered_set< shared_ptr<Signal> > sigs(session_.signals());
 
 	for (const ChannelSelector &s : channel_selectors_)
 	{
-		if(s.decoder_ != dec)
+		if (s.decoder_ != dec)
 			break;
 
 		const LogicSignal *const selection =
@@ -756,7 +762,7 @@ void DecodeTrace::commit_decoder_channels(shared_ptr<data::decode::Decoder> &dec
 				s.combo_->currentIndex()).value<void*>();
 
 		for (shared_ptr<Signal> sig : sigs)
-			if(sig.get() == selection) {
+			if (sig.get() == selection) {
 				channel_map[s.pdch_] =
 					dynamic_pointer_cast<LogicSignal>(sig);
 				break;
@@ -825,7 +831,7 @@ void DecodeTrace::on_show_hide_decoder(int index)
 
 	// Find the decoder in the stack
 	auto iter = stack.cbegin();
-	for(int i = 0; i < index; i++, iter++)
+	for (int i = 0; i < index; i++, iter++)
 		assert(iter != stack.end());
 
 	shared_ptr<Decoder> dec = *iter;