X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fview%2Ftimemarker.hpp;h=2280363a4c127697b1e09759e82793e9856e4ba9;hp=864a4e3865dc007c722cedbee04179f5c437e49e;hb=f4e57597347e47a4ea58fbdc7b0a22e07f1c0ede;hpb=98cfe4e8dadad2cf710eb46fd5c85d9d0520a875

diff --git a/pv/view/timemarker.hpp b/pv/view/timemarker.hpp
index 864a4e38..2280363a 100644
--- 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_VIEWS_TRACEVIEW_MARKER_HPP
+#define PULSEVIEW_PV_VIEWS_TRACEVIEW_MARKER_HPP
 
 #include <QColor>
 #include <QDoubleSpinBox>
@@ -33,7 +33,12 @@ class QPainter;
 class QRect;
 
 namespace pv {
-namespace view {
+namespace widgets {
+	class TimestampSpinBox;
+}
+
+namespace views {
+namespace TraceView {
 
 class View;
 
@@ -43,7 +48,6 @@ class TimeMarker : public TimeItem
 
 public:
 	static const int ArrowSize;
-	static const int Offset;
 
 protected:
 	/**
@@ -52,32 +56,40 @@ 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;
+	float get_x() const override;
 
 	/**
-	 * 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 override;
 
 	/**
 	 * Computes the outline rectangle of a label.
 	 * @param rect the rectangle of the header area.
 	 * @return Returns the rectangle of the signal label.
 	 */
-	QRectF label_rect(const QRectF &rect) const;
+	QRectF label_rect(const QRectF &rect) const override;
+
+	/**
+	 * 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 ViewItemPaintParams &pp) const override;
 
 	/**
 	 * Gets the text to show in the marker.
@@ -88,34 +100,36 @@ public:
 	 * Paints the marker's label to the ruler.
 	 * @param p The painter to draw with.
 	 * @param rect The rectangle of the ruler client area.
+	 * @param hover true if the label is being hovered over by the mouse.
 	 */
-	void paint_label(QPainter &p, const QRect &rect);
+	void paint_label(QPainter &p, const QRect &rect, bool hover) override;
 
 	/**
 	 * Paints the foreground layer of the item with a QPainter
 	 * @param p the QPainter to paint into.
 	 * @param pp the painting parameters object to paint with.
-	 **/
-	void paint_fore(QPainter &p, const ViewItemPaintParams &pp);
+	 */
+	void paint_fore(QPainter &p, const ViewItemPaintParams &pp) override;
 
-	pv::widgets::Popup* create_popup(QWidget *parent);
+	virtual pv::widgets::Popup* create_popup(QWidget *parent) override;
 
 private Q_SLOTS:
-	void on_value_changed(double value);
+	void on_value_changed(const pv::util::Timestamp& value);
 
 protected:
 	const QColor &colour_;
 
-	double time_;
+	pv::util::Timestamp time_;
 
 	QSizeF text_size_;
 
 	QWidgetAction *value_action_;
-	QDoubleSpinBox *value_widget_;
+	pv::widgets::TimestampSpinBox *value_widget_;
 	bool updating_value_widget_;
 };
 
-} // namespace view
+} // namespace TraceView
+} // namespace views
 } // namespace pv
 
-#endif // PULSEVIEW_PV_VIEW_MARKER_H
+#endif // PULSEVIEW_PV_VIEWS_TRACEVIEW_MARKER_HPP