Move signals to views and make Session handle multiple views

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

diff --git a/pv/view/view.hpp b/pv/view/view.hpp
index 42fa322cc50b7e47f42ee51e1145a60ecf97c19b..d699be4ffaa37092391c8a492e6d30f82ba2849e 100644 (file)
--- a/pv/view/view.hpp
+++ b/pv/view/view.hpp
@@ -53,6 +53,7 @@ namespace view {
 class CursorHeader;
 class Header;
 class Ruler;
+class Signal;
 class Trace;
 class Viewport;
 class TriggerMarker;
@@ -81,6 +82,15 @@ public:
        Session& session();
        const Session& session() const;
 
+       /**
+        * Returns the signals contained in this view.
+        */
+       std::unordered_set< std::shared_ptr<view::Signal> > signals() const;
+
+       void clear_signals();
+
+       void add_signal(const std::shared_ptr<view::Signal> signal);
+
        /**
         * Returns the view of the owner.
         */
@@ -214,8 +224,6 @@ public:
 
        const QPoint& hover_point() const;
 
-       void update_viewport();
-
        void restack_all_trace_tree_items();
 
 Q_SIGNALS:
@@ -273,30 +281,15 @@ private:
 
        void update_layout();
 
-       /**
-        * Satisfies TraceTreeItem functionality.
-        * @param p the QPainter to paint into.
-        * @param rect the rectangle of the header area.
-        * @param hover true if the label is being hovered over by the mouse.
-        */
-       void paint_label(QPainter &p, const QRect &rect, bool hover);
-
-       /**
-        * Computes the outline rectangle of a label.
-        * @param rect the rectangle of the header area.
-        * @return Returns the rectangle of the signal label.
-        */
-       QRectF label_rect(const QRectF &rect);
-
        TraceTreeItemOwner* find_prevalent_trace_group(
                const std::shared_ptr<sigrok::ChannelGroup> &group,
-               const std::unordered_map<std::shared_ptr<sigrok::Channel>,
+               const std::unordered_map<std::shared_ptr<data::SignalBase>,
                        std::shared_ptr<Signal> > &signal_map);
 
        static std::vector< std::shared_ptr<Trace> >
                extract_new_traces_for_channels(
                const std::vector< std::shared_ptr<sigrok::Channel> > &channels,
-               const std::unordered_map<std::shared_ptr<sigrok::Channel>,
+               const std::unordered_map<std::shared_ptr<data::SignalBase>,
                        std::shared_ptr<Signal> > &signal_map,
                std::set< std::shared_ptr<Trace> > &add_list);
 
@@ -372,6 +365,8 @@ private:
        Ruler *ruler_;
        Header *header_;
 
+       std::unordered_set< std::shared_ptr<view::Signal> > signals_;
+
        /// The view time scale in seconds per pixel.
        double scale_;