Backport recent changes from mainline.

[pulseview.git] / pv / views / trace / timeitem.hpp

diff --git a/pv/views/trace/timeitem.hpp b/pv/views/trace/timeitem.hpp
index ba858254f786aadf0477a61bfc495d1a53dd786e..06d850505ce8ebde350ecfbcbaeecbd5b3a79c3a 100644 (file)
--- a/pv/views/trace/timeitem.hpp
+++ b/pv/views/trace/timeitem.hpp
@@ -43,20 +43,32 @@ protected:
         */
        TimeItem(View &view);
 
+       bool snapping_disabled_ = false;
+
 public:
        /**
         * Sets the time of the marker.
         */
        virtual void set_time(const pv::util::Timestamp& time) = 0;
 
+       /**
+        * Returns the time this time item is set to.
+        * @return 0 in case there is no valid time (e.g. for a cursor pair)
+        */
+       virtual const pv::util::Timestamp time() const = 0;
+
        virtual float get_x() const = 0;
 
+       virtual const pv::util::Timestamp delta(const pv::util::Timestamp& other) const;
+
        /**
         * Drags the item to a delta relative to the drag point.
         * @param delta the offset from the drag point.
         */
        void drag_by(const QPoint &delta);
 
+       bool is_snapping_disabled() const;
+
 protected:
        View &view_;
 };