X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fviews%2Ftrace%2Ftimemarker.hpp;h=040a29ea78605fadcd5c2723ac37019b9691cca9;hp=7c49948b497179a29a32fd22cfcc3e633c2a78f1;hb=8845be3c9c7d5aca02fb2efc4038f4735a5242d6;hpb=1573bf16ba50d1c023ad3a9ce596f0ab6eaeacff

diff --git a/pv/views/trace/timemarker.hpp b/pv/views/trace/timemarker.hpp
index 7c49948b..040a29ea 100644
--- a/pv/views/trace/timemarker.hpp
+++ b/pv/views/trace/timemarker.hpp
@@ -17,8 +17,8 @@
  * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef PULSEVIEW_PV_VIEWS_TRACEVIEW_MARKER_HPP
-#define PULSEVIEW_PV_VIEWS_TRACEVIEW_MARKER_HPP
+#ifndef PULSEVIEW_PV_VIEWS_TRACE_TIMEMARKER_HPP
+#define PULSEVIEW_PV_VIEWS_TRACE_TIMEMARKER_HPP
 
 #include <QColor>
 #include <QDoubleSpinBox>
@@ -41,6 +41,10 @@ namespace trace {
 
 class View;
 
+/**
+ * The TimeMarker class represents items on the @ref Ruler that highlight a
+ * single point in time to the user. Aside from this, it is generic in nature.
+ */
 class TimeMarker : public TimeItem
 {
 	Q_OBJECT
@@ -52,16 +56,16 @@ protected:
 	/**
 	 * Constructor.
 	 * @param view A reference to the view that owns this marker.
-	 * @param colour A reference to the colour of this cursor.
+	 * @param color A reference to the color of this cursor.
 	 * @param time The time to set the flag to.
 	 */
-	TimeMarker(View &view, const QColor &colour, const pv::util::Timestamp& time);
+	TimeMarker(View &view, const QColor &color, const pv::util::Timestamp& time);
 
 public:
 	/**
 	 * Gets the time of the marker.
 	 */
-	const pv::util::Timestamp& time() const;
+	virtual const pv::util::Timestamp time() const override;
 
 	/**
 	 * Sets the time of the marker.
@@ -74,7 +78,7 @@ public:
 	 * Gets the arrow-tip point of the time marker.
 	 * @param rect the rectangle of the ruler area.
 	 */
-	QPoint point(const QRect &rect) const override;
+	QPoint drag_point(const QRect &rect) const override;
 
 	/**
 	 * Computes the outline rectangle of a label.
@@ -95,6 +99,11 @@ public:
 	 */
 	virtual QString get_text() const = 0;
 
+	/**
+	 * Sets the text to show in the marker.
+	 */
+	virtual void set_text(const QString &text);
+
 	/**
 	 * Paints the marker's label to the ruler.
 	 * @param p The painter to draw with.
@@ -116,7 +125,7 @@ private Q_SLOTS:
 	void on_value_changed(const pv::util::Timestamp& value);
 
 protected:
-	const QColor &colour_;
+	const QColor &color_;
 
 	pv::util::Timestamp time_;
 
@@ -124,11 +133,10 @@ protected:
 
 	QWidgetAction *value_action_;
 	pv::widgets::TimestampSpinBox *value_widget_;
-	bool updating_value_widget_;
 };
 
 } // namespace trace
 } // namespace views
 } // namespace pv
 
-#endif // PULSEVIEW_PV_VIEWS_TRACEVIEW_MARKER_HPP
+#endif // PULSEVIEW_PV_VIEWS_TRACE_TIMEMARKER_HPP