X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fview%2Fview.h;h=021767dba6a197ea551effd1f6068da2c3c0e20c;hp=06616376c96045447dcd81af766bf236f1d1e0a0;hb=e9213170687cf4afd14e20acdc690ff9381d94ae;hpb=3925091ab254d42f1ce29ee0df042d343b4113e0 diff --git a/pv/view/view.h b/pv/view/view.h index 06616376..021767db 100644 --- a/pv/view/view.h +++ b/pv/view/view.h @@ -23,12 +23,10 @@ #include +#include #include #include -#include -#include - #include #include @@ -42,6 +40,7 @@ class SigSession; namespace view { +class CursorHeader; class Header; class Ruler; class Trace; @@ -97,11 +96,11 @@ public: */ void set_scale_offset(double scale, double offset); - std::vector< boost::shared_ptr > get_traces() const; + std::vector< std::shared_ptr > get_traces() const; - std::list > selected_items() const; + std::list > selected_items() const; - std::set< boost::shared_ptr > + std::set< std::shared_ptr > get_visible_data() const; std::pair get_time_extents() const; @@ -137,7 +136,7 @@ public: void update_viewport(); -signals: +Q_SIGNALS: void hover_point_changed(); void signals_moved(); @@ -162,8 +161,8 @@ private: void update_layout(); static bool compare_trace_v_offsets( - const boost::shared_ptr &a, - const boost::shared_ptr &b); + const std::shared_ptr &a, + const std::shared_ptr &b); private: bool eventFilter(QObject *object, QEvent *event); @@ -172,7 +171,7 @@ private: void resizeEvent(QResizeEvent *e); -private slots: +private Q_SLOTS: void h_scroll_value_changed(int value); void v_scroll_value_changed(int value); @@ -191,6 +190,7 @@ private: Viewport *_viewport; Ruler *_ruler; + CursorHeader *_cursorheader; Header *_header; /// The view time scale in seconds per pixel.