X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fdialogs%2Fconnect.cpp;h=f878d4997293bb47bb1d8cb348ed5fbc4e72d49f;hp=4d33cc9f3b6d1d2e1ebbc798147f53e307d80744;hb=f21fd40b1b68ab0a5117d3a6b64041b6f6590ac3;hpb=7bb0fbf4d3809dbbd0fe5b35fc7e475b1065ae20

diff --git a/pv/dialogs/connect.cpp b/pv/dialogs/connect.cpp
index 4d33cc9f..f878d499 100644
--- a/pv/dialogs/connect.cpp
+++ b/pv/dialogs/connect.cpp
@@ -22,6 +22,8 @@
 
 #include <libsigrokcxx/libsigrokcxx.hpp>
 
+#include <QLabel>
+
 #include "connect.hpp"
 
 #include <pv/devicemanager.hpp>
@@ -53,7 +55,11 @@ Connect::Connect(QWidget *parent, pv::DeviceManager &device_manager) :
 	form_layout_(&form_),
 	drivers_(&form_),
 	serial_devices_(&form_),
-	scan_button_(tr("&Scan for Devices"), this),
+	tcp_endpoint_(&form_),
+	tcp_endpoint_layout_(&tcp_endpoint_),
+	tcp_host_(&tcp_endpoint_),
+	tcp_port_(&tcp_endpoint_),
+	scan_button_(tr("&Scan for devices using driver above"), this),
 	device_list_(this),
 	button_box_(QDialogButtonBox::Ok | QDialogButtonBox::Cancel,
 		Qt::Horizontal, this)
@@ -73,6 +79,15 @@ Connect::Connect(QWidget *parent, pv::DeviceManager &device_manager) :
 	form_layout_.addRow(tr("Serial &Port"), &serial_devices_);
 	serial_devices_.setEditable(true);
 
+	tcp_host_.setPlaceholderText("192.168.1.100");
+	tcp_endpoint_layout_.addWidget(&tcp_host_);
+	tcp_endpoint_layout_.addWidget(new QLabel(":"));
+	tcp_port_.setRange(1, 65535);
+	tcp_port_.setValue(5555);
+	tcp_endpoint_layout_.addWidget(&tcp_port_);
+	tcp_endpoint_layout_.setContentsMargins(0, 0, 0, 0);
+	form_layout_.addRow(tr("TCP &Endpoint"), &tcp_endpoint_);
+
 	unset_connection();
 
 	connect(&scan_button_, SIGNAL(pressed()),
@@ -113,7 +128,7 @@ void Connect::populate_drivers()
 
 		if (supported_device)
 			drivers_.addItem(QString("%1 (%2)").arg(
-				driver->long_name().c_str()).arg(name.c_str()),
+				driver->long_name().c_str(), name.c_str()),
 				qVariantFromValue(driver));
 	}
 }
@@ -123,7 +138,7 @@ void Connect::populate_serials(shared_ptr<Driver> driver)
 	serial_devices_.clear();
 	for (auto serial : device_manager_.context()->serials(driver))
 		serial_devices_.addItem(QString("%1 (%2)").arg(
-			serial.first.c_str()).arg(serial.second.c_str()),
+			serial.first.c_str(), serial.second.c_str()),
 			QString::fromStdString(serial.first));
 }
 
@@ -132,6 +147,8 @@ void Connect::unset_connection()
 	device_list_.clear();
 	serial_devices_.hide();
 	form_layout_.labelForField(&serial_devices_)->hide();
+	tcp_endpoint_.hide();
+	form_layout_.labelForField(&tcp_endpoint_)->hide();
 	button_box_.button(QDialogButtonBox::Ok)->setDisabled(true);
 }
 
@@ -142,6 +159,14 @@ void Connect::set_serial_connection(shared_ptr<Driver> driver)
 	form_layout_.labelForField(&serial_devices_)->show();
 }
 
+void Connect::set_tcp_connection(shared_ptr<Driver> driver)
+{
+	(void)driver;
+
+	tcp_endpoint_.show();
+	form_layout_.labelForField(&tcp_endpoint_)->show();
+}
+
 void Connect::scan_pressed()
 {
 	device_list_.clear();
@@ -169,6 +194,16 @@ void Connect::scan_pressed()
 			serial.toUtf8().constData());
 	}
 
+	if (tcp_endpoint_.isVisible()) {
+		QString host = tcp_host_.text();
+		QString port = tcp_port_.text();
+		if(!host.isEmpty()) {
+			QString conn = QString("tcp-raw/%1/%2").arg(host, port);
+			drvopts[ConfigKey::CONN] = Variant<ustring>::create(
+				conn.toUtf8().constData());
+		}
+	}
+
 	const list< shared_ptr<HardwareDevice> > devices =
 		device_manager_.driver_scan(driver, drvopts);
 
@@ -199,6 +234,9 @@ void Connect::device_selected(int index)
 
 	if (driver->scan_options().count(ConfigKey::SERIALCOMM))
 		set_serial_connection(driver);
+
+	if (driver->name() == "rigol-ds") // NBNB
+		set_tcp_connection(driver);
 }
 
 } // namespace dialogs