projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Move view-independent data from view::DecodeTrace to SignalBase
[pulseview.git]
/
pv
/
data
/
signalbase.hpp
diff --git
a/pv/data/signalbase.hpp
b/pv/data/signalbase.hpp
index ca3cd5c47c8b0489490c65a66905cc0c000c3a47..a682a56e1f52cadbb60a8a3a1dba9a80e2eacbc2 100644
(file)
--- a/
pv/data/signalbase.hpp
+++ b/
pv/data/signalbase.hpp
@@
-38,6
+38,7
@@
namespace pv {
namespace data {
class Analog;
namespace data {
class Analog;
+class DecoderStack;
class Logic;
class SignalData;
class Logic;
class SignalData;
@@
-119,6
+120,14
@@
public:
*/
std::shared_ptr<pv::data::Logic> logic_data() const;
*/
std::shared_ptr<pv::data::Logic> logic_data() const;
+#ifdef ENABLE_DECODE
+ bool is_decode_signal() const;
+
+ std::shared_ptr<pv::data::DecoderStack> decoder_stack() const;
+
+ void set_decoder_stack(std::shared_ptr<pv::data::DecoderStack>
+ decoder_stack);
+#endif
Q_SIGNALS:
void enabled_changed(const bool &value);
Q_SIGNALS:
void enabled_changed(const bool &value);
@@
-131,6
+140,10
@@
private:
std::shared_ptr<sigrok::Channel> channel_;
std::shared_ptr<pv::data::SignalData> data_;
std::shared_ptr<sigrok::Channel> channel_;
std::shared_ptr<pv::data::SignalData> data_;
+#ifdef ENABLE_DECODE
+ std::shared_ptr<pv::data::DecoderStack> decoder_stack_;
+#endif
+
QString name_;
QColor colour_, bgcolour_;
};
QString name_;
QColor colour_, bgcolour_;
};