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

diff --git a/pv/view/view.cpp b/pv/view/view.cpp
index 026d2e7f..372aff25 100644
--- a/pv/view/view.cpp
+++ b/pv/view/view.cpp
@@ -18,17 +18,21 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-#include <assert.h>
-#include <limits.h>
-#include <math.h>
+#ifdef ENABLE_DECODE
+#include <libsigrokdecode/libsigrokdecode.h>
+#endif
 
-#include <boost/foreach.hpp>
+#include <cassert>
+#include <climits>
+#include <cmath>
+#include <mutex>
 
 #include <QEvent>
 #include <QMouseEvent>
 #include <QScrollBar>
 
-#include "decodesignal.h"
+#include "cursorheader.h"
+#include "decodetrace.h"
 #include "header.h"
 #include "ruler.h"
 #include "signal.h"
@@ -39,8 +43,21 @@
 #include "pv/data/logic.h"
 #include "pv/data/logicsnapshot.h"
 
-using namespace boost;
-using namespace std;
+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;
+using std::pair;
+using std::set;
+using std::shared_ptr;
+using std::vector;
+using std::weak_ptr;
 
 namespace pv {
 namespace view {
@@ -48,9 +65,6 @@ namespace view {
 const double View::MaxScale = 1e9;
 const double View::MinScale = 1e-15;
 
-const int View::LabelMarginWidth = 70;
-const int View::RulerHeight = 30;
-
 const int View::MaxScrollValue = INT_MAX / 2;
 
 const int View::SignalHeight = 30;
@@ -66,8 +80,8 @@ View::View(SigSession &session, QWidget *parent) :
 	_session(session),
 	_viewport(new Viewport(*this)),
 	_ruler(new Ruler(*this)),
+	_cursorheader(new CursorHeader(*this)),
 	_header(new Header(*this)),
-	_data_length(0),
 	_scale(1e-6),
 	_offset(0),
 	_v_offset(0),
@@ -83,7 +97,11 @@ View::View(SigSession &session, QWidget *parent) :
 
 	connect(&_session, SIGNAL(signals_changed()),
 		this, SLOT(signals_changed()));
-	connect(&_session, SIGNAL(data_updated()),
+	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()),
 		this, SLOT(data_updated()));
 
 	connect(_cursors.first().get(), SIGNAL(time_changed()),
@@ -91,25 +109,38 @@ View::View(SigSession &session, QWidget *parent) :
 	connect(_cursors.second().get(), SIGNAL(time_changed()),
 		this, SLOT(marker_time_changed()));
 
+	connect(_header, SIGNAL(geometry_updated()),
+		this, SLOT(on_geometry_updated()));
 	connect(_header, SIGNAL(signals_moved()),
 		this, SLOT(on_signals_moved()));
 
 	connect(_header, SIGNAL(selection_changed()),
-		_ruler, SLOT(clear_selection()));
-	connect(_ruler, SIGNAL(selection_changed()),
+		_cursorheader, SLOT(clear_selection()));
+	connect(_cursorheader, SIGNAL(selection_changed()),
 		_header, SLOT(clear_selection()));
 
 	connect(_header, SIGNAL(selection_changed()),
 		this, SIGNAL(selection_changed()));
-	connect(_ruler, SIGNAL(selection_changed()),
+	connect(_cursorheader, SIGNAL(selection_changed()),
 		this, SIGNAL(selection_changed()));
 
-	setViewportMargins(LabelMarginWidth, RulerHeight, 0, 0);
+	connect(this, SIGNAL(hover_point_changed()),
+		this, SLOT(on_hover_point_changed()));
+
 	setViewport(_viewport);
 
 	_viewport->installEventFilter(this);
 	_ruler->installEventFilter(this);
+	_cursorheader->installEventFilter(this);
 	_header->installEventFilter(this);
+
+	// Trigger the initial event manually. The default device has signals
+	// which were created before this object came into being
+	signals_changed();
+
+	// make sure the transparent widgets are on the top
+	_cursorheader->raise();
+	_header->raise();
 }
 
 SigSession& View::session()
@@ -122,6 +153,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;
@@ -132,28 +183,62 @@ 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)
 {
-	zoom(steps, (width() - LabelMarginWidth) / 2);
+	zoom(steps, _viewport->width() / 2);
 }
 
 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;
+	set_zoom(_scale * pow(3.0/2.0, -steps), offset);
+}
 
-	_ruler->update();
-	_viewport->update();
-	update_scroll();
+void View::zoom_fit()
+{
+	const pair<double, double> extents = get_time_extents();
+	const double delta = extents.second - extents.first;
+	if (delta < 1e-12)
+		return;
+
+	assert(_viewport);
+	const int w = _viewport->width();
+	if (w <= 0)
+		return;
+
+	const double scale = max(min(delta / w, MaxScale), MinScale);
+	set_scale_offset(scale, extents.first);
 }
 
+void View::zoom_one_to_one()
+{
+	using pv::data::SignalData;
+
+	// Make a set of all the visible data objects
+	set< shared_ptr<SignalData> > visible_data = get_visible_data();
+	if (visible_data.empty())
+		return;
+
+	double samplerate = 0.0;
+	for (const shared_ptr<SignalData> d : visible_data) {
+		assert(d);
+		samplerate = max(samplerate, d->samplerate());
+	}
+
+	if (samplerate == 0.0)
+		return;
+
+	assert(_viewport);
+	const int w = _viewport->width();
+	if (w <= 0)
+		return;
+
+	set_zoom(1.0 / samplerate, w / 2);
+}
 
 void View::set_scale_offset(double scale, double offset)
 {
@@ -162,45 +247,45 @@ void View::set_scale_offset(double scale, double offset)
 
 	update_scroll();
 	_ruler->update();
+	_cursorheader->update();
 	_viewport->update();
+	scale_offset_changed();
 }
 
-vector< shared_ptr<Trace> > View::get_traces() const
+set< shared_ptr<SignalData> > View::get_visible_data() 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());
+	shared_lock<shared_mutex> lock(session().signals_mutex());
+	const vector< shared_ptr<Signal> > &sigs(session().signals());
 
-	vector< shared_ptr<Trace> >::iterator i = traces.begin();
-	i = copy(sigs.begin(), sigs.end(), i);
-	i = copy(decode_sigs.begin(), decode_sigs.end(), i);
+	// Make a set of all the visible data objects
+	set< shared_ptr<SignalData> > visible_data;
+	for (const shared_ptr<Signal> sig : sigs)
+		if (sig->enabled())
+			visible_data.insert(sig->data());
 
-	sort(traces.begin(), traces.end(), compare_trace_v_offsets);
-	return traces;
+	return visible_data;
 }
 
-list<weak_ptr<SelectableItem> > View::selected_items() const
+pair<double, double> View::get_time_extents() 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);
+	const set< shared_ptr<SignalData> > visible_data = get_visible_data();
+	if (visible_data.empty())
+		return make_pair(0.0, 0.0);
+
+	double left_time = DBL_MAX, right_time = DBL_MIN;
+	for (const shared_ptr<SignalData> d : visible_data)
+	{
+		const double start_time = d->get_start_time();
+		double samplerate = d->samplerate();
+		samplerate = (samplerate <= 0.0) ? 1.0 : samplerate;
+
+		left_time = min(left_time, start_time);
+		right_time = max(right_time, start_time +
+			d->get_max_sample_count() / samplerate);
 	}
 
-	// List the selected cursors
-	if (_cursors.first()->selected())
-		items.push_back(_cursors.first());
-	if (_cursors.second()->selected())
-		items.push_back(_cursors.second());
-
-	return items;
+	assert(left_time < right_time);
+	return make_pair(left_time, right_time);
 }
 
 bool View::cursors_shown() const
@@ -211,7 +296,7 @@ bool View::cursors_shown() const
 void View::show_cursors(bool show)
 {
 	_show_cursors = show;
-	_ruler->update();
+	_cursorheader->update();
 	_viewport->update();
 }
 
@@ -220,7 +305,7 @@ 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);
-	_ruler->update();
+	_cursorheader->update();
 	_viewport->update();
 }
 
@@ -241,30 +326,41 @@ 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;
-	BOOST_FOREACH(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);
-	BOOST_FOREACH(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());
 }
 
-void View::get_scroll_layout(double &length, double &offset) const
+void View::update_viewport()
 {
-	const shared_ptr<data::SignalData> sig_data = _session.get_data();
-	if (!sig_data)
-		return;
+	assert(_viewport);
+	_viewport->update();
+}
 
-	length = _data_length / (sig_data->get_samplerate() * _scale);
+void View::get_scroll_layout(double &length, double &offset) const
+{
+	const pair<double, double> extents = get_time_extents();
+	length = (extents.second - extents.first) / _scale;
 	offset = _offset / _scale;
 }
 
+void View::set_zoom(double scale, int offset)
+{
+	const double cursor_offset = _offset + _scale * offset;
+	const double new_scale = max(min(scale, MaxScale), MinScale);
+	const double new_offset = cursor_offset - new_scale * offset;
+	set_scale_offset(new_scale, new_offset);
+}
+
 void View::update_scroll()
 {
 	assert(_viewport);
@@ -298,12 +394,33 @@ void View::update_scroll()
 		areaSize.height());
 }
 
-bool View::compare_trace_v_offsets(const shared_ptr<Trace> &a,
-	const shared_ptr<Trace> &b)
+void View::update_layout()
+{
+	setViewportMargins(
+		_header->sizeHint().width() - pv::view::Header::BaselineOffset,
+		_ruler->sizeHint().height(), 0, 0);
+	_ruler->setGeometry(_viewport->x(), 0,
+		_viewport->width(), _viewport->y());
+	_cursorheader->setGeometry(
+		_viewport->x(),
+		_ruler->sizeHint().height() - _cursorheader->sizeHint().height() / 2,
+		_viewport->width(), _cursorheader->sizeHint().height());
+	_header->setGeometry(0, _viewport->y(),
+		_header->sizeHint().width(), _viewport->height());
+	update_scroll();
+}
+
+void View::paint_label(QPainter &p, int right, bool hover)
+{
+	(void)p;
+	(void)right;
+	(void)hover;
+}
+
+QRectF View::label_rect(int right)
 {
-	assert(a);
-	assert(b);
-	return a->get_v_offset() < b->get_v_offset();
+	(void)right;
+	return QRectF();
 }
 
 bool View::eventFilter(QObject *object, QEvent *event)
@@ -314,7 +431,7 @@ bool View::eventFilter(QObject *object, QEvent *event)
 		const QMouseEvent *const mouse_event = (QMouseEvent*)event;
 		if (object == _viewport)
 			_hover_point = mouse_event->pos();
-		else if (object == _ruler)
+		else if (object == _ruler || object == _cursorheader)
 			_hover_point = QPoint(mouse_event->x(), 0);
 		else if (object == _header)
 			_hover_point = QPoint(0, mouse_event->y());
@@ -340,6 +457,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:
@@ -349,11 +469,7 @@ bool View::viewportEvent(QEvent *e)
 
 void View::resizeEvent(QResizeEvent*)
 {
-	_ruler->setGeometry(_viewport->x(), 0,
-		_viewport->width(), _viewport->y());
-	_header->setGeometry(0, _viewport->y(),
-		_viewport->x(), _viewport->height());
-	update_scroll();
+	update_layout();
 }
 
 void View::h_scroll_value_changed(int value)
@@ -371,6 +487,7 @@ void View::h_scroll_value_changed(int value)
 	}
 
 	_ruler->update();
+	_cursorheader->update();
 	_viewport->update();
 }
 
@@ -383,32 +500,34 @@ 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());
-	BOOST_FOREACH(shared_ptr<Trace> t, traces) {
-		t->set_view(this);
-		t->init_context_bar_actions(NULL);
-		t->set_v_offset(offset);
+	for (shared_ptr<RowItem> r : child_items()) {
+		r->set_v_offset(offset);
 		offset += SignalHeight + 2 * SignalMargin;
 	}
 
+	update_layout();
 	normalize_layout();
 }
 
 void View::data_updated()
 {
-	// Get the new data length
-	_data_length = 0;
-	shared_ptr<data::Logic> sig_data = _session.get_data();
-	if (sig_data) {
-		deque< shared_ptr<data::LogicSnapshot> > &snapshots =
-			sig_data->get_snapshots();
-		BOOST_FOREACH(shared_ptr<data::LogicSnapshot> s, snapshots)
-			if (s)
-				_data_length = max(_data_length,
-					s->get_sample_count());
-	}
-
 	// Update the scroll bars
 	update_scroll();
 
@@ -418,7 +537,7 @@ void View::data_updated()
 
 void View::marker_time_changed()
 {
-	_ruler->update();
+	_cursorheader->update();
 	_viewport->update();
 }
 
@@ -428,5 +547,17 @@ void View::on_signals_moved()
 	signals_moved();
 }
 
+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