Revert "Make traces non-draggable outside the header area"

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

diff --git a/pv/view/cursorpair.hpp b/pv/view/cursorpair.hpp
index fc9f0d1ba6f4a4edc718e869bfe61dd381588641..345700fa3c96c557dd4b36697af4e8091a2906ad 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"
 
@@ -36,6 +36,7 @@ class CursorPair : public TimeItem
 {
 private:
        static const int DeltaPadding;
+       static const QColor ViewportFillColour;
 
 public:
        /**
@@ -63,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);
 
@@ -86,10 +87,15 @@ public:
         * 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 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;
 
@@ -102,4 +108,4 @@ private:
 } // namespace view
 } // namespace pv
 
-#endif // PULSEVIEW_PV_VIEW_CURSORPAIR_H
+#endif // PULSEVIEW_PV_VIEW_CURSORPAIR_HPP