X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fviews%2Ftrace%2Fruler.hpp;h=bfab766619d135c7d251a2863c7e9078c102ee81;hp=8c1876cced37f5e2598f655a51e309eff0c4fbd7;hb=4468ee4246cd5e47845494e8b3b22a17d434ed5b;hpb=4bc9230c442427a27a3934ce5ff6ff4fdd4e0855 diff --git a/pv/views/trace/ruler.hpp b/pv/views/trace/ruler.hpp index 8c1876cc..bfab7666 100644 --- a/pv/views/trace/ruler.hpp +++ b/pv/views/trace/ruler.hpp @@ -117,7 +117,11 @@ public: unsigned precision = 0, bool sign = true); - pv::util::Timestamp get_time_from_x_pos(uint32_t x); + pv::util::Timestamp get_absolute_time_from_x_pos(uint32_t x) const; + pv::util::Timestamp get_ruler_time_from_x_pos(uint32_t x) const; + + pv::util::Timestamp get_ruler_time_from_absolute_time(const pv::util::Timestamp& abs_time) const; + pv::util::Timestamp get_absolute_time_from_ruler_time(const pv::util::Timestamp& ruler_time) const; protected: virtual void contextMenuEvent(QContextMenuEvent *event) override; @@ -171,11 +175,12 @@ private: function format_function); private Q_SLOTS: - void hover_point_changed(const QPoint &hp); + void on_hover_point_changed(const QWidget* widget, const QPoint &hp); void invalidate_tick_position_cache(); void on_createMarker(); + void on_setZeroPosition(); void on_toggleHoverMarker(); private: