X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fview%2Fview.cpp;h=6ad7dea0822c0d6653a75b6b0ee2dd1e86a07e8b;hp=124048bda8f9c63c1b14a5e770977ab89e09e37c;hb=dcfe0a01f72021aab961245d0ebcc9f8d4504b40;hpb=e081bf3d864d5662716668d6b4adcb0871d11dae diff --git a/pv/view/view.cpp b/pv/view/view.cpp index 124048bd..6ad7dea0 100644 --- a/pv/view/view.cpp +++ b/pv/view/view.cpp @@ -43,7 +43,6 @@ #include #include "analogsignal.hpp" -#include "decodetrace.hpp" #include "header.hpp" #include "logicsignal.hpp" #include "ruler.hpp" @@ -59,6 +58,10 @@ #include "pv/data/logicsegment.hpp" #include "pv/util.hpp" +#ifdef ENABLE_DECODE +#include "decodetrace.hpp" +#endif + using boost::shared_lock; using boost::shared_mutex; @@ -203,11 +206,6 @@ const Viewport* View::viewport() const return viewport_; } -const QSize View::header_size() const -{ - return header_->sizeHint(); -} - vector< shared_ptr > View::time_items() const { const vector> f(flags()); @@ -460,9 +458,11 @@ void View::enable_coloured_bg(bool state) if (l) l->set_coloured_bg(state); +#ifdef ENABLE_DECODE shared_ptr d = dynamic_pointer_cast(i); if (d) d->set_coloured_bg(state); +#endif } viewport_->update();