X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fview%2Fanalogsignal.cpp;h=250fb94e9bc6623c6720a581721662798cdb571c;hb=a5d93c27b5bd6b95000e29c6cddac56ab254b289;hp=38468942a79ad594d7854cd43029aea08e75a3a7;hpb=b86aa8f4a22857a90bbfca6e7993b2deaf1157d4;p=pulseview.git

diff --git a/pv/view/analogsignal.cpp b/pv/view/analogsignal.cpp
index 3846894..250fb94 100644
--- a/pv/view/analogsignal.cpp
+++ b/pv/view/analogsignal.cpp
@@ -31,6 +31,7 @@
 #include <libsigrok/libsigrok.hpp>
 
 using std::max;
+using std::make_pair;
 using std::min;
 using std::shared_ptr;
 using std::deque;
@@ -40,6 +41,8 @@ using sigrok::Channel;
 namespace pv {
 namespace view {
 
+const int AnalogSignal::NominalHeight = 80;
+
 const QColor AnalogSignal::SignalColours[4] = {
 	QColor(0xC4, 0xA0, 0x00),	// Yellow
 	QColor(0x87, 0x20, 0x7A),	// Magenta
@@ -79,6 +82,11 @@ void AnalogSignal::set_scale(float scale)
 	_scale = scale;
 }
 
+std::pair<int, int> AnalogSignal::v_extents() const
+{
+	return make_pair(-NominalHeight / 2, NominalHeight / 2);
+}
+
 void AnalogSignal::paint_back(QPainter &p, int left, int right)
 {
 	if (_channel->enabled())
@@ -89,14 +97,17 @@ void AnalogSignal::paint_mid(QPainter &p, int left, int right)
 {
 	assert(_data);
 	assert(right >= left);
+	assert(_owner);
+
+	const int y = get_y();
 
-	assert(_view);
-	const int y = _v_offset - _view->v_offset();
+	const View *const view = _owner->view();
+	assert(view);
 
-	const double scale = _view->scale();
+	const double scale = view->scale();
 	assert(scale > 0);
 
-	const double offset = _view->offset();
+	const double offset = view->offset();
 
 	if (!_channel->enabled())
 		return;