X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fview%2Fviewport.cpp;h=7f2cedea0ccde0a1975c5a202e82a46fd62400b2;hb=0ba172cf7a0cecee952ed195cf80585bfb01f831;hp=70282d41c4acfbd1cbe759411a716de241079aee;hpb=b42d25c43e52c900cbdd3e5cde0282961b8721e7;p=pulseview.git

diff --git a/pv/view/viewport.cpp b/pv/view/viewport.cpp
index 70282d4..7f2cede 100644
--- a/pv/view/viewport.cpp
+++ b/pv/view/viewport.cpp
@@ -67,7 +67,8 @@ void Viewport::paintEvent(QPaintEvent*)
 	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();
@@ -78,7 +79,8 @@ void Viewport::paintEvent(QPaintEvent*)
 			_view.scale(), _view.offset());
 	}
 
-	draw_cursors_foreground(p);
+	if (_view.cursors_shown())
+		_view.cursors().draw_viewport_foreground(p, rect());
 
 	p.end();
 }
@@ -119,34 +121,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 CursorPair &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();
-	CursorPair &cursors = _view.cursors();
-	cursors.first().paint(p, r);
-	cursors.second().paint(p, r);
-}
-
 void Viewport::on_signals_moved()
 {
 	update();