View: Removed selected_items

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

diff --git a/pv/view/view.h b/pv/view/view.h
index 6f1e87288bd1dd14f40568f86198ea39f0a3a7bc..cc06f80dae12ac19dccdb7f00ca0c7971a1d7368 100644 (file)
--- a/pv/view/view.h
+++ b/pv/view/view.h
@@ -23,15 +23,17 @@
 
 #include <stdint.h>
 
+#include <memory>
+#include <set>
 #include <vector>
 
-#include <boost/shared_ptr.hpp>
-#include <boost/weak_ptr.hpp>
-
 #include <QAbstractScrollArea>
 #include <QSizeF>
 
+#include <pv/data/signaldata.h>
+
 #include "cursorpair.h"
+#include "rowitemowner.h"
 
 namespace pv {
 
@@ -39,12 +41,12 @@ class SigSession;
 
 namespace view {
 
+class CursorHeader;
 class Header;
 class Ruler;
-class Trace;
 class Viewport;
 
-class View : public QAbstractScrollArea {
+class View : public QAbstractScrollArea, public RowItemOwner {
        Q_OBJECT
 
 private:
@@ -68,6 +70,20 @@ public:
        SigSession& session();
        const SigSession& session() const;
 
+       /**
+        * Returns the view of the owner.
+        */
+       virtual pv::view::View* view();
+
+       /**
+        * Returns the view of the owner.
+        */
+       virtual const pv::view::View* view() const;
+
+       Viewport* viewport();
+
+       const Viewport* viewport() const;
+
        /**
         * Returns the view time scale in seconds per pixel.
         */
@@ -78,7 +94,7 @@ public:
         * seconds.
         */
        double offset() const;
-       int v_offset() const;
+       int owner_v_offset() const;
 
        void zoom(double steps);
        void zoom(double steps, int offset);
@@ -94,9 +110,10 @@ public:
         */
        void set_scale_offset(double scale, double offset);
 
-       std::vector< boost::shared_ptr<Trace> > get_traces() const;
+       std::set< std::shared_ptr<pv::data::SignalData> >
+               get_visible_data() const;
 
-       std::list<boost::weak_ptr<SelectableItem> > selected_items() const;
+       std::pair<double, double> get_time_extents() const;
 
        /**
         * Returns true if cursors are displayed. false otherwise.
@@ -129,7 +146,7 @@ public:
 
        void update_viewport();
 
-signals:
+Q_SIGNALS:
        void hover_point_changed();
 
        void signals_moved();
@@ -140,16 +157,35 @@ signals:
 
 private:
        void get_scroll_layout(double &length, double &offset) const;
-       
+
+       /**
+        * Simultaneously sets the zoom and offset.
+        * @param scale The scale to set the view to in seconds per pixel. This
+        * value is clamped between MinScale and MaxScale.
+        * @param offset The offset of the left edge of the view in seconds.
+        */
        void set_zoom(double scale, int offset);
 
        void update_scroll();
 
        void update_layout();
 
-       static bool compare_trace_v_offsets(
-               const boost::shared_ptr<pv::view::Trace> &a,
-               const boost::shared_ptr<pv::view::Trace> &b);
+       /**
+        * Satisifies RowItem functionality.
+        * @param p the QPainter to paint into.
+        * @param right the x-coordinate of the right edge of the header
+        *      area.
+        * @param hover true if the label is being hovered over by the mouse.
+        */
+       void paint_label(QPainter &p, int right, bool hover);
+
+       /**
+        * Computes the outline rectangle of a label.
+        * @param right the x-coordinate of the right edge of the header
+        *      area.
+        * @return Returns the rectangle of the signal label.
+        */
+       QRectF label_rect(int right);
 
 private:
        bool eventFilter(QObject *object, QEvent *event);
@@ -158,7 +194,7 @@ private:
 
        void resizeEvent(QResizeEvent *e);
 
-private slots:
+private Q_SLOTS:
 
        void h_scroll_value_changed(int value);
        void v_scroll_value_changed(int value);
@@ -172,15 +208,16 @@ private slots:
 
        void on_geometry_updated();
 
+       void on_hover_point_changed();
+
 private:
        SigSession &_session;
 
        Viewport *_viewport;
        Ruler *_ruler;
+       CursorHeader *_cursorheader;
        Header *_header;
 
-       uint64_t _data_length;
-
        /// The view time scale in seconds per pixel.
        double _scale;