X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fview%2Fview.cpp;h=82be599b2ff951c61da3ef4e6dbbc7aa523c855e;hb=23935421086ebf58cfe68228971ded327a6155a1;hp=6c7df488e3492c6e87d893488af811d40c691d55;hpb=84a0d458a4b04141dd45af6dec44d36782ee163e;p=pulseview.git

diff --git a/pv/view/view.cpp b/pv/view/view.cpp
index 6c7df48..82be599 100644
--- a/pv/view/view.cpp
+++ b/pv/view/view.cpp
@@ -43,6 +43,7 @@
 #include "pv/data/logicsnapshot.h"
 
 using pv::data::SignalData;
+using std::back_inserter;
 using std::deque;
 using std::list;
 using std::max;
@@ -92,6 +93,8 @@ View::View(SigSession &session, QWidget *parent) :
 
 	connect(&_session, SIGNAL(signals_changed()),
 		this, SLOT(signals_changed()));
+	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()),
@@ -117,6 +120,9 @@ View::View(SigSession &session, QWidget *parent) :
 	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);
@@ -128,8 +134,9 @@ View::View(SigSession &session, QWidget *parent) :
 	// which were created before this object came into being
 	signals_changed();
 
-	// make sure the cursorheader is over the ruler
+	// make sure the transparent widgets are on the top
 	_cursorheader->raise();
+	_header->raise();
 }
 
 SigSession& View::session()
@@ -142,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;
@@ -154,7 +171,7 @@ double View::offset() const
 
 int View::v_offset() const
 {
-	return _v_offset;
+	return -_v_offset;
 }
 
 void View::zoom(double steps)
@@ -226,24 +243,22 @@ void View::set_scale_offset(double scale, double offset)
 
 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
 
-	auto 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;
 }
 
@@ -412,7 +427,8 @@ 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());
@@ -421,18 +437,10 @@ void View::update_layout()
 		_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();
@@ -467,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:
@@ -545,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