X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=pv%2Fviews%2Ftrace%2Fcursorpair.hpp;h=ba6b2a7097590120942ad530325bf48bb4321aa0;hb=2823de2c821f01b9b6d8df7fc972e290518075ae;hp=1dc66a32b8eef8bd622c199e75f9ddf09872dd65;hpb=ef85cfa4599d3741e7007921e39a44490e97cfaf;p=pulseview.git

diff --git a/pv/views/trace/cursorpair.hpp b/pv/views/trace/cursorpair.hpp
index 1dc66a32..ba6b2a70 100644
--- a/pv/views/trace/cursorpair.hpp
+++ b/pv/views/trace/cursorpair.hpp
@@ -17,8 +17,8 @@
  * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef PULSEVIEW_PV_VIEWS_TRACEVIEW_CURSORPAIR_HPP
-#define PULSEVIEW_PV_VIEWS_TRACEVIEW_CURSORPAIR_HPP
+#ifndef PULSEVIEW_PV_VIEWS_TRACE_CURSORPAIR_HPP
+#define PULSEVIEW_PV_VIEWS_TRACE_CURSORPAIR_HPP
 
 #include "cursor.hpp"
 #include "pv/globalsettings.hpp"
@@ -76,12 +76,18 @@ 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;
 
+	QMenu* create_header_context_menu(QWidget *parent) override;
+
 	QRectF label_rect(const QRectF &rect) const override;
 
 	/**
@@ -102,8 +108,8 @@ public:
 	/**
 	 * Constructs the string to display.
 	 */
-	QString format_string(qreal max_width = 0, std::function<qreal(const QString&)> query_size
-			= [](const QString& s) -> qreal { Q_UNUSED(s); return 0; });
+	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;
 
@@ -112,6 +118,9 @@ public:
 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_;
@@ -119,10 +128,11 @@ private:
 	QSizeF text_size_;
 	QRectF label_area_;
 	bool label_incomplete_;
+	bool show_interval_, show_frequency_, show_samples_;
 };
 
 } // namespace trace
 } // namespace views
 } // namespace pv
 
-#endif // PULSEVIEW_PV_VIEWS_TRACEVIEW_CURSORPAIR_HPP
+#endif // PULSEVIEW_PV_VIEWS_TRACE_CURSORPAIR_HPP