X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fview%2Fview.hpp;h=12527b656d80943f2abb8d69039d33729d45adc0;hb=60d9b99a32e551cffd2b537d3e157d578a761c9b;hp=5fc6e4e0a619c94442dea0e34e87dab8438af02c;hpb=b3f44329f5846bfb800ee53c15c65b2395d3ba0c;p=pulseview.git diff --git a/pv/view/view.hpp b/pv/view/view.hpp index 5fc6e4e..12527b6 100644 --- a/pv/view/view.hpp +++ b/pv/view/view.hpp @@ -18,11 +18,12 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef PULSEVIEW_PV_VIEW_VIEW_H -#define PULSEVIEW_PV_VIEW_VIEW_H +#ifndef PULSEVIEW_PV_VIEW_VIEW_HPP +#define PULSEVIEW_PV_VIEW_VIEW_HPP #include +#include #include #include #include @@ -33,10 +34,16 @@ #include #include +#include #include "cursorpair.hpp" +#include "flag.hpp" #include "rowitemowner.hpp" +namespace sigrok { +class ChannelGroup; +} + namespace pv { class Session; @@ -46,6 +53,7 @@ namespace view { class CursorHeader; class Header; class Ruler; +class Trace; class Viewport; class View : public QAbstractScrollArea, public RowItemOwner { @@ -53,23 +61,19 @@ class View : public QAbstractScrollArea, public RowItemOwner { private: enum StickyEvents { - SelectableItemHExtentsChanged = 1, - SelectableItemVExtentsChanged = 2 + RowItemHExtentsChanged = 1, + RowItemVExtentsChanged = 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]; -public: - static const QColor CursorAreaColour; - - static const QSizeF LabelPadding; - public: explicit View(Session &session, QWidget *parent = 0); @@ -104,19 +108,38 @@ 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. + */ int owner_visual_v_offset() const; + /** + * Sets the visual v-offset. + */ + void set_v_offset(int offset); + /** * Returns the SI prefix to apply to the graticule time markings. */ unsigned int 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; + /** + * Returns the unit of time currently used. + */ + util::TimeUnit time_unit() const; + /** * Returns the number of nested parents that this row item owner has. */ @@ -125,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(); @@ -134,12 +157,18 @@ 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); /** * Returns true if cursors are displayed. false otherwise. @@ -161,6 +190,21 @@ public: */ std::shared_ptr cursors() const; + /** + * Adds a new flag at a specified time. + */ + void add_flag(const pv::util::Timestamp& time); + + /** + * Removes a flag from the list. + */ + void remove_flag(std::shared_ptr flag); + + /** + * Gets the list of flags. + */ + std::vector< std::shared_ptr > flags() const; + const QPoint& hover_point() const; void update_viewport(); @@ -170,14 +214,16 @@ public: Q_SIGNALS: void hover_point_changed(); - void signals_moved(); - void selection_changed(); void scale_offset_changed(); + void sticky_scrolling_changed(bool state); + + void always_zoom_to_fit_changed(bool state); + 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. @@ -212,16 +258,19 @@ private: */ QRectF label_rect(const QRectF &rect); - static bool add_channels_to_owner( + RowItemOwner* find_prevalent_trace_group( + const std::shared_ptr &group, + 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, - RowItemOwner *owner, int &offset, - std::unordered_map, + const std::unordered_map, std::shared_ptr > &signal_map, - std::function)> filter_func = - std::function)>()); + std::set< std::shared_ptr > &add_list); - static void apply_offset( - std::shared_ptr row_item, int &offset); + void determine_time_unit(); private: bool eventFilter(QObject *object, QEvent *event); @@ -231,21 +280,21 @@ private: void resizeEvent(QResizeEvent *e); public: - void appearance_changed(bool label, bool content); + void row_item_appearance_changed(bool label, bool content); + void time_item_appearance_changed(bool label, bool content); void extents_changed(bool horz, bool vert); private Q_SLOTS: void h_scroll_value_changed(int value); - void v_scroll_value_changed(int value); + void v_scroll_value_changed(); void signals_changed(); + void capture_state_updated(int state); void data_updated(); - void marker_time_changed(); - - void on_signals_moved(); + void perform_delayed_view_update(); void process_sticky_events(); @@ -256,24 +305,30 @@ private: Viewport *viewport_; Ruler *ruler_; - CursorHeader *cursorheader_; Header *header_; /// The view time scale in seconds per pixel. double scale_; /// The view time offset in seconds. - double offset_; + pv::util::Timestamp offset_; - int v_offset_; bool updating_scroll_; + bool sticky_scrolling_; + bool always_zoom_to_fit_; + QTimer delayed_view_updater_; double tick_period_; unsigned int tick_prefix_; + unsigned int tick_precision_; + util::TimeUnit time_unit_; bool show_cursors_; std::shared_ptr cursors_; + std::list< std::shared_ptr > flags_; + char next_flag_text_; + QPoint hover_point_; unsigned int sticky_events_; @@ -283,4 +338,4 @@ private: } // namespace view } // namespace pv -#endif // PULSEVIEW_PV_VIEW_VIEW_H +#endif // PULSEVIEW_PV_VIEW_VIEW_HPP