Show ruler timestamps in cursors and popups

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

diff --git a/pv/views/trace/view.hpp b/pv/views/trace/view.hpp
index 4bde31d6dd17e3f6a5dd417a3397ebb98a3ded77..06b2cf2fb6275f2cd51f55e8b5a43007ff0d757c 100644 (file)
--- a/pv/views/trace/view.hpp
+++ b/pv/views/trace/view.hpp
@@ -145,6 +145,8 @@ public:
 
        const Viewport* viewport() const;
 
+       const Ruler* ruler() const;
+
        virtual void save_settings(QSettings &settings) const;
 
        virtual void restore_settings(QSettings &settings);
@@ -171,10 +173,13 @@ public:
         */
        const pv::util::Timestamp& ruler_offset() const;
 
-       void set_zero_position(pv::util::Timestamp& position);
+       void set_zero_position(const pv::util::Timestamp& position);
 
        void reset_zero_position();
 
+    pv::util::Timestamp absolute_to_ruler_time(const pv::util::Timestamp& abs_time) const;
+    pv::util::Timestamp ruler_to_absolute_time(const pv::util::Timestamp& ruler_time) const;
+
        /**
         * Returns the vertical scroll offset.
         */
@@ -276,6 +281,11 @@ public:
         */
        void show_cursors(bool show = true);
 
+       /**
+        * Sets the cursors to the given offsets. You will still have to call show_cursors separately.
+        */
+       void set_cursors(pv::util::Timestamp& first, pv::util::Timestamp& second);
+
        /**
         * Moves the cursors to a convenient position in the view.
         */
@@ -302,6 +312,7 @@ public:
        vector< shared_ptr<Flag> > flags() const;
 
        const QPoint& hover_point() const;
+       const QWidget* hover_widget() const;
 
        /**
         * Determines the closest level change (i.e. edge) to a given point, which
@@ -319,7 +330,7 @@ public:
        void on_setting_changed(const QString &key, const QVariant &value);
 
 Q_SIGNALS:
-       void hover_point_changed(const QPoint &hp);
+       void hover_point_changed(const QWidget* widget, const QPoint &hp);
 
        void selection_changed();
 
@@ -504,6 +515,8 @@ private:
        pv::util::Timestamp offset_;
        /// The ruler version of the time offset in seconds.
        pv::util::Timestamp ruler_offset_;
+       /// The offset of the zero point in seconds.
+       pv::util::Timestamp zero_offset_;
 
        bool updating_scroll_;
        bool settings_restored_;
@@ -527,6 +540,7 @@ private:
 
        vector< shared_ptr<TriggerMarker> > trigger_markers_;
 
+       QWidget* hover_widget_;
        QPoint hover_point_;
        shared_ptr<Signal> signal_under_mouse_cursor_;
        uint16_t snap_distance_;