X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fview%2Fdecodetrace.cpp;h=38cbecb85337500cf3c20ca5963aa769918bb728;hp=36e7a10458a0c9467740f5edf770177199268e2f;hb=f1626bb80080435e306c9a6c5d6ff20dd6dc9e57;hpb=f32905530347e1020d5ce7959123cf797c9a4829

diff --git a/pv/view/decodetrace.cpp b/pv/view/decodetrace.cpp
index 36e7a104..38cbecb8 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()),
@@ -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(),
@@ -743,8 +748,7 @@ 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_)
 	{