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

diff --git a/pv/view/decodetrace.cpp b/pv/view/decodetrace.cpp
index ae2ec162..5ca665e0 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,10 +53,14 @@ 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::make_pair;
 using std::map;
 using std::min;
 using std::pair;
@@ -150,10 +156,20 @@ const std::shared_ptr<pv::data::DecoderStack>& DecodeTrace::decoder() const
 	return _decoder_stack;
 }
 
+pair<int, int> DecodeTrace::v_extents() const
+{
+	/// @todo Replace this with an implementation that knows the true
+	/// height of the trace
+	QFontMetrics m(QApplication::font());
+	const int text_height =  m.boundingRect(QRect(), 0, "Tg").height();
+	const int row_height = (text_height * 6) / 4;
+	return make_pair(-row_height / 2, row_height * 7 / 2);
+}
+
 void DecodeTrace::paint_back(QPainter &p, int left, int right)
 {
 	Trace::paint_back(p, left, right);
-	paint_axis(p, get_y(), left, right);
+	paint_axis(p, get_visual_y(), left, right);
 }
 
 void DecodeTrace::paint_mid(QPainter &p, int left, int right)
@@ -175,7 +191,7 @@ void DecodeTrace::paint_mid(QPainter &p, int left, int right)
 	}
 
 	// Iterate through the rows
-	int y = get_y();
+	int y = get_visual_y();
 	pair<uint64_t, uint64_t> sample_range = get_sample_range(left, right);
 
 	assert(_decoder_stack);
@@ -220,7 +236,7 @@ void DecodeTrace::paint_fore(QPainter &p, int left, int right)
 
 	for (size_t i = 0; i < _visible_rows.size(); i++)
 	{
-		const int y = i * _row_height + get_y();
+		const int y = i * _row_height + get_visual_y();
 
 		p.setPen(QPen(Qt::NoPen));
 		p.setBrush(QApplication::palette().brush(QPalette::WindowText));
@@ -427,7 +443,7 @@ void DecodeTrace::draw_range(const pv::data::decode::Annotation &a, QPainter &p,
 void DecodeTrace::draw_error(QPainter &p, const QString &message,
 	int left, int right)
 {
-	const int y = get_y();
+	const int y = get_visual_y();
 
 	p.setPen(ErrorBgColour.darker());
 	p.setBrush(ErrorBgColour);
@@ -483,7 +499,7 @@ void DecodeTrace::draw_unresolved_period(QPainter &p, int h, int left,
 	if (sample_count == samples_decoded)
 		return;
 
-	const int y = get_y();
+	const int y = get_visual_y();
 
 	tie(pixels_offset, samples_per_pixel) =
 		get_pixels_offset_samples_per_pixel();
@@ -505,14 +521,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();
 
@@ -543,7 +562,8 @@ int DecodeTrace::get_row_at_point(const QPoint &point)
 	if (!_row_height)
 		return -1;
 
-	const int row = (point.y() - get_y() + _row_height / 2) / _row_height;
+	const int row = (point.y() - get_visual_y() + _row_height / 2) /
+		_row_height;
 	if (row < 0 || row >= (int)_visible_rows.size())
 		return -1;
 
@@ -580,10 +600,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()) {
@@ -606,10 +631,11 @@ void DecodeTrace::hover_point_changed()
 	// decode trace, not below.
 	hp.setX(hp.x() - (text_size.width() / 2) - padding);
 
-	hp.setY(get_y() - (_row_height / 2) + (hover_row * _row_height)
-		- _row_height - text_size.height());
+	hp.setY(get_visual_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 +710,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 +744,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 +779,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 +839,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