Change namespace for the trace view and implement ViewBase

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

diff --git a/pv/view/marginwidget.hpp b/pv/view/marginwidget.hpp
index 7df6c02d3fbebbcdf8ca5db4222e5a53c41e9713..b785877299cd49ff508354cb04f6d337d6725a4b 100644 (file)
--- a/pv/view/marginwidget.hpp
+++ b/pv/view/marginwidget.hpp
@@ -18,26 +18,27 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-#ifndef PULSEVIEW_PV_MARGINWIDGET_H
-#define PULSEVIEW_PV_MARGINWIDGET_H
+#ifndef PULSEVIEW_PV_MARGINWIDGET_HPP
+#define PULSEVIEW_PV_MARGINWIDGET_HPP
 
 #include <memory>
 
 #include <QPoint>
-#include <QWidget>
+
+#include "viewwidget.hpp"
 
 namespace pv {
-namespace view {
+namespace views {
+namespace TraceView {
 
-class View;
 class ViewItem;
 
-class MarginWidget : public QWidget
+class MarginWidget : public ViewWidget
 {
        Q_OBJECT
 
 public:
-       MarginWidget(pv::view::View &parent);
+       MarginWidget(View &parent);
 
        /**
         * The extended area that the margin widget would like to be sized to.
@@ -48,18 +49,11 @@ public:
 
 protected:
        /**
-        * Gets the items in the margin widget.
+        * Indicates the event an a view item has been clicked.
+        * @param item the view item that has been clicked.
         */
-       virtual std::vector< std::shared_ptr<pv::view::ViewItem> > items() = 0;
-
-       /**
-        * Gets the first view item which has a label that contains @c pt .
-        * @param pt the point to search with.
-        * @return the view item that has been found, or and empty
-        *   @c shared_ptr if no item was found.
-        */
-       virtual std::shared_ptr<pv::view::ViewItem> get_mouse_over_item(
-               const QPoint &pt) = 0;
+       virtual void item_clicked(
+               const std::shared_ptr<ViewItem> &item);
 
        /**
         * Shows the popup of a the specified @c ViewItem .
@@ -67,26 +61,14 @@ protected:
         */
        void show_popup(const std::shared_ptr<ViewItem> &item);
 
-private:
-       void leaveEvent(QEvent *event);
-
+protected:
        virtual void contextMenuEvent(QContextMenuEvent *event);
 
-public Q_SLOTS:
-       void clear_selection();
-
-Q_SIGNALS:
-       void selection_changed();
-
-protected:
-       pv::view::View &view_;
-       QPoint mouse_point_;
-       QPoint mouse_down_point_;
-       std::shared_ptr<ViewItem> mouse_down_item_;
-       bool dragging_;
+       virtual void keyPressEvent(QKeyEvent *event);
 };
 
-} // namespace view
+} // namespace TraceView
+} // namespace views
 } // namespace pv
 
-#endif // PULSEVIEW_PV_MARGINWIDGET_H
+#endif // PULSEVIEW_PV_MARGINWIDGET_HPP