X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=pv%2Fview%2Fdecodetrace.cpp;h=1cb9ce7154a9c302f15e3ecb63637f109f84286a;hb=f0c0b38f812bfbb2bb1978d40e2ce93f1da3f89d;hp=ae2ec16287b561e775b595e35a622ab17e105fbd;hpb=0a47889b01386b1e55c7df73ca301046a195ff97;p=pulseview.git

diff --git a/pv/view/decodetrace.cpp b/pv/view/decodetrace.cpp
index ae2ec162..1cb9ce71 100644
--- a/pv/view/decodetrace.cpp
+++ b/pv/view/decodetrace.cpp
@@ -22,6 +22,8 @@ extern "C" {
 #include <libsigrokdecode/libsigrokdecode.h>
 }
 
+#include <mutex>
+
 #include <extdef.h>
 
 #include <tuple>
@@ -51,8 +53,11 @@ extern "C" {
 #include <pv/widgets/decodergroupbox.h>
 #include <pv/widgets/decodermenu.h>
 
+using boost::shared_lock;
+using boost::shared_mutex;
 using std::dynamic_pointer_cast;
 using std::list;
+using std::lock_guard;
 using std::make_pair;
 using std::max;
 using std::map;
@@ -505,14 +510,17 @@ void DecodeTrace::draw_unresolved_period(QPainter &p, int h, int left,
 
 pair<double, double> DecodeTrace::get_pixels_offset_samples_per_pixel() const
 {
-	assert(_view);
+	assert(_owner);
 	assert(_decoder_stack);
 
-	const double scale = _view->scale();
+	const View *view = _owner->view();
+	assert(view);
+
+	const double scale = view->scale();
 	assert(scale > 0);
 
 	const double pixels_offset =
-		(_view->offset() - _decoder_stack->get_start_time()) / scale;
+		(view->offset() - _decoder_stack->get_start_time()) / scale;
 
 	double samplerate = _decoder_stack->samplerate();
 
@@ -580,10 +588,15 @@ void DecodeTrace::hide_hover_annotation()
 
 void DecodeTrace::hover_point_changed()
 {
-	QPoint hp = _view->hover_point();
+	assert(_owner);
+
+	const View *const view = _owner->view();
+	assert(view);
+
+	QPoint hp = view->hover_point();
 	QString ann = get_annotation_at_point(hp);
 
-	assert(_view);
+	assert(view);
 	assert(_row_height);
 
 	if (ann.isEmpty()) {
@@ -609,7 +622,7 @@ void DecodeTrace::hover_point_changed()
 	hp.setY(get_y() - (_row_height / 2) + (hover_row * _row_height)
 		- _row_height - text_size.height());
 
-	QToolTip::showText(_view->viewport()->mapToGlobal(hp), ann);
+	QToolTip::showText(view->viewport()->mapToGlobal(hp), ann);
 }
 
 void DecodeTrace::create_decoder_form(int index,
@@ -684,7 +697,8 @@ QComboBox* DecodeTrace::create_channel_selector(
 {
 	assert(dec);
 
-	const vector< shared_ptr<Signal> > sigs = _session.get_signals();
+	shared_lock<shared_mutex> lock(_session.signals_mutex());
+	const vector< shared_ptr<Signal> > &sigs(_session.signals());
 
 	assert(_decoder_stack);
 	const auto channel_iter = dec->channels().find(pdch);
@@ -717,7 +731,9 @@ void DecodeTrace::commit_decoder_channels(shared_ptr<data::decode::Decoder> &dec
 	assert(dec);
 
 	map<const srd_channel*, shared_ptr<LogicSignal> > channel_map;
-	const vector< shared_ptr<Signal> > sigs = _session.get_signals();
+
+	shared_lock<shared_mutex> lock(_session.signals_mutex());
+	const vector< shared_ptr<Signal> > &sigs(_session.signals());
 
 	for (const ChannelSelector &s : _channel_selectors)
 	{
@@ -750,8 +766,8 @@ void DecodeTrace::commit_channels()
 
 void DecodeTrace::on_new_decode_data()
 {
-	if (_view)
-		_view->update_viewport();
+	if (_owner)
+		_owner->update_viewport();
 }
 
 void DecodeTrace::delete_pressed()
@@ -810,7 +826,7 @@ void DecodeTrace::on_show_hide_decoder(int index)
 	assert(index < (int)_decoder_forms.size());
 	_decoder_forms[index]->set_decoder_visible(show);
 
-	_view->update_viewport();
+	_owner->update_viewport();
 }
 
 } // namespace view