projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
SignalBase: Default to dynamic conversion preset, not custom values
[pulseview.git]
/
pv
/
data
/
decodesignal.cpp
diff --git
a/pv/data/decodesignal.cpp
b/pv/data/decodesignal.cpp
index a57a9a1a9624556d5658dc3d6d3877f160194095..daa52ed62d67231821f4fee2647fd506853d96a7 100644
(file)
--- a/
pv/data/decodesignal.cpp
+++ b/
pv/data/decodesignal.cpp
@@
-62,8
+62,6
@@
DecodeSignal::DecodeSignal(pv::Session &session) :
{
connect(&session_, SIGNAL(capture_state_changed(int)),
this, SLOT(on_capture_state_changed(int)));
{
connect(&session_, SIGNAL(capture_state_changed(int)),
this, SLOT(on_capture_state_changed(int)));
-
- set_name(tr("Empty decoder signal"));
}
DecodeSignal::~DecodeSignal()
}
DecodeSignal::~DecodeSignal()
@@
-508,11
+506,13
@@
void DecodeSignal::restore_settings(QSettings &settings)
// Include the newly created decode channels in the channel lists
update_channel_list();
// Include the newly created decode channels in the channel lists
update_channel_list();
+ commit_decoder_channels();
break;
}
}
settings.endGroup();
break;
}
}
settings.endGroup();
+ channels_updated();
}
// Restore channel mapping
}
// Restore channel mapping
@@
-930,7
+930,7
@@
void DecodeSignal::connect_input_notifiers()
void DecodeSignal::annotation_callback(srd_proto_data *pdata, void *decode_signal)
{
assert(pdata);
void DecodeSignal::annotation_callback(srd_proto_data *pdata, void *decode_signal)
{
assert(pdata);
- assert(decode
r
);
+ assert(decode
_signal
);
DecodeSignal *const ds = (DecodeSignal*)decode_signal;
assert(ds);
DecodeSignal *const ds = (DecodeSignal*)decode_signal;
assert(ds);