X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=pv%2Fviews%2Ftrace%2Fdecodetrace.hpp;h=0ba52b357c8ed80e108b25559b5aa2559716c5cc;hb=67784be7a0b4ab46ed566119d182d92695a40ae3;hp=9877dc11ff63c7ece0c0cdc945ab5b3c31cb6335;hpb=adf9e02242336548a384c23dadc062af7a2ef83a;p=pulseview.git
diff --git a/pv/views/trace/decodetrace.hpp b/pv/views/trace/decodetrace.hpp
index 9877dc11..0ba52b35 100644
--- a/pv/views/trace/decodetrace.hpp
+++ b/pv/views/trace/decodetrace.hpp
@@ -17,8 +17,8 @@
* 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"
@@ -29,6 +29,7 @@
#include
#include
+#include
#include
#include
#include
@@ -97,10 +98,8 @@ struct DecodeTraceRow {
ContainerWidget* container;
QWidget* header_container;
QWidget* selector_container;
+ QCheckBox* row_visibility_checkbox;
vector selectors;
-
- QColor row_color;
- map ann_class_color;
};
class ContainerWidget : public QWidget
@@ -121,9 +120,9 @@ class DecodeTrace : public Trace
Q_OBJECT
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;
@@ -133,7 +132,8 @@ 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,
@@ -145,6 +145,12 @@ public:
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.
* @return A pair containing the minimum and maximum y-values.
@@ -185,13 +191,13 @@ public:
virtual void mouse_left_press_event(const QMouseEvent* event);
private:
- void draw_annotations(vector annotations, QPainter &p,
+ void draw_annotations(deque& annotations, QPainter &p,
const ViewItemPaintParams &pp, int y, const DecodeTraceRow& row);
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, Annotation::Class ann_class,
+ 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 Annotation* a, QPainter &p, qreal x, int y) const;
@@ -214,9 +220,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);
@@ -233,7 +236,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();
@@ -253,6 +256,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();
@@ -273,7 +278,13 @@ private Q_SLOTS:
void on_show_hide_decoder(int index);
void on_show_hide_row(int row_id);
+#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
+ void on_show_hide_class(QObject* sender);
+#else
void on_show_hide_class(QWidget* sender);
+#endif
+ void on_show_all_classes();
+ void on_hide_all_classes();
void on_row_container_resized(QWidget* sender);
void on_copy_annotation_to_clipboard();
@@ -286,6 +297,7 @@ private Q_SLOTS:
void on_export_all_rows_from_here();
void on_animation_timer();
+ void on_hide_hidden_rows();
private:
pv::Session &session_;
@@ -305,15 +317,15 @@ 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_;
@@ -326,4 +338,4 @@ private:
} // namespace views
} // namespace pv
-#endif // PULSEVIEW_PV_VIEWS_TRACEVIEW_DECODETRACE_HPP
+#endif // PULSEVIEW_PV_VIEWS_TRACE_DECODETRACE_HPP