X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fview%2Fview.cpp;h=9c4920f997f66585d8f75e2e62da15f2f587d531;hp=49b96ba390a093326ba770ce80d8e1995ddace60;hb=51e77110d4316fd0106f8306f5e1f0523c5bf7d7;hpb=cdf7bea7f0eead18de2616cbfd8697ac0fffb59b

diff --git a/pv/view/view.cpp b/pv/view/view.cpp
index 49b96ba3..9c4920f9 100644
--- a/pv/view/view.cpp
+++ b/pv/view/view.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>
  *
@@ -19,6 +19,7 @@
  */
 
 #include <assert.h>
+#include <limits.h>
 #include <math.h>
 
 #include <boost/foreach.hpp>
@@ -26,12 +27,14 @@
 #include <QEvent>
 #include <QScrollBar>
 
+#include "header.h"
+#include "ruler.h"
 #include "view.h"
 #include "viewport.h"
 
-#include "../../logicdata.h"
-#include "../../logicdatasnapshot.h"
-#include "../../sigsession.h"
+#include "../logicdata.h"
+#include "../logicdatasnapshot.h"
+#include "../sigsession.h"
 
 using namespace boost;
 using namespace std;
@@ -45,10 +48,16 @@ const double View::MinScale = 1e-15;
 const int View::LabelMarginWidth = 70;
 const int View::RulerHeight = 30;
 
+const int View::MaxScrollValue = INT_MAX / 2;
+
+const int View::SignalHeight = 50;
+
 View::View(SigSession &session, QWidget *parent) :
 	QAbstractScrollArea(parent),
 	_session(session),
 	_viewport(new Viewport(*this)),
+	_ruler(new Ruler(*this)),
+	_header(new Header(*this)),
 	_data_length(0),
 	_scale(1e-6),
 	_offset(0),
@@ -60,9 +69,16 @@ View::View(SigSession &session, QWidget *parent) :
 		this, SLOT(v_scroll_value_changed(int)));
 	connect(&_session, SIGNAL(data_updated()),
 		this, SLOT(data_updated()));
+
+	setViewportMargins(LabelMarginWidth, RulerHeight, 0, 0);
 	setViewport(_viewport);
 }
 
+SigSession& View::session()
+{
+	return _session;
+}
+
 double View::scale() const
 {
 	return _scale;
@@ -83,14 +99,39 @@ void View::zoom(double steps)
 	zoom(steps, (width() - LabelMarginWidth) / 2);
 }
 
+void View::zoom(double steps, int offset)
+{
+	const double cursor_offset = _offset + _scale * offset;
+	_scale *= pow(3.0/2.0, -steps);
+	_scale = max(min(_scale, MaxScale), MinScale);
+	_offset = cursor_offset - _scale * offset;
+
+	_ruler->update();
+	_viewport->update();
+	update_scroll();
+}
+
+
 void View::set_scale_offset(double scale, double offset)
 {
 	_scale = scale;
 	_offset = offset;
+
 	update_scroll();
+	_ruler->update();
 	_viewport->update();
 }
 
+void View::get_scroll_layout(double &length, double &offset) const
+{
+	const shared_ptr<SignalData> sig_data = _session.get_data();
+	if(!sig_data)
+		return;
+
+	length = _data_length / (sig_data->get_samplerate() * _scale);
+	offset = _offset / _scale;
+}
+
 void View::update_scroll()
 {
 	assert(_viewport);
@@ -99,17 +140,19 @@ void View::update_scroll()
 
 	// Set the horizontal scroll bar
 	double length = 0, offset = 0;
-	const shared_ptr<SignalData> sig_data = _session.get_data();
-	if(sig_data) {
-		length = _data_length /
-			(sig_data->get_samplerate() * _scale);
-		offset = _offset / _scale;
-	}
+	get_scroll_layout(length, offset);
+	length = max(length - areaSize.width(), 0.0);
 
 	horizontalScrollBar()->setPageStep(areaSize.width());
-	horizontalScrollBar()->setRange(0,
-		max((int)(length - areaSize.width()), 0));
-	horizontalScrollBar()->setSliderPosition(offset);
+
+	if(length < MaxScrollValue) {
+		horizontalScrollBar()->setRange(0, length);
+		horizontalScrollBar()->setSliderPosition(offset);
+	} else {
+		horizontalScrollBar()->setRange(0, MaxScrollValue);
+		horizontalScrollBar()->setSliderPosition(
+			_offset * MaxScrollValue / (_scale * length));
+	}
 
 	// Set the vertical scrollbar
 	verticalScrollBar()->setPageStep(areaSize.height());
@@ -117,16 +160,6 @@ void View::update_scroll()
 		_viewport->get_total_height() - areaSize.height());
 }
 
-void View::zoom(double steps, int offset)
-{
-	const double cursor_offset = _offset + _scale * offset;
-	_scale *= pow(3.0/2.0, -steps);
-	_scale = max(min(_scale, MaxScale), MinScale);
-	_offset = cursor_offset - _scale * offset;
-	_viewport->update();
-	update_scroll();
-}
-
 bool View::viewportEvent(QEvent *e)
 {
 	switch(e->type()) {
@@ -145,18 +178,32 @@ bool View::viewportEvent(QEvent *e)
 
 void View::resizeEvent(QResizeEvent *e)
 {
+	_ruler->setGeometry(_viewport->x(), 0,
+		_viewport->width(), _viewport->y());
+	_header->setGeometry(0, _viewport->y(),
+		_viewport->x(), _viewport->height());
 	update_scroll();
 }
 
 void View::h_scroll_value_changed(int value)
 {
-	_offset = _scale * value;
+	const int range = horizontalScrollBar()->maximum();
+	if(range < MaxScrollValue)
+		_offset = _scale * value;
+	else {
+		double length = 0, offset;
+		get_scroll_layout(length, offset);
+		_offset = _scale * length * value / MaxScrollValue;
+	}
+
+	_ruler->update();
 	_viewport->update();
 }
 
 void View::v_scroll_value_changed(int value)
 {
 	_v_offset = value;
+	_header->update();
 	_viewport->update();
 }