X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;ds=sidebyside;f=pv%2Fview%2Fview.cpp;h=54871b5ebc3d4c211898f5961fc9eb3978571782;hb=b3a7c0136e427d823eec18b14780182740e9de5d;hp=95b94cf1a0ab8d768fd966207dad1b92628aaf97;hpb=17c0f398438df75dc5547d630e7d334e5de3c66a;p=pulseview.git

diff --git a/pv/view/view.cpp b/pv/view/view.cpp
index 95b94cf..54871b5 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,11 +19,13 @@
  */
 
 #include <assert.h>
+#include <limits.h>
 #include <math.h>
 
 #include <boost/foreach.hpp>
 
 #include <QEvent>
+#include <QMouseEvent>
 #include <QScrollBar>
 
 #include "header.h"
@@ -31,9 +33,9 @@
 #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;
@@ -47,6 +49,8 @@ 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) :
@@ -58,7 +62,8 @@ View::View(SigSession &session, QWidget *parent) :
 	_data_length(0),
 	_scale(1e-6),
 	_offset(0),
-	_v_offset(0)
+	_v_offset(0),
+	_hover_point(-1, -1)
 {
 	connect(horizontalScrollBar(), SIGNAL(valueChanged(int)),
 		this, SLOT(h_scroll_value_changed(int)));
@@ -69,6 +74,10 @@ View::View(SigSession &session, QWidget *parent) :
 
 	setViewportMargins(LabelMarginWidth, RulerHeight, 0, 0);
 	setViewport(_viewport);
+
+	_viewport->installEventFilter(this);
+	_ruler->installEventFilter(this);
+	_header->installEventFilter(this);
 }
 
 SigSession& View::session()
@@ -119,6 +128,21 @@ void View::set_scale_offset(double scale, double offset)
 	_viewport->update();
 }
 
+const QPoint& View::hover_point() const
+{
+	return _hover_point;
+}
+
+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);
@@ -127,17 +151,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());
@@ -145,6 +171,31 @@ void View::update_scroll()
 		_viewport->get_total_height() - areaSize.height());
 }
 
+bool View::eventFilter(QObject *object, QEvent *event)
+{
+	const QEvent::Type type = event->type();
+	if(type == QEvent::MouseMove) {
+
+		const QMouseEvent *const mouse_event = (QMouseEvent*)event;
+		if(object == _viewport)
+			_hover_point = mouse_event->pos();
+		else if(object == _ruler)
+			_hover_point = QPoint(mouse_event->x(), 0);
+		else if(object == _header)
+			_hover_point = QPoint(0, mouse_event->y());
+		else
+			_hover_point = QPoint(-1, -1);
+
+		hover_point_changed();
+
+	} else if(type == QEvent::Leave) {
+		_hover_point = QPoint(-1, -1);
+		hover_point_changed();
+	}
+
+	return QObject::eventFilter(object, event);
+}
+
 bool View::viewportEvent(QEvent *e)
 {
 	switch(e->type()) {
@@ -172,7 +223,15 @@ void View::resizeEvent(QResizeEvent *e)
 
 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();
 }