DecodeTrace: Prevent trace height from jumping

[pulseview.git] / pv / view / decodetrace.hpp

diff --git a/pv/view/decodetrace.hpp b/pv/view/decodetrace.hpp
index 49168522d23c07c29e69978e8fca39e3ff3fb102..4964a95df2f7a024f1bd9c721158dd979db316ed 100644 (file)
--- a/pv/view/decodetrace.hpp
+++ b/pv/view/decodetrace.hpp
@@ -26,6 +26,7 @@
 #include <list>
 #include <map>
 #include <memory>
 #include <list>
 #include <map>
 #include <memory>

+#include <vector>

 
 #include <QSignalMapper>
 
 
 #include <QSignalMapper>
 


@@ -100,21 +101,21 @@ public:
         * Paints the background layer of the trace with a QPainter
         * @param p the QPainter to paint into.
         * @param pp the painting parameters object to paint with..
         * Paints the background layer of the trace with a QPainter
         * @param p the QPainter to paint into.
         * @param pp the painting parameters object to paint with..

-        **/
+        */

        void paint_back(QPainter &p, const ViewItemPaintParams &pp);
 
        /**
         * Paints the mid-layer of the trace with a QPainter
         * @param p the QPainter to paint into.
         * @param pp the painting parameters object to paint with.
        void paint_back(QPainter &p, const ViewItemPaintParams &pp);
 
        /**
         * Paints the mid-layer of the trace with a QPainter
         * @param p the QPainter to paint into.
         * @param pp the painting parameters object to paint with.

-        **/
+        */

        void paint_mid(QPainter &p, const ViewItemPaintParams &pp);
 
        /**
         * Paints the foreground layer of the trace with a QPainter
         * @param p the QPainter to paint into.
         * @param pp the painting parameters object to paint with.
        void paint_mid(QPainter &p, const ViewItemPaintParams &pp);
 
        /**
         * Paints the foreground layer of the trace with a QPainter
         * @param p the QPainter to paint into.
         * @param pp the painting parameters object to paint with.

-        **/
+        */

        void paint_fore(QPainter &p, const ViewItemPaintParams &pp);
 
        void populate_popup_form(QWidget *parent, QFormLayout *form);
        void paint_fore(QPainter &p, const ViewItemPaintParams &pp);
 
        void populate_popup_form(QWidget *parent, QFormLayout *form);


@@ -124,10 +125,17 @@ public:
        void delete_pressed();
 
 private:
        void delete_pressed();
 
 private:

+       void draw_annotations(std::vector<pv::data::decode::Annotation> annotations,
+               QPainter &p, int h, const ViewItemPaintParams &pp, int y,
+               size_t base_colour);
+

        void draw_annotation(const pv::data::decode::Annotation &a, QPainter &p,
                int text_height, const ViewItemPaintParams &pp, int y,
                size_t base_colour) const;
 
        void draw_annotation(const pv::data::decode::Annotation &a, QPainter &p,
                int text_height, const ViewItemPaintParams &pp, int y,
                size_t base_colour) const;
 

+       void draw_annotation_block(std::vector<pv::data::decode::Annotation> a,
+               QPainter &p, int h, int y, size_t base_colour) const;
+

        void draw_instant(const pv::data::decode::Annotation &a, QPainter &p,
                QColor fill, QColor outline, int h, double x, int y) const;
 
        void draw_instant(const pv::data::decode::Annotation &a, QPainter &p,
                QColor fill, QColor outline, int h, double x, int y) const;
 


@@ -198,7 +206,7 @@ private:
        std::vector<pv::widgets::DecoderGroupBox*> decoder_forms_;
 
        std::vector<data::decode::Row> visible_rows_;
        std::vector<pv::widgets::DecoderGroupBox*> decoder_forms_;
 
        std::vector<data::decode::Row> visible_rows_;

-       int row_height_;
+       int row_height_, max_visible_rows_;

 
        QSignalMapper delete_mapper_, show_hide_mapper_;
 };
 
        QSignalMapper delete_mapper_, show_hide_mapper_;
 };