X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=pv%2Fview%2Fview.hpp;h=d699be4ffaa37092391c8a492e6d30f82ba2849e;hb=47e9e7bbc3a4e91a960f4cbb1db48c5aff6dcace;hp=3e0a347142fb91b69b72301c4adeaa60e109e07b;hpb=cf124e472f9b5be7f85ecf708fe5290d6a6d1c9e;p=pulseview.git diff --git a/pv/view/view.hpp b/pv/view/view.hpp index 3e0a3471..d699be4f 100644 --- a/pv/view/view.hpp +++ b/pv/view/view.hpp @@ -34,10 +34,11 @@ #include #include +#include #include "cursorpair.hpp" #include "flag.hpp" -#include "rowitemowner.hpp" +#include "tracetreeitemowner.hpp" namespace sigrok { class ChannelGroup; @@ -52,23 +53,26 @@ namespace view { class CursorHeader; class Header; class Ruler; +class Signal; class Trace; class Viewport; +class TriggerMarker; -class View : public QAbstractScrollArea, public RowItemOwner { +class View : public QAbstractScrollArea, public TraceTreeItemOwner { Q_OBJECT private: enum StickyEvents { - RowItemHExtentsChanged = 1, - RowItemVExtentsChanged = 2 + TraceTreeItemHExtentsChanged = 1, + TraceTreeItemVExtentsChanged = 2 }; private: - static const double MaxScale; - static const double MinScale; + static const pv::util::Timestamp MaxScale; + static const pv::util::Timestamp MinScale; static const int MaxScrollValue; + static const int MaxViewAutoUpdateRate; static const int ScaleUnits[3]; @@ -78,6 +82,15 @@ public: Session& session(); const Session& session() const; + /** + * Returns the signals contained in this view. + */ + std::unordered_set< std::shared_ptr > signals() const; + + void clear_signals(); + + void add_signal(const std::shared_ptr signal); + /** * Returns the view of the owner. */ @@ -106,7 +119,7 @@ public: * Returns the time offset of the left edge of the view in * seconds. */ - double offset() const; + const pv::util::Timestamp& offset() const; /** * Returns the vertical scroll offset. @@ -121,12 +134,22 @@ public: /** * Returns the SI prefix to apply to the graticule time markings. */ - unsigned int tick_prefix() const; + pv::util::SIPrefix tick_prefix() const; + + /** + * Returns the number of fractional digits shown for the time markings. + */ + unsigned int tick_precision() const; /** * Returns period of the graticule time markings. */ - double tick_period() const; + const pv::util::Timestamp& tick_period() const; + + /** + * Returns the unit of time currently used. + */ + util::TimeUnit time_unit() const; /** * Returns the number of nested parents that this row item owner has. @@ -136,7 +159,7 @@ public: void zoom(double steps); void zoom(double steps, int offset); - void zoom_fit(); + void zoom_fit(bool gui_state); void zoom_one_to_one(); @@ -145,12 +168,24 @@ public: * @param scale The new view scale in seconds per pixel. * @param offset The view time offset in seconds. */ - void set_scale_offset(double scale, double offset); + void set_scale_offset(double scale, const pv::util::Timestamp& offset); std::set< std::shared_ptr > get_visible_data() const; - std::pair get_time_extents() const; + std::pair get_time_extents() const; + + /** + * Enables or disables sticky scrolling, i.e. the view always shows + * the most recent samples when capturing data. + */ + void enable_sticky_scrolling(bool state); + + /** + * Enables or disables coloured trace backgrounds. If they're not + * coloured then they will use alternating colors. + */ + void enable_coloured_bg(bool state); /** * Returns true if cursors are displayed. false otherwise. @@ -175,7 +210,7 @@ public: /** * Adds a new flag at a specified time. */ - void add_flag(double time); + void add_flag(const pv::util::Timestamp& time); /** * Removes a flag from the list. @@ -189,19 +224,40 @@ public: const QPoint& hover_point() const; - void update_viewport(); - - void restack_all_row_items(); + void restack_all_trace_tree_items(); Q_SIGNALS: void hover_point_changed(); void selection_changed(); - void scale_offset_changed(); + /// Emitted when the offset changed. + void offset_changed(); + + /// Emitted when the scale changed. + void scale_changed(); + + void sticky_scrolling_changed(bool state); + + void always_zoom_to_fit_changed(bool state); + + /// Emitted when the tick_prefix changed. + void tick_prefix_changed(); + + /// Emitted when the tick_precision changed. + void tick_precision_changed(); + + /// Emitted when the tick_period changed. + void tick_period_changed(); + + /// Emitted when the time_unit changed. + void time_unit_changed(); + +public Q_SLOTS: + void trigger_event(util::Timestamp location); private: - void get_scroll_layout(double &length, double &offset) const; + void get_scroll_layout(double &length, pv::util::Timestamp &offset) const; /** * Simultaneously sets the zoom and offset. @@ -219,41 +275,31 @@ private: void update_scroll(); - void update_layout(); + void reset_scroll(); - /** - * Satisifies RowItem functionality. - * @param p the QPainter to paint into. - * @param rect the rectangle of the header area. - * @param hover true if the label is being hovered over by the mouse. - */ - void paint_label(QPainter &p, const QRect &rect, bool hover); + void set_scroll_default(); - /** - * Computes the outline rectangle of a label. - * @param rect the rectangle of the header area. - * @return Returns the rectangle of the signal label. - */ - QRectF label_rect(const QRectF &rect); + void update_layout(); - RowItemOwner* find_prevalent_trace_group( + TraceTreeItemOwner* find_prevalent_trace_group( const std::shared_ptr &group, - const std::unordered_map, + const std::unordered_map, std::shared_ptr > &signal_map); static std::vector< std::shared_ptr > extract_new_traces_for_channels( const std::vector< std::shared_ptr > &channels, - const std::unordered_map, + const std::unordered_map, std::shared_ptr > &signal_map, std::set< std::shared_ptr > &add_list); -private: + void determine_time_unit(); + bool eventFilter(QObject *object, QEvent *event); - bool viewportEvent(QEvent *e); + bool viewportEvent(QEvent *event); - void resizeEvent(QResizeEvent *e); + void resizeEvent(QResizeEvent *event); public: void row_item_appearance_changed(bool label, bool content); @@ -267,12 +313,51 @@ private Q_SLOTS: void v_scroll_value_changed(); void signals_changed(); + void capture_state_updated(int state); void data_updated(); + void perform_delayed_view_update(); + void process_sticky_events(); void on_hover_point_changed(); + /** + * Sets the 'offset_' member and emits the 'offset_changed' + * signal if needed. + */ + void set_offset(const pv::util::Timestamp& offset); + + /** + * Sets the 'scale_' member and emits the 'scale_changed' + * signal if needed. + */ + void set_scale(double scale); + + /** + * Sets the 'tick_prefix_' member and emits the 'tick_prefix_changed' + * signal if needed. + */ + void set_tick_prefix(pv::util::SIPrefix tick_prefix); + + /** + * Sets the 'tick_precision_' member and emits the 'tick_precision_changed' + * signal if needed. + */ + void set_tick_precision(unsigned tick_precision); + + /** + * Sets the 'tick_period_' member and emits the 'tick_period_changed' + * signal if needed. + */ + void set_tick_period(const pv::util::Timestamp& tick_period); + + /** + * Sets the 'time_unit' member and emits the 'time_unit_changed' + * signal if needed. + */ + void set_time_unit(pv::util::TimeUnit time_unit); + private: Session &session_; @@ -280,16 +365,23 @@ private: Ruler *ruler_; Header *header_; + std::unordered_set< std::shared_ptr > signals_; + /// The view time scale in seconds per pixel. double scale_; /// The view time offset in seconds. - double offset_; + pv::util::Timestamp offset_; bool updating_scroll_; + bool sticky_scrolling_; + bool always_zoom_to_fit_; + QTimer delayed_view_updater_; - double tick_period_; - unsigned int tick_prefix_; + pv::util::Timestamp tick_period_; + pv::util::SIPrefix tick_prefix_; + unsigned int tick_precision_; + util::TimeUnit time_unit_; bool show_cursors_; std::shared_ptr cursors_; @@ -297,10 +389,15 @@ private: std::list< std::shared_ptr > flags_; char next_flag_text_; + std::vector< std::shared_ptr > trigger_markers_; + QPoint hover_point_; unsigned int sticky_events_; QTimer lazy_event_handler_; + + // This is true when the defaults couldn't be set due to insufficient info + bool scroll_needs_defaults; }; } // namespace view