X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fview%2Ftimemarker.hpp;h=38dfa18e61d69a6b1e679c8ffd1b1498bbf22231;hp=1c0703a43adf2fc2a409fcd3a1a72692591cdebd;hb=4a5c385ee6a9ce387e0fe908f4d9367aa96d8342;hpb=361c560ed9ef67278916e086ed0b0649ae01b583

diff --git a/pv/view/timemarker.hpp b/pv/view/timemarker.hpp
index 1c0703a4..38dfa18e 100644
--- a/pv/view/timemarker.hpp
+++ b/pv/view/timemarker.hpp
@@ -27,7 +27,7 @@
 #include <QRectF>
 #include <QWidgetAction>
 
-#include "selectableitem.hpp"
+#include "timeitem.hpp"
 
 class QPainter;
 class QRect;
@@ -37,10 +37,14 @@ namespace view {
 
 class View;
 
-class TimeMarker : public SelectableItem
+class TimeMarker : public TimeItem
 {
 	Q_OBJECT
 
+public:
+	static const int ArrowSize;
+	static const int Offset;
+
 protected:
 	/**
 	 * Constructor.
@@ -76,18 +80,23 @@ public:
 	virtual void paint(QPainter &p, const QRect &rect);
 
 	/**
-	 * Gets the marker label rectangle.
-	 * @param rect The rectangle of the ruler client area.
-	 * @return Returns the label rectangle.
+	 * 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;
+
+	/**
+	 * Gets the text to show in the marker.
 	 */
-	virtual QRectF get_label_rect(const QRect &rect) const = 0;
+	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.
 	 */
-	virtual void paint_label(QPainter &p, const QRect &rect) = 0;
+	void paint_label(QPainter &p, const QRect &rect);
 
 	pv::widgets::Popup* create_popup(QWidget *parent);
 
@@ -98,7 +107,6 @@ Q_SIGNALS:
 	void time_changed();
 
 protected:
-	View &view_;
 	const QColor &colour_;
 
 	double time_;