projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Show the file-device in the selector when a file is loaded
[pulseview.git]
/
pv
/
mainwindow.cpp
diff --git
a/pv/mainwindow.cpp
b/pv/mainwindow.cpp
index 57e9c51f8d51b647e8ea6164d61834c1d832d11a..c75b3a9e59a5e940cbb2da11168c98e577be2b7d 100644
(file)
--- a/
pv/mainwindow.cpp
+++ b/
pv/mainwindow.cpp
@@
-287,34
+287,23
@@
void MainWindow::session_error(
Q_ARG(QString, info_text));
}
Q_ARG(QString, info_text));
}
-void MainWindow::update_device_list(
- shared_ptr<pv::device::DevInst> selected_device)
+void MainWindow::update_device_list()
{
assert(_sampling_bar);
{
assert(_sampling_bar);
+ shared_ptr<pv::device::DevInst> selected_device = _session.get_device();
list< shared_ptr<device::DevInst> > devices;
std::copy(_device_manager.devices().begin(),
_device_manager.devices().end(), std::back_inserter(devices));
list< shared_ptr<device::DevInst> > devices;
std::copy(_device_manager.devices().begin(),
_device_manager.devices().end(), std::back_inserter(devices));
- _sampling_bar->set_device_list(devices);
-
- if (!selected_device && !devices.empty()) {
- // Fall back to the first device in the list.
- selected_device = devices.front();
+ if (std::find(devices.begin(), devices.end(), selected_device) ==
+ devices.end())
+ devices.push_back(selected_device);
- // Try and find the demo device and select that by default
- BOOST_FOREACH (shared_ptr<pv::device::DevInst> dev_inst, devices)
- if (strcmp(dev_inst->dev_inst()->driver->name,
- "demo") == 0) {
- selected_device = dev_inst;
- }
- }
+ _sampling_bar->set_device_list(devices);
- if (selected_device) {
- // Setting the selected device in the sampling bar, generates
- // an event which updates the selected device in the SigSession.
+ if (selected_device)
_sampling_bar->set_selected_device(selected_device);
_sampling_bar->set_selected_device(selected_device);
- }
}
void MainWindow::load_file(QString file_name)
}
void MainWindow::load_file(QString file_name)
@@
-329,6
+318,8
@@
void MainWindow::load_file(QString file_name)
show_session_error(tr("Failed to load ") + file_name, e);
}
show_session_error(tr("Failed to load ") + file_name, e);
}
+ update_device_list();
+
_session.start_capture(boost::bind(&MainWindow::session_error, this,
errorMessage, infoMessage));
}
_session.start_capture(boost::bind(&MainWindow::session_error, this,
errorMessage, infoMessage));
}
@@
-382,10
+373,10
@@
void MainWindow::on_actionConnect_triggered()
// If the user selected a device, select it in the device list. Select the
// current device otherwise.
// If the user selected a device, select it in the device list. Select the
// current device otherwise.
- shared_ptr<device::DevInst> dev_inst = dlg.exec() ?
-
dlg.get_selected_device() : _session.get_device(
);
+ if (dlg.exec())
+
_session.set_device(dlg.get_selected_device()
);
- update_device_list(
dev_inst
);
+ update_device_list();
}
void MainWindow::on_actionQuit_triggered()
}
void MainWindow::on_actionQuit_triggered()