X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fview%2Fviewport.cpp;h=ba26c3c1bcaf1743b0809c9d53c4b9fe44d6fbae;hp=b437175f75fa89b0adc9f325d6f43ad98a4b30c9;hb=a8e3b0d777d81712e24f352fadb12e6bd33e30fa;hpb=ccdd3ef548ce34f25c6c168598556a350831aa37

diff --git a/pv/view/viewport.cpp b/pv/view/viewport.cpp
index b437175f..ba26c3c1 100644
--- a/pv/view/viewport.cpp
+++ b/pv/view/viewport.cpp
@@ -1,5 +1,5 @@
 /*
- * This file is part of the sigrok project.
+ * This file is part of the PulseView project.
  *
  * Copyright (C) 2012 Joel Holdsworth <joel@airwebreathe.org.uk>
  *
@@ -21,8 +21,8 @@
 #include "view.h"
 #include "viewport.h"
 
-#include "../../sigsession.h"
-#include "../../signal.h"
+#include "signal.h"
+#include "../sigsession.h"
 
 #include <QMouseEvent>
 
@@ -35,75 +35,52 @@ namespace pv {
 namespace view {
 
 Viewport::Viewport(View &parent) :
-	QGLWidget(&parent),
+	QWidget(&parent),
         _view(parent)
 {
 	setMouseTracking(true);
-	setAutoFillBackground(false);
+	setAutoFillBackground(true);
+	setBackgroundRole(QPalette::Base);
+
+	connect(&_view, SIGNAL(signals_moved()),
+		this, SLOT(on_signals_moved()));
 }
 
 int Viewport::get_total_height() const
 {
-	int height = 0;
-	BOOST_FOREACH(const shared_ptr<Signal> s,
-		_view.session().get_signals()) {
+	int h = 0;
+	const vector< shared_ptr<Signal> > sigs(
+		_view.session().get_signals());
+	BOOST_FOREACH(const shared_ptr<Signal> s, sigs) {
 		assert(s);
-		height += View::SignalHeight;
+		h = max(s->get_v_offset() + View::SignalHeight, h);
 	}
 
-	return height;
-}
-
-void Viewport::initializeGL()
-{
-}
-
-void Viewport::resizeGL(int width, int height)
-{
-	setup_viewport(width, height);
+	return h;
 }
 
-void Viewport::paintEvent(QPaintEvent *event)
+void Viewport::paintEvent(QPaintEvent*)
 {
-	int offset;
+	const vector< shared_ptr<Signal> > sigs(
+		_view.session().get_signals());
 
-	const vector< shared_ptr<Signal> > &sigs =
-		_view.session().get_signals();
+	QPainter p(this);
+	p.setRenderHint(QPainter::Antialiasing);
 
-	// Prepare for OpenGL rendering
-	makeCurrent();
-	glMatrixMode(GL_MODELVIEW);
-	glPushMatrix();
-
-	setup_viewport(width(), height());
-
-	qglClearColor(Qt::white);
-	glClear(GL_COLOR_BUFFER_BIT);
+	draw_cursors_background(p);
 
 	// Plot the signal
-	glEnable(GL_SCISSOR_TEST);
-	glScissor(0, 0, width(), height());
-	offset = -_view.v_offset();
+	const int v_offset = _view.v_offset();
 	BOOST_FOREACH(const shared_ptr<Signal> s, sigs)
 	{
 		assert(s);
-
-		const QRect signal_rect(0, offset,
-			width(), View::SignalHeight);
-
-		s->paint(*this, signal_rect, _view.scale(), _view.offset());
-
-		offset += View::SignalHeight;
+		s->paint(p, s->get_v_offset() - v_offset, 0, width(),
+			_view.scale(), _view.offset());
 	}
 
-	glDisable(GL_SCISSOR_TEST);
-
-	// Prepare for QPainter rendering
-	glMatrixMode(GL_MODELVIEW);
-	glPopMatrix();
+	draw_cursors_foreground(p);
 
-	QPainter painter(this);
-	painter.end();
+	p.end();
 }
 
 void Viewport::mousePressEvent(QMouseEvent *event)
@@ -118,7 +95,7 @@ void Viewport::mouseMoveEvent(QMouseEvent *event)
 {
 	assert(event);
 
-	if(event->buttons() & Qt::LeftButton)
+	if (event->buttons() & Qt::LeftButton)
 	{
 		_view.set_scale_offset(_view.scale(),
 			_mouse_down_offset +
@@ -127,24 +104,52 @@ void Viewport::mouseMoveEvent(QMouseEvent *event)
 	}
 }
 
-void Viewport::mouseReleaseEvent(QMouseEvent *event)
+void Viewport::wheelEvent(QWheelEvent *event)
 {
 	assert(event);
+
+	if (event->orientation() == Qt::Vertical) {
+		// Vertical scrolling is interpreted as zooming in/out
+		_view.zoom(event->delta() / 120, event->x());
+	} else if (event->orientation() == Qt::Horizontal) {
+		// Horizontal scrolling is interpreted as moving left/right
+		_view.set_scale_offset(_view.scale(),
+				       event->delta() * _view.scale()
+				       + _view.offset());
+	}
 }
 
-void Viewport::wheelEvent(QWheelEvent *event)
+void Viewport::draw_cursors_background(QPainter &p)
 {
-	assert(event);
-	_view.zoom(event->delta() / 120, event->x());
+	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::setup_viewport(int width, int height)
+void Viewport::on_signals_moved()
 {
-	glViewport(0, 0, (GLint)width, (GLint)height);
-	glMatrixMode(GL_PROJECTION);
-	glLoadIdentity();
-	glOrtho(0, width, height, 0, -1, 1);
-	glMatrixMode(GL_MODELVIEW);
+	update();
 }
 
 } // namespace view