projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Made DeviceManager only handle Device objects
[pulseview.git]
/
pv
/
mainwindow.cpp
diff --git
a/pv/mainwindow.cpp
b/pv/mainwindow.cpp
index f72d1b7056041bd5cb34c563f68c7aed3523917e..9995e50ac2ef42650ba4d904a3d7b70c287336ff 100644
(file)
--- a/
pv/mainwindow.cpp
+++ b/
pv/mainwindow.cpp
@@
-25,6
+25,9
@@
#include <boost/bind.hpp>
#include <boost/foreach.hpp>
#include <boost/bind.hpp>
#include <boost/foreach.hpp>
+#include <algorithm>
+#include <iterator>
+
#include <QAction>
#include <QApplication>
#include <QButtonGroup>
#include <QAction>
#include <QApplication>
#include <QButtonGroup>
@@
-39,7
+42,7
@@
#include "mainwindow.h"
#include "devicemanager.h"
#include "mainwindow.h"
#include "devicemanager.h"
-#include "device/devi
nst
.h"
+#include "device/devi
ce
.h"
#include "dialogs/about.h"
#include "dialogs/connect.h"
#include "dialogs/storeprogress.h"
#include "dialogs/about.h"
#include "dialogs/connect.h"
#include "dialogs/storeprogress.h"
@@
-289,8
+292,10
@@
void MainWindow::update_device_list(
{
assert(_sampling_bar);
{
assert(_sampling_bar);
- const list< shared_ptr<device::DevInst> > &devices =
- _device_manager.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()) {
_sampling_bar->set_device_list(devices);
if (!selected_device && !devices.empty()) {