X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fview%2Fviewport.cpp;h=0e0ae8ae4ad0807f5b99abe1f31ca458f437af94;hp=f39c8201421d43956e5b6e3bc72c2768ab0cf365;hb=38eeddeab105aea3f8015dda5399ebbead21550a;hpb=e314eca490a09eec9ee851787f6e8c28805a81fd

diff --git a/pv/view/viewport.cpp b/pv/view/viewport.cpp
index f39c8201..0e0ae8ae 100644
--- a/pv/view/viewport.cpp
+++ b/pv/view/viewport.cpp
@@ -49,11 +49,10 @@ Viewport::Viewport(View &parent) :
 int Viewport::get_total_height() const
 {
 	int h = 0;
-	const vector< shared_ptr<Signal> > sigs(
-		_view.session().get_signals());
-	BOOST_FOREACH(const shared_ptr<Signal> s, sigs) {
-		assert(s);
-		h = max(s->get_v_offset() + View::SignalHeight, h);
+	const vector< shared_ptr<Trace> > traces(_view.get_traces());
+	BOOST_FOREACH(const shared_ptr<Trace> t, traces) {
+		assert(t);
+		h = max(t->get_v_offset() + View::SignalHeight, h);
 	}
 
 	return h;
@@ -61,27 +60,25 @@ int Viewport::get_total_height() const
 
 void Viewport::paintEvent(QPaintEvent*)
 {
-	const vector< shared_ptr<Signal> > sigs(
-		_view.session().get_signals());
+	const vector< shared_ptr<Trace> > traces(_view.get_traces());
 
 	QPainter p(this);
 	p.setRenderHint(QPainter::Antialiasing);
 
-	draw_cursors_background(p);
+	if (_view.cursors_shown())
+		_view.cursors().draw_viewport_background(p, rect());
 
 	// Plot the signal
 	const int v_offset = _view.v_offset();
-	BOOST_FOREACH(const shared_ptr<Signal> s, sigs)
+	BOOST_FOREACH(const shared_ptr<Trace> t, traces)
 	{
-		assert(s);
-
-		const QRect signal_rect(0, s->get_v_offset() - v_offset,
-			width(), View::SignalHeight);
-
-		s->paint(p, signal_rect, _view.scale(), _view.offset());
+		assert(t);
+		t->paint(p, t->get_v_offset() - v_offset, 0, width(),
+			_view.scale(), _view.offset());
 	}
 
-	draw_cursors_foreground(p);
+	if (_view.cursors_shown())
+		_view.cursors().draw_viewport_foreground(p, rect());
 
 	p.end();
 }
@@ -107,11 +104,6 @@ void Viewport::mouseMoveEvent(QMouseEvent *event)
 	}
 }
 
-void Viewport::mouseReleaseEvent(QMouseEvent *event)
-{
-	assert(event);
-}
-
 void Viewport::wheelEvent(QWheelEvent *event)
 {
 	assert(event);
@@ -127,34 +119,6 @@ void Viewport::wheelEvent(QWheelEvent *event)
 	}
 }
 
-void Viewport::draw_cursors_background(QPainter &p)
-{
-	if (!_view.cursors_shown())
-		return;
-
-	p.setPen(Qt::NoPen);
-	p.setBrush(QBrush(View::CursorAreaColour));
-
-	const pair<Cursor, Cursor> &c = _view.cursors();
-	const float x1 = (c.first.time() - _view.offset()) / _view.scale();
-	const float x2 = (c.second.time() - _view.offset()) / _view.scale();
-	const int l = (int)max(min(x1, x2), 0.0f);
-	const int r = (int)min(max(x1, x2), (float)width());
-
-	p.drawRect(l, 0, r - l, height());
-}
-
-void Viewport::draw_cursors_foreground(QPainter &p)
-{
-	if (!_view.cursors_shown())
-		return;
-
-	const QRect r = rect();
-	pair<Cursor, Cursor> &cursors = _view.cursors();
-	cursors.first.paint(p, r);
-	cursors.second.paint(p, r);
-}
-
 void Viewport::on_signals_moved()
 {
 	update();