X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fview%2Flogicsignal.cpp;h=75a125a7eae58f334427edd86b73f5531058b825;hb=ba6ec376740b86510493465ce3e4e8bdc7089656;hp=21bd5b95ec630a4b484c367ff8d9fd66ed3384ef;hpb=640bd149b1e66bf2d4687a7efc6ab326bdf9d61f;p=pulseview.git

diff --git a/pv/view/logicsignal.cpp b/pv/view/logicsignal.cpp
index 21bd5b9..75a125a 100644
--- a/pv/view/logicsignal.cpp
+++ b/pv/view/logicsignal.cpp
@@ -41,6 +41,7 @@
 
 using std::deque;
 using std::max;
+using std::make_pair;
 using std::min;
 using std::pair;
 using std::shared_ptr;
@@ -58,6 +59,9 @@ using sigrok::TriggerMatchType;
 namespace pv {
 namespace view {
 
+const int LogicSignal::SignalHeight = 30;
+const int LogicSignal::SignalMargin = 10;
+
 const float LogicSignal::Oversampling = 2.0f;
 
 const QColor LogicSignal::EdgeColour(0x80, 0x80, 0x80);
@@ -120,10 +124,15 @@ shared_ptr<pv::data::Logic> LogicSignal::logic_data() const
 	return _data;
 }
 
+std::pair<int, int> LogicSignal::v_extents() const
+{
+	return make_pair(-SignalHeight - SignalMargin, SignalMargin);
+}
+
 void LogicSignal::paint_back(QPainter &p, int left, int right)
 {
 	if (_channel->enabled())
-		paint_axis(p, get_y(), left, right);
+		paint_axis(p, get_visual_y(), left, right);
 }
 
 void LogicSignal::paint_mid(QPainter &p, int left, int right)
@@ -137,19 +146,22 @@ void LogicSignal::paint_mid(QPainter &p, int left, int right)
 	assert(_channel);
 	assert(_data);
 	assert(right >= left);
+	assert(_owner);
+
+	const int y = get_visual_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;
 
-	const float high_offset = y - View::SignalHeight + 0.5f;
+	const float high_offset = y - SignalHeight + 0.5f;
 	const float low_offset = y + 0.5f;
 
 	const deque< shared_ptr<pv::data::LogicSnapshot> > &snapshots =