X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fviews%2Ftrace%2Fview.hpp;h=b4c946d6449f29ada6eec4191c5d3adc769ca691;hp=8183fefc6c0b814a0cf96351e3a0d047fded990c;hb=5a8c6b596a36e8c07fee234aa208ef23c8520c92;hpb=9cee9c1b895be4010deb55623f5c6916320d4401
diff --git a/pv/views/trace/view.hpp b/pv/views/trace/view.hpp
index 8183fefc..b4c946d6 100644
--- a/pv/views/trace/view.hpp
+++ b/pv/views/trace/view.hpp
@@ -17,12 +17,13 @@
* along with this program; if not, see .
*/
-#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
#include
#include
+#include
#include
#include
@@ -121,9 +122,9 @@ public:
shared_ptr get_signal_by_signalbase(shared_ptr base) const;
- virtual void clear_signals();
-
- void add_signal(const shared_ptr signal);
+ virtual void clear_signalbases();
+ virtual void add_signalbase(const shared_ptr signalbase);
+ virtual void remove_signalbase(const shared_ptr signalbase);
#ifdef ENABLE_DECODE
virtual void clear_decode_signals();
@@ -133,6 +134,8 @@ public:
virtual void remove_decode_signal(shared_ptr signal);
#endif
+ void remove_trace(shared_ptr trace);
+
shared_ptr get_signal_under_mouse_cursor() const;
/**
@@ -508,6 +511,7 @@ private:
QShortcut *grab_ruler_left_shortcut_, *grab_ruler_right_shortcut_;
QShortcut *cancel_grab_shortcut_;
+ mutable mutex signal_mutex_;
vector< shared_ptr > signals_;
#ifdef ENABLE_DECODE
@@ -532,7 +536,7 @@ private:
bool custom_zero_offset_set_;
bool updating_scroll_;
- bool settings_restored_;
+ bool restoring_state_;
bool header_was_shrunk_;
bool sticky_scrolling_;
@@ -565,22 +569,16 @@ 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_;
};
} // namespace trace
} // namespace views
} // namespace pv
-#endif // PULSEVIEW_PV_VIEWS_TRACEVIEW_VIEW_HPP
+#endif // PULSEVIEW_PV_VIEWS_TRACE_VIEW_HPP