X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=pv%2Fviews%2Ftrace%2Fdecodetrace.hpp;h=1b79161dbdb8143328651baf3a0440283fe3e830;hb=20c99cfc69d3c7430817abd9a1f810698deb4a18;hp=e262498848bf2c2c513498c69a499d6d2bc96bad;hpb=6a26fc4417798ab21654197e105e707a14d462f0;p=pulseview.git
diff --git a/pv/views/trace/decodetrace.hpp b/pv/views/trace/decodetrace.hpp
index e2624988..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
@@ -28,7 +29,9 @@
#include
#include
+#include
#include
+#include
#include
#include
#include
@@ -40,6 +43,8 @@
#include
#include
+#define DECODETRACE_SHOW_RENDER_TIME 0
+
using std::deque;
using std::list;
using std::map;
@@ -48,6 +53,9 @@ 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;
@@ -74,23 +82,39 @@ class DecoderGroupBox;
namespace views {
namespace 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;
+ bool exists, currently_visible, has_hidden_classes;
bool expand_marker_highlighted, expanding, expanded, collapsing;
QPolygon expand_marker_shape;
float anim_height, anim_shape;
- QWidget* container;
+ ContainerWidget* container;
QWidget* header_container;
QWidget* selector_container;
+ QCheckBox* row_visibility_checkbox;
vector selectors;
};
+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
{
Q_OBJECT
@@ -98,6 +122,8 @@ class DecodeTrace : public Trace
private:
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;
@@ -107,17 +133,24 @@ private:
static const int DrawPadding;
static const int MaxTraceUpdateRate;
- static const unsigned int AnimationDurationInTicks;
+ 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;
- 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.
@@ -159,30 +192,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, 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, 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;
@@ -195,9 +221,6 @@ private:
*/
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;
-
unsigned int get_row_y(const DecodeTraceRow* row) const;
DecodeTraceRow* get_row_at_point(const QPoint &point);
@@ -206,8 +229,7 @@ private:
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,
@@ -215,7 +237,7 @@ 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();
@@ -235,6 +257,8 @@ private:
private Q_SLOTS:
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();
@@ -256,6 +280,9 @@ private Q_SLOTS:
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();
@@ -267,6 +294,7 @@ private Q_SLOTS:
void on_export_all_rows_from_here();
void on_animation_timer();
+ void on_hide_hidden_rows();
private:
pv::Session &session_;
@@ -286,21 +314,25 @@ private:
QPushButton* stack_button_;
unsigned int default_row_height_, annotation_height_;
- unsigned int visible_rows_, max_visible_rows_;
+ unsigned int visible_rows_;
int min_useful_label_width_;
- bool always_show_all_rows_;
+ 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_;
+ 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