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 b64c09d2c019ab00ee3c56b0a8ef0732b1af2c92..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.
         */
@@ -171,6 +181,12 @@ public:
         */
        void enable_sticky_scrolling(bool state);
 
+       /**
+        * Enables or disables coloured trace backgrounds. If they're not
+        * coloured then they will use alternating colors.
+        */
+       void enable_coloured_bg(bool state);
+
        /**
         * Returns true if cursors are displayed. false otherwise.
         */
@@ -208,8 +224,6 @@ public:
 
        const QPoint& hover_point() const;
 
-       void update_viewport();
-
        void restack_all_trace_tree_items();
 
 Q_SIGNALS:
@@ -261,32 +275,21 @@ private:
 
        void update_scroll();
 
-       void update_layout();
+       void reset_scroll();
 
-       /**
-        * Satisifies 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);
+       void set_scroll_default();
 
-       /**
-        * 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);
+       void update_layout();
 
        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);
 
@@ -294,9 +297,9 @@ private:
 
        bool eventFilter(QObject *object, QEvent *event);
 
-       bool viewportEvent(QEvent *e);
+       bool viewportEvent(QEvent *event);
 
-       void resizeEvent(QResizeEvent *e);
+       void resizeEvent(QResizeEvent *event);
 
 public:
        void row_item_appearance_changed(bool label, bool content);
@@ -362,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_;
 
@@ -384,12 +389,15 @@ private:
        std::list< std::shared_ptr<Flag> > flags_;
        char next_flag_text_;
 
-       std::shared_ptr<TriggerMarker> trigger_marker_;
+       std::vector< std::shared_ptr<TriggerMarker> > trigger_markers_;
 
        QPoint hover_point_;
 
        unsigned int sticky_events_;
        QTimer lazy_event_handler_;
+
+       // This is true when the defaults couldn't be set due to insufficient info
+       bool scroll_needs_defaults;
 };
 
 } // namespace view