projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
DecodeSignal: Mux all segments
[pulseview.git]
/
pv
/
data
/
signalbase.cpp
diff --git
a/pv/data/signalbase.cpp
b/pv/data/signalbase.cpp
index e267885d8d214356d6e19692decf19cf7f56d796..e500231b6e0404aeb75fbf5d603276e443bda1b5 100644
(file)
--- a/
pv/data/signalbase.cpp
+++ b/
pv/data/signalbase.cpp
@@
-344,7
+344,7
@@
SignalBase::ConversionPreset SignalBase::get_current_conversion_preset() const
if (preset != conversion_options_.end())
return (ConversionPreset)((preset->second).toInt());
if (preset != conversion_options_.end())
return (ConversionPreset)((preset->second).toInt());
- return
No
Preset;
+ return
Dynamic
Preset;
}
void SignalBase::set_conversion_preset(ConversionPreset id)
}
void SignalBase::set_conversion_preset(ConversionPreset id)
@@
-539,6
+539,7
@@
void SignalBase::start_conversion(bool delayed_start)
if (converted_data_)
converted_data_->clear();
if (converted_data_)
converted_data_->clear();
+ samples_cleared();
if (conversion_is_a2l()) {
shared_ptr<Analog> analog_data = dynamic_pointer_cast<Analog>(data_);
if (conversion_is_a2l()) {
shared_ptr<Analog> analog_data = dynamic_pointer_cast<Analog>(data_);