projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
license: remove FSF postal address from boiler plate license text
[pulseview.git]
/
pv
/
dialogs
/
connect.hpp
diff --git
a/pv/dialogs/connect.hpp
b/pv/dialogs/connect.hpp
index cc477631571eae3b97dc31f3b25a627bbab18ccc..e14972abd47150824dec6d811596df855bcec014 100644
(file)
--- a/
pv/dialogs/connect.hpp
+++ b/
pv/dialogs/connect.hpp
@@
-14,8
+14,7
@@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
#ifndef PULSEVIEW_PV_CONNECT_HPP
*/
#ifndef PULSEVIEW_PV_CONNECT_HPP
@@
-23,22
+22,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 {
class Driver;
#include <QListWidget>
#include <QPushButton>
#include <QVBoxLayout>
namespace sigrok {
class Driver;
+}
+
+namespace pv {
+namespace devices {
class HardwareDevice;
}
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
+60,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
+69,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
+89,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_;