projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Wrapped sr_dev_inst in a class: pv::DevInst
[pulseview.git]
/
pv
/
dialogs
/
connect.h
diff --git
a/pv/dialogs/connect.h
b/pv/dialogs/connect.h
index 443f6e07fde6c3a94dca2e28f8ac563aece77898..0f272cae73a6eb8e0d94b5cf7fe3ee296896acee 100644
(file)
--- a/
pv/dialogs/connect.h
+++ b/
pv/dialogs/connect.h
@@
-21,14
+21,25
@@
#ifndef PULSEVIEW_PV_CONNECT_H
#define PULSEVIEW_PV_CONNECT_H
#ifndef PULSEVIEW_PV_CONNECT_H
#define PULSEVIEW_PV_CONNECT_H
+#include <boost/shared_ptr.hpp>
+
#include <QComboBox>
#include <QDialog>
#include <QDialogButtonBox>
#include <QFormLayout>
#include <QLineEdit>
#include <QComboBox>
#include <QDialog>
#include <QDialogButtonBox>
#include <QFormLayout>
#include <QLineEdit>
+#include <QListWidget>
+#include <QPushButton>
#include <QVBoxLayout>
#include <QVBoxLayout>
+struct sr_config;
+struct sr_dev_inst;
+
namespace pv {
namespace pv {
+
+class DeviceManager;
+class DevInst;
+
namespace dialogs {
class Connect : public QDialog
namespace dialogs {
class Connect : public QDialog
@@
-36,19
+47,28
@@
class Connect : public QDialog
Q_OBJECT
public:
Q_OBJECT
public:
- Connect(QWidget *parent);
+ Connect(QWidget *parent, pv::DeviceManager &device_manager);
+
+ boost::shared_ptr<DevInst> get_selected_device() const;
private:
void populate_drivers();
private:
void populate_drivers();
+ void unset_connection();
+
+ void set_serial_connection();
+
private slots:
void device_selected(int index);
private slots:
void device_selected(int index);
- void
unset_connection
();
+ void
scan_pressed
();
- void set_serial_connection();
+private:
+ static void free_drvopts(sr_config *src);
private:
private:
+ pv::DeviceManager &_device_manager;
+
QVBoxLayout _layout;
QWidget _form;
QVBoxLayout _layout;
QWidget _form;
@@
-58,6
+78,11
@@
private:
QLineEdit _serial_device;
QLineEdit _serial_device;
+ QPushButton _scan_button;
+ QListWidget _device_list;
+ std::map<const sr_dev_inst*, boost::shared_ptr<pv::DevInst> >
+ _device_map;
+
QDialogButtonBox _button_box;
};
QDialogButtonBox _button_box;
};