X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fview%2Fview.cpp;h=d2f708e5e103d5642d1af1de46f9a30a3ce68073;hp=697d07141c3903e6dbca951f4bad37558c3dc1cc;hb=ca4ec3eab886e62c0f9d0cc91636383a74ad5d7b;hpb=b3f22de060b73f15ad3eb2dabee04a0b4f5d947e

diff --git a/pv/view/view.cpp b/pv/view/view.cpp
index 697d0714..d2f708e5 100644
--- a/pv/view/view.cpp
+++ b/pv/view/view.cpp
@@ -25,6 +25,7 @@
 #include <boost/foreach.hpp>
 
 #include <QEvent>
+#include <QMouseEvent>
 #include <QScrollBar>
 
 #include "header.h"
@@ -32,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;
@@ -52,6 +53,8 @@ const int View::MaxScrollValue = INT_MAX / 2;
 
 const int View::SignalHeight = 50;
 
+const QColor View::CursorAreaColour(220, 231, 243);
+
 View::View(SigSession &session, QWidget *parent) :
 	QAbstractScrollArea(parent),
 	_session(session),
@@ -61,7 +64,11 @@ View::View(SigSession &session, QWidget *parent) :
 	_data_length(0),
 	_scale(1e-6),
 	_offset(0),
-	_v_offset(0)
+	_v_offset(0),
+	_show_cursors(false),
+	_cursors(pair<Cursor, Cursor>(Cursor(*this, 0.0),
+		Cursor(*this, 1.0))),
+	_hover_point(-1, -1)
 {
 	connect(horizontalScrollBar(), SIGNAL(valueChanged(int)),
 		this, SLOT(h_scroll_value_changed(int)));
@@ -70,8 +77,17 @@ View::View(SigSession &session, QWidget *parent) :
 	connect(&_session, SIGNAL(data_updated()),
 		this, SLOT(data_updated()));
 
+	connect(&_cursors.first, SIGNAL(time_changed()),
+		this, SLOT(marker_time_changed()));
+	connect(&_cursors.second, SIGNAL(time_changed()),
+		this, SLOT(marker_time_changed()));
+
 	setViewportMargins(LabelMarginWidth, RulerHeight, 0, 0);
 	setViewport(_viewport);
+
+	_viewport->installEventFilter(this);
+	_ruler->installEventFilter(this);
+	_header->installEventFilter(this);
 }
 
 SigSession& View::session()
@@ -122,6 +138,28 @@ void View::set_scale_offset(double scale, double offset)
 	_viewport->update();
 }
 
+bool View::cursors_shown() const
+{
+	return _show_cursors;
+}
+
+void View::show_cursors(bool show)
+{
+	_show_cursors = show;
+	_ruler->update();
+	_viewport->update();
+}
+
+std::pair<Cursor, Cursor>& View::cursors()
+{
+	return _cursors;
+}
+
+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();
@@ -160,6 +198,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()) {
@@ -228,5 +291,11 @@ void View::data_updated()
 	_viewport->update();
 }
 
+void View::marker_time_changed()
+{
+	_ruler->update();
+	_viewport->update();
+}
+
 } // namespace view
 } // namespace pv