projects
/
pulseview.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
1c8faf5
)
View: Honor ENABLE_DECODE compiler switch
author
Soeren Apel
<soeren@apelpie.net>
Sun, 31 Jan 2016 13:12:44 +0000
(14:12 +0100)
committer
Soeren Apel
<soeren@apelpie.net>
Sun, 31 Jan 2016 13:13:21 +0000
(14:13 +0100)
pv/view/view.cpp
patch
|
blob
|
history
diff --git
a/pv/view/view.cpp
b/pv/view/view.cpp
index c9b08bf8c0445de0783d5bbb16d4d4275f5066f1..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;
@@
-455,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();