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
/
session.cpp
diff --git
a/pv/session.cpp
b/pv/session.cpp
index 9d00a51032c649455b15eceab0f7dfdead57e335..a61224048b018701cad13b891db4baf00a50a8b7 100644
(file)
--- a/
pv/session.cpp
+++ b/
pv/session.cpp
@@
-417,11
+417,6
@@
void Session::update_signals()
if (iter != prev_sigs.end()) {
// Copy the signal from the old set to the new
signal = *iter;
if (iter != prev_sigs.end()) {
// Copy the signal from the old set to the new
signal = *iter;
- auto logic_signal = dynamic_pointer_cast<
- view::LogicSignal>(signal);
- if (logic_signal)
- logic_signal->set_logic_data(
- logic_data_);
} else {
// Create a new signal
signalbase = shared_ptr<data::SignalBase>(
} else {
// Create a new signal
signalbase = shared_ptr<data::SignalBase>(
@@
-429,9
+424,10
@@
void Session::update_signals()
switch(channel->type()->id()) {
case SR_CHANNEL_LOGIC:
switch(channel->type()->id()) {
case SR_CHANNEL_LOGIC:
+ signalbase->set_data(logic_data_);
signal = shared_ptr<view::Signal>(
new view::LogicSignal(*this,
signal = shared_ptr<view::Signal>(
new view::LogicSignal(*this,
- device_, signalbase
, logic_data_
));
+ device_, signalbase));
all_signal_data_.insert(logic_data_);
signalbases_.insert(signalbase);
break;
all_signal_data_.insert(logic_data_);
signalbases_.insert(signalbase);
break;