projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Don't use Qt-defined keywords, they can cause problems with other headers.
[pulseview.git]
/
pv
/
dialogs
/
connect.h
diff --git
a/pv/dialogs/connect.h
b/pv/dialogs/connect.h
index 862184b87326566415b2a142f59baef523dc6b6b..e1a2c30d6c68422fbc37858c2be491702860e42d 100644
(file)
--- a/
pv/dialogs/connect.h
+++ b/
pv/dialogs/connect.h
@@
-21,6
+21,8
@@
#ifndef PULSEVIEW_PV_CONNECT_H
#define PULSEVIEW_PV_CONNECT_H
#ifndef PULSEVIEW_PV_CONNECT_H
#define PULSEVIEW_PV_CONNECT_H
+#include <memory>
+
#include <QComboBox>
#include <QDialog>
#include <QDialogButtonBox>
#include <QComboBox>
#include <QDialog>
#include <QDialogButtonBox>
@@
-31,8
+33,16
@@
#include <QVBoxLayout>
struct sr_config;
#include <QVBoxLayout>
struct sr_config;
+struct sr_dev_inst;
namespace pv {
namespace pv {
+
+class DeviceManager;
+
+namespace device {
+class Device;
+}
+
namespace dialogs {
class Connect : public QDialog
namespace dialogs {
class Connect : public QDialog
@@
-40,7
+50,9
@@
class Connect : public QDialog
Q_OBJECT
public:
Q_OBJECT
public:
- Connect(QWidget *parent);
+ Connect(QWidget *parent, pv::DeviceManager &device_manager);
+
+ std::shared_ptr<device::Device> get_selected_device() const;
private:
void populate_drivers();
private:
void populate_drivers();
@@
-49,7
+61,7
@@
private:
void set_serial_connection();
void set_serial_connection();
-private
slots
:
+private
Q_SLOTS
:
void device_selected(int index);
void scan_pressed();
void device_selected(int index);
void scan_pressed();
@@
-58,6
+70,8
@@
private:
static void free_drvopts(sr_config *src);
private:
static void free_drvopts(sr_config *src);
private:
+ pv::DeviceManager &_device_manager;
+
QVBoxLayout _layout;
QWidget _form;
QVBoxLayout _layout;
QWidget _form;
@@
-69,6
+83,8
@@
private:
QPushButton _scan_button;
QListWidget _device_list;
QPushButton _scan_button;
QListWidget _device_list;
+ std::map<const sr_dev_inst*, std::shared_ptr<pv::device::Device> >
+ _device_map;
QDialogButtonBox _button_box;
};
QDialogButtonBox _button_box;
};