projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Rename 'probe' to 'channel' everywhere.
[pulseview.git]
/
pv
/
view
/
decodetrace.h
diff --git
a/pv/view/decodetrace.h
b/pv/view/decodetrace.h
index 4b3bc3dec21ca6322cb4de879ebb01ffab020e75..b93aa01f0a4cc8f69cfd44eb9ab37260b448db5d 100644
(file)
--- a/
pv/view/decodetrace.h
+++ b/
pv/view/decodetrace.h
@@
-61,7
+61,7
@@
class DecodeTrace : public Trace
Q_OBJECT
private:
Q_OBJECT
private:
- struct
Probe
Selector
+ struct
Channel
Selector
{
const QComboBox *_combo;
const std::shared_ptr<pv::data::decode::Decoder> _decoder;
{
const QComboBox *_combo;
const std::shared_ptr<pv::data::decode::Decoder> _decoder;
@@
-145,21
+145,21
@@
private:
std::shared_ptr<pv::data::decode::Decoder> &dec,
QWidget *parent, QFormLayout *form);
std::shared_ptr<pv::data::decode::Decoder> &dec,
QWidget *parent, QFormLayout *form);
- QComboBox* create_
probe
_selector(QWidget *parent,
+ QComboBox* create_
channel
_selector(QWidget *parent,
const std::shared_ptr<pv::data::decode::Decoder> &dec,
const srd_channel *const pdch);
const std::shared_ptr<pv::data::decode::Decoder> &dec,
const srd_channel *const pdch);
- void commit_decoder_
probe
s(
+ void commit_decoder_
channel
s(
std::shared_ptr<data::decode::Decoder> &dec);
std::shared_ptr<data::decode::Decoder> &dec);
- void commit_
probe
s();
+ void commit_
channel
s();
private Q_SLOTS:
void on_new_decode_data();
void on_delete();
private Q_SLOTS:
void on_new_decode_data();
void on_delete();
- void on_
probe
_selected(int);
+ void on_
channel
_selected(int);
void on_stack_decoder(srd_decoder *decoder);
void on_stack_decoder(srd_decoder *decoder);
@@
-176,7
+176,7
@@
private:
std::list< std::shared_ptr<pv::prop::binding::DecoderOptions> >
_bindings;
std::list< std::shared_ptr<pv::prop::binding::DecoderOptions> >
_bindings;
- std::list<
ProbeSelector> _probe
_selectors;
+ std::list<
ChannelSelector> _channel
_selectors;
std::vector<pv::widgets::DecoderGroupBox*> _decoder_forms;
std::vector<QString> _cur_row_headings;
std::vector<pv::widgets::DecoderGroupBox*> _decoder_forms;
std::vector<QString> _cur_row_headings;