X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fviews%2Ftrace%2Ftriggermarker.cpp;h=ee1aa15adfb70025f03ba7c57978eeff0d0cba52;hp=31afba1c538e3214af64c32039276cc82746221d;hb=710c2a1896fbac968c82f2d1257aaabd10a48cc8;hpb=1573bf16ba50d1c023ad3a9ce596f0ab6eaeacff

diff --git a/pv/views/trace/triggermarker.cpp b/pv/views/trace/triggermarker.cpp
index 31afba1c..ee1aa15a 100644
--- a/pv/views/trace/triggermarker.cpp
+++ b/pv/views/trace/triggermarker.cpp
@@ -24,7 +24,7 @@ namespace pv {
 namespace views {
 namespace trace {
 
-const QColor TriggerMarker::Colour(0x00, 0x00, 0xB0);
+const QColor TriggerMarker::Color(0x00, 0x00, 0xB0);
 
 TriggerMarker::TriggerMarker(View &view, const pv::util::Timestamp& time) :
 	TimeItem(view),
@@ -43,26 +43,39 @@ bool TriggerMarker::enabled() const
 	return true;
 }
 
-bool TriggerMarker::is_draggable() const
+bool TriggerMarker::is_draggable(QPoint pos) const
 {
+	(void)pos;
 	return false;
 }
 
 void TriggerMarker::set_time(const pv::util::Timestamp& time)
 {
 	time_ = time;
-
 	view_.time_item_appearance_changed(true, true);
 }
 
+const pv::util::Timestamp TriggerMarker::time() const
+{
+	return time_;
+}
+
 float TriggerMarker::get_x() const
 {
 	return ((time_ - view_.offset()) / view_.scale()).convert_to<float>();
 }
 
-QPoint TriggerMarker::point(const QRect &rect) const
+const pv::util::Timestamp TriggerMarker::delta(const pv::util::Timestamp& other) const
 {
-	return QPoint(get_x(), rect.bottom());
+	return other - time_;
+}
+
+QPoint TriggerMarker::drag_point(const QRect &rect) const
+{
+	(void)rect;
+
+	// The trigger marker cannot be moved, so there is no drag point
+	return QPoint(INT_MIN, INT_MIN);
 }
 
 void TriggerMarker::paint_fore(QPainter &p, ViewItemPaintParams &pp)
@@ -70,7 +83,7 @@ void TriggerMarker::paint_fore(QPainter &p, ViewItemPaintParams &pp)
 	if (!enabled())
 		return;
 
-	QPen pen(Colour);
+	QPen pen(Color);
 	pen.setStyle(Qt::DashLine);
 
 	const float x = get_x();