X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=pv%2Fview%2Fcursorpair.hpp;h=e63113c051b4befab10fda64751e5842bc67b058;hb=a2b9ac403cb540b5c6499d00d3d376384ec6c94f;hp=2c4d5c1c70be67a37a176b38fa41e21811a8a24c;hpb=3b9c4a0df39e718ba69f3c778b51676617aeb1eb;p=pulseview.git

diff --git a/pv/view/cursorpair.hpp b/pv/view/cursorpair.hpp
index 2c4d5c1c..e63113c0 100644
--- a/pv/view/cursorpair.hpp
+++ b/pv/view/cursorpair.hpp
@@ -14,12 +14,11 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#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,12 +29,14 @@
 class QPainter;
 
 namespace pv {
-namespace view {
+namespace views {
+namespace TraceView {
 
 class CursorPair : public TimeItem
 {
 private:
 	static const int DeltaPadding;
+	static const QColor ViewportFillColour;
 
 public:
 	/**
@@ -48,7 +49,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.
@@ -63,22 +64,38 @@ public:
 	/**
 	 * Sets the time of the marker.
 	 */
-	void set_time(double time);
+	void set_time(const pv::util::Timestamp& time) override;
 
-	QPoint point() const;
+	float get_x() const override;
 
-	pv::widgets::Popup* create_popup(QWidget *parent);
+	QPoint point(const QRect &rect) const override;
+
+	pv::widgets::Popup* create_popup(QWidget *parent) override;
 
 public:
-	QRectF label_rect(const QRectF &rect) const;
+	QRectF label_rect(const QRectF &rect) const override;
 
-	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) override;
 
-	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) override;
 
-	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;
 
@@ -88,7 +105,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