Session: Fix issue #67 by improving error handling

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

diff --git a/pv/views/trace/view.hpp b/pv/views/trace/view.hpp
index 0adab674b10cfdeaa513bce11d7b6d871aa8ee1a..7fef8419e625232b7013eb4e4e84a7bbcae60af0 100644 (file)
--- a/pv/views/trace/view.hpp
+++ b/pv/views/trace/view.hpp
@@ -17,8 +17,8 @@
  * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef PULSEVIEW_PV_VIEWS_TRACEVIEW_VIEW_HPP
-#define PULSEVIEW_PV_VIEWS_TRACEVIEW_VIEW_HPP
+#ifndef PULSEVIEW_PV_VIEWS_TRACE_VIEW_HPP
+#define PULSEVIEW_PV_VIEWS_TRACE_VIEW_HPP
 
 #include <cstdint>
 #include <list>
@@ -134,6 +134,8 @@ public:
        virtual void remove_decode_signal(shared_ptr<data::DecodeSignal> signal);
 #endif
 
+       void remove_trace(shared_ptr<Trace> trace);
+
        shared_ptr<Signal> get_signal_under_mouse_cursor() const;
 
        /**
@@ -391,9 +393,7 @@ private:
        void adjust_top_margin();
 
        void update_scroll();
-
        void reset_scroll();
-
        void set_scroll_default();
 
        void determine_if_header_was_shrunk();
@@ -420,6 +420,7 @@ private:
 
        void resizeEvent(QResizeEvent *event);
 
+       void update_view_range_metaobject() const;
        void update_hover_point();
 
 public:
@@ -451,6 +452,8 @@ private Q_SLOTS:
 
        void on_settingViewTriggerIsZeroTime_changed(const QVariant new_value);
 
+       void on_create_marker_here();
+
        virtual void perform_delayed_view_update();
 
        void process_sticky_events();
@@ -534,7 +537,7 @@ private:
        bool custom_zero_offset_set_;
 
        bool updating_scroll_;
-       bool settings_restored_;
+       bool restoring_state_;
        bool header_was_shrunk_;
 
        bool sticky_scrolling_;
@@ -567,22 +570,19 @@ private:
        // This is true when the defaults couldn't be set due to insufficient info
        bool scroll_needs_defaults_;
 
-       // A nonzero value indicates the v offset to restore. See View::resizeEvent()
+       // The v offset to restore. See View::eventFilter()
        int saved_v_offset_;
 
        // These are used to determine whether the view was altered after acq started
        double scale_at_acq_start_;
        pv::util::Timestamp offset_at_acq_start_;
 
-       // Used to suppress performing a "zoom to fit" when the session stops. This
-       // is needed when the view's settings are restored before acquisition ends.
-       // In that case we want to keep the restored settings, not have a "zoom to fit"
-       // mess them up.
-       bool suppress_zoom_to_fit_after_acq_;
+       // X coordinate of mouse cursor where the user clicked to open a context menu
+       uint32_t context_menu_x_pos_;
 };
 
 } // namespace trace
 } // namespace views
 } // namespace pv
 
-#endif // PULSEVIEW_PV_VIEWS_TRACEVIEW_VIEW_HPP
+#endif // PULSEVIEW_PV_VIEWS_TRACE_VIEW_HPP