projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Remove data_ also for LogicSignal and use SignalBase data instead
[pulseview.git]
/
pv
/
view
/
logicsignal.hpp
diff --git
a/pv/view/logicsignal.hpp
b/pv/view/logicsignal.hpp
index d34b65e755a399540ff96ee965b1f73d93a930c5..8274b618a541b565126aa4c67562292957e29cd8 100644
(file)
--- a/
pv/view/logicsignal.hpp
+++ b/
pv/view/logicsignal.hpp
@@
-66,17
+66,14
@@
private:
public:
LogicSignal(pv::Session &session,
std::shared_ptr<devices::Device> device,
public:
LogicSignal(pv::Session &session,
std::shared_ptr<devices::Device> device,
- std::shared_ptr<sigrok::Channel> channel,
- std::shared_ptr<pv::data::Logic> data);
+ std::shared_ptr<data::SignalBase> base);
- virtual ~LogicSignal();
+ virtual ~LogicSignal()
= default
;
std::shared_ptr<pv::data::SignalData> data() const;
std::shared_ptr<pv::data::Logic> logic_data() const;
std::shared_ptr<pv::data::SignalData> data() const;
std::shared_ptr<pv::data::Logic> logic_data() const;
- void set_logic_data(std::shared_ptr<pv::data::Logic> data);
-
/**
* Computes the vertical extents of the contents of this row item.
* @return A pair containing the minimum and maximum y-values.
/**
* Computes the vertical extents of the contents of this row item.
* @return A pair containing the minimum and maximum y-values.
@@
-134,7
+131,6
@@
private:
int signal_height_;
std::shared_ptr<pv::devices::Device> device_;
int signal_height_;
std::shared_ptr<pv::devices::Device> device_;
- std::shared_ptr<pv::data::Logic> data_;
const sigrok::TriggerMatchType *trigger_match_;
QToolBar *trigger_bar_;
const sigrok::TriggerMatchType *trigger_match_;
QToolBar *trigger_bar_;