Change namespace for the trace view and implement ViewBase

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

diff --git a/pv/view/timeitem.hpp b/pv/view/timeitem.hpp
index 8374244215807b5c34e4433c441c8f4a19582e6d..35cbab3f097e8af5d76359aa947d93ed17e0ebd2 100644 (file)
--- a/pv/view/timeitem.hpp
+++ b/pv/view/timeitem.hpp
@@ -18,13 +18,14 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-#ifndef PULSEVIEW_PV_VIEW_TIMEITEM_H
-#define PULSEVIEW_PV_VIEW_TIMEITEM_H
+#ifndef PULSEVIEW_PV_VIEWS_TRACEVIEW_TIMEITEM_HPP
+#define PULSEVIEW_PV_VIEWS_TRACEVIEW_TIMEITEM_HPP
 
 #include "viewitem.hpp"
 
 namespace pv {
-namespace view {
+namespace views {
+namespace TraceView {
 
 class View;
 
@@ -44,22 +45,22 @@ public:
        /**
         * Sets the time of the marker.
         */
-       virtual void set_time(double time) = 0;
+       virtual void set_time(const pv::util::Timestamp& time) = 0;
 
        virtual float get_x() const = 0;
 
        /**
-        * Paints the marker's label to the ruler.
-        * @param p The painter to draw with.
-        * @param rect The rectangle of the ruler client area.
+        * Drags the item to a delta relative to the drag point.
+        * @param delta the offset from the drag point.
         */
-       virtual void paint_label(QPainter &p, const QRect &rect) = 0;
+       void drag_by(const QPoint &delta);
 
 protected:
        View &view_;
 };
 
-} // namespace view
+} // namespace TraceView
+} // namespace views
 } // namespace pv
 
-#endif // PULSEVIEW_PV_VIEW_TIMEITEM_H
+#endif // PULSEVIEW_PV_VIEWS_TRACEVIEW_TIMEITEM_HPP