Change namespace for the trace view and implement ViewBase

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

diff --git a/pv/view/viewport.hpp b/pv/view/viewport.hpp
index 78dfbb24bbfd485f7f12ae1f211145af06d8e933..a8062fb650c6e9f8fe11d93c29fd6f4dbb6e3bc7 100644 (file)
--- a/pv/view/viewport.hpp
+++ b/pv/view/viewport.hpp
@@ -18,12 +18,15 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-#ifndef PULSEVIEW_PV_VIEW_VIEWPORT_H
-#define PULSEVIEW_PV_VIEW_VIEWPORT_H
+#ifndef PULSEVIEW_PV_VIEWS_TRACEVIEW_VIEWPORT_HPP
+#define PULSEVIEW_PV_VIEWS_TRACEVIEW_VIEWPORT_HPP
+
+#include <boost/optional.hpp>
 
 #include <QTimer>
 #include <QTouchEvent>
 
+#include "pv/util.hpp"
 #include "viewwidget.hpp"
 
 class QPainter;
@@ -31,7 +34,8 @@ class QPaintEvent;
 class Session;
 
 namespace pv {
-namespace view {
+namespace views {
+namespace TraceView {
 
 class View;
 
@@ -48,7 +52,7 @@ private:
         * @param item The item that is being hovered over, or @c nullptr
         * if no view item is being hovered over.
         */
-       void item_hover(const std::shared_ptr<pv::view::ViewItem> &item);
+       void item_hover(const std::shared_ptr<ViewItem> &item);
 
        /**
         * Gets the first view item which has a hit-box that contains @c pt .
@@ -56,8 +60,7 @@ private:
         * @return the view item that has been found, or and empty
         *   @c shared_ptr if no item was found.
         */
-       std::shared_ptr<pv::view::ViewItem> get_mouse_over_item(
-               const QPoint &pt);
+       std::shared_ptr<ViewItem> get_mouse_over_item(const QPoint &pt);
 
        /**
         * Sets this item into the dragged state.
@@ -78,29 +81,31 @@ private:
        /**
         * Gets the items in the view widget.
         */
-       std::vector< std::shared_ptr<pv::view::ViewItem> > items();
+       std::vector< std::shared_ptr<ViewItem> > items();
 
        /**
         * Handles touch begin update and end events.
         * @param e the event that triggered this handler.
         */
-       bool touch_event(QTouchEvent *e);
+       bool touch_event(QTouchEvent *event);
 
 private:
        void paintEvent(QPaintEvent *event);
 
-       void mouseDoubleClickEvent(QMouseEvent * event);
+       void mouseDoubleClickEvent(QMouseEvent *event);
        void wheelEvent(QWheelEvent *event);
 
 private:
-       double drag_offset_;
+       boost::optional<pv::util::Timestamp> drag_offset_;
+       int drag_v_offset_;
 
        double pinch_offset0_;
        double pinch_offset1_;
        bool pinch_zoom_active_;
 };
 
-} // namespace view
+} // namespace TraceView
+} // namespace views
 } // namespace pv
 
-#endif // PULSEVIEW_PV_VIEW_VIEWPORT_H
+#endif // PULSEVIEW_PV_VIEWS_TRACEVIEW_VIEWPORT_HPP