X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fview%2Fview.hpp;h=3e0a347142fb91b69b72301c4adeaa60e109e07b;hb=cf124e472f9b5be7f85ecf708fe5290d6a6d1c9e;hp=e763da7e398a9b563b8fc5927088ad3ed391a2aa;hpb=2b81ae4682ade4109ffa442794de36ceb32045eb;p=pulseview.git diff --git a/pv/view/view.hpp b/pv/view/view.hpp index e763da7..3e0a347 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 @@ -35,8 +36,13 @@ #include #include "cursorpair.hpp" +#include "flag.hpp" #include "rowitemowner.hpp" +namespace sigrok { +class ChannelGroup; +} + namespace pv { class Session; @@ -46,6 +52,7 @@ namespace view { class CursorHeader; class Header; class Ruler; +class Trace; class Viewport; class View : public QAbstractScrollArea, public RowItemOwner { @@ -53,8 +60,8 @@ class View : public QAbstractScrollArea, public RowItemOwner { private: enum StickyEvents { - SelectableItemHExtentsChanged = 1, - SelectableItemVExtentsChanged = 2 + RowItemHExtentsChanged = 1, + RowItemVExtentsChanged = 2 }; private: @@ -63,10 +70,7 @@ private: static const int MaxScrollValue; -public: - static const QColor CursorAreaColour; - - static const QSizeF LabelPadding; + static const int ScaleUnits[3]; public: explicit View(Session &session, QWidget *parent = 0); @@ -88,6 +92,11 @@ public: const Viewport* viewport() const; + /** + * Gets a list of time markers. + */ + std::vector< std::shared_ptr > time_items() const; + /** * Returns the view time scale in seconds per pixel. */ @@ -98,8 +107,27 @@ public: * seconds. */ double 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 period of the graticule time markings. + */ + double tick_period() const; + /** * Returns the number of nested parents that this row item owner has. */ @@ -142,12 +170,22 @@ public: /** * Returns a reference to the pair of cursors. */ - CursorPair& cursors(); + std::shared_ptr cursors() const; /** - * Returns a reference to the pair of cursors. + * Adds a new flag at a specified time. */ - const CursorPair& cursors() const; + void add_flag(double 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; @@ -158,8 +196,6 @@ public: Q_SIGNALS: void hover_point_changed(); - void signals_moved(); - void selection_changed(); void scale_offset_changed(); @@ -175,6 +211,12 @@ private: */ void set_zoom(double scale, int offset); + /** + * Find a tick spacing and number formatting that does not cause + * the values to collide. + */ + void calculate_tick_spacing(); + void update_scroll(); void update_layout(); @@ -182,30 +224,29 @@ private: /** * Satisifies RowItem functionality. * @param p the QPainter to paint into. - * @param right the x-coordinate of the right edge of the header - * area. + * @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, int right, bool hover); + void paint_label(QPainter &p, const QRect &rect, bool hover); /** * Computes the outline rectangle of a label. - * @param right the x-coordinate of the right edge of the header - * area. + * @param rect the rectangle of the header area. * @return Returns the rectangle of the signal label. */ - QRectF label_rect(int right); + 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)>()); - - static void apply_offset( - std::shared_ptr row_item, int &offset); + std::set< std::shared_ptr > &add_list); private: bool eventFilter(QObject *object, QEvent *event); @@ -215,22 +256,19 @@ 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 data_updated(); - void marker_time_changed(); - - void on_signals_moved(); - void process_sticky_events(); void on_hover_point_changed(); @@ -240,7 +278,6 @@ private: Viewport *viewport_; Ruler *ruler_; - CursorHeader *cursorheader_; Header *header_; /// The view time scale in seconds per pixel. @@ -249,11 +286,16 @@ private: /// The view time offset in seconds. double offset_; - int v_offset_; bool updating_scroll_; + double tick_period_; + unsigned int tick_prefix_; + bool show_cursors_; - CursorPair cursors_; + std::shared_ptr cursors_; + + std::list< std::shared_ptr > flags_; + char next_flag_text_; QPoint hover_point_; @@ -264,4 +306,4 @@ private: } // namespace view } // namespace pv -#endif // PULSEVIEW_PV_VIEW_VIEW_H +#endif // PULSEVIEW_PV_VIEW_VIEW_HPP