X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fview%2Fview.hpp;h=42fa322cc50b7e47f42ee51e1145a60ecf97c19b;hp=95a02084dca1d95cafa28949b24dccd5441d4930;hb=925763b09cd26608cf4b38ce7b44800948a0e5aa;hpb=7ee199a77ecbb7edd6decca4786648cfe07e6eec diff --git a/pv/view/view.hpp b/pv/view/view.hpp index 95a02084..42fa322c 100644 --- a/pv/view/view.hpp +++ b/pv/view/view.hpp @@ -38,7 +38,7 @@ #include "cursorpair.hpp" #include "flag.hpp" -#include "rowitemowner.hpp" +#include "tracetreeitemowner.hpp" namespace sigrok { class ChannelGroup; @@ -55,19 +55,20 @@ class Header; class Ruler; 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; @@ -108,7 +109,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. @@ -123,12 +124,17 @@ 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. @@ -152,12 +158,12 @@ 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 @@ -165,6 +171,12 @@ public: */ 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. */ @@ -188,7 +200,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. @@ -204,21 +216,40 @@ public: 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. @@ -236,10 +267,14 @@ private: void update_scroll(); + void reset_scroll(); + + void set_scroll_default(); + void update_layout(); /** - * Satisifies RowItem functionality. + * Satisfies TraceTreeItem 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. @@ -253,7 +288,7 @@ private: */ QRectF label_rect(const QRectF &rect); - RowItemOwner* find_prevalent_trace_group( + TraceTreeItemOwner* find_prevalent_trace_group( const std::shared_ptr &group, const std::unordered_map, std::shared_ptr > &signal_map); @@ -267,12 +302,11 @@ private: void determine_time_unit(); -private: 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); @@ -295,6 +329,42 @@ private Q_SLOTS: 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_; @@ -306,15 +376,16 @@ private: 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_; @@ -323,10 +394,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