X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fdialogs%2Fconnect.cpp;h=1dd8c5077301dbebde604aa64fa9463328df5573;hp=52530beb5d391815233f8a11140bde1c2d5ad20b;hb=f46e495ef1db0a4e522462ac18260f2151fa2b89;hpb=819f4c25391a9c74d3d2f528d462142d5c4aad4d

diff --git a/pv/dialogs/connect.cpp b/pv/dialogs/connect.cpp
index 52530beb..1dd8c507 100644
--- a/pv/dialogs/connect.cpp
+++ b/pv/dialogs/connect.cpp
@@ -20,9 +20,12 @@
 
 #include <boost/foreach.hpp>
 
+#include <libsigrok/libsigrok.h>
+
 #include "connect.h"
 
 #include "pv/devicemanager.h"
+#include "pv/device/device.h"
 
 extern "C" {
 /* __STDC_FORMAT_MACROS is required for PRIu64 and friends (in C++). */
@@ -31,6 +34,7 @@ extern "C" {
 #include <libsigrok/libsigrok.h>
 }
 
+using boost::shared_ptr;
 using std::list;
 using std::string;
 
@@ -78,13 +82,20 @@ Connect::Connect(QWidget *parent, pv::DeviceManager &device_manager) :
 	_layout.addWidget(&_button_box);
 }
 
-struct sr_dev_inst* Connect::get_selected_device() const
+shared_ptr<device::Device> Connect::get_selected_device() const
 {
 	const QListWidgetItem *const item = _device_list.currentItem();
 	if (!item)
-		return NULL;
+		return shared_ptr<device::Device>();
+
+	const sr_dev_inst *const sdi = (sr_dev_inst*)item->data(
+		Qt::UserRole).value<void*>();
+	assert(sdi);
 
-	return (sr_dev_inst*)item->data(Qt::UserRole).value<void*>();
+	const auto iter = _device_map.find(sdi);
+	assert(iter != _device_map.end());
+
+	return (*iter).second;
 }
 
 void Connect::populate_drivers()
@@ -124,6 +135,7 @@ void Connect::populate_drivers()
 void Connect::unset_connection()
 {
 	_device_list.clear();
+	_device_map.clear();
 	_serial_device.hide();
 	_form_layout.labelForField(&_serial_device)->hide();
 	_button_box.button(QDialogButtonBox::Ok)->setDisabled(true);
@@ -138,6 +150,7 @@ void Connect::set_serial_connection()
 void Connect::scan_pressed()
 {
 	_device_list.clear();
+	_device_map.clear();
 
 	const int index = _drivers.currentIndex();
 	if (index == -1)
@@ -156,28 +169,34 @@ void Connect::scan_pressed()
 		drvopts = g_slist_append(drvopts, src);
 	}
 
-	const list<sr_dev_inst*> devices = _device_manager.driver_scan(
-		driver, drvopts);
+	const list< shared_ptr<device::Device> > devices =
+		_device_manager.driver_scan(driver, drvopts);
 
 	g_slist_free_full(drvopts, (GDestroyNotify)free_drvopts);
 
-	BOOST_FOREACH(sr_dev_inst *const sdi, devices)
+	BOOST_FOREACH(shared_ptr<device::Device> dev_inst, devices)
 	{
-		const string title = DeviceManager::format_device_title(sdi);
+		assert(dev_inst);
+		const sr_dev_inst *const sdi = dev_inst->dev_inst();
+		assert(sdi);
+
+		const string title = dev_inst->format_device_title();
 		QString text = QString::fromUtf8(title.c_str());
-		if (sdi->probes) {
-			text += QString(" with %1 probes").arg(
-				g_slist_length(sdi->probes));
+
+		if (sdi->channels) {
+			text += QString(" with %1 channels").arg(
+				g_slist_length(sdi->channels));
 		}
 
 		QListWidgetItem *const item = new QListWidgetItem(text,
 			&_device_list);
 		item->setData(Qt::UserRole, qVariantFromValue((void*)sdi));
 		_device_list.addItem(item);
+		_device_map[sdi] = dev_inst;
 	}
 
 	_device_list.setCurrentRow(0);
-	_button_box.button(QDialogButtonBox::Ok)->setDisabled(false);
+	_button_box.button(QDialogButtonBox::Ok)->setDisabled(_device_list.count() == 0);
 }
 
 void Connect::device_selected(int index)