projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Update description for Trace::get_label_rect()
[pulseview.git]
/
pv
/
mainwindow.cpp
diff --git
a/pv/mainwindow.cpp
b/pv/mainwindow.cpp
index 598976eb77298b83d4aa9b123259722c82964e85..170d14e79ccffa4fa9f7d24fdf91fbc57062c050 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;
@@
-283,7
+284,7
@@
void MainWindow::save_ui_settings()
settings.setValue("geometry", saveGeometry());
settings.endGroup();
settings.setValue("geometry", saveGeometry());
settings.endGroup();
- if (_session.
get_
device()) {
+ if (_session.device()) {
settings.beginGroup("Device");
key_list.push_back("vendor");
key_list.push_back("model");
settings.beginGroup("Device");
key_list.push_back("vendor");
key_list.push_back("model");
@@
-292,7
+293,7
@@
void MainWindow::save_ui_settings()
key_list.push_back("connection_id");
dev_info = _device_manager.get_device_info(
key_list.push_back("connection_id");
dev_info = _device_manager.get_device_info(
- _session.
get_
device());
+ _session.device());
for (string key : key_list) {
for (string key : key_list) {
@@
-367,7
+368,7
@@
void MainWindow::update_device_list()
{
assert(_sampling_bar);
{
assert(_sampling_bar);
- shared_ptr<Device> selected_device = _session.
get_
device();
+ shared_ptr<Device> selected_device = _session.device();
list< shared_ptr<Device> > devices;
if (_device_manager.devices().size() == 0)
list< shared_ptr<Device> > devices;
if (_device_manager.devices().size() == 0)
@@
-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.device_description(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)