X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=pv%2Fview%2Ftimemarker.hpp;h=113a6a10a6f04c097d2bc9d828e1f516f63fa2f0;hb=208c6fc371951fe74ba5a08a0950f2837eef8b7b;hp=93c7dc90940928c74f208784b290c6a50b3b5b77;hpb=3b84fd6d59b10053d5ffba90f8e66324f49841a3;p=pulseview.git

diff --git a/pv/view/timemarker.hpp b/pv/view/timemarker.hpp
index 93c7dc90..113a6a10 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,13 +37,12 @@ namespace view {
 
 class View;
 
-class TimeMarker : public SelectableItem
+class TimeMarker : public TimeItem
 {
 	Q_OBJECT
 
 public:
 	static const int ArrowSize;
-	static const int Offset;
 
 protected:
 	/**
@@ -68,46 +67,51 @@ public:
 	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);
+
+	/**
+	 * 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);
 
-	pv::widgets::Popup* create_popup(QWidget *parent);
+	virtual pv::widgets::Popup* create_popup(QWidget *parent);
 
 private Q_SLOTS:
 	void on_value_changed(double value);
 
-Q_SIGNALS:
-	void time_changed();
-
 protected:
-	View &view_;
 	const QColor &colour_;
 
 	double time_;