projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Introduce pv::data::SignalBase
[pulseview.git]
/
pv
/
view
/
logicsignal.hpp
diff --git
a/pv/view/logicsignal.hpp
b/pv/view/logicsignal.hpp
index 8c3525e6c47427bf94587fbfd82203ec1c2964e0..9bd91ba93a54eb6994f5569337921aa7580f472c 100644
(file)
--- a/
pv/view/logicsignal.hpp
+++ b/
pv/view/logicsignal.hpp
@@
-66,10
+66,10
@@
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<
data::SignalBase
> channel,
std::shared_ptr<pv::data::Logic> data);
std::shared_ptr<pv::data::Logic> data);
- virtual ~LogicSignal();
+ virtual ~LogicSignal()
= default
;
std::shared_ptr<pv::data::SignalData> data() const;
std::shared_ptr<pv::data::SignalData> data() const;
@@
-118,7
+118,7
@@
private:
const std::vector<int32_t> get_trigger_types() const;
QAction* action_from_trigger_type(
const std::vector<int32_t> get_trigger_types() const;
QAction* action_from_trigger_type(
- const sigrok::TriggerMatchType *
match
);
+ const sigrok::TriggerMatchType *
type
);
const sigrok::TriggerMatchType* trigger_type_from_action(
QAction *action);
void populate_popup_form(QWidget *parent, QFormLayout *form);
const sigrok::TriggerMatchType* trigger_type_from_action(
QAction *action);
void populate_popup_form(QWidget *parent, QFormLayout *form);