X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fviews%2Ftrace%2Fdecodetrace.hpp;h=f8976cb7b2da84a22c0968715972e67affbfd3c1;hp=79f7a27d23b948bebf3c231de8df04c5042bfdd0;hb=65bde9b3e02f7ad11f88ba4eac9d1c3ce7933437;hpb=74bf66669012692f7eda790abe724bd5bb4ae8c6 diff --git a/pv/views/trace/decodetrace.hpp b/pv/views/trace/decodetrace.hpp index 79f7a27d..f8976cb7 100644 --- a/pv/views/trace/decodetrace.hpp +++ b/pv/views/trace/decodetrace.hpp @@ -20,6 +20,7 @@ #ifndef PULSEVIEW_PV_VIEWS_TRACEVIEW_DECODETRACE_HPP #define PULSEVIEW_PV_VIEWS_TRACEVIEW_DECODETRACE_HPP +#include #include "trace.hpp" #include @@ -28,7 +29,8 @@ #include #include -#include +#include +#include #include #include #include @@ -40,6 +42,8 @@ #include #include +#define DECODETRACE_SHOW_RENDER_TIME 0 + using std::deque; using std::list; using std::map; @@ -48,6 +52,11 @@ using std::pair; using std::shared_ptr; using std::vector; +using pv::data::SignalBase; +using pv::data::decode::Annotation; +using pv::data::decode::Decoder; +using pv::data::decode::Row; + struct srd_channel; struct srd_decoder; @@ -61,6 +70,7 @@ class DecodeSignal; namespace decode { class Decoder; +class Row; } } // namespace data @@ -71,16 +81,40 @@ class DecoderGroupBox; namespace views { namespace trace { -struct RowData { +class ContainerWidget; + +struct DecodeTraceRow { // When adding a field, make sure it's initialized properly in // DecodeTrace::update_rows() - data::decode::Row decode_row; + Row* decode_row; unsigned int height, expanded_height, title_width, animation_step; - bool exists, currently_visible; + bool exists, currently_visible, has_hidden_classes; bool expand_marker_highlighted, expanding, expanded, collapsing; QPolygon expand_marker_shape; float anim_height, anim_shape; + + ContainerWidget* container; + QWidget* header_container; + QWidget* selector_container; + vector selectors; + + QColor row_color; + map ann_class_color; + map ann_class_dark_color; +}; + +class ContainerWidget : public QWidget +{ + Q_OBJECT + +public: + ContainerWidget(QWidget *parent = nullptr); + + virtual void resizeEvent(QResizeEvent* event); + +Q_SIGNALS: + void widgetResized(QWidget* sender); }; class DecodeTrace : public Trace @@ -90,6 +124,9 @@ class DecodeTrace : public Trace private: static const QColor ErrorBgColor; static const QColor NoDecodeColor; + static const QColor ExpandMarkerWarnColor; + static const uint8_t ExpansionAreaHeaderAlpha; + static const uint8_t ExpansionAreaAlpha; static const int ArrowSize; static const double EndCapWidth; @@ -100,14 +137,14 @@ private: static const unsigned int AnimationDurationInTicks; public: - DecodeTrace(pv::Session &session, shared_ptr signalbase, + DecodeTrace(pv::Session &session, shared_ptr signalbase, int index); ~DecodeTrace(); bool enabled() const; - shared_ptr base() const; + shared_ptr base() const; /** * Computes the vertical extents of the contents of this row item. @@ -149,30 +186,23 @@ public: virtual void mouse_left_press_event(const QMouseEvent* event); private: - void draw_annotations(vector annotations, - QPainter &p, int h, const ViewItemPaintParams &pp, int y, - QColor row_color, int row_title_width); + void draw_annotations(deque& annotations, QPainter &p, + const ViewItemPaintParams &pp, int y, const DecodeTraceRow& row); - void draw_annotation(const pv::data::decode::Annotation &a, QPainter &p, - int h, const ViewItemPaintParams &pp, int y, - QColor row_color, int row_title_width) const; + void draw_annotation(const Annotation* a, QPainter &p, + const ViewItemPaintParams &pp, int y, const DecodeTraceRow& row) const; - void draw_annotation_block(qreal start, qreal end, - pv::data::decode::Annotation::Class ann_class, bool use_ann_format, - QPainter &p, int h, int y, QColor row_color) const; + void draw_annotation_block(qreal start, qreal end, Annotation::Class ann_class, + bool use_ann_format, QPainter &p, int y, const DecodeTraceRow& row) const; - void draw_instant(const pv::data::decode::Annotation &a, QPainter &p, - int h, qreal x, int y) const; + void draw_instant(const Annotation* a, QPainter &p, qreal x, int y) const; - void draw_range(const pv::data::decode::Annotation &a, QPainter &p, - int h, qreal start, qreal end, int y, const ViewItemPaintParams &pp, - int row_title_width) const; + void draw_range(const Annotation* a, QPainter &p, qreal start, qreal end, + int y, const ViewItemPaintParams &pp, int row_title_width) const; - void draw_error(QPainter &p, const QString &message, - const ViewItemPaintParams &pp); + void draw_error(QPainter &p, const QString &message, const ViewItemPaintParams &pp); - void draw_unresolved_period(QPainter &p, int h, int left, - int right) const; + void draw_unresolved_period(QPainter &p, int left, int right) const; pair get_pixels_offset_samples_per_pixel() const; @@ -188,16 +218,15 @@ private: QColor get_row_color(int row_index) const; QColor get_annotation_color(QColor row_color, int annotation_index) const; - unsigned int get_row_y(const RowData* row) const; + unsigned int get_row_y(const DecodeTraceRow* row) const; - RowData* get_row_at_point(const QPoint &point); + DecodeTraceRow* get_row_at_point(const QPoint &point); const QString get_annotation_at_point(const QPoint &point); void update_stack_button(); - void create_decoder_form(int index, - shared_ptr &dec, + void create_decoder_form(int index, shared_ptr &dec, QWidget *parent, QFormLayout *form); QComboBox* create_channel_selector(QWidget *parent, @@ -205,10 +234,23 @@ private: QComboBox* create_channel_selector_init_state(QWidget *parent, const data::decode::DecodeChannel *ch); - void export_annotations(vector *annotations) const; + void export_annotations(deque& annotations) const; + void initialize_row_widgets(DecodeTraceRow* r, unsigned int row_id); void update_rows(); + /** + * Sets row r to expanded state without forcing an update of the view + */ + void set_row_expanded(DecodeTraceRow* r); + + /** + * Sets row r to collapsed state without forcing an update of the view + */ + void set_row_collapsed(DecodeTraceRow* r); + + void update_expanded_rows(); + private Q_SLOTS: void on_setting_changed(const QString &key, const QVariant &value); @@ -231,6 +273,11 @@ private Q_SLOTS: void on_delete_decoder(int index); void on_show_hide_decoder(int index); + void on_show_hide_row(int row_id); + void on_show_hide_class(QWidget* sender); + void on_show_all_classes(); + void on_hide_all_classes(); + void on_row_container_resized(QWidget* sender); void on_copy_annotation_to_clipboard(); @@ -247,14 +294,14 @@ private: pv::Session &session_; shared_ptr decode_signal_; - deque rows_; + deque rows_; mutable mutex row_modification_mutex_; map channel_id_map_; // channel selector -> decode channel ID map init_state_map_; // init state selector -> decode channel ID list< shared_ptr > bindings_; - const data::decode::Row* selected_row_; + const Row* selected_row_; pair selected_sample_range_; vector decoder_forms_; @@ -267,10 +314,15 @@ private: bool always_show_all_rows_; QSignalMapper delete_mapper_, show_hide_mapper_; + QSignalMapper row_show_hide_mapper_, class_show_hide_mapper_; QTimer delayed_trace_updater_, animation_timer_; QPolygon default_marker_shape_; + +#if DECODETRACE_SHOW_RENDER_TIME + QElapsedTimer render_time_; +#endif }; } // namespace trace