DecodeTrace: Try to keep annotation labels within the view

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

diff --git a/pv/view/decodetrace.hpp b/pv/view/decodetrace.hpp
index a0f8e8000cbf66e5dc3b2d4b277f75970ce68d0f..af9151810100f1cf5eadea7dc3f58d60725d3bb5 100644 (file)
--- a/pv/view/decodetrace.hpp
+++ b/pv/view/decodetrace.hpp
@@ -18,18 +18,19 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-#ifndef PULSEVIEW_PV_VIEW_DECODETRACE_H
-#define PULSEVIEW_PV_VIEW_DECODETRACE_H
+#ifndef PULSEVIEW_PV_VIEW_DECODETRACE_HPP
+#define PULSEVIEW_PV_VIEW_DECODETRACE_HPP
 
 #include "trace.hpp"
 
 #include <list>
 #include <map>
 #include <memory>
+#include <vector>
 
 #include <QSignalMapper>
 
-#include <pv/prop/binding/decoderoptions.hpp>
+#include <pv/binding/decoder.hpp>
 #include <pv/data/decode/row.hpp>
 
 struct srd_channel;
@@ -100,22 +101,22 @@ 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..
-        **/
-       void paint_back(QPainter &p, const RowItemPaintParams &pp);
+        */
+       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 RowItemPaintParams &pp);
+        */
+       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 RowItemPaintParams &pp);
+        */
+       void paint_fore(QPainter &p, const ViewItemPaintParams &pp);
 
        void populate_popup_form(QWidget *parent, QFormLayout *form);
 
@@ -124,19 +125,26 @@ public:
        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 RowItemPaintParams &pp, int y,
+               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_range(const pv::data::decode::Annotation &a, QPainter &p,
                QColor fill, QColor outline, int h, double start,
-               double end, int y) const;
+               double end, int y, const ViewItemPaintParams &pp) const;
 
        void draw_error(QPainter &p, const QString &message,
-               const RowItemPaintParams &pp);
+               const ViewItemPaintParams &pp);
 
        void draw_unresolved_period(QPainter &p, int h, int left,
                int right) const;
@@ -191,14 +199,14 @@ private:
 
        uint64_t decode_start_, decode_end_;
 
-       std::list< std::shared_ptr<pv::prop::binding::DecoderOptions> >
+       std::list< std::shared_ptr<pv::binding::Decoder> >
                bindings_;
 
        std::list<ChannelSelector> channel_selectors_;
        std::vector<pv::widgets::DecoderGroupBox*> decoder_forms_;
 
        std::vector<data::decode::Row> visible_rows_;
-       int text_height_, row_height_;
+       int row_height_, max_visible_rows_;
 
        QSignalMapper delete_mapper_, show_hide_mapper_;
 };
@@ -206,4 +214,4 @@ private:
 } // namespace view
 } // namespace pv
 
-#endif // PULSEVIEW_PV_VIEW_DECODETRACE_H
+#endif // PULSEVIEW_PV_VIEW_DECODETRACE_HPP