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

diff --git a/pv/view/view.cpp b/pv/view/view.cpp
index 388c4c49..61f01766 100644
--- a/pv/view/view.cpp
+++ b/pv/view/view.cpp
@@ -22,9 +22,10 @@
 #include <libsigrokdecode/libsigrokdecode.h>
 #endif
 
-#include <assert.h>
-#include <limits.h>
-#include <math.h>
+#include <cassert>
+#include <climits>
+#include <cmath>
+#include <mutex>
 
 #include <QEvent>
 #include <QMouseEvent>
@@ -42,10 +43,13 @@
 #include "pv/data/logic.h"
 #include "pv/data/logicsnapshot.h"
 
+using boost::shared_lock;
+using boost::shared_mutex;
 using pv::data::SignalData;
 using std::back_inserter;
 using std::deque;
 using std::list;
+using std::lock_guard;
 using std::max;
 using std::make_pair;
 using std::min;
@@ -149,6 +153,16 @@ const SigSession& View::session() const
 	return _session;
 }
 
+View* View::view()
+{
+	return this;
+}
+
+const View* View::view() const
+{
+	return this;
+}
+
 Viewport* View::viewport()
 {
 	return _viewport;
@@ -169,9 +183,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)
@@ -204,9 +218,6 @@ void View::zoom_one_to_one()
 {
 	using pv::data::SignalData;
 
-	const vector< shared_ptr<Signal> > sigs(
-		session().get_signals());
-
 	// Make a set of all the visible data objects
 	set< shared_ptr<SignalData> > visible_data = get_visible_data();
 	if (visible_data.empty())
@@ -241,37 +252,15 @@ void View::set_scale_offset(double scale, double offset)
 	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());
-	copy(decode_sigs.begin(), decode_sigs.end(), back_inserter(traces));
-#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(); });
-
-	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());
-	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) {
+		if (r && r->selected())
+			items.push_back(r);
 	}
 
 	// List the selected cursors
@@ -285,8 +274,8 @@ list<weak_ptr<SelectableItem> > View::selected_items() const
 
 set< shared_ptr<SignalData> > View::get_visible_data() const
 {
-	const vector< shared_ptr<Signal> > sigs(
-		session().get_signals());
+	shared_lock<shared_mutex> lock(session().signals_mutex());
+	const vector< shared_ptr<Signal> > &sigs(session().signals());
 
 	// Make a set of all the visible data objects
 	set< shared_ptr<SignalData> > visible_data;
@@ -357,15 +346,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());
@@ -441,6 +430,19 @@ void View::update_layout()
 	update_scroll();
 }
 
+void View::paint_label(QPainter &p, int right, bool hover)
+{
+	(void)p;
+	(void)right;
+	(void)hover;
+}
+
+QRectF View::label_rect(int right)
+{
+	(void)right;
+	return QRectF();
+}
+
 bool View::eventFilter(QObject *object, QEvent *event)
 {
 	const QEvent::Type type = event->type();
@@ -518,11 +520,25 @@ void View::v_scroll_value_changed(int value)
 
 void View::signals_changed()
 {
+	// Populate the traces
+	clear_child_items();
+
+	shared_lock<shared_mutex> lock(session().signals_mutex());
+	const vector< shared_ptr<Signal> > &sigs(session().signals());
+	for (auto s : sigs)
+		add_child_item(s);
+
+#ifdef ENABLE_DECODE
+	const vector< shared_ptr<DecodeTrace> > decode_sigs(
+		session().get_decode_signals());
+	for (auto s : decode_sigs)
+		add_child_item(s);
+#endif
+
+	// Create the initial layout
 	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);
+	for (shared_ptr<RowItem> r : child_items()) {
+		r->set_v_offset(offset);
 		offset += SignalHeight + 2 * SignalMargin;
 	}
 
@@ -558,9 +574,9 @@ void View::on_geometry_updated()
 
 void View::on_hover_point_changed()
 {
-	const vector< shared_ptr<Trace> > traces(get_traces());
-	for (shared_ptr<Trace> t : traces)
-		t->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