X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fview%2Ftimemarker.hpp;h=371b6e4a54ce607edbdfd7dc3ead53c55e9ae447;hp=24688ebc2e3d91a6ef319e932948026971668198;hb=806d3e1eb3d60e93ff95d23e79588a0486730967;hpb=ad341c3a893c66cfd59ac66eedb1de405ed0dbbb

diff --git a/pv/view/timemarker.hpp b/pv/view/timemarker.hpp
index 24688ebc..371b6e4a 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_VIEW_MARKER_HPP
+#define PULSEVIEW_PV_VIEW_MARKER_HPP
 
 #include <QColor>
 #include <QDoubleSpinBox>
@@ -33,6 +33,10 @@ class QPainter;
 class QRect;
 
 namespace pv {
+namespace widgets {
+	class TimestampSpinBox;
+}
+
 namespace view {
 
 class View;
@@ -43,7 +47,6 @@ class TimeMarker : public TimeItem
 
 public:
 	static const int ArrowSize;
-	static const int Offset;
 
 protected:
 	/**
@@ -52,73 +55,79 @@ 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;
 
 	/**
-	 * Paints the marker to the viewport.
-	 * @param p The painter to draw with.
-	 * @param rect The rectangle of the viewport client area.
+	 * Computes the outline rectangle of a label.
+	 * @param rect the rectangle of the header area.
+	 * @return Returns the rectangle of the signal label.
 	 */
-	virtual void paint(QPainter &p, const QRect &rect);
+	QRectF label_rect(const QRectF &rect) const;
 
 	/**
-	 * Gets the text to show in the marker.
+	 * 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.
 	 */
-	virtual QString get_text() const = 0;
+	QRectF hit_box_rect(const QRectF &rect) const;
 
 	/**
-	 * Gets the marker label rectangle.
-	 * @param rect The rectangle of the ruler client area.
-	 * @return Returns the label rectangle.
+	 * Gets the text to show in the marker.
 	 */
-	virtual QRectF get_label_rect(const QRect &rect) const;
+	virtual QString get_text() const = 0;
 
 	/**
 	 * 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);
 
-	pv::widgets::Popup* create_popup(QWidget *parent);
+	/**
+	 * 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);
 
-private Q_SLOTS:
-	void on_value_changed(double value);
+	virtual pv::widgets::Popup* create_popup(QWidget *parent);
 
-Q_SIGNALS:
-	void time_changed();
+private Q_SLOTS:
+	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 pv
 
-#endif // PULSEVIEW_PV_VIEW_MARKER_H
+#endif // PULSEVIEW_PV_VIEW_MARKER_HPP