Change namespace for the trace view and implement ViewBase

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

diff --git a/pv/view/decodetrace.hpp b/pv/view/decodetrace.hpp
index 968ebf9569672a92e76640bc7a88039603a235ee..7e9c081be542b7f08235d73ec88853342320d054 100644 (file)
--- a/pv/view/decodetrace.hpp
+++ b/pv/view/decodetrace.hpp
@@ -18,18 +18,20 @@
  * 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_VIEWS_TRACEVIEW_DECODETRACE_HPP
+#define PULSEVIEW_PV_VIEWS_TRACEVIEW_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/signalbase.hpp>
 #include <pv/data/decode/row.hpp>
 
 struct srd_channel;
@@ -43,6 +45,7 @@ class Session;
 
 namespace data {
 class DecoderStack;
+class SignalBase;
 
 namespace decode {
 class Annotation;
@@ -55,7 +58,8 @@ namespace widgets {
 class DecoderGroupBox;
 }
 
-namespace view {
+namespace views {
+namespace TraceView {
 
 class DecodeTrace : public Trace
 {
@@ -76,20 +80,22 @@ private:
 
        static const int ArrowSize;
        static const double EndCapWidth;
+       static const int RowTitleMargin;
        static const int DrawPadding;
 
        static const QColor Colours[16];
        static const QColor OutlineColours[16];
 
 public:
-       DecodeTrace(pv::Session &session,
-               std::shared_ptr<pv::data::DecoderStack> decoder_stack,
+       DecodeTrace(pv::Session &session, std::shared_ptr<data::SignalBase> signalbase,
                int index);
 
        bool enabled() const;
 
        const std::shared_ptr<pv::data::DecoderStack>& decoder() const;
 
+       std::shared_ptr<data::SignalBase> base() const;
+
        /**
         * Computes the vertical extents of the contents of this row item.
         * @return A pair containing the minimum and maximum y-values.
@@ -100,21 +106,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..
-        **/
+        */
        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_fore(QPainter &p, const ViewItemPaintParams &pp);
 
        void populate_popup_form(QWidget *parent, QFormLayout *form);
@@ -124,16 +130,23 @@ 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, int row_title_width);
+
        void draw_annotation(const pv::data::decode::Annotation &a, QPainter &p,
-               int text_height, const ViewItemPaintParams &pp, int y,
-               size_t base_colour) const;
+               int h, const ViewItemPaintParams &pp, int y,
+               size_t base_colour, int row_title_width) const;
+
+       void draw_annotation_block(std::vector<pv::data::decode::Annotation> annotations,
+               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;
+               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;
+               int h, double start, double end, int y, const ViewItemPaintParams &pp,
+               int row_title_width) const;
 
        void draw_error(QPainter &p, const QString &message,
                const ViewItemPaintParams &pp);
@@ -187,23 +200,27 @@ private Q_SLOTS:
 
 private:
        pv::Session &session_;
-       std::shared_ptr<pv::data::DecoderStack> decoder_stack_;
+       std::shared_ptr<data::SignalBase> signalbase_;
 
+       std::vector<data::decode::Row> visible_rows_;
        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 row_height_;
+       std::map<data::decode::Row, int> row_title_widths_;
+       int row_height_, max_visible_rows_;
+
+       int min_useful_label_width_;
 
        QSignalMapper delete_mapper_, show_hide_mapper_;
 };
 
-} // namespace view
+} // namespace TraceView
+} // namespace views
 } // namespace pv
 
-#endif // PULSEVIEW_PV_VIEW_DECODETRACE_H
+#endif // PULSEVIEW_PV_VIEWS_TRACEVIEW_DECODETRACE_HPP