Change namespace for the trace view and implement ViewBase

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

diff --git a/pv/view/cursorpair.hpp b/pv/view/cursorpair.hpp
index af7f5556c722bc83609e72664a5b610858072d08..110f9ea087c046fc6afd4c859f715e979cdbbd2c 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_VIEWS_TRACEVIEW_CURSORPAIR_HPP
+#define PULSEVIEW_PV_VIEWS_TRACEVIEW_CURSORPAIR_HPP
 
 #include "cursor.hpp"
 
@@ -30,12 +30,14 @@
 class QPainter;
 
 namespace pv {
-namespace view {
+namespace views {
+namespace TraceView {
 
 class CursorPair : public TimeItem
 {
 private:
        static const int DeltaPadding;
+       static const QColor ViewportFillColour;
 
 public:
        /**
@@ -48,7 +50,7 @@ public:
        /**
         * Returns true if the item is visible and enabled.
         */
-       bool enabled() const;
+       bool enabled() const override;
 
        /**
         * Returns a pointer to the first cursor.
@@ -63,27 +65,38 @@ 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;
+       float get_x() const override;
 
-       QPoint point() const;
+       QPoint point(const QRect &rect) const override;
 
-       pv::widgets::Popup* create_popup(QWidget *parent);
+       pv::widgets::Popup* create_popup(QWidget *parent) override;
 
 public:
-       QRectF label_rect(const QRectF &rect) const;
+       QRectF label_rect(const QRectF &rect) const override;
 
-       void paint_label(QPainter &p, const QRect &rect);
+       /**
+        * 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 hover true if the label is being hovered over by the mouse.
+        */
+       void paint_label(QPainter &p, const QRect &rect, bool hover) override;
 
        /**
         * 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 paint_back(QPainter &p, const ViewItemPaintParams &pp) override;
+
+       /**
+        * Constructs the string to display.
+        */
+       QString format_string();
 
-       void compute_text_size(QPainter &p, unsigned int prefix);
+       void compute_text_size(QPainter &p);
 
        std::pair<float, float> get_cursor_offsets() const;
 
@@ -93,7 +106,8 @@ private:
        QSizeF text_size_;
 };
 
-} // namespace view
+} // namespace TraceView
+} // namespace views
 } // namespace pv
 
-#endif // PULSEVIEW_PV_VIEW_CURSORPAIR_H
+#endif // PULSEVIEW_PV_VIEWS_TRACEVIEW_CURSORPAIR_HPP