X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fview%2Ftimemarker.h;h=ec34fb5668a1a89a6db2f03bc21753e8a0dfe4ce;hp=c02dab159dbecb93c03a9f5a2b921012e6d82c40;hb=e9213170687cf4afd14e20acdc690ff9381d94ae;hpb=3efda736308edc11468a4b59bdb28d5793902529

diff --git a/pv/view/timemarker.h b/pv/view/timemarker.h
index c02dab15..ec34fb56 100644
--- a/pv/view/timemarker.h
+++ b/pv/view/timemarker.h
@@ -22,7 +22,12 @@
 #define PULSEVIEW_PV_VIEW_MARKER_H
 
 #include <QColor>
+#include <QDoubleSpinBox>
 #include <QObject>
+#include <QRectF>
+#include <QWidgetAction>
+
+#include "selectableitem.h"
 
 class QPainter;
 class QRect;
@@ -32,7 +37,7 @@ namespace view {
 
 class View;
 
-class TimeMarker : public QObject
+class TimeMarker : public SelectableItem
 {
 	Q_OBJECT
 
@@ -43,12 +48,7 @@ protected:
 	 * @param colour A reference to the colour of this cursor.
 	 * @param time The time to set the flag to.
 	 */
-	TimeMarker(const View &view, const QColor &colour, double time);
-
-	/**
-	 * Copy constructor
-	 */
-	TimeMarker(const TimeMarker &s);
+	TimeMarker(View &view, const QColor &colour, double time);
 
 public:
 	/**
@@ -61,6 +61,8 @@ public:
 	 */
 	void set_time(double time);
 
+	float get_x() const;
+
 	/**
 	 * Paints the marker to the viewport.
 	 * @param p The painter to draw with.
@@ -68,21 +70,44 @@ 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.
+	 */
+	virtual QRectF get_label_rect(const QRect &rect) 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 prefix The SI prefix to paint time value with.
 	 */
-	virtual void paint_label(QPainter &p, const QRect &rect) = 0;
+	virtual void paint_label(QPainter &p, const QRect &rect,
+		unsigned int prefix) = 0;
+
+	pv::widgets::Popup* create_popup(QWidget *parent);
+
+private Q_SLOTS:
+	void on_value_changed(double value);
+
+Q_SIGNALS:
+	void time_changed();
 
 protected:
-	const View &_view;
+	View &_view;
 	const QColor &_colour;
 
 	double _time;
+
+	QSizeF _text_size;
+
+	QWidgetAction *_value_action;
+	QDoubleSpinBox *_value_widget;
+	bool _updating_value_widget;
 };
 
 } // namespace view
 } // namespace pv
 
-#endif // PULSEVIEW_PV_VIEW_MARKER_H
\ No newline at end of file
+#endif // PULSEVIEW_PV_VIEW_MARKER_H