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

diff --git a/pv/view/view.cpp b/pv/view/view.cpp
index 6c7df48..7a55bbb 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,26 @@ const SigSession& View::session() const
 	return _session;
 }
 
+View* View::view()
+{
+	return this;
+}
+
+const View* View::view() const
+{
+	return this;
+}
+
+Viewport* View::viewport()
+{
+	return _viewport;
+}
+
+const Viewport* View::viewport() const
+{
+	return _viewport;
+}
+
 double View::scale() const
 {
 	return _scale;
@@ -152,9 +179,9 @@ double View::offset() const
 	return _offset;
 }
 
-int View::v_offset() const
+int View::owner_v_offset() const
 {
-	return _v_offset;
+	return -_v_offset;
 }
 
 void View::zoom(double steps)
@@ -224,27 +251,25 @@ void View::set_scale_offset(double scale, double offset)
 	scale_offset_changed();
 }
 
-vector< shared_ptr<Trace> > View::get_traces() const
+vector< shared_ptr<RowItem> > View::child_items() const
 {
+	vector< shared_ptr<RowItem> > row_items;
+
 	const vector< shared_ptr<Signal> > sigs(
 		session().get_signals());
+	copy(sigs.begin(), sigs.end(), back_inserter(row_items));
+
 #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(row_items));
 #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(row_items.begin(), row_items.end(),
+		[](const shared_ptr<RowItem> &a, const shared_ptr<RowItem> &b) {
+			return a->v_offset() < b->v_offset(); });
 
-	stable_sort(traces.begin(), traces.end(), compare_trace_v_offsets);
-	return traces;
+	return row_items;
 }
 
 list<weak_ptr<SelectableItem> > View::selected_items() const
@@ -252,11 +277,11 @@ list<weak_ptr<SelectableItem> > View::selected_items() const
 	list<weak_ptr<SelectableItem> > items;
 
 	// List the selected signals
-	const vector< shared_ptr<Trace> > traces(get_traces());
-	for (shared_ptr<Trace> t : traces) {
-		assert(t);
-		if (t->selected())
-			items.push_back(t);
+	const vector< shared_ptr<RowItem> > row_items(child_items());
+	for (shared_ptr<RowItem> r : row_items) {
+		assert(r);
+		if (r->selected())
+			items.push_back(r);
 	}
 
 	// List the selected cursors
@@ -342,15 +367,15 @@ const QPoint& View::hover_point() const
 
 void View::normalize_layout()
 {
-	const vector< shared_ptr<Trace> > traces(get_traces());
+	const vector< shared_ptr<RowItem> > row_items(child_items());
 
 	int v_min = INT_MAX;
-	for (const shared_ptr<Trace> t : traces)
-		v_min = min(t->get_v_offset(), v_min);
+	for (const shared_ptr<RowItem> r : row_items)
+		v_min = min(r->v_offset(), v_min);
 
 	const int delta = -min(v_min, 0);
-	for (shared_ptr<Trace> t : traces)
-		t->set_v_offset(t->get_v_offset() + delta);
+	for (shared_ptr<RowItem> r : row_items)
+		r->set_v_offset(r->v_offset() + delta);
 
 	verticalScrollBar()->setSliderPosition(_v_offset + delta);
 	v_scroll_value_changed(verticalScrollBar()->sliderPosition());
@@ -412,7 +437,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,16 +447,21 @@ 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)
+void View::paint_label(QPainter &p, int right, bool hover)
 {
-	assert(a);
-	assert(b);
-	return a->get_v_offset() < b->get_v_offset();
+	(void)p;
+	(void)right;
+	(void)hover;
+}
+
+QRectF View::label_rect(int right)
+{
+	(void)right;
+	return QRectF();
 }
 
 bool View::eventFilter(QObject *object, QEvent *event)
@@ -467,6 +498,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:
@@ -508,10 +542,10 @@ void View::v_scroll_value_changed(int value)
 void View::signals_changed()
 {
 	int offset = SignalMargin + SignalHeight;
-	const vector< shared_ptr<Trace> > traces(get_traces());
-	for (shared_ptr<Trace> t : traces) {
-		t->set_view(this);
-		t->set_v_offset(offset);
+	const vector< shared_ptr<RowItem> > row_items(child_items());
+	for (shared_ptr<RowItem> r : row_items) {
+		r->set_owner(this);
+		r->set_v_offset(offset);
 		offset += SignalHeight + 2 * SignalMargin;
 	}
 
@@ -545,5 +579,12 @@ void View::on_geometry_updated()
 	update_layout();
 }
 
+void View::on_hover_point_changed()
+{
+	const vector< shared_ptr<RowItem> > row_items(child_items());
+	for (shared_ptr<RowItem> r : row_items)
+		r->hover_point_changed();
+}
+
 } // namespace view
 } // namespace pv