X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fview%2Fview.hpp;h=eeb43ec88303a79ed55f5a93107afe113cc7d143;hp=ed1c92633da5348384e6f4081f185448986656df;hb=bb7dd726eb7159ddd80d94ede791f2e2a9eaef0f;hpb=d001f416aec37d5b13b804dec9ee9e1c011ffabb diff --git a/pv/view/view.hpp b/pv/view/view.hpp index ed1c9263..eeb43ec8 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; @@ -51,18 +51,21 @@ class Session; namespace view { class CursorHeader; +class DecodeTrace; 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: @@ -80,6 +83,23 @@ 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); + +#ifdef ENABLE_DECODE + void clear_decode_traces(); + + void add_decode_trace(std::shared_ptr signalbase); + + void remove_decode_trace(std::shared_ptr signalbase); +#endif + /** * Returns the view of the owner. */ @@ -133,7 +153,7 @@ public: /** * 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. @@ -170,6 +190,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. */ @@ -207,21 +233,38 @@ 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, pv::util::Timestamp &offset) const; @@ -241,43 +284,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); 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); @@ -300,6 +331,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_; @@ -307,6 +374,12 @@ private: Ruler *ruler_; Header *header_; + std::unordered_set< std::shared_ptr > signals_; + +#ifdef ENABLE_DECODE + std::vector< std::shared_ptr > decode_traces_; +#endif + /// The view time scale in seconds per pixel. double scale_; @@ -318,7 +391,7 @@ private: bool always_zoom_to_fit_; QTimer delayed_view_updater_; - double tick_period_; + pv::util::Timestamp tick_period_; pv::util::SIPrefix tick_prefix_; unsigned int tick_precision_; util::TimeUnit time_unit_; @@ -329,10 +402,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