Fix #1505 by always updating the DecodeTrace height when needed

[pulseview.git] / pv / views / trace / decodetrace.hpp

diff --git a/pv/views/trace/decodetrace.hpp b/pv/views/trace/decodetrace.hpp
index e262498848bf2c2c513498c69a499d6d2bc96bad..258509e66ea4ec4869bda2a185e95454f73130d7 100644 (file)
--- 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 <config.h>
 #include "trace.hpp"
 
 #include <list>
@@ -28,7 +29,9 @@
 #include <vector>
 
 #include <QColor>
+#include <QComboBox>
 #include <QCheckBox>
+#include <QElapsedTimer>
 #include <QPolygon>
 #include <QPushButton>
 #include <QSignalMapper>
@@ -40,6 +43,8 @@
 #include <pv/data/decode/row.hpp>
 #include <pv/data/signalbase.hpp>
 
+#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,21 +82,41 @@ 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<QCheckBox*> selectors;
+
+       QColor row_color;
+       map<uint32_t, QColor> ann_class_color;
+       map<uint32_t, QColor> 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
@@ -98,6 +126,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 +137,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<data::SignalBase> signalbase,
+       DecodeTrace(pv::Session &session, shared_ptr<SignalBase> signalbase,
                int index);
 
        ~DecodeTrace();
 
        bool enabled() const;
 
-       shared_ptr<data::SignalBase> base() const;
+       shared_ptr<SignalBase> 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 +196,23 @@ public:
        virtual void mouse_left_press_event(const QMouseEvent* event);
 
 private:
-       void draw_annotations(vector<pv::data::decode::Annotation> annotations,
-               QPainter &p, int h, const ViewItemPaintParams &pp, int y,
-               QColor row_color, int row_title_width);
+       void draw_annotations(deque<const Annotation*>& 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<double, double> get_pixels_offset_samples_per_pixel() const;
 
@@ -206,8 +236,7 @@ private:
 
        void update_stack_button();
 
-       void create_decoder_form(int index,
-               shared_ptr<pv::data::decode::Decoder> &dec,
+       void create_decoder_form(int index, shared_ptr<Decoder> &dec,
                QWidget *parent, QFormLayout *form);
 
        QComboBox* create_channel_selector(QWidget *parent,
@@ -215,7 +244,7 @@ private:
        QComboBox* create_channel_selector_init_state(QWidget *parent,
                const data::decode::DecodeChannel *ch);
 
-       void export_annotations(vector<data::decode::Annotation> *annotations) const;
+       void export_annotations(deque<const Annotation*>& annotations) const;
 
        void initialize_row_widgets(DecodeTraceRow* r, unsigned int row_id);
        void update_rows();
@@ -256,6 +285,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 +299,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,17 +319,21 @@ 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