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

diff --git a/pv/dialogs/connect.cpp b/pv/dialogs/connect.cpp
index f7b0fc76..997234be 100644
--- a/pv/dialogs/connect.cpp
+++ b/pv/dialogs/connect.cpp
@@ -20,11 +20,12 @@
 
 #include <cassert>
 
-#include <libsigrok/libsigrok.hpp>
+#include <libsigrokcxx/libsigrokcxx.hpp>
 
 #include "connect.hpp"
 
-#include "pv/devicemanager.hpp"
+#include <pv/devicemanager.hpp>
+#include <pv/devices/hardwaredevice.hpp>
 
 using std::list;
 using std::map;
@@ -38,7 +39,8 @@ using Glib::VariantBase;
 using sigrok::ConfigKey;
 using sigrok::Driver;
 using sigrok::Error;
-using sigrok::HardwareDevice;
+
+using pv::devices::HardwareDevice;
 
 namespace pv {
 namespace dialogs {
@@ -50,8 +52,8 @@ Connect::Connect(QWidget *parent, pv::DeviceManager &device_manager) :
 	form_(this),
 	form_layout_(&form_),
 	drivers_(&form_),
-	serial_device_(&form_),
-	scan_button_(tr("Scan for Devices"), this),
+	serial_devices_(&form_),
+	scan_button_(tr("&Scan for devices using driver above"), this),
 	device_list_(this),
 	button_box_(QDialogButtonBox::Ok | QDialogButtonBox::Cancel,
 		Qt::Horizontal, this)
@@ -66,9 +68,10 @@ Connect::Connect(QWidget *parent, pv::DeviceManager &device_manager) :
 		this, SLOT(device_selected(int)));
 
 	form_.setLayout(&form_layout_);
-	form_layout_.addRow(tr("Driver"), &drivers_);
+	form_layout_.addRow(tr("&Driver"), &drivers_);
 
-	form_layout_.addRow(tr("Serial Port"), &serial_device_);
+	form_layout_.addRow(tr("Serial &Port"), &serial_devices_);
+	serial_devices_.setEditable(true);
 
 	unset_connection();
 
@@ -103,30 +106,40 @@ void Connect::populate_drivers()
 		 * @todo Add support for non-monotonic devices i.e. DMMs
 		 * and sensors.
 		 */
-		bool supported_device = driver->config_check(
-			ConfigKey::LOGIC_ANALYZER, ConfigKey::DEVICE_OPTIONS) |
-		                        driver->config_check(
-			ConfigKey::OSCILLOSCOPE, ConfigKey::DEVICE_OPTIONS);
+		const auto keys = driver->config_keys();
+
+		bool supported_device = keys.count(ConfigKey::LOGIC_ANALYZER) |
+			keys.count(ConfigKey::OSCILLOSCOPE);
 
 		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));
 	}
 }
 
+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(), serial.second.c_str()),
+			QString::fromStdString(serial.first));
+}
+
 void Connect::unset_connection()
 {
 	device_list_.clear();
-	serial_device_.hide();
-	form_layout_.labelForField(&serial_device_)->hide();
+	serial_devices_.hide();
+	form_layout_.labelForField(&serial_devices_)->hide();
 	button_box_.button(QDialogButtonBox::Ok)->setDisabled(true);
 }
 
-void Connect::set_serial_connection()
+void Connect::set_serial_connection(shared_ptr<Driver> driver)
 {
-	serial_device_.show();
-	form_layout_.labelForField(&serial_device_)->show();
+	populate_serials(driver);
+	serial_devices_.show();
+	form_layout_.labelForField(&serial_devices_)->show();
 }
 
 void Connect::scan_pressed()
@@ -144,20 +157,28 @@ void Connect::scan_pressed()
 
 	map<const ConfigKey *, VariantBase> drvopts;
 
-	if (serial_device_.isVisible())
+	if (serial_devices_.isVisible()) {
+		QString serial;
+		const int index = serial_devices_.currentIndex();
+		if (index >= 0 && index < serial_devices_.count() &&
+		    serial_devices_.currentText() == serial_devices_.itemText(index))
+			serial = serial_devices_.itemData(index).value<QString>();
+		else
+			serial = serial_devices_.currentText();
 		drvopts[ConfigKey::CONN] = Variant<ustring>::create(
-			serial_device_.text().toUtf8().constData());
+			serial.toUtf8().constData());
+	}
 
-	list< shared_ptr<HardwareDevice> > devices =
+	const list< shared_ptr<HardwareDevice> > devices =
 		device_manager_.driver_scan(driver, drvopts);
 
-	for (shared_ptr<HardwareDevice> device : devices)
-	{
+	for (shared_ptr<HardwareDevice> device : devices) {
 		assert(device);
 
 		QString text = QString::fromStdString(
-			device_manager_.get_display_name(device));
-		text += QString(" with %1 channels").arg(device->channels().size());
+			device->display_name(device_manager_));
+		text += QString(" with %1 channels").arg(
+			device->device()->channels().size());
 
 		QListWidgetItem *const item = new QListWidgetItem(text,
 			&device_list_);
@@ -176,8 +197,8 @@ void Connect::device_selected(int index)
 
 	unset_connection();
 
-	if (driver->config_check(ConfigKey::SERIALCOMM, ConfigKey::SCAN_OPTIONS))
-			set_serial_connection();
+	if (driver->scan_options().count(ConfigKey::SERIALCOMM))
+		set_serial_connection(driver);
 }
 
 } // namespace dialogs