Change namespace for the trace view and implement ViewBase

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

diff --git a/pv/view/view.hpp b/pv/view/view.hpp
index 9bb42ef14ea6e239500482698c81f95994c94cc9..0412c697ba1db0aea118760618fb1fd99c97c04d 100644 (file)
--- a/pv/view/view.hpp
+++ b/pv/view/view.hpp
@@ -18,8 +18,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-#ifndef PULSEVIEW_PV_VIEW_VIEW_HPP
-#define PULSEVIEW_PV_VIEW_VIEW_HPP
+#ifndef PULSEVIEW_PV_VIEWS_TRACEVIEW_VIEW_HPP
+#define PULSEVIEW_PV_VIEWS_TRACEVIEW_VIEW_HPP
 
 #include <stdint.h>
 
@@ -34,6 +34,7 @@
 #include <QTimer>
 
 #include <pv/data/signaldata.hpp>
+#include <pv/views/viewbase.hpp>
 #include <pv/util.hpp>
 
 #include "cursorpair.hpp"
@@ -48,15 +49,29 @@ namespace pv {
 
 class Session;
 
-namespace view {
+namespace views {
+
+namespace TraceView {
 
 class CursorHeader;
+class DecodeTrace;
 class Header;
 class Ruler;
+class Signal;
 class Trace;
 class Viewport;
+class TriggerMarker;
 
-class View : public QAbstractScrollArea, public TraceTreeItemOwner {
+class CustomAbstractScrollArea : public QAbstractScrollArea {
+       Q_OBJECT
+
+public:
+       CustomAbstractScrollArea(QWidget *parent = 0);
+       void setViewportMargins(int left, int top, int right, int bottom);
+       bool viewportEvent(QEvent *event);
+};
+
+class View : public ViewBase, public TraceTreeItemOwner {
        Q_OBJECT
 
 private:
@@ -80,20 +95,41 @@ public:
        Session& session();
        const Session& session() const;
 
+       /**
+        * Returns the signals contained in this view.
+        */
+       std::unordered_set< std::shared_ptr<Signal> > signals() const;
+
+       virtual void clear_signals();
+
+       virtual void add_signal(const std::shared_ptr<Signal> signal);
+
+#ifdef ENABLE_DECODE
+       virtual void clear_decode_signals();
+
+       virtual void add_decode_signal(std::shared_ptr<data::SignalBase> signalbase);
+
+       virtual void remove_decode_signal(std::shared_ptr<data::SignalBase> signalbase);
+#endif
+
        /**
         * Returns the view of the owner.
         */
-       virtual pv::view::View* view();
+       virtual View* view();
 
        /**
         * Returns the view of the owner.
         */
-       virtual const pv::view::View* view() const;
+       virtual const View* view() const;
 
        Viewport* viewport();
 
        const Viewport* viewport() const;
 
+       virtual void save_settings(QSettings &settings) const;
+
+       virtual void restore_settings(QSettings &settings);
+
        /**
         * Gets a list of time markers.
         */
@@ -170,6 +206,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.
         */
@@ -207,8 +249,6 @@ public:
 
        const QPoint& hover_point() const;
 
-       void update_viewport();
-
        void restack_all_trace_tree_items();
 
 Q_SIGNALS:
@@ -260,32 +300,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);
 
@@ -293,9 +322,7 @@ private:
 
        bool eventFilter(QObject *object, QEvent *event);
 
-       bool viewportEvent(QEvent *e);
-
-       void resizeEvent(QResizeEvent *e);
+       void resizeEvent(QResizeEvent *event);
 
 public:
        void row_item_appearance_changed(bool label, bool content);
@@ -355,12 +382,18 @@ private Q_SLOTS:
        void set_time_unit(pv::util::TimeUnit time_unit);
 
 private:
-       Session &session_;
-
        Viewport *viewport_;
        Ruler *ruler_;
        Header *header_;
 
+       std::unordered_set< std::shared_ptr<Signal> > signals_;
+
+#ifdef ENABLE_DECODE
+       std::vector< std::shared_ptr<DecodeTrace> > decode_traces_;
+#endif
+
+       CustomAbstractScrollArea scrollarea_;
+
        /// The view time scale in seconds per pixel.
        double scale_;
 
@@ -383,13 +416,19 @@ private:
        std::list< std::shared_ptr<Flag> > flags_;
        char next_flag_text_;
 
+       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
+} // namespace TraceView
+} // namespace views
 } // namespace pv
 
-#endif // PULSEVIEW_PV_VIEW_VIEW_HPP
+#endif // PULSEVIEW_PV_VIEWS_TRACEVIEW_VIEW_HPP