X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=pv%2Fviews%2Ftrace%2Fdecodetrace.hpp;h=1b79161dbdb8143328651baf3a0440283fe3e830;hb=e6d85b8936b5b7aee80b03834f095fd5b52fe6f4;hp=e49d12292863766668627fe68cb10b51dc3b88ea;hpb=1573bf16ba50d1c023ad3a9ce596f0ab6eaeacff;p=pulseview.git
diff --git a/pv/views/trace/decodetrace.hpp b/pv/views/trace/decodetrace.hpp
index e49d1229..1b79161d 100644
--- a/pv/views/trace/decodetrace.hpp
+++ b/pv/views/trace/decodetrace.hpp
@@ -17,9 +17,10 @@
* along with this program; if not, see .
*/
-#ifndef PULSEVIEW_PV_VIEWS_TRACEVIEW_DECODETRACE_HPP
-#define PULSEVIEW_PV_VIEWS_TRACEVIEW_DECODETRACE_HPP
+#ifndef PULSEVIEW_PV_VIEWS_TRACE_DECODETRACE_HPP
+#define PULSEVIEW_PV_VIEWS_TRACE_DECODETRACE_HPP
+#include
#include "trace.hpp"
#include
@@ -27,37 +28,52 @@
#include
#include
+#include
+#include
+#include
+#include
+#include
+#include
#include
+#include
#include
+#include
+#include
#include
#include
+#define DECODETRACE_SHOW_RENDER_TIME 0
+
+using std::deque;
using std::list;
using std::map;
+using std::mutex;
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;
-class QComboBox;
-
namespace pv {
class Session;
namespace data {
-class DecoderStack;
-class SignalBase;
+struct DecodeChannel;
+class DecodeSignal;
namespace decode {
-class Annotation;
class Decoder;
class Row;
}
-}
+} // namespace data
namespace widgets {
class DecoderGroupBox;
@@ -66,41 +82,75 @@ class DecoderGroupBox;
namespace views {
namespace trace {
-class DecodeTrace : public Trace
+class ContainerWidget;
+
+struct DecodeTraceRow {
+ // When adding a field, make sure it's initialized properly in
+ // DecodeTrace::update_rows()
+
+ Row* decode_row;
+ unsigned int height, expanded_height, title_width, animation_step;
+ 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;
+ QCheckBox* row_visibility_checkbox;
+ vector selectors;
+};
+
+class ContainerWidget : public QWidget
{
Q_OBJECT
-private:
- struct ChannelSelector
- {
- const QComboBox *combo_;
- const QComboBox *combo_initial_pin_;
- const shared_ptr decoder_;
- const srd_channel *pdch_;
- };
+public:
+ ContainerWidget(QWidget *parent = nullptr);
+
+ virtual void resizeEvent(QResizeEvent* event);
+
+Q_SIGNALS:
+ void widgetResized(QWidget* sender);
+};
+
+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 QColor ExpandMarkerWarnColor;
+ static const QColor ExpandMarkerHiddenColor;
+ static const uint8_t ExpansionAreaHeaderAlpha;
+ static const uint8_t ExpansionAreaAlpha;
static const int ArrowSize;
static const double EndCapWidth;
static const int RowTitleMargin;
static const int DrawPadding;
- static const QColor Colours[16];
- static const QColor OutlineColours[16];
+ static const int MaxTraceUpdateRate;
+ static const int AnimationDurationInTicks;
+ static const int HiddenRowHideDelay;
public:
- DecodeTrace(pv::Session &session, shared_ptr signalbase,
+ DecodeTrace(pv::Session &session, shared_ptr signalbase,
int index);
+ ~DecodeTrace();
+
bool enabled() const;
- const shared_ptr& decoder() const;
+ shared_ptr base() const;
- shared_ptr base() const;
+ /**
+ * Sets the owner this trace in the view trace hierachy.
+ * @param The new owner of the trace.
+ */
+ virtual void set_owner(TraceTreeItemOwner *owner);
/**
* Computes the vertical extents of the contents of this row item.
@@ -131,34 +181,34 @@ public:
void populate_popup_form(QWidget *parent, QFormLayout *form);
- QMenu* create_context_menu(QWidget *parent);
+ QMenu* create_header_context_menu(QWidget *parent);
- void delete_pressed();
+ virtual QMenu* create_view_context_menu(QWidget *parent, QPoint &click_pos);
+
+ virtual void delete_pressed();
+
+ virtual void hover_point_changed(const QPoint &hp);
+
+ virtual void mouse_left_press_event(const QMouseEvent* event);
private:
- void draw_annotations(vector annotations,
- QPainter &p, int h, const ViewItemPaintParams &pp, int y,
- size_t base_colour, 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,
- size_t base_colour, 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(vector annotations,
- QPainter &p, int h, int y, size_t base_colour) const;
+ void draw_annotation_block(qreal start, qreal end, uint32_t 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, double 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, double start, double 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;
@@ -169,67 +219,120 @@ 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;
- int get_row_at_point(const QPoint &point);
+ unsigned int get_row_y(const DecodeTraceRow* row) const;
+
+ DecodeTraceRow* get_row_at_point(const QPoint &point);
const QString get_annotation_at_point(const QPoint &point);
- void create_decoder_form(int index,
- shared_ptr &dec,
+ void update_stack_button();
+
+ void create_decoder_form(int index, shared_ptr &dec,
QWidget *parent, QFormLayout *form);
QComboBox* create_channel_selector(QWidget *parent,
- const shared_ptr &dec,
- const srd_channel *const pdch);
+ const data::decode::DecodeChannel *ch);
+ QComboBox* create_channel_selector_init_state(QWidget *parent,
+ const data::decode::DecodeChannel *ch);
- QComboBox* create_channel_selector_initial_pin(QWidget *parent,
- const shared_ptr &dec,
- const srd_channel *const pdch);
+ void export_annotations(deque& annotations) const;
- void commit_decoder_channels(shared_ptr &dec);
+ void initialize_row_widgets(DecodeTraceRow* r, unsigned int row_id);
+ void update_rows();
- void commit_channels();
+ /**
+ * Sets row r to expanded state without forcing an update of the view
+ */
+ void set_row_expanded(DecodeTraceRow* r);
-public:
- void hover_point_changed();
+ /**
+ * 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_new_decode_data();
+ void on_setting_changed(const QString &key, const QVariant &value);
+
+ void on_color_changed(const QColor &color);
+
+ void on_new_annotations();
+ void on_delayed_trace_update();
+ void on_decode_reset();
+ void on_decode_finished();
+ void on_pause_decode();
void on_delete();
void on_channel_selected(int);
- void on_initial_pin_selected(int);
+ void on_channels_updated();
+
+ void on_init_state_changed(int);
void on_stack_decoder(srd_decoder *decoder);
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();
+
+ 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();
+
+ void on_animation_timer();
+ void on_hide_hidden_rows();
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_;
- list channel_selectors_;
+ const 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_;
int min_useful_label_width_;
+ bool always_show_all_rows_, show_hidden_rows_;
QSignalMapper delete_mapper_, show_hide_mapper_;
+ QSignalMapper row_show_hide_mapper_, class_show_hide_mapper_;
+
+ QTimer delayed_trace_updater_, animation_timer_, delayed_hidden_row_hider_;
+
+ QPolygon default_marker_shape_;
+
+#if DECODETRACE_SHOW_RENDER_TIME
+ QElapsedTimer render_time_;
+#endif
};
} // namespace trace
} // namespace views
} // namespace pv
-#endif // PULSEVIEW_PV_VIEWS_TRACEVIEW_DECODETRACE_HPP
+#endif // PULSEVIEW_PV_VIEWS_TRACE_DECODETRACE_HPP