View: Honor ENABLE_DECODE compiler switch

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

diff --git a/pv/view/view.cpp b/pv/view/view.cpp
index 124048bda8f9c63c1b14a5e770977ab89e09e37c..6ad7dea0822c0d6653a75b6b0ee2dd1e86a07e8b 100644 (file)
--- a/pv/view/view.cpp
+++ b/pv/view/view.cpp
@@ -43,7 +43,6 @@
 #include <libsigrokcxx/libsigrokcxx.hpp>
 
 #include "analogsignal.hpp"
 #include <libsigrokcxx/libsigrokcxx.hpp>
 
 #include "analogsignal.hpp"

-#include "decodetrace.hpp"

 #include "header.hpp"
 #include "logicsignal.hpp"
 #include "ruler.hpp"
 #include "header.hpp"
 #include "logicsignal.hpp"
 #include "ruler.hpp"


@@ -59,6 +58,10 @@
 #include "pv/data/logicsegment.hpp"
 #include "pv/util.hpp"
 
 #include "pv/data/logicsegment.hpp"
 #include "pv/util.hpp"
 

+#ifdef ENABLE_DECODE
+#include "decodetrace.hpp"
+#endif
+

 using boost::shared_lock;
 using boost::shared_mutex;
 
 using boost::shared_lock;
 using boost::shared_mutex;
 


@@ -203,11 +206,6 @@ const Viewport* View::viewport() const
        return viewport_;
 }
 
        return viewport_;
 }
 

-const QSize View::header_size() const
-{
-       return header_->sizeHint();
-}
-

 vector< shared_ptr<TimeItem> > View::time_items() const
 {
        const vector<shared_ptr<Flag>> f(flags());
 vector< shared_ptr<TimeItem> > View::time_items() const
 {
        const vector<shared_ptr<Flag>> f(flags());


@@ -460,9 +458,11 @@ void View::enable_coloured_bg(bool state)
                if (l)
                        l->set_coloured_bg(state);
 
                if (l)
                        l->set_coloured_bg(state);
 

+#ifdef ENABLE_DECODE

                shared_ptr<DecodeTrace> d = dynamic_pointer_cast<DecodeTrace>(i);
                if (d)
                        d->set_coloured_bg(state);
                shared_ptr<DecodeTrace> d = dynamic_pointer_cast<DecodeTrace>(i);
                if (d)
                        d->set_coloured_bg(state);

+#endif

        }
 
        viewport_->update();
        }
 
        viewport_->update();