Removed TimeMarker copy constructor

[pulseview.git] / pv / view / timemarker.h

diff --git a/pv/view/timemarker.h b/pv/view/timemarker.h
index 08ed93890b6e4f8647e1855b08162f133387955f..2536db75b649694a05a3fe919c3eb7dd524fef27 100644 (file)
--- a/pv/view/timemarker.h
+++ b/pv/view/timemarker.h
@@ -25,6 +25,8 @@
 #include <QObject>
 #include <QRectF>
 
+#include "selectableitem.h"
+
 class QPainter;
 class QRect;
 
@@ -33,7 +35,7 @@ namespace view {
 
 class View;
 
-class TimeMarker : public QObject
+class TimeMarker : public SelectableItem
 {
        Q_OBJECT
 
@@ -46,11 +48,6 @@ protected:
         */
        TimeMarker(const View &view, const QColor &colour, double time);
 
-       /**
-        * Copy constructor
-        */
-       TimeMarker(const TimeMarker &s);
-
 public:
        /**
         * Gets the time of the marker.
@@ -80,8 +77,10 @@ public:
         * 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 prefix The SI prefix to paint time value with.
         */
-       virtual void paint_label(QPainter &p, const QRect &rect) = 0;
+       virtual void paint_label(QPainter &p, const QRect &rect,
+               unsigned int prefix) = 0;
 
 signals:
        void time_changed();
@@ -91,9 +90,11 @@ protected:
        const QColor &_colour;
 
        double _time;
+
+       QSizeF _text_size;
 };
 
 } // namespace view
 } // namespace pv
 
-#endif // PULSEVIEW_PV_VIEW_MARKER_H
\ No newline at end of file
+#endif // PULSEVIEW_PV_VIEW_MARKER_H