X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=pv%2Fviews%2Ftrace%2Fcursorpair.hpp;h=0a5ff4cb782e7bca07607b90b112587fc3a955e7;hb=2bdc5796c866b9494b2c40051e973e4385d9c46f;hp=5d53bacfd3ad839c825e6fbc90a33b21569a34cd;hpb=a3d5a7c7682ebb991718b49ae916c5840b3b6b51;p=pulseview.git

diff --git a/pv/views/trace/cursorpair.hpp b/pv/views/trace/cursorpair.hpp
index 5d53bacf..0a5ff4cb 100644
--- a/pv/views/trace/cursorpair.hpp
+++ b/pv/views/trace/cursorpair.hpp
@@ -21,10 +21,13 @@
 #define PULSEVIEW_PV_VIEWS_TRACEVIEW_CURSORPAIR_HPP
 
 #include "cursor.hpp"
+#include "pv/globalsettings.hpp"
 
 #include <memory>
 
+#include <QColor>
 #include <QPainter>
+#include <QRect>
 
 using std::pair;
 using std::shared_ptr;
@@ -35,11 +38,14 @@ namespace pv {
 namespace views {
 namespace trace {
 
-class CursorPair : public TimeItem
+class View;
+
+class CursorPair : public TimeItem, public GlobalSettingsInterface
 {
+	Q_OBJECT
+
 private:
 	static const int DeltaPadding;
-	static const QColor ViewportFillColour;
 
 public:
 	/**
@@ -48,7 +54,8 @@ public:
 	 */
 	CursorPair(View &view);
 
-public:
+	~CursorPair();
+
 	/**
 	 * Returns true if the item is visible and enabled.
 	 */
@@ -69,13 +76,16 @@ public:
 	 */
 	void set_time(const pv::util::Timestamp& time) override;
 
+	virtual const pv::util::Timestamp time() const override;
+
 	float get_x() const override;
 
+	virtual const pv::util::Timestamp delta(const pv::util::Timestamp& other) const override;
+
 	QPoint drag_point(const QRect &rect) const override;
 
 	pv::widgets::Popup* create_popup(QWidget *parent) override;
 
-public:
 	QRectF label_rect(const QRectF &rect) const override;
 
 	/**
@@ -96,16 +106,26 @@ public:
 	/**
 	 * Constructs the string to display.
 	 */
-	QString format_string();
-
-	void compute_text_size(QPainter &p);
+	QString format_string(int max_width = 0, std::function<double(const QString&)> query_size
+		= [](const QString& s) -> double { (void)s; return 0; });
 
 	pair<float, float> get_cursor_offsets() const;
 
+	virtual void on_setting_changed(const QString &key, const QVariant &value) override;
+
+public Q_SLOTS:
+	void on_hover_point_changed(const QWidget* widget, const QPoint &hp);
+
+private:
+	QString format_string_sub(int time_precision, int freq_precision, bool show_unit = true);
+
 private:
 	shared_ptr<Cursor> first_, second_;
+	QColor fill_color_;
 
 	QSizeF text_size_;
+	QRectF label_area_;
+	bool label_incomplete_;
 };
 
 } // namespace trace