projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Change namespace for the trace view and implement ViewBase
[pulseview.git]
/
pv
/
dialogs
/
connect.hpp
diff --git
a/pv/dialogs/connect.hpp
b/pv/dialogs/connect.hpp
index a0bac740a71929dd378f550f05bda2f28e391a0b..ce97ba80895959d8cf4241e2989e1af99116be28 100644
(file)
--- a/
pv/dialogs/connect.hpp
+++ b/
pv/dialogs/connect.hpp
@@
-23,22
+23,30
@@
#include <memory>
#include <memory>
+#include <QCheckBox>
#include <QComboBox>
#include <QDialog>
#include <QDialogButtonBox>
#include <QFormLayout>
#include <QComboBox>
#include <QDialog>
#include <QDialogButtonBox>
#include <QFormLayout>
+#include <QHBoxLayout>
#include <QLineEdit>
#include <QLineEdit>
+#include <QSpinBox>
#include <QListWidget>
#include <QPushButton>
#include <QVBoxLayout>
namespace sigrok {
#include <QListWidget>
#include <QPushButton>
#include <QVBoxLayout>
namespace sigrok {
- class Driver;
- class HardwareDevice;
+class Driver;
+}
+
+namespace pv {
+namespace devices {
+class HardwareDevice;
+}
}
Q_DECLARE_METATYPE(std::shared_ptr<sigrok::Driver>);
}
Q_DECLARE_METATYPE(std::shared_ptr<sigrok::Driver>);
-Q_DECLARE_METATYPE(std::shared_ptr<
sigrok
::HardwareDevice>);
+Q_DECLARE_METATYPE(std::shared_ptr<
pv::devices
::HardwareDevice>);
namespace pv {
namespace pv {
@@
-53,7
+61,7
@@
class Connect : public QDialog
public:
Connect(QWidget *parent, pv::DeviceManager &device_manager);
public:
Connect(QWidget *parent, pv::DeviceManager &device_manager);
- std::shared_ptr<
sigrok
::HardwareDevice> get_selected_device() const;
+ std::shared_ptr<
devices
::HardwareDevice> get_selected_device() const;
private:
void populate_drivers();
private:
void populate_drivers();
@@
-62,10
+70,11
@@
private:
void unset_connection();
void unset_connection();
- void set_serial_connection(std::shared_ptr<sigrok::Driver> driver);
-
private Q_SLOTS:
private Q_SLOTS:
- void device_selected(int index);
+ void driver_selected(int index);
+
+ void serial_toggled(bool checked);
+ void tcp_toggled(bool checked);
void scan_pressed();
void scan_pressed();
@@
-81,6
+90,11
@@
private:
QComboBox serial_devices_;
QComboBox serial_devices_;
+ QWidget *tcp_config_;
+ QLineEdit *tcp_host_;
+ QSpinBox *tcp_port_;
+ QCheckBox *tcp_use_vxi_;
+
QPushButton scan_button_;
QListWidget device_list_;
QPushButton scan_button_;
QListWidget device_list_;