X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=pv%2Fviews%2Ftrace%2Ftimemarker.hpp;h=040a29ea78605fadcd5c2723ac37019b9691cca9;hb=c259400566cecf3b6ca959bc60c671a7195c0078;hp=1a2abb3251e7bc3a8a3caa6e4d63b150141ecffd;hpb=1373fec59223e7511078abe3dbf4a6b61b4af234;p=pulseview.git
diff --git a/pv/views/trace/timemarker.hpp b/pv/views/trace/timemarker.hpp
index 1a2abb32..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 .
*/
-#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
#include
@@ -56,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.
@@ -99,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.
@@ -120,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_;
@@ -128,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