LogicSignal: Added an icon cache

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

diff --git a/pv/view/decodetrace.cpp b/pv/view/decodetrace.cpp
index 005d98b8a86b35de72c31910f86033a0bf2f32e7..790589568582003b70f2ceb948a7803b4ae07fc1 100644 (file)
--- a/pv/view/decodetrace.cpp
+++ b/pv/view/decodetrace.cpp
@@ -39,19 +39,19 @@ extern "C" {
 #include <QPushButton>
 #include <QToolTip>
 
-#include "decodetrace.h"
-
-#include <pv/sigsession.h>
-#include <pv/data/decoderstack.h>
-#include <pv/data/decode/decoder.h>
-#include <pv/data/logic.h>
-#include <pv/data/logicsnapshot.h>
-#include <pv/data/decode/annotation.h>
-#include <pv/view/logicsignal.h>
-#include <pv/view/view.h>
-#include <pv/view/viewport.h>
-#include <pv/widgets/decodergroupbox.h>
-#include <pv/widgets/decodermenu.h>
+#include "decodetrace.hpp"
+
+#include <pv/sigsession.hpp>
+#include <pv/data/decoderstack.hpp>
+#include <pv/data/decode/decoder.hpp>
+#include <pv/data/logic.hpp>
+#include <pv/data/logicsnapshot.hpp>
+#include <pv/data/decode/annotation.hpp>
+#include <pv/view/logicsignal.hpp>
+#include <pv/view/view.hpp>
+#include <pv/view/viewport.hpp>
+#include <pv/widgets/decodergroupbox.hpp>
+#include <pv/widgets/decodermenu.hpp>
 
 using boost::shared_lock;
 using boost::shared_mutex;
@@ -123,7 +123,7 @@ const QColor DecodeTrace::OutlineColours[16] = {
        QColor(0x6B, 0x23, 0x37)
 };
 
-DecodeTrace::DecodeTrace(pv::SigSession &session,
+DecodeTrace::DecodeTrace(pv::Session &session,
        std::shared_ptr<pv::data::DecoderStack> decoder_stack, int index) :
        Trace(QString::fromUtf8(
                decoder_stack->stack().front()->decoder()->name)),
@@ -609,9 +609,8 @@ void DecodeTrace::hover_point_changed()
        QString ann = get_annotation_at_point(hp);
 
        assert(view);
-       assert(row_height_);
 
-       if (ann.isEmpty()) {
+       if (!row_height_ || ann.isEmpty()) {
                hide_hover_annotation();
                return;
        }