X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fview%2Fview.hpp;h=95e518a274db8c11314ca22808bbea6fd0831108;hp=b29fb157dce383eec55535fcd187ecf104eaa9b7;hb=af503b104d890a357c736c678bb00296d889c090;hpb=c7b03d9daa9574bd633fbac2d5976716f58027f5 diff --git a/pv/view/view.hpp b/pv/view/view.hpp index b29fb157..95e518a2 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; @@ -55,18 +56,18 @@ class Ruler; class Trace; class Viewport; -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; @@ -107,7 +108,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. @@ -122,12 +123,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. @@ -137,7 +148,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(); @@ -146,12 +157,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 @@ -182,7 +193,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. @@ -198,19 +209,37 @@ 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(); + 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. @@ -231,7 +260,7 @@ private: void update_layout(); /** - * Satisifies RowItem functionality. + * Satisifies 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. @@ -245,7 +274,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); @@ -257,7 +286,8 @@ private: 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); @@ -276,6 +306,7 @@ 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(); @@ -284,6 +315,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_; @@ -295,14 +362,17 @@ 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_; std::shared_ptr cursors_;