X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fview%2Fview.cpp;h=6af03c9c0f7a78fec96a341c57c7e38b1d951bae;hp=ca575bec2ebc0e0258e3ee08490e1f6b5e111b8d;hb=03ce95a9bb81c05bae0da9de189d280214db67c3;hpb=949361337a82aa8765d72d8d475a79ace956945c

diff --git a/pv/view/view.cpp b/pv/view/view.cpp
index ca575bec..6af03c9c 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"
@@ -116,6 +117,11 @@ SigSession& View::session()
 	return _session;
 }
 
+const SigSession& View::session() const
+{
+	return _session;
+}
+
 double View::scale() const
 {
 	return _scale;
@@ -139,16 +145,12 @@ void View::zoom(double steps)
 void View::zoom(double steps, int offset)
 {
 	const double cursor_offset = _offset + _scale * offset;
-	_scale *= pow(3.0/2.0, -steps);
-	_scale = max(min(_scale, MaxScale), MinScale);
-	_offset = cursor_offset - _scale * offset;
-
-	_ruler->update();
-	_viewport->update();
-	update_scroll();
+	const double new_scale = max(min(_scale * pow(3.0/2.0, -steps),
+		MaxScale), MinScale);
+	const double new_offset = cursor_offset - new_scale * offset;
+	set_scale_offset(new_scale, new_offset);
 }
 
-
 void View::set_scale_offset(double scale, double offset)
 {
 	_scale = scale;
@@ -157,6 +159,24 @@ void View::set_scale_offset(double scale, double offset)
 	update_scroll();
 	_ruler->update();
 	_viewport->update();
+	scale_offset_changed();
+}
+
+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
@@ -164,11 +184,11 @@ list<weak_ptr<SelectableItem> > View::selected_items() const
 	list<weak_ptr<SelectableItem> > items;
 
 	// List the selected signals
-	const vector< shared_ptr<Signal> > sigs(_session.get_signals());
-	BOOST_FOREACH (shared_ptr<Signal> s, sigs) {
-		assert(s);
-		if (s->selected())
-			items.push_back(s);
+	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
@@ -218,20 +238,26 @@ 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());
 }
 
+void View::update_viewport()
+{
+	assert(_viewport);
+	_viewport->update();
+}
+
 void View::get_scroll_layout(double &length, double &offset) const
 {
 	const shared_ptr<data::SignalData> sig_data = _session.get_data();
@@ -275,16 +301,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)
@@ -364,7 +386,15 @@ 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->set_v_offset(offset);
+		offset += SignalHeight + 2 * SignalMargin;
+	}
+
+	normalize_layout();
 }
 
 void View::data_updated()