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
/
mainwindow.cpp
diff --git
a/pv/mainwindow.cpp
b/pv/mainwindow.cpp
index 42ae957640d491c19a7c740b9204c55224d7f852..6142709cd69efd9025805338b6a913aeb3053612 100644
(file)
--- a/
pv/mainwindow.cpp
+++ b/
pv/mainwindow.cpp
@@
-61,6
+61,7
@@
using std::list;
using std::map;
using std::list;
using std::map;
+using std::pair;
using std::shared_ptr;
using std::string;
using std::shared_ptr;
using std::string;
@@
-381,12
+382,13
@@
void MainWindow::update_device_list()
devices.push_back(selected_device);
assert(selected_device);
devices.push_back(selected_device);
assert(selected_device);
-
map<shared_ptr<Device>, string> device_names
;
+
list< pair< shared_ptr<Device>, string> > device_list
;
for (auto device : devices)
for (auto device : devices)
- device_names[device] = _device_manager.get_display_name(device);
+ device_list.push_back(make_pair(
+ device, _device_manager.get_display_name(device)));
- _sampling_bar->set_device_list(device_
names
, selected_device);
+ _sampling_bar->set_device_list(device_
list
, selected_device);
}
void MainWindow::closeEvent(QCloseEvent *event)
}
void MainWindow::closeEvent(QCloseEvent *event)