X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fview%2Fcursorpair.hpp;h=110f9ea087c046fc6afd4c859f715e979cdbbd2c;hp=4361784a7a0a3d43e4e730add4217269bcb23b67;hb=455bc29ab7bf8acb9b3520f8a59b8365309134ac;hpb=be7170664b80552fdfb38da1c214c271cbf116aa

diff --git a/pv/view/cursorpair.hpp b/pv/view/cursorpair.hpp
index 4361784a..110f9ea0 100644
--- a/pv/view/cursorpair.hpp
+++ b/pv/view/cursorpair.hpp
@@ -18,8 +18,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-#ifndef PULSEVIEW_PV_VIEW_CURSORPAIR_H
-#define PULSEVIEW_PV_VIEW_CURSORPAIR_H
+#ifndef PULSEVIEW_PV_VIEWS_TRACEVIEW_CURSORPAIR_HPP
+#define PULSEVIEW_PV_VIEWS_TRACEVIEW_CURSORPAIR_HPP
 
 #include "cursor.hpp"
 
@@ -30,7 +30,8 @@
 class QPainter;
 
 namespace pv {
-namespace view {
+namespace views {
+namespace TraceView {
 
 class CursorPair : public TimeItem
 {
@@ -49,7 +50,7 @@ public:
 	/**
 	 * Returns true if the item is visible and enabled.
 	 */
-	bool enabled() const;
+	bool enabled() const override;
 
 	/**
 	 * Returns a pointer to the first cursor.
@@ -64,16 +65,16 @@ public:
 	/**
 	 * Sets the time of the marker.
 	 */
-	void set_time(double time);
+	void set_time(const pv::util::Timestamp& time) override;
 
-	float get_x() const;
+	float get_x() const override;
 
-	QPoint point(const QRect &rect) const;
+	QPoint point(const QRect &rect) const override;
 
-	pv::widgets::Popup* create_popup(QWidget *parent);
+	pv::widgets::Popup* create_popup(QWidget *parent) override;
 
 public:
-	QRectF label_rect(const QRectF &rect) const;
+	QRectF label_rect(const QRectF &rect) const override;
 
 	/**
 	 * Paints the marker's label to the ruler.
@@ -81,16 +82,21 @@ public:
 	 * @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, bool hover);
+	void paint_label(QPainter &p, const QRect &rect, bool hover) override;
 
 	/**
 	 * Paints the background 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_back(QPainter &p, const ViewItemPaintParams &pp);
+	 */
+	void paint_back(QPainter &p, const ViewItemPaintParams &pp) override;
+
+	/**
+	 * Constructs the string to display.
+	 */
+	QString format_string();
 
-	void compute_text_size(QPainter &p, unsigned int prefix);
+	void compute_text_size(QPainter &p);
 
 	std::pair<float, float> get_cursor_offsets() const;
 
@@ -100,7 +106,8 @@ private:
 	QSizeF text_size_;
 };
 
-} // namespace view
+} // namespace TraceView
+} // namespace views
 } // namespace pv
 
-#endif // PULSEVIEW_PV_VIEW_CURSORPAIR_H
+#endif // PULSEVIEW_PV_VIEWS_TRACEVIEW_CURSORPAIR_HPP