Session: Removed signals_mutex(), and made signals() return a copy not a reference

[pulseview.git] / pv / view / cursorpair.hpp

diff --git a/pv/view/cursorpair.hpp b/pv/view/cursorpair.hpp
index 7e089083f0d34ecb426c8b2de3977cc799a01934..2d47212ef77f1879ff3e7e9b0c761d609b33394c 100644 (file)
--- 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"
 
@@ -64,11 +64,11 @@ 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);
 
@@ -90,7 +90,12 @@ public:
         **/
        void paint_back(QPainter &p, const ViewItemPaintParams &pp);
 
-       void compute_text_size(QPainter &p, unsigned int prefix);
+       /**
+        * Constructs the string to display.
+        */
+       QString format_string();
+
+       void compute_text_size(QPainter &p);
 
        std::pair<float, float> get_cursor_offsets() const;
 
@@ -103,4 +108,4 @@ private:
 } // namespace view
 } // namespace pv
 
-#endif // PULSEVIEW_PV_VIEW_CURSORPAIR_H
+#endif // PULSEVIEW_PV_VIEW_CURSORPAIR_HPP