X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fview%2Fcursorpair.hpp;h=345700fa3c96c557dd4b36697af4e8091a2906ad;hp=43e06545ad4fd94cfe6690dc473906fa9fd3d910;hb=796e136093befc76f6c223afff1c1221182cf5dd;hpb=5165bb349b14802ca98766b4cecee3699d22fa55

diff --git a/pv/view/cursorpair.hpp b/pv/view/cursorpair.hpp
index 43e06545..345700fa 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_VIEW_CURSORPAIR_HPP
+#define PULSEVIEW_PV_VIEW_CURSORPAIR_HPP
 
 #include "cursor.hpp"
 
@@ -36,6 +36,7 @@ class CursorPair : public TimeItem
 {
 private:
 	static const int DeltaPadding;
+	static const QColor ViewportFillColour;
 
 public:
 	/**
@@ -63,24 +64,38 @@ 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;
 
-	QPoint point() const;
+	QPoint point(const QRect &rect) const;
 
 	pv::widgets::Popup* create_popup(QWidget *parent);
 
 public:
 	QRectF label_rect(const QRectF &rect) const;
 
-	void draw_markers(QPainter &p, const QRect &rect);
+	/**
+	 * 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, bool hover);
 
-	void draw_viewport_background(QPainter &p, const QRect &rect);
+	/**
+	 * 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 draw_viewport_foreground(QPainter &p, const QRect &rect);
+	/**
+	 * 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;
 
@@ -93,4 +108,4 @@ private:
 } // namespace view
 } // namespace pv
 
-#endif // PULSEVIEW_PV_VIEW_CURSORPAIR_H
+#endif // PULSEVIEW_PV_VIEW_CURSORPAIR_HPP