X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=pv%2Fviews%2Ftrace%2Fruler.hpp;h=55c156f5942e34f8a97912322b25a3b2df4c669b;hb=20c99cfc69d3c7430817abd9a1f810698deb4a18;hp=b14148728c579b8c8f2885c8a76859fae976a3ca;hpb=e23567ed84aa55e2a0c48252080058186f6b80e7;p=pulseview.git
diff --git a/pv/views/trace/ruler.hpp b/pv/views/trace/ruler.hpp
index b1414872..55c156f5 100644
--- a/pv/views/trace/ruler.hpp
+++ b/pv/views/trace/ruler.hpp
@@ -17,8 +17,8 @@
* along with this program; if not, see .
*/
-#ifndef PULSEVIEW_PV_VIEWS_TRACEVIEW_RULER_HPP
-#define PULSEVIEW_PV_VIEWS_TRACEVIEW_RULER_HPP
+#ifndef PULSEVIEW_PV_VIEWS_TRACE_RULER_HPP
+#define PULSEVIEW_PV_VIEWS_TRACE_RULER_HPP
#include
#include
@@ -117,11 +117,18 @@ public:
unsigned precision = 0,
bool sign = true);
- pv::util::Timestamp get_time_from_x_pos(uint32_t x) const;
+ 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;
+
+ shared_ptr get_reference_item() const;
protected:
virtual void contextMenuEvent(QContextMenuEvent *event) override;
void resizeEvent(QResizeEvent*) override;
+ virtual void item_hover(const shared_ptr &item, QPoint pos) override;
private:
/**
@@ -177,6 +184,7 @@ private Q_SLOTS:
void on_createMarker();
void on_setZeroPosition();
+ void on_resetZeroPosition();
void on_toggleHoverMarker();
private:
@@ -186,6 +194,8 @@ private:
*/
boost::optional tick_position_cache_;
+ shared_ptr hover_item_;
+
uint32_t context_menu_x_pos_;
};
@@ -193,4 +203,4 @@ private:
} // namespace views
} // namespace pv
-#endif // PULSEVIEW_PV_VIEWS_TRACEVIEW_RULER_HPP
+#endif // PULSEVIEW_PV_VIEWS_TRACE_RULER_HPP