projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Replace map by list to preserve device order
[pulseview.git]
/
pv
/
toolbars
/
samplingbar.cpp
diff --git
a/pv/toolbars/samplingbar.cpp
b/pv/toolbars/samplingbar.cpp
index 2350a45f8f76269f6457f67e3cf46d4652f25242..14990d81567704843fc08f05d7fb0ca17a40e430 100644
(file)
--- a/
pv/toolbars/samplingbar.cpp
+++ b/
pv/toolbars/samplingbar.cpp
@@
-109,7
+109,7
@@
SamplingBar::SamplingBar(SigSession &session, QWidget *parent) :
}
void SamplingBar::set_device_list(
}
void SamplingBar::set_device_list(
- const std::
map< shared_ptr<Device>, string > &device_nam
es,
+ const std::
list< std::pair<std::shared_ptr<sigrok::Device>, std::string> > &devic
es,
shared_ptr<Device> selected)
{
int selected_index = -1;
shared_ptr<Device> selected)
{
int selected_index = -1;
@@
-120,16
+120,16
@@
void SamplingBar::set_device_list(
_device_selector.clear();
_device_selector.clear();
- for (auto entry : device
_name
s) {
+ for (auto entry : devices) {
auto device = entry.first;
auto device = entry.first;
- auto d
escription
= entry.second;
+ auto d
isplay_name
= entry.second;
assert(device);
if (selected == device)
selected_index = _device_selector.count();
assert(device);
if (selected == device)
selected_index = _device_selector.count();
- _device_selector.addItem(d
escription
.c_str(),
+ _device_selector.addItem(d
isplay_name
.c_str(),
qVariantFromValue(device));
}
qVariantFromValue(device));
}