X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fdialogs%2Fconnect.cpp;h=46df783dbe1361092f76b4ddacd0bb5f438bf9ef;hp=997234be76dc1815f229dd54ae56a7559eab730d;hb=09f55d9665efb3b17ba7de4bae47be6989e884fe;hpb=be7645e8d02d1865f9bc1a4a9bb397812ea3c380

diff --git a/pv/dialogs/connect.cpp b/pv/dialogs/connect.cpp
index 997234be..46df783d 100644
--- a/pv/dialogs/connect.cpp
+++ b/pv/dialogs/connect.cpp
@@ -14,14 +14,17 @@
  * 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/>.
  */
 
 #include <cassert>
 
 #include <libsigrokcxx/libsigrokcxx.hpp>
 
+#include <QLabel>
+#include <QGroupBox>
+#include <QRadioButton>
+
 #include "connect.hpp"
 
 #include <pv/devicemanager.hpp>
@@ -64,24 +67,74 @@ Connect::Connect(QWidget *parent, pv::DeviceManager &device_manager) :
 	connect(&button_box_, SIGNAL(rejected()), this, SLOT(reject()));
 
 	populate_drivers();
-	connect(&drivers_, SIGNAL(activated(int)),
-		this, SLOT(device_selected(int)));
+	connect(&drivers_, SIGNAL(activated(int)), this, SLOT(driver_selected(int)));
 
 	form_.setLayout(&form_layout_);
-	form_layout_.addRow(tr("&Driver"), &drivers_);
 
-	form_layout_.addRow(tr("Serial &Port"), &serial_devices_);
+	QVBoxLayout *vbox_drv = new QVBoxLayout;
+	vbox_drv->addWidget(&drivers_);
+	QGroupBox *groupbox_drv = new QGroupBox(tr("Step 1: Choose the driver"));
+	groupbox_drv->setLayout(vbox_drv);
+	form_layout_.addRow(groupbox_drv);
+
+	QRadioButton *radiobtn_usb = new QRadioButton(tr("&USB"), this);
+	QRadioButton *radiobtn_serial = new QRadioButton(tr("Serial &Port"), this);
+	QRadioButton *radiobtn_tcp = new QRadioButton(tr("&TCP/IP"), this);
+
+	radiobtn_usb->setChecked(true);
+
 	serial_devices_.setEditable(true);
+	serial_devices_.setEnabled(false);
+
+	tcp_config_ = new QWidget();
+	QHBoxLayout *tcp_config_layout = new QHBoxLayout(tcp_config_);
+	tcp_host_ = new QLineEdit;
+	tcp_host_->setText("192.168.1.100");
+	tcp_config_layout->addWidget(tcp_host_);
+	tcp_config_layout->addWidget(new QLabel(":"));
+	tcp_port_ = new QSpinBox;
+	tcp_port_->setRange(1, 65535);
+	tcp_port_->setValue(5555);
+	tcp_config_layout->addWidget(tcp_port_);
+	tcp_use_vxi_ = new QCheckBox();
+	tcp_use_vxi_->setText(tr("Use VXI"));
+	tcp_config_layout->addSpacing(30);
+	tcp_config_layout->addWidget(tcp_use_vxi_);
+	tcp_config_layout->setContentsMargins(0, 0, 0, 0);
+	tcp_config_->setEnabled(false);
+
+	QVBoxLayout *vbox_if = new QVBoxLayout;
+	vbox_if->addWidget(radiobtn_usb);
+	vbox_if->addWidget(radiobtn_serial);
+	vbox_if->addWidget(&serial_devices_);
+	vbox_if->addWidget(radiobtn_tcp);
+	vbox_if->addWidget(tcp_config_);
+
+	QGroupBox *groupbox_if = new QGroupBox(tr("Step 2: Choose the interface"));
+	groupbox_if->setLayout(vbox_if);
+	form_layout_.addRow(groupbox_if);
+
+	QVBoxLayout *vbox_scan = new QVBoxLayout;
+	vbox_scan->addWidget(&scan_button_);
+	QGroupBox *groupbox_scan = new QGroupBox(tr("Step 3: Scan for devices"));
+	groupbox_scan->setLayout(vbox_scan);
+	form_layout_.addRow(groupbox_scan);
+
+	QVBoxLayout *vbox_select = new QVBoxLayout;
+	vbox_select->addWidget(&device_list_);
+	QGroupBox *groupbox_select = new QGroupBox(tr("Step 4: Select the device"));
+	groupbox_select->setLayout(vbox_select);
+	form_layout_.addRow(groupbox_select);
 
 	unset_connection();
 
-	connect(&scan_button_, SIGNAL(pressed()),
-		this, SLOT(scan_pressed()));
+	connect(radiobtn_serial, SIGNAL(toggled(bool)), this, SLOT(serial_toggled(bool)));
+	connect(radiobtn_tcp, SIGNAL(toggled(bool)), this, SLOT(tcp_toggled(bool)));
+	connect(&scan_button_, SIGNAL(pressed()), this, SLOT(scan_pressed()));
 
 	setLayout(&layout_);
+
 	layout_.addWidget(&form_);
-	layout_.addWidget(&scan_button_);
-	layout_.addWidget(&device_list_);
 	layout_.addWidget(&button_box_);
 }
 
@@ -130,16 +183,17 @@ void Connect::populate_serials(shared_ptr<Driver> driver)
 void Connect::unset_connection()
 {
 	device_list_.clear();
-	serial_devices_.hide();
-	form_layout_.labelForField(&serial_devices_)->hide();
 	button_box_.button(QDialogButtonBox::Ok)->setDisabled(true);
 }
 
-void Connect::set_serial_connection(shared_ptr<Driver> driver)
+void Connect::serial_toggled(bool checked)
 {
-	populate_serials(driver);
-	serial_devices_.show();
-	form_layout_.labelForField(&serial_devices_)->show();
+	serial_devices_.setEnabled(checked);
+}
+
+void Connect::tcp_toggled(bool checked)
+{
+	tcp_config_->setEnabled(checked);
 }
 
 void Connect::scan_pressed()
@@ -157,7 +211,7 @@ void Connect::scan_pressed()
 
 	map<const ConfigKey *, VariantBase> drvopts;
 
-	if (serial_devices_.isVisible()) {
+	if (serial_devices_.isEnabled()) {
 		QString serial;
 		const int index = serial_devices_.currentIndex();
 		if (index >= 0 && index < serial_devices_.count() &&
@@ -169,6 +223,21 @@ void Connect::scan_pressed()
 			serial.toUtf8().constData());
 	}
 
+	if (tcp_config_->isEnabled()) {
+		QString host = tcp_host_->text();
+		QString port = tcp_port_->text();
+		if (!host.isEmpty()) {
+			QString conn;
+			if (tcp_use_vxi_->isChecked())
+				conn = QString("vxi/%1/%2").arg(host, port);
+			else
+				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);
 
@@ -190,15 +259,14 @@ void Connect::scan_pressed()
 	button_box_.button(QDialogButtonBox::Ok)->setDisabled(device_list_.count() == 0);
 }
 
-void Connect::device_selected(int index)
+void Connect::driver_selected(int index)
 {
 	shared_ptr<Driver> driver =
 		drivers_.itemData(index).value<shared_ptr<Driver>>();
 
 	unset_connection();
 
-	if (driver->scan_options().count(ConfigKey::SERIALCOMM))
-		set_serial_connection(driver);
+	populate_serials(driver);
 }
 
 } // namespace dialogs