View: Update signals without destroying layout

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

diff --git a/pv/view/view.hpp b/pv/view/view.hpp
index 6a249c22db4af0742861d5b07aa6315f36e4c017..3e0a347142fb91b69b72301c4adeaa60e109e07b 100644 (file)
--- a/pv/view/view.hpp
+++ b/pv/view/view.hpp
@@ -18,11 +18,12 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-#ifndef PULSEVIEW_PV_VIEW_VIEW_H
-#define PULSEVIEW_PV_VIEW_VIEW_H
+#ifndef PULSEVIEW_PV_VIEW_VIEW_HPP
+#define PULSEVIEW_PV_VIEW_VIEW_HPP
 
 #include <stdint.h>
 
+#include <list>
 #include <memory>
 #include <set>
 #include <unordered_map>
@@ -35,8 +36,13 @@
 #include <pv/data/signaldata.hpp>
 
 #include "cursorpair.hpp"
+#include "flag.hpp"
 #include "rowitemowner.hpp"
 
+namespace sigrok {
+class ChannelGroup;
+}
+
 namespace pv {
 
 class Session;
@@ -46,6 +52,7 @@ namespace view {
 class CursorHeader;
 class Header;
 class Ruler;
+class Trace;
 class Viewport;
 
 class View : public QAbstractScrollArea, public RowItemOwner {
@@ -65,11 +72,6 @@ private:
 
        static const int ScaleUnits[3];
 
-public:
-       static const QColor CursorAreaColour;
-
-       static const QSizeF LabelPadding;
-
 public:
        explicit View(Session &session, QWidget *parent = 0);
 
@@ -105,8 +107,17 @@ public:
         * seconds.
         */
        double offset() const;
+
+       /**
+        * Returns the vertical scroll offset.
+        */
        int owner_visual_v_offset() const;
 
+       /**
+        * Sets the visual v-offset.
+        */
+       void set_v_offset(int offset);
+
        /**
         * Returns the SI prefix to apply to the graticule time markings.
         */
@@ -161,6 +172,21 @@ public:
         */
        std::shared_ptr<CursorPair> cursors() const;
 
+       /**
+        * Adds a new flag at a specified time.
+        */
+       void add_flag(double time);
+
+       /**
+        * Removes a flag from the list.
+        */
+       void remove_flag(std::shared_ptr<Flag> flag);
+
+       /**
+        * Gets the list of flags.
+        */
+       std::vector< std::shared_ptr<Flag> > flags() const;
+
        const QPoint& hover_point() const;
 
        void update_viewport();
@@ -170,8 +196,6 @@ public:
 Q_SIGNALS:
        void hover_point_changed();
 
-       void signals_moved();
-
        void selection_changed();
 
        void scale_offset_changed();
@@ -212,16 +236,17 @@ private:
         */
        QRectF label_rect(const QRectF &rect);
 
-       static bool add_channels_to_owner(
+       RowItemOwner* find_prevalent_trace_group(
+               const std::shared_ptr<sigrok::ChannelGroup> &group,
+               const std::unordered_map<std::shared_ptr<sigrok::Channel>,
+                       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,
-               RowItemOwner *owner, int &offset,
-               std::unordered_map<std::shared_ptr<sigrok::Channel>,
+               const std::unordered_map<std::shared_ptr<sigrok::Channel>,
                        std::shared_ptr<Signal> > &signal_map,
-               std::function<bool (std::shared_ptr<RowItem>)> filter_func =
-                       std::function<bool (std::shared_ptr<RowItem>)>());
-
-       static void apply_offset(
-               std::shared_ptr<RowItem> row_item, int &offset);
+               std::set< std::shared_ptr<Trace> > &add_list);
 
 private:
        bool eventFilter(QObject *object, QEvent *event);
@@ -239,13 +264,11 @@ public:
 private Q_SLOTS:
 
        void h_scroll_value_changed(int value);
-       void v_scroll_value_changed(int value);
+       void v_scroll_value_changed();
 
        void signals_changed();
        void data_updated();
 
-       void on_signals_moved();
-
        void process_sticky_events();
 
        void on_hover_point_changed();
@@ -255,7 +278,6 @@ private:
 
        Viewport *viewport_;
        Ruler *ruler_;
-       CursorHeader *cursorheader_;
        Header *header_;
 
        /// The view time scale in seconds per pixel.
@@ -264,7 +286,6 @@ private:
        /// The view time offset in seconds.
        double offset_;
 
-       int v_offset_;
        bool updating_scroll_;
 
        double tick_period_;
@@ -273,6 +294,9 @@ private:
        bool show_cursors_;
        std::shared_ptr<CursorPair> cursors_;
 
+       std::list< std::shared_ptr<Flag> > flags_;
+       char next_flag_text_;
+
        QPoint hover_point_;
 
        unsigned int sticky_events_;
@@ -282,4 +306,4 @@ private:
 } // namespace view
 } // namespace pv
 
-#endif // PULSEVIEW_PV_VIEW_VIEW_H
+#endif // PULSEVIEW_PV_VIEW_VIEW_HPP