X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fview%2Fviewport.cpp;h=b437175f75fa89b0adc9f325d6f43ad98a4b30c9;hb=ccdd3ef548ce34f25c6c168598556a350831aa37;hp=b8598bcb619534b597d66e9b9d21a071049f63b5;hpb=1d19ef83d7598f3248086d456df55e844b229bb3;p=pulseview.git

diff --git a/pv/view/viewport.cpp b/pv/view/viewport.cpp
index b8598bc..b437175 100644
--- a/pv/view/viewport.cpp
+++ b/pv/view/viewport.cpp
@@ -24,12 +24,7 @@
 #include "../../sigsession.h"
 #include "../../signal.h"
 
-#include "../../extdef.h"
-
 #include <QMouseEvent>
-#include <QTextStream>
-
-#include <math.h>
 
 #include <boost/foreach.hpp>
 
@@ -39,15 +34,6 @@ using namespace std;
 namespace pv {
 namespace view {
 
-const int Viewport::SignalHeight = 50;
-
-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),
         _view(parent)
@@ -62,7 +48,7 @@ int Viewport::get_total_height() const
 	BOOST_FOREACH(const shared_ptr<Signal> s,
 		_view.session().get_signals()) {
 		assert(s);
-		height += SignalHeight;
+		height += View::SignalHeight;
 	}
 
 	return height;
@@ -96,18 +82,18 @@ void Viewport::paintEvent(QPaintEvent *event)
 
 	// Plot the signal
 	glEnable(GL_SCISSOR_TEST);
-	glScissor(View::LabelMarginWidth, 0, width(), height());
-	offset = View::RulerHeight - _view.v_offset();
+	glScissor(0, 0, width(), height());
+	offset = -_view.v_offset();
 	BOOST_FOREACH(const shared_ptr<Signal> s, sigs)
 	{
 		assert(s);
 
-		const QRect signal_rect(View::LabelMarginWidth, offset,
-			width() - View::LabelMarginWidth, SignalHeight);
+		const QRect signal_rect(0, offset,
+			width(), View::SignalHeight);
 
 		s->paint(*this, signal_rect, _view.scale(), _view.offset());
 
-		offset += SignalHeight;
+		offset += View::SignalHeight;
 	}
 
 	glDisable(GL_SCISSOR_TEST);
@@ -117,24 +103,6 @@ void Viewport::paintEvent(QPaintEvent *event)
 	glPopMatrix();
 
 	QPainter painter(this);
-	painter.setRenderHint(QPainter::Antialiasing);
-
-	// Paint the labels
-	offset = View::RulerHeight - _view.v_offset();
-	BOOST_FOREACH(const shared_ptr<Signal> s, sigs)
-	{
-		assert(s);
-
-		const QRect label_rect(0, offset,
-			View::LabelMarginWidth, SignalHeight);
-		s->paint_label(painter, label_rect);
-
-		offset += SignalHeight;
-	}
-
-	// Paint the ruler
-	paint_ruler(painter);
-
 	painter.end();
 }
 
@@ -167,8 +135,7 @@ void Viewport::mouseReleaseEvent(QMouseEvent *event)
 void Viewport::wheelEvent(QWheelEvent *event)
 {
 	assert(event);
-	_view.zoom(event->delta() / 120, event->x() -
-		View::LabelMarginWidth);
+	_view.zoom(event->delta() / 120, event->x());
 }
 
 void Viewport::setup_viewport(int width, int height)
@@ -180,72 +147,5 @@ void Viewport::setup_viewport(int width, int height)
 	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() +
-			View::LabelMarginWidth;
-
-		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