X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fview%2Fview.cpp;h=388c4c49ec75e00f35fac366366bef960823a87c;hp=2b0f04a5952983ec3c4909fed12e112c4a34fc3e;hb=a77dac4e7ab85ac97f7ff63862d28948ae4dec61;hpb=d873f4d685e16c708a15fcde12fbbec66650511c

diff --git a/pv/view/view.cpp b/pv/view/view.cpp
index 2b0f04a5..388c4c49 100644
--- a/pv/view/view.cpp
+++ b/pv/view/view.cpp
@@ -26,12 +26,11 @@
 #include <limits.h>
 #include <math.h>
 
-#include <boost/foreach.hpp>
-
 #include <QEvent>
 #include <QMouseEvent>
 #include <QScrollBar>
 
+#include "cursorheader.h"
 #include "decodetrace.h"
 #include "header.h"
 #include "ruler.h"
@@ -43,9 +42,8 @@
 #include "pv/data/logic.h"
 #include "pv/data/logicsnapshot.h"
 
-using boost::shared_ptr;
-using boost::weak_ptr;
 using pv::data::SignalData;
+using std::back_inserter;
 using std::deque;
 using std::list;
 using std::max;
@@ -53,7 +51,9 @@ using std::make_pair;
 using std::min;
 using std::pair;
 using std::set;
+using std::shared_ptr;
 using std::vector;
+using std::weak_ptr;
 
 namespace pv {
 namespace view {
@@ -76,6 +76,7 @@ View::View(SigSession &session, QWidget *parent) :
 	_session(session),
 	_viewport(new Viewport(*this)),
 	_ruler(new Ruler(*this)),
+	_cursorheader(new CursorHeader(*this)),
 	_header(new Header(*this)),
 	_scale(1e-6),
 	_offset(0),
@@ -92,7 +93,11 @@ View::View(SigSession &session, QWidget *parent) :
 
 	connect(&_session, SIGNAL(signals_changed()),
 		this, SLOT(signals_changed()));
-	connect(&_session, SIGNAL(data_updated()),
+	connect(&_session, SIGNAL(capture_state_changed(int)),
+		this, SLOT(data_updated()));
+	connect(&_session, SIGNAL(data_received()),
+		this, SLOT(data_updated()));
+	connect(&_session, SIGNAL(frame_ended()),
 		this, SLOT(data_updated()));
 
 	connect(_cursors.first().get(), SIGNAL(time_changed()),
@@ -106,22 +111,32 @@ View::View(SigSession &session, QWidget *parent) :
 		this, SLOT(on_signals_moved()));
 
 	connect(_header, SIGNAL(selection_changed()),
-		_ruler, SLOT(clear_selection()));
-	connect(_ruler, SIGNAL(selection_changed()),
+		_cursorheader, SLOT(clear_selection()));
+	connect(_cursorheader, SIGNAL(selection_changed()),
 		_header, SLOT(clear_selection()));
 
 	connect(_header, SIGNAL(selection_changed()),
 		this, SIGNAL(selection_changed()));
-	connect(_ruler, SIGNAL(selection_changed()),
+	connect(_cursorheader, SIGNAL(selection_changed()),
 		this, SIGNAL(selection_changed()));
 
+	connect(this, SIGNAL(hover_point_changed()),
+		this, SLOT(on_hover_point_changed()));
+
 	setViewport(_viewport);
 
 	_viewport->installEventFilter(this);
 	_ruler->installEventFilter(this);
+	_cursorheader->installEventFilter(this);
 	_header->installEventFilter(this);
 
+	// Trigger the initial event manually. The default device has signals
+	// which were created before this object came into being
 	signals_changed();
+
+	// make sure the transparent widgets are on the top
+	_cursorheader->raise();
+	_header->raise();
 }
 
 SigSession& View::session()
@@ -134,6 +149,16 @@ const SigSession& View::session() const
 	return _session;
 }
 
+Viewport* View::viewport()
+{
+	return _viewport;
+}
+
+const Viewport* View::viewport() const
+{
+	return _viewport;
+}
+
 double View::scale() const
 {
 	return _scale;
@@ -188,7 +213,7 @@ void View::zoom_one_to_one()
 		return;
 
 	double samplerate = 0.0;
-	BOOST_FOREACH(const shared_ptr<SignalData> d, visible_data) {
+	for (const shared_ptr<SignalData> d : visible_data) {
 		assert(d);
 		samplerate = max(samplerate, d->samplerate());
 	}
@@ -211,30 +236,29 @@ void View::set_scale_offset(double scale, double offset)
 
 	update_scroll();
 	_ruler->update();
+	_cursorheader->update();
 	_viewport->update();
 	scale_offset_changed();
 }
 
 vector< shared_ptr<Trace> > View::get_traces() const
 {
+	vector< shared_ptr<Trace> > traces;
+
 	const vector< shared_ptr<Signal> > sigs(
 		session().get_signals());
+	copy(sigs.begin(), sigs.end(), back_inserter(traces));
+
 #ifdef ENABLE_DECODE
 	const vector< shared_ptr<DecodeTrace> > decode_sigs(
 		session().get_decode_signals());
-	vector< shared_ptr<Trace> > traces(
-		sigs.size() + decode_sigs.size());
-#else
-	vector< shared_ptr<Trace> > traces(sigs.size());
+	copy(decode_sigs.begin(), decode_sigs.end(), back_inserter(traces));
 #endif
 
-	vector< shared_ptr<Trace> >::iterator i = traces.begin();
-	i = copy(sigs.begin(), sigs.end(), i);
-#ifdef ENABLE_DECODE
-	i = copy(decode_sigs.begin(), decode_sigs.end(), i);
-#endif
+	stable_sort(traces.begin(), traces.end(),
+		[](const shared_ptr<Trace> &a, const shared_ptr<Trace> &b) {
+			return a->get_v_offset() < b->get_v_offset(); });
 
-	stable_sort(traces.begin(), traces.end(), compare_trace_v_offsets);
 	return traces;
 }
 
@@ -244,7 +268,7 @@ list<weak_ptr<SelectableItem> > View::selected_items() const
 
 	// List the selected signals
 	const vector< shared_ptr<Trace> > traces(get_traces());
-	BOOST_FOREACH (shared_ptr<Trace> t, traces) {
+	for (shared_ptr<Trace> t : traces) {
 		assert(t);
 		if (t->selected())
 			items.push_back(t);
@@ -266,7 +290,7 @@ set< shared_ptr<SignalData> > View::get_visible_data() const
 
 	// Make a set of all the visible data objects
 	set< shared_ptr<SignalData> > visible_data;
-	BOOST_FOREACH(const shared_ptr<Signal> sig, sigs)
+	for (const shared_ptr<Signal> sig : sigs)
 		if (sig->enabled())
 			visible_data.insert(sig->data());
 
@@ -280,7 +304,7 @@ pair<double, double> View::get_time_extents() const
 		return make_pair(0.0, 0.0);
 
 	double left_time = DBL_MAX, right_time = DBL_MIN;
-	BOOST_FOREACH(const shared_ptr<SignalData> d, visible_data)
+	for (const shared_ptr<SignalData> d : visible_data)
 	{
 		const double start_time = d->get_start_time();
 		double samplerate = d->samplerate();
@@ -303,7 +327,7 @@ bool View::cursors_shown() const
 void View::show_cursors(bool show)
 {
 	_show_cursors = show;
-	_ruler->update();
+	_cursorheader->update();
 	_viewport->update();
 }
 
@@ -312,7 +336,7 @@ void View::centre_cursors()
 	const double time_width = _scale * _viewport->width();
 	_cursors.first()->set_time(_offset + time_width * 0.4);
 	_cursors.second()->set_time(_offset + time_width * 0.6);
-	_ruler->update();
+	_cursorheader->update();
 	_viewport->update();
 }
 
@@ -336,11 +360,11 @@ void View::normalize_layout()
 	const vector< shared_ptr<Trace> > traces(get_traces());
 
 	int v_min = INT_MAX;
-	BOOST_FOREACH(const shared_ptr<Trace> t, traces)
+	for (const shared_ptr<Trace> t : traces)
 		v_min = min(t->get_v_offset(), v_min);
 
 	const int delta = -min(v_min, 0);
-	BOOST_FOREACH(shared_ptr<Trace> t, traces)
+	for (shared_ptr<Trace> t : traces)
 		t->set_v_offset(t->get_v_offset() + delta);
 
 	verticalScrollBar()->setSliderPosition(_v_offset + delta);
@@ -403,23 +427,20 @@ void View::update_scroll()
 
 void View::update_layout()
 {
-	setViewportMargins(_header->sizeHint().width(),
+	setViewportMargins(
+		_header->sizeHint().width() - pv::view::Header::BaselineOffset,
 		_ruler->sizeHint().height(), 0, 0);
 	_ruler->setGeometry(_viewport->x(), 0,
 		_viewport->width(), _viewport->y());
+	_cursorheader->setGeometry(
+		_viewport->x(),
+		_ruler->sizeHint().height() - _cursorheader->sizeHint().height() / 2,
+		_viewport->width(), _cursorheader->sizeHint().height());
 	_header->setGeometry(0, _viewport->y(),
-		_viewport->x(), _viewport->height());
+		_header->sizeHint().width(), _viewport->height());
 	update_scroll();
 }
 
-bool View::compare_trace_v_offsets(const shared_ptr<Trace> &a,
-	const shared_ptr<Trace> &b)
-{
-	assert(a);
-	assert(b);
-	return a->get_v_offset() < b->get_v_offset();
-}
-
 bool View::eventFilter(QObject *object, QEvent *event)
 {
 	const QEvent::Type type = event->type();
@@ -428,7 +449,7 @@ bool View::eventFilter(QObject *object, QEvent *event)
 		const QMouseEvent *const mouse_event = (QMouseEvent*)event;
 		if (object == _viewport)
 			_hover_point = mouse_event->pos();
-		else if (object == _ruler)
+		else if (object == _ruler || object == _cursorheader)
 			_hover_point = QPoint(mouse_event->x(), 0);
 		else if (object == _header)
 			_hover_point = QPoint(0, mouse_event->y());
@@ -454,6 +475,9 @@ bool View::viewportEvent(QEvent *e)
 	case QEvent::MouseButtonDblClick:
 	case QEvent::MouseMove:
 	case QEvent::Wheel:
+	case QEvent::TouchBegin:
+	case QEvent::TouchUpdate:
+	case QEvent::TouchEnd:
 		return false;
 
 	default:
@@ -481,6 +505,7 @@ void View::h_scroll_value_changed(int value)
 	}
 
 	_ruler->update();
+	_cursorheader->update();
 	_viewport->update();
 }
 
@@ -495,7 +520,7 @@ void View::signals_changed()
 {
 	int offset = SignalMargin + SignalHeight;
 	const vector< shared_ptr<Trace> > traces(get_traces());
-	BOOST_FOREACH(shared_ptr<Trace> t, traces) {
+	for (shared_ptr<Trace> t : traces) {
 		t->set_view(this);
 		t->set_v_offset(offset);
 		offset += SignalHeight + 2 * SignalMargin;
@@ -516,7 +541,7 @@ void View::data_updated()
 
 void View::marker_time_changed()
 {
-	_ruler->update();
+	_cursorheader->update();
 	_viewport->update();
 }
 
@@ -531,5 +556,12 @@ void View::on_geometry_updated()
 	update_layout();
 }
 
+void View::on_hover_point_changed()
+{
+	const vector< shared_ptr<Trace> > traces(get_traces());
+	for (shared_ptr<Trace> t : traces)
+		t->hover_point_changed();
+}
+
 } // namespace view
 } // namespace pv