X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=pv%2Fview%2Fview.cpp;h=026d2e7fda92a516e2032dcabac64d1a7d0d5fa5;hb=01fd32630269c1cfb99eb2b0d6060d7d19a42475;hp=b240af06c1514f0f763e7ce097b7bbcc50cf95b4;hpb=17348f85b8dd4c96aace88f790ba4fda2bccca5a;p=pulseview.git

diff --git a/pv/view/view.cpp b/pv/view/view.cpp
index b240af06..026d2e7f 100644
--- a/pv/view/view.cpp
+++ b/pv/view/view.cpp
@@ -28,6 +28,7 @@
 #include <QMouseEvent>
 #include <QScrollBar>
 
+#include "decodesignal.h"
 #include "header.h"
 #include "ruler.h"
 #include "signal.h"
@@ -85,9 +86,9 @@ View::View(SigSession &session, QWidget *parent) :
 	connect(&_session, SIGNAL(data_updated()),
 		this, SLOT(data_updated()));
 
-	connect(&_cursors.first(), SIGNAL(time_changed()),
+	connect(_cursors.first().get(), SIGNAL(time_changed()),
 		this, SLOT(marker_time_changed()));
-	connect(&_cursors.second(), SIGNAL(time_changed()),
+	connect(_cursors.second().get(), SIGNAL(time_changed()),
 		this, SLOT(marker_time_changed()));
 
 	connect(_header, SIGNAL(signals_moved()),
@@ -98,6 +99,11 @@ View::View(SigSession &session, QWidget *parent) :
 	connect(_ruler, SIGNAL(selection_changed()),
 		_header, SLOT(clear_selection()));
 
+	connect(_header, SIGNAL(selection_changed()),
+		this, SIGNAL(selection_changed()));
+	connect(_ruler, SIGNAL(selection_changed()),
+		this, SIGNAL(selection_changed()));
+
 	setViewportMargins(LabelMarginWidth, RulerHeight, 0, 0);
 	setViewport(_viewport);
 
@@ -111,6 +117,11 @@ SigSession& View::session()
 	return _session;
 }
 
+const SigSession& View::session() const
+{
+	return _session;
+}
+
 double View::scale() const
 {
 	return _scale;
@@ -154,6 +165,44 @@ void View::set_scale_offset(double scale, double offset)
 	_viewport->update();
 }
 
+vector< shared_ptr<Trace> > View::get_traces() const
+{
+	const vector< shared_ptr<Signal> > sigs(
+		session().get_signals());
+	const vector< shared_ptr<DecodeSignal> > decode_sigs(
+		session().get_decode_signals());
+	vector< shared_ptr<Trace> > traces(
+		sigs.size() + decode_sigs.size());
+
+	vector< shared_ptr<Trace> >::iterator i = traces.begin();
+	i = copy(sigs.begin(), sigs.end(), i);
+	i = copy(decode_sigs.begin(), decode_sigs.end(), i);
+
+	sort(traces.begin(), traces.end(), compare_trace_v_offsets);
+	return traces;
+}
+
+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());
+	BOOST_FOREACH (shared_ptr<Trace> t, traces) {
+		assert(t);
+		if (t->selected())
+			items.push_back(t);
+	}
+
+	// List the selected cursors
+	if (_cursors.first()->selected())
+		items.push_back(_cursors.first());
+	if (_cursors.second()->selected())
+		items.push_back(_cursors.second());
+
+	return items;
+}
+
 bool View::cursors_shown() const
 {
 	return _show_cursors;
@@ -169,8 +218,8 @@ void View::show_cursors(bool show)
 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);
+	_cursors.first()->set_time(_offset + time_width * 0.4);
+	_cursors.second()->set_time(_offset + time_width * 0.6);
 	_ruler->update();
 	_viewport->update();
 }
@@ -180,6 +229,11 @@ CursorPair& View::cursors()
 	return _cursors;
 }
 
+const CursorPair& View::cursors() const
+{
+	return _cursors;
+}
+
 const QPoint& View::hover_point() const
 {
 	return _hover_point;
@@ -187,15 +241,15 @@ const QPoint& View::hover_point() const
 
 void View::normalize_layout()
 {
-	const vector< shared_ptr<Signal> > sigs(_session.get_signals());
+	const vector< shared_ptr<Trace> > traces(get_traces());
 
 	int v_min = INT_MAX;
-	BOOST_FOREACH(const shared_ptr<Signal> s, sigs)
-		v_min = min(s->get_v_offset(), v_min);
+	BOOST_FOREACH(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<Signal> s, sigs)
-		s->set_v_offset(s->get_v_offset() + delta);
+	BOOST_FOREACH(shared_ptr<Trace> t, traces)
+		t->set_v_offset(t->get_v_offset() + delta);
 
 	verticalScrollBar()->setSliderPosition(_v_offset + delta);
 	v_scroll_value_changed(verticalScrollBar()->sliderPosition());
@@ -244,16 +298,12 @@ void View::update_scroll()
 		areaSize.height());
 }
 
-void View::reset_signal_layout()
+bool View::compare_trace_v_offsets(const shared_ptr<Trace> &a,
+	const shared_ptr<Trace> &b)
 {
-	int offset = SignalMargin + SignalHeight;
-	const 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();
+	assert(a);
+	assert(b);
+	return a->get_v_offset() < b->get_v_offset();
 }
 
 bool View::eventFilter(QObject *object, QEvent *event)
@@ -333,7 +383,16 @@ void View::v_scroll_value_changed(int value)
 
 void View::signals_changed()
 {
-	reset_signal_layout();
+	int offset = SignalMargin + SignalHeight;
+	const vector< shared_ptr<Trace> > traces(get_traces());
+	BOOST_FOREACH(shared_ptr<Trace> t, traces) {
+		t->set_view(this);
+		t->init_context_bar_actions(NULL);
+		t->set_v_offset(offset);
+		offset += SignalHeight + 2 * SignalMargin;
+	}
+
+	normalize_layout();
 }
 
 void View::data_updated()