Show relative time of flags on hover

[pulseview.git] / pv / views / trace / triggermarker.cpp

diff --git a/pv/views/trace/triggermarker.cpp b/pv/views/trace/triggermarker.cpp
index 2ef4b6badf8663b877b8a693977ee96935954437..ee1aa15adfb70025f03ba7c57978eeff0d0cba52 100644 (file)
--- 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>();
 }
 
+const pv::util::Timestamp TriggerMarker::delta(const pv::util::Timestamp& other) const
+{
+       return other - time_;
+}
+
 QPoint TriggerMarker::drag_point(const QRect &rect) const
 {
-       return QPoint(get_x(), rect.bottom());
+       (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();