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 e0ef3aa297e4f71e7f3678cc0bbd151ce27696ff..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,6
+42,7
@@
#include "mainwindow.h"
#include "devicemanager.h"
#include "mainwindow.h"
#include "devicemanager.h"
+#include "device/device.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"
@@
-57,6
+61,7
@@
#include <glib.h>
#include <libsigrok/libsigrok.h>
#include <glib.h>
#include <libsigrok/libsigrok.h>
+using boost::shared_ptr;
using std::list;
namespace pv {
using std::list;
namespace pv {
@@
-282,11
+287,15
@@
void MainWindow::session_error(
Q_ARG(QString, info_text));
}
Q_ARG(QString, info_text));
}
-void MainWindow::update_device_list(struct sr_dev_inst *selected_device)
+void MainWindow::update_device_list(
+ shared_ptr<pv::device::DevInst> selected_device)
{
assert(_sampling_bar);
{
assert(_sampling_bar);
- const list<sr_dev_inst*> &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()) {
@@
-294,9
+303,10
@@
void MainWindow::update_device_list(struct sr_dev_inst *selected_device)
selected_device = devices.front();
// Try and find the demo device and select that by default
selected_device = devices.front();
// Try and find the demo device and select that by default
- BOOST_FOREACH (struct sr_dev_inst *sdi, devices)
- if (strcmp(sdi->driver->name, "demo") == 0) {
- selected_device = sdi;
+ BOOST_FOREACH (shared_ptr<pv::device::DevInst> dev_inst, devices)
+ if (strcmp(dev_inst->dev_inst()->driver->name,
+ "demo") == 0) {
+ selected_device = dev_inst;
}
}
}
}
@@
-365,10
+375,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.
- s
truct sr_dev_inst *const sdi
= dlg.exec() ?
+ s
hared_ptr<device::DevInst> dev_inst
= dlg.exec() ?
dlg.get_selected_device() : _session.get_device();
dlg.get_selected_device() : _session.get_device();
- update_device_list(
sdi
);
+ update_device_list(
dev_inst
);
}
void MainWindow::on_actionQuit_triggered()
}
void MainWindow::on_actionQuit_triggered()