X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fview%2Fview.cpp;h=3619ba0694d8f4bc48c5c8a97368e9f005192a9e;hb=ef8311a4296a2dc85c82b063de61efa4eb7a8404;hp=b52d689f22c12d988ef3d2f56499bc0b3e9f4629;hpb=149e359e48ede480f3734cfc5c04bd1399d0d4be;p=pulseview.git

diff --git a/pv/view/view.cpp b/pv/view/view.cpp
index b52d689..3619ba0 100644
--- a/pv/view/view.cpp
+++ b/pv/view/view.cpp
@@ -70,13 +70,13 @@ View::View(SigSession &session, QWidget *parent) :
 	_scale(1e-6),
 	_offset(0),
 	_v_offset(0),
+	_updating_scroll(false),
 	_show_cursors(false),
-	_cursors(pair<Cursor, Cursor>(Cursor(*this, 0.0),
-		Cursor(*this, 1.0))),
+	_cursors(*this),
 	_hover_point(-1, -1)
 {
-	connect(horizontalScrollBar(), SIGNAL(sliderMoved(int)),
-		this, SLOT(h_scroll_moved(int)));
+	connect(horizontalScrollBar(), SIGNAL(valueChanged(int)),
+		this, SLOT(h_scroll_value_changed(int)));
 	connect(verticalScrollBar(), SIGNAL(valueChanged(int)),
 		this, SLOT(v_scroll_value_changed(int)));
 
@@ -85,14 +85,24 @@ 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()),
 		this, SLOT(on_signals_moved()));
 
+	connect(_header, SIGNAL(selection_changed()),
+		_ruler, SLOT(clear_selection()));
+	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);
 
@@ -149,6 +159,27 @@ void View::set_scale_offset(double scale, double offset)
 	_viewport->update();
 }
 
+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);
+	}
+
+	// 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;
@@ -161,7 +192,21 @@ void View::show_cursors(bool show)
 	_viewport->update();
 }
 
-std::pair<Cursor, Cursor>& View::cursors()
+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();
+	_viewport->update();
+}
+
+CursorPair& View::cursors()
+{
+	return _cursors;
+}
+
+const CursorPair& View::cursors() const
 {
 	return _cursors;
 }
@@ -208,7 +253,9 @@ void View::update_scroll()
 	get_scroll_layout(length, offset);
 	length = max(length - areaSize.width(), 0.0);
 
-	horizontalScrollBar()->setPageStep(areaSize.width());
+	horizontalScrollBar()->setPageStep(areaSize.width() / 2);
+
+	_updating_scroll = true;
 
 	if (length < MaxScrollValue) {
 		horizontalScrollBar()->setRange(0, length);
@@ -219,6 +266,8 @@ void View::update_scroll()
 			_offset * MaxScrollValue / (_scale * length));
 	}
 
+	_updating_scroll = false;
+
 	// Set the vertical scrollbar
 	verticalScrollBar()->setPageStep(areaSize.height());
 	verticalScrollBar()->setRange(0,
@@ -226,18 +275,6 @@ void View::update_scroll()
 		areaSize.height());
 }
 
-void View::reset_signal_layout()
-{
-	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();
-}
-
 bool View::eventFilter(QObject *object, QEvent *event)
 {
 	const QEvent::Type type = event->type();
@@ -288,8 +325,11 @@ void View::resizeEvent(QResizeEvent*)
 	update_scroll();
 }
 
-void View::h_scroll_moved(int value)
+void View::h_scroll_value_changed(int value)
 {
+	if (_updating_scroll)
+		return;
+
 	const int range = horizontalScrollBar()->maximum();
 	if (range < MaxScrollValue)
 		_offset = _scale * value;
@@ -312,7 +352,15 @@ void View::v_scroll_value_changed(int value)
 
 void View::signals_changed()
 {
-	reset_signal_layout();
+	int offset = SignalMargin + SignalHeight;
+	const vector< shared_ptr<Signal> > sigs(_session.get_signals());
+	BOOST_FOREACH(shared_ptr<Signal> s, sigs) {
+		s->init_context_bar_actions(NULL);
+		s->set_v_offset(offset);
+		offset += SignalHeight + 2 * SignalMargin;
+	}
+
+	normalize_layout();
 }
 
 void View::data_updated()