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

diff --git a/pv/view/view.cpp b/pv/view/view.cpp
index 9c4920f9..c5465ff3 100644
--- a/pv/view/view.cpp
+++ b/pv/view/view.cpp
@@ -25,10 +25,12 @@
 #include <boost/foreach.hpp>
 
 #include <QEvent>
+#include <QMouseEvent>
 #include <QScrollBar>
 
 #include "header.h"
 #include "ruler.h"
+#include "signal.h"
 #include "view.h"
 #include "viewport.h"
 
@@ -50,7 +52,13 @@ const int View::RulerHeight = 30;
 
 const int View::MaxScrollValue = INT_MAX / 2;
 
-const int View::SignalHeight = 50;
+const int View::SignalHeight = 30;
+const int View::SignalMargin = 10;
+const int View::SignalSnapGridSize = 10;
+
+const QColor View::CursorAreaColour(220, 231, 243);
+
+const QSizeF View::LabelPadding(4, 0);
 
 View::View(SigSession &session, QWidget *parent) :
 	QAbstractScrollArea(parent),
@@ -61,7 +69,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 +82,20 @@ 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()));
+
+	connect(_header, SIGNAL(signals_moved()),
+		this, SLOT(on_signals_moved()));
+
 	setViewportMargins(LabelMarginWidth, RulerHeight, 0, 0);
 	setViewport(_viewport);
+
+	_viewport->installEventFilter(this);
+	_ruler->installEventFilter(this);
+	_header->installEventFilter(this);
 }
 
 SigSession& View::session()
@@ -122,6 +146,44 @@ 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::normalize_layout()
+{
+	vector< shared_ptr<Signal> > &sigs = _session.get_signals();
+
+	int v_min = INT_MAX;
+	BOOST_FOREACH(const shared_ptr<Signal> s, sigs)
+		v_min = min(s->get_v_offset(), v_min);
+
+	const int delta = -min(v_min, 0);
+	BOOST_FOREACH(shared_ptr<Signal> s, sigs)
+		s->set_v_offset(s->get_v_offset() + delta);
+
+	verticalScrollBar()->setSliderPosition(_v_offset + delta);
+	v_scroll_value_changed(verticalScrollBar()->sliderPosition());
+}
+
 void View::get_scroll_layout(double &length, double &offset) const
 {
 	const shared_ptr<SignalData> sig_data = _session.get_data();
@@ -157,7 +219,45 @@ void View::update_scroll()
 	// Set the vertical scrollbar
 	verticalScrollBar()->setPageStep(areaSize.height());
 	verticalScrollBar()->setRange(0,
-		_viewport->get_total_height() - areaSize.height());
+		_viewport->get_total_height() + SignalMargin -
+		areaSize.height());
+}
+
+void View::reset_signal_layout()
+{
+	int offset = SignalMargin;
+	vector< shared_ptr<Signal> > &sigs = _session.get_signals();
+	BOOST_FOREACH(shared_ptr<Signal> s, sigs) {
+		s->set_v_offset(offset);
+		offset += SignalHeight + 2 * SignalMargin;
+	}
+
+	normalize_layout();
+}
+
+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)
@@ -226,6 +326,21 @@ void View::data_updated()
 
 	// Repaint the view
 	_viewport->update();
+
+	/// @todo: Call this only once when the signals are first created.
+	reset_signal_layout();
+}
+
+void View::marker_time_changed()
+{
+	_ruler->update();
+	_viewport->update();
+}
+
+void View::on_signals_moved()
+{
+	update_scroll();
+	signals_moved();
 }
 
 } // namespace view