X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=pv%2Fviews%2Ftrace%2Fdecodetrace.hpp;h=75bea06cdd81668582d6953007953e2c37d60c61;hb=9741d6e0ef768fc9f9fddd458803423c733b2305;hp=6ba48455fe88a964cf7268ae1fbf021523d23404;hpb=5b6ae10391736ab2f81de851686dee15bbcbf9f9;p=pulseview.git diff --git a/pv/views/trace/decodetrace.hpp b/pv/views/trace/decodetrace.hpp index 6ba48455..75bea06c 100644 --- a/pv/views/trace/decodetrace.hpp +++ b/pv/views/trace/decodetrace.hpp @@ -27,16 +27,22 @@ #include #include +#include #include +#include #include #include #include +#include +#include #include #include +using std::deque; using std::list; using std::map; +using std::mutex; using std::pair; using std::shared_ptr; using std::vector; @@ -44,23 +50,18 @@ using std::vector; struct srd_channel; struct srd_decoder; -class QComboBox; - namespace pv { class Session; namespace data { -class SignalBase; struct DecodeChannel; class DecodeSignal; namespace decode { -class Annotation; class Decoder; -class Row; -} } +} // namespace data namespace widgets { class DecoderGroupBox; @@ -69,14 +70,22 @@ class DecoderGroupBox; namespace views { namespace trace { +struct RowData { + // When adding a field, make sure it's initialized properly in + // DecodeTrace::update_rows() + + data::decode::Row decode_row; + unsigned int height, title_width; + bool exists, currently_visible, expand_marker_highlighted, expanded; +}; + class DecodeTrace : public Trace { Q_OBJECT private: - static const QColor DecodeColours[4]; - static const QColor ErrorBgColour; - static const QColor NoDecodeColour; + static const QColor ErrorBgColor; + static const QColor NoDecodeColor; static const int ArrowSize; static const double EndCapWidth; @@ -85,13 +94,12 @@ private: static const int MaxTraceUpdateRate; - static const QColor Colours[16]; - static const QColor OutlineColours[16]; - public: DecodeTrace(pv::Session &session, shared_ptr signalbase, int index); + ~DecodeTrace(); + bool enabled() const; shared_ptr base() const; @@ -125,27 +133,30 @@ public: void populate_popup_form(QWidget *parent, QFormLayout *form); - QMenu* create_context_menu(QWidget *parent); + QMenu* create_header_context_menu(QWidget *parent); + + virtual QMenu* create_view_context_menu(QWidget *parent, QPoint &click_pos); void delete_pressed(); private: void draw_annotations(vector annotations, QPainter &p, int h, const ViewItemPaintParams &pp, int y, - size_t base_colour, int row_title_width); + QColor row_color, int row_title_width); void draw_annotation(const pv::data::decode::Annotation &a, QPainter &p, int h, const ViewItemPaintParams &pp, int y, - size_t base_colour, int row_title_width) const; + QColor row_color, int row_title_width) const; - void draw_annotation_block(vector annotations, - QPainter &p, int h, int y, size_t base_colour) 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_instant(const pv::data::decode::Annotation &a, QPainter &p, - int h, double x, int y) const; + int h, qreal x, int y) const; void draw_range(const pv::data::decode::Annotation &a, QPainter &p, - int h, double start, double end, int y, const ViewItemPaintParams &pp, + int h, qreal start, qreal end, int y, const ViewItemPaintParams &pp, int row_title_width) const; void draw_error(QPainter &p, const QString &message, @@ -163,27 +174,43 @@ private: * @return Returns a pair containing the start sample and the end * sample that correspond to the start and end coordinates. */ - pair get_sample_range(int x_start, int x_end) const; + pair get_view_sample_range(int x_start, int x_end) const; + + QColor get_row_color(int row_index) const; + QColor get_annotation_color(QColor row_color, int annotation_index) const; - int get_row_at_point(const QPoint &point); + unsigned int get_row_y(const RowData* row) const; + + RowData* 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, QWidget *parent, QFormLayout *form); QComboBox* create_channel_selector(QWidget *parent, - const data::DecodeChannel *ch); + const data::decode::DecodeChannel *ch); QComboBox* create_channel_selector_init_state(QWidget *parent, - const data::DecodeChannel *ch); + const data::decode::DecodeChannel *ch); + + void export_annotations(vector *annotations) const; + + void update_rows(); public: - void hover_point_changed(); + virtual void hover_point_changed(const QPoint &hp); private Q_SLOTS: + void on_setting_changed(const QString &key, const QVariant &value); + void on_new_annotations(); void on_delayed_trace_update(); + void on_decode_reset(); + void on_decode_finished(); + void on_pause_decode(); void on_delete(); @@ -199,23 +226,37 @@ private Q_SLOTS: void on_show_hide_decoder(int index); + void on_copy_annotation_to_clipboard(); + + void on_export_row(); + void on_export_all_rows(); + void on_export_row_with_cursor(); + void on_export_all_rows_with_cursor(); + void on_export_row_from_here(); + void on_export_all_rows_from_here(); + private: pv::Session &session_; shared_ptr decode_signal_; - vector visible_rows_; - uint64_t decode_start_, decode_end_; + 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_; + pair selected_sample_range_; + vector decoder_forms_; + QPushButton* stack_button_; - map row_title_widths_; - int row_height_, max_visible_rows_; + unsigned int default_row_height_, annotation_height_; + unsigned int visible_rows_, max_visible_rows_; int min_useful_label_width_; + bool always_show_all_rows_; QSignalMapper delete_mapper_, show_hide_mapper_;