AnalogSignal: Recalculate scale when restoring div height

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

diff --git a/pv/views/trace/decodetrace.hpp b/pv/views/trace/decodetrace.hpp
index 4d6d4f8e883cdc897a0c812bea406d0dfbdb5c56..0ba52b357c8ed80e108b25559b5aa2559716c5cc 100644 (file)
--- a/pv/views/trace/decodetrace.hpp
+++ b/pv/views/trace/decodetrace.hpp
@@ -17,8 +17,8 @@
  * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#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 <config.h>
 #include "trace.hpp"
@@ -120,7 +120,6 @@ class DecodeTrace : public Trace
        Q_OBJECT
 
 private:
-       static const QColor ErrorBgColor;
        static const QColor NoDecodeColor;
        static const QColor ExpandMarkerWarnColor;
        static const QColor ExpandMarkerHiddenColor;
@@ -198,7 +197,7 @@ private:
        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;
@@ -279,7 +278,11 @@ 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);
@@ -335,4 +338,4 @@ private:
 } // namespace views
 } // namespace pv
 
-#endif // PULSEVIEW_PV_VIEWS_TRACEVIEW_DECODETRACE_HPP
+#endif // PULSEVIEW_PV_VIEWS_TRACE_DECODETRACE_HPP