Fix regression introduced by 2980ff2da269c9ed

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

diff --git a/pv/views/trace/view.hpp b/pv/views/trace/view.hpp
index fb097b01cfb604fb9893d4d50390ca7b64e5100f..8e78b6260e2143dcbb141ad2a5aa0f1b4836c822 100644 (file)
--- a/pv/views/trace/view.hpp
+++ b/pv/views/trace/view.hpp
@@ -31,8 +31,9 @@
 #include <QSizeF>
 #include <QSplitter>
 
-#include <pv/data/signaldata.hpp>
+#include <pv/globalsettings.hpp>
 #include <pv/util.hpp>
+#include <pv/data/signaldata.hpp>
 #include <pv/views/viewbase.hpp>
 
 #include "cursorpair.hpp"
@@ -63,12 +64,10 @@ namespace views {
 
 namespace trace {
 
-class CursorHeader;
 class DecodeTrace;
 class Header;
 class Ruler;
 class Signal;
-class Trace;
 class Viewport;
 class TriggerMarker;
 
@@ -81,7 +80,7 @@ public:
        bool viewportEvent(QEvent *event);
 };
 
-class View : public ViewBase, public TraceTreeItemOwner
+class View : public ViewBase, public TraceTreeItemOwner, public GlobalSettingsInterface
 {
        Q_OBJECT
 
@@ -102,6 +101,14 @@ private:
 public:
        explicit View(Session &session, bool is_main_view=false, QWidget *parent = nullptr);
 
+       ~View();
+
+       /**
+        * Resets the view to its default state after construction. It does however
+        * not reset the signal bases or any other connections with the session.
+        */
+       virtual void reset_view_state();
+
        Session& session();
        const Session& session() const;
 
@@ -162,6 +169,10 @@ public:
         */
        const pv::util::Timestamp& ruler_offset() const;
 
+       void set_zero_position(pv::util::Timestamp& position);
+
+       void reset_zero_position();
+
        /**
         * Returns the vertical scroll offset.
         */
@@ -221,8 +232,6 @@ public:
 
        void zoom_fit(bool gui_state);
 
-       void zoom_one_to_one();
-
        /**
         * Sets the scale and offset.
         * @param scale The new view scale in seconds per pixel.
@@ -235,15 +244,15 @@ public:
        pair<pv::util::Timestamp, pv::util::Timestamp> get_time_extents() const;
 
        /**
-        * Enables or disables coloured trace backgrounds. If they're not
-        * coloured then they will use alternating colors.
+        * Enables or disables colored trace backgrounds. If they're not
+        * colored then they will use alternating colors.
         */
-       void enable_coloured_bg(bool state);
+       void enable_colored_bg(bool state);
 
        /**
-        * Returns true if the trace background should be drawn with a coloured background.
+        * Returns true if the trace background should be drawn with a colored background.
         */
-       bool coloured_bg() const;
+       bool colored_bg() const;
 
        /**
         * Enable or disable showing sampling points.
@@ -294,6 +303,10 @@ public:
 
        void restack_all_trace_tree_items();
 
+       int header_width() const;
+
+       void on_setting_changed(const QString &key, const QVariant &value);
+
 Q_SIGNALS:
        void hover_point_changed(const QPoint &hp);
 
@@ -328,6 +341,9 @@ Q_SIGNALS:
        /// @param mode is a value of Trace::SegmentDisplayMode
        void segment_display_mode_changed(int mode, bool segment_selectable);
 
+       /// Emitted when the cursors are shown/hidden
+       void cursor_state_changed(bool show);
+
 public Q_SLOTS:
        void trigger_event(int segment_id, util::Timestamp location);
 
@@ -378,6 +394,8 @@ private:
 
        bool eventFilter(QObject *object, QEvent *event);
 
+       virtual void contextMenuEvent(QContextMenuEvent *event);
+
        void resizeEvent(QResizeEvent *event);
 
        void update_hover_point();
@@ -403,6 +421,8 @@ private Q_SLOTS:
        void on_segment_completed(int new_segment_id);
        void on_segment_changed(int segment);
 
+       void on_settingViewTriggerIsZeroTime_changed(const QVariant new_value);
+
        virtual void perform_delayed_view_update();
 
        void process_sticky_events();
@@ -411,7 +431,7 @@ private Q_SLOTS:
         * Sets the 'offset_' and ruler_offset_ members and emits the 'offset_changed'
         * signal if needed.
         */
-       void set_offset(const pv::util::Timestamp& offset);
+       void set_offset(const pv::util::Timestamp& offset, bool force_update = false);
 
        /**
         * Sets the 'scale_' member and emits the 'scale_changed'
@@ -479,7 +499,7 @@ private:
        bool header_was_shrunk_;
 
        bool sticky_scrolling_;
-       bool coloured_bg_;
+       bool colored_bg_;
        bool always_zoom_to_fit_;
 
        pv::util::Timestamp tick_period_;