X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=pv%2Fviews%2Ftrace%2Fview.cpp;h=15e65127b2932062b46a5734575febf9d163631c;hb=3d6ff1cd;hp=a3861d1f99afba820d2f7ce1e7efc0339f4e9a37;hpb=db29815836442ac83d453b3de2bf1755e9fd89f0;p=pulseview.git

diff --git a/pv/views/trace/view.cpp b/pv/views/trace/view.cpp
index a3861d1f..15e65127 100644
--- a/pv/views/trace/view.cpp
+++ b/pv/views/trace/view.cpp
@@ -208,7 +208,7 @@ View::View(Session &session, bool is_main_view, QMainWindow *parent) :
 
 	// Set up local keyboard shortcuts
 	zoom_in_shortcut_ = new QShortcut(QKeySequence(Qt::Key_Plus), this,
-			SLOT(on_zoom_in_shortcut_triggered()), nullptr, Qt::WidgetWithChildrenShortcut);
+		SLOT(on_zoom_in_shortcut_triggered()), nullptr, Qt::WidgetWithChildrenShortcut);
 	zoom_in_shortcut_->setAutoRepeat(false);
 
 	zoom_out_shortcut_ = new QShortcut(QKeySequence(Qt::Key_Minus), this,
@@ -228,6 +228,24 @@ View::View(Session &session, bool is_main_view, QMainWindow *parent) :
 		SLOT(on_scroll_to_end_shortcut_triggered()), nullptr, Qt::WidgetWithChildrenShortcut);
 	end_shortcut_->setAutoRepeat(false);
 
+	grab_ruler_left_shortcut_ = new QShortcut(QKeySequence(Qt::Key_1), this,
+		nullptr, nullptr, Qt::WidgetWithChildrenShortcut);
+	connect(grab_ruler_left_shortcut_, &QShortcut::activated,
+		this, [=]{on_grab_ruler(1);});
+	grab_ruler_left_shortcut_->setAutoRepeat(false);
+
+	grab_ruler_right_shortcut_ = new QShortcut(QKeySequence(Qt::Key_2), this,
+		nullptr, nullptr, Qt::WidgetWithChildrenShortcut);
+	connect(grab_ruler_right_shortcut_, &QShortcut::activated,
+		this, [=]{on_grab_ruler(2);});
+	grab_ruler_right_shortcut_->setAutoRepeat(false);
+
+	cancel_grab_shortcut_ = new QShortcut(QKeySequence(Qt::Key_Escape), this,
+		nullptr, nullptr, Qt::WidgetWithChildrenShortcut);
+	connect(cancel_grab_shortcut_, &QShortcut::activated,
+		this, [=]{grabbed_widget_ = nullptr;});
+	cancel_grab_shortcut_->setAutoRepeat(false);
+
 	// Trigger the initial event manually. The default device has signals
 	// which were created before this object came into being
 	signals_changed();
@@ -270,6 +288,7 @@ void View::reset_view_state()
 	next_flag_text_ = 'A';
 	trigger_markers_.clear();
 	hover_widget_ = nullptr;
+	grabbed_widget_ = nullptr;
 	hover_point_ = QPoint(-1, -1);
 	scroll_needs_defaults_ = true;
 	saved_v_offset_ = 0;
@@ -303,9 +322,22 @@ unordered_set< shared_ptr<Signal> > View::signals() const
 	return signals_;
 }
 
+shared_ptr<Signal> View::get_signal_by_signalbase(shared_ptr<data::SignalBase> base) const
+{
+	shared_ptr<Signal> ret_val;
+
+	for (const shared_ptr<Signal>& s : signals_)
+		if (s->base() == base) {
+			ret_val = s;
+			break;
+		}
+
+	return ret_val;
+}
+
 void View::clear_signals()
 {
-	ViewBase::clear_signalbases();
+	ViewBase::clear_signals();
 	signals_.clear();
 }
 
@@ -324,11 +356,14 @@ void View::add_signal(const shared_ptr<Signal> signal)
 #ifdef ENABLE_DECODE
 void View::clear_decode_signals()
 {
+	ViewBase::clear_decode_signals();
 	decode_traces_.clear();
 }
 
 void View::add_decode_signal(shared_ptr<data::DecodeSignal> signal)
 {
+	ViewBase::add_decode_signal(signal);
+
 	shared_ptr<DecodeTrace> d(
 		new DecodeTrace(session_, signal, decode_traces_.size()));
 	decode_traces_.push_back(d);
@@ -348,6 +383,8 @@ void View::remove_decode_signal(shared_ptr<data::DecodeSignal> signal)
 			signals_changed();
 			return;
 		}
+
+	ViewBase::remove_decode_signal(signal);
 }
 #endif
 
@@ -376,6 +413,11 @@ const Viewport* View::viewport() const
 	return viewport_;
 }
 
+QAbstractScrollArea* View::scrollarea() const
+{
+	return scrollarea_;
+}
+
 const Ruler* View::ruler() const
 {
 	return ruler_;
@@ -835,7 +877,7 @@ void View::set_cursors(pv::util::Timestamp& first, pv::util::Timestamp& second)
 	viewport_->update();
 }
 
-void View::centre_cursors()
+void View::center_cursors()
 {
 	assert(cursors_);
 
@@ -1364,6 +1406,7 @@ void View::determine_time_unit()
 bool View::eventFilter(QObject *object, QEvent *event)
 {
 	const QEvent::Type type = event->type();
+
 	if (type == QEvent::MouseMove) {
 
 		if (object)
@@ -1381,6 +1424,28 @@ bool View::eventFilter(QObject *object, QEvent *event)
 
 		update_hover_point();
 
+		if (grabbed_widget_) {
+			int64_t nearest = get_nearest_level_change(hover_point_);
+			pv::util::Timestamp mouse_time = offset_ + hover_point_.x() * scale_;
+
+			if (nearest == -1) {
+				grabbed_widget_->set_time(mouse_time);
+			} else {
+				grabbed_widget_->set_time(nearest / get_signal_under_mouse_cursor()->base()->get_samplerate());
+			}
+		}
+
+	} else if (type == QEvent::MouseButtonPress) {
+		grabbed_widget_ = nullptr;
+
+		const QMouseEvent *const mouse_event = (QMouseEvent*)event;
+		if ((object == viewport_) && (mouse_event->button() & Qt::LeftButton)) {
+			// Send event to all trace tree items
+			const vector<shared_ptr<TraceTreeItem>> trace_tree_items(
+				list_by_type<TraceTreeItem>());
+			for (const shared_ptr<TraceTreeItem>& r : trace_tree_items)
+				r->mouse_left_press_event(mouse_event);
+		}
 	} else if (type == QEvent::Leave) {
 		hover_point_ = QPoint(-1, -1);
 		update_hover_point();
@@ -1559,6 +1624,26 @@ void View::v_scroll_value_changed()
 	viewport_->update();
 }
 
+void View::on_grab_ruler(int ruler_id)
+{
+	if (!cursors_shown()) {
+		center_cursors();
+		show_cursors();
+	}
+
+	// Release the grabbed widget if its trigger hotkey was pressed twice
+	if (ruler_id == 1)
+		grabbed_widget_ = (grabbed_widget_ == cursors_->first().get()) ?
+			nullptr : cursors_->first().get();
+	else
+		grabbed_widget_ = (grabbed_widget_ == cursors_->second().get()) ?
+			nullptr : cursors_->second().get();
+
+	if (grabbed_widget_)
+		grabbed_widget_->set_time(ruler_->get_absolute_time_from_x_pos(
+			mapFromGlobal(QCursor::pos()).x() - header_width()));
+}
+
 void View::signals_changed()
 {
 	using sigrok::Channel;