X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fview%2Fviewport.cpp;h=99e08b277d151160bbf3b0842d68f0119c60582a;hp=ee30965d603e12ee29994c49855ad71188977600;hb=ce6e73a8e2a2a353233b440f4bbbd53007602e1a;hpb=1d8dca913d07df3a53184e40246eb2e333520e31

diff --git a/pv/view/viewport.cpp b/pv/view/viewport.cpp
index ee30965d..99e08b27 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,15 +21,10 @@
 #include "view.h"
 #include "viewport.h"
 
-#include "../../sigsession.h"
-#include "../../signal.h"
-
-#include "../../extdef.h"
+#include "../sigsession.h"
+#include "../signal.h"
 
 #include <QMouseEvent>
-#include <QTextStream>
-
-#include <math.h>
 
 #include <boost/foreach.hpp>
 
@@ -39,19 +34,13 @@ using namespace std;
 namespace pv {
 namespace view {
 
-const int Viewport::MinorTickSubdivision = 4;
-const int Viewport::ScaleUnits[3] = {1, 2, 5};
-
-const QString Viewport::SIPrefixes[9] =
-	{"f", "p", "n", QChar(0x03BC), "m", "", "k", "M", "G"};
-const int Viewport::FirstSIPrefixPower = -15;
-
 Viewport::Viewport(View &parent) :
-	QGLWidget(&parent),
+	QWidget(&parent),
         _view(parent)
 {
 	setMouseTracking(true);
-	setAutoFillBackground(false);
+	setAutoFillBackground(true);
+	setBackgroundRole(QPalette::Base);
 }
 
 int Viewport::get_total_height() const
@@ -66,36 +55,16 @@ int Viewport::get_total_height() const
 	return height;
 }
 
-void Viewport::initializeGL()
-{
-}
-
-void Viewport::resizeGL(int width, int height)
-{
-	setup_viewport(width, height);
-}
-
 void Viewport::paintEvent(QPaintEvent *event)
 {
-	int offset;
-
 	const vector< shared_ptr<Signal> > &sigs =
 		_view.session().get_signals();
 
-	// Prepare for OpenGL rendering
-	makeCurrent();
-	glMatrixMode(GL_MODELVIEW);
-	glPushMatrix();
-
-	setup_viewport(width(), height());
-
-	qglClearColor(Qt::white);
-	glClear(GL_COLOR_BUFFER_BIT);
+	QPainter p(this);
+	p.setRenderHint(QPainter::Antialiasing);
 
 	// Plot the signal
-	glEnable(GL_SCISSOR_TEST);
-	glScissor(0, 0, width(), height());
-	offset = View::RulerHeight - _view.v_offset();
+	int offset = -_view.v_offset();
 	BOOST_FOREACH(const shared_ptr<Signal> s, sigs)
 	{
 		assert(s);
@@ -103,24 +72,12 @@ void Viewport::paintEvent(QPaintEvent *event)
 		const QRect signal_rect(0, offset,
 			width(), View::SignalHeight);
 
-		s->paint(*this, signal_rect, _view.scale(), _view.offset());
+		s->paint(p, signal_rect, _view.scale(), _view.offset());
 
 		offset += View::SignalHeight;
 	}
 
-	glDisable(GL_SCISSOR_TEST);
-
-	// Prepare for QPainter rendering
-	glMatrixMode(GL_MODELVIEW);
-	glPopMatrix();
-
-	QPainter painter(this);
-	painter.setRenderHint(QPainter::Antialiasing);
-
-	// Paint the ruler
-	paint_ruler(painter);
-
-	painter.end();
+	p.end();
 }
 
 void Viewport::mousePressEvent(QMouseEvent *event)
@@ -155,80 +112,5 @@ void Viewport::wheelEvent(QWheelEvent *event)
 	_view.zoom(event->delta() / 120, event->x());
 }
 
-void Viewport::setup_viewport(int width, int height)
-{
-	glViewport(0, 0, (GLint)width, (GLint)height);
-	glMatrixMode(GL_PROJECTION);
-	glLoadIdentity();
-	glOrtho(0, width, height, 0, -1, 1);
-	glMatrixMode(GL_MODELVIEW);
-}
-
-void Viewport::paint_ruler(QPainter &p)
-{
-	const double MinSpacing = 80;
-
-	const double min_period = _view.scale() * MinSpacing;
-
-	const int order = (int)floorf(log10f(min_period));
-	const double order_decimal = pow(10, order);
-
-	int unit = 0;
-	double tick_period = 0.0f;
-
-	do
-	{
-		tick_period = order_decimal * ScaleUnits[unit++];
-	} while(tick_period < min_period && unit < countof(ScaleUnits));
-
-	const int prefix = (order - FirstSIPrefixPower) / 3;
-	assert(prefix >= 0);
-	assert(prefix < countof(SIPrefixes));
-
-	const int text_height = p.boundingRect(0, 0, INT_MAX, INT_MAX,
-		Qt::AlignLeft | Qt::AlignTop, "8").height();
-
-	// Draw the tick marks
-	p.setPen(Qt::black);
-
-	const double minor_tick_period = tick_period / MinorTickSubdivision;
-	const double first_major_division =
-		floor(_view.offset() / tick_period);
-	const double first_minor_division =
-		ceil(_view.offset() / minor_tick_period);
-	const double t0 = first_major_division * tick_period;
-
-	int division = (int)round(first_minor_division -
-		first_major_division * MinorTickSubdivision);
-	while(1)
-	{
-		const double t = t0 + division * minor_tick_period;
-		const double x = (t - _view.offset()) / _view.scale();
-
-		if(x >= width())
-			break;
-
-		if(division % MinorTickSubdivision == 0)
-		{
-			// Draw a major tick
-			QString s;
-			QTextStream ts(&s);
-			ts << (t / order_decimal) << SIPrefixes[prefix] << "s";
-			p.drawText(x, 0, 0, text_height, Qt::AlignCenter | Qt::AlignTop |
-				Qt::TextDontClip, s);
-			p.drawLine(x, text_height, x, View::RulerHeight);
-		}
-		else
-		{
-			// Draw a minor tick
-			p.drawLine(x,
-				(text_height + View::RulerHeight) / 2, x,
-				View::RulerHeight);
-		}
-
-		division++;
-	}
-}
-
 } // namespace view
 } // namespace pv