Use a type with a greater resolution to represent time values

[pulseview.git] / pv / view / timemarker.hpp

diff --git a/pv/view/timemarker.hpp b/pv/view/timemarker.hpp
index 4e5d92e6c6a75efee20a0283b36676c6d8d4cb86..10e3331c639ba4eee64bd146d1ea1d07c7fdd49c 100644 (file)
--- a/pv/view/timemarker.hpp
+++ b/pv/view/timemarker.hpp
@@ -18,8 +18,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-#ifndef PULSEVIEW_PV_VIEW_MARKER_H
-#define PULSEVIEW_PV_VIEW_MARKER_H
+#ifndef PULSEVIEW_PV_VIEW_MARKER_HPP
+#define PULSEVIEW_PV_VIEW_MARKER_HPP
 
 #include <QColor>
 #include <QDoubleSpinBox>
@@ -51,25 +51,26 @@ protected:
         * @param colour A reference to the colour of this cursor.
         * @param time The time to set the flag to.
         */
-       TimeMarker(View &view, const QColor &colour, double time);
+       TimeMarker(View &view, const QColor &colour, const pv::util::Timestamp& time);
 
 public:
        /**
         * Gets the time of the marker.
         */
-       double time() const;
+       const pv::util::Timestamp& time() const;
 
        /**
         * Sets the time of the marker.
         */
-       void set_time(double time);
+       void set_time(const pv::util::Timestamp& time) override;
 
        float get_x() const;
 
        /**
-        * Gets the drag point of the row item.
+        * Gets the arrow-tip point of the time marker.
+        * @param rect the rectangle of the ruler area.
         */
-       QPoint point() const;
+       QPoint point(const QRect &rect) const;
 
        /**
         * Computes the outline rectangle of a label.
@@ -78,6 +79,13 @@ public:
         */
        QRectF label_rect(const QRectF &rect) const;
 
+       /**
+        * Computes the outline rectangle of the viewport hit-box.
+        * @param rect the rectangle of the viewport area.
+        * @return Returns the rectangle of the hit-box.
+        */
+       QRectF hit_box_rect(const QRectF &rect) const;
+
        /**
         * Gets the text to show in the marker.
         */
@@ -106,7 +114,7 @@ private Q_SLOTS:
 protected:
        const QColor &colour_;
 
-       double time_;
+       pv::util::Timestamp time_;
 
        QSizeF text_size_;
 
@@ -118,4 +126,4 @@ protected:
 } // namespace view
 } // namespace pv
 
-#endif // PULSEVIEW_PV_VIEW_MARKER_H
+#endif // PULSEVIEW_PV_VIEW_MARKER_HPP