X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=pv%2Fviews%2Ftrace%2Fview.hpp;h=5863bc9d976caf6a2eb43d392879aa26b74a0a2b;hb=1c5211005b1c7682bf4597bfb20cf8b1937d792d;hp=c2cceb274d851989c8d6b1f8d225fb5ec3e238a1;hpb=e887fe9e6ede73b9fe9ace9c6bfd4f6a096eb3b2;p=pulseview.git diff --git a/pv/views/trace/view.hpp b/pv/views/trace/view.hpp index c2cceb27..5863bc9d 100644 --- a/pv/views/trace/view.hpp +++ b/pv/views/trace/view.hpp @@ -44,7 +44,6 @@ using std::list; using std::unordered_map; -using std::unordered_set; using std::set; using std::shared_ptr; using std::vector; @@ -96,6 +95,7 @@ private: static const pv::util::Timestamp MinScale; static const int MaxScrollValue; + static const int ViewScrollMargin; static const int ScaleUnits[3]; @@ -118,7 +118,7 @@ public: /** * Returns the signals contained in this view. */ - unordered_set< shared_ptr > signals() const; + vector< shared_ptr > signals() const; shared_ptr get_signal_by_signalbase(shared_ptr base) const; @@ -154,7 +154,6 @@ public: const Ruler* ruler() const; virtual void save_settings(QSettings &settings) const; - virtual void restore_settings(QSettings &settings); /** @@ -254,6 +253,8 @@ public: void zoom_fit(bool gui_state); + virtual void focus_on_range(uint64_t start_sample, uint64_t end_sample); + /** * Sets the scale and offset. * @param scale The new view scale in seconds per pixel. @@ -261,7 +262,7 @@ public: */ void set_scale_offset(double scale, const pv::util::Timestamp& offset); - set< shared_ptr > get_visible_data() const; + vector< shared_ptr > get_visible_data() const; pair get_time_extents() const; @@ -510,7 +511,7 @@ private: QShortcut *grab_ruler_left_shortcut_, *grab_ruler_right_shortcut_; QShortcut *cancel_grab_shortcut_; - unordered_set< shared_ptr > signals_; + vector< shared_ptr > signals_; #ifdef ENABLE_DECODE vector< shared_ptr > decode_traces_;