Use new probe_groups API

[pulseview.git] / pv / dialogs / connect.cpp

diff --git a/pv/dialogs/connect.cpp b/pv/dialogs/connect.cpp
index f7a75da0c6e081840ee9cd597c90a31d1605d4ac..f8fbe67f79bb1bf2260f7e3749e0044c2b139abd 100644 (file)
--- a/pv/dialogs/connect.cpp
+++ b/pv/dialogs/connect.cpp
@@ -18,8 +18,12 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
+#include <boost/foreach.hpp>
+
 #include "connect.h"
 
+#include "pv/devicemanager.h"
+
 extern "C" {
 /* __STDC_FORMAT_MACROS is required for PRIu64 and friends (in C++). */
 #define __STDC_FORMAT_MACROS
@@ -27,13 +31,16 @@ extern "C" {
 #include <libsigrok/libsigrok.h>
 }
 
+using namespace std;
+
 extern sr_context *sr_ctx;
 
 namespace pv {
 namespace dialogs {
 
-Connect::Connect(QWidget *parent) :
+Connect::Connect(QWidget *parent, pv::DeviceManager &device_manager) :
        QDialog(parent),
+       _device_manager(device_manager),
        _layout(this),
        _form(this),
        _form_layout(&_form),
@@ -70,10 +77,22 @@ Connect::Connect(QWidget *parent) :
        _layout.addWidget(&_button_box);
 }
 
+struct sr_dev_inst* Connect::get_selected_device() const
+{
+       const QListWidgetItem *const item = _device_list.currentItem();
+       if (!item)
+               return NULL;
+
+       return (sr_dev_inst*)item->data(Qt::UserRole).value<void*>();
+}
+
 void Connect::populate_drivers()
 {
-       const int *hwopts;
+       gsize num_opts = 0;
+       const int32_t *hwopts;
        struct sr_dev_driver **drivers = sr_driver_list();
+       GVariant *gvar_opts;
+
        for (int i = 0; drivers[i]; ++i) {
                /**
                 * We currently only support devices that can deliver
@@ -83,15 +102,18 @@ void Connect::populate_drivers()
                 * and sensors.
                 */
                bool supported_device = false;
-               if ((sr_config_list(drivers[i], SR_CONF_DEVICE_OPTIONS,
-                       (const void **)&hwopts, NULL) == SR_OK) && hwopts)
-                       for (int j = 0; hwopts[j]; j++)
-                               if(hwopts[j] == SR_CONF_SAMPLERATE) {
+               if ((sr_config_list(drivers[i], NULL, NULL,
+                               SR_CONF_DEVICE_OPTIONS, &gvar_opts) == SR_OK)) {
+                       hwopts = (const int32_t *)g_variant_get_fixed_array(gvar_opts,
+                                       &num_opts, sizeof(int32_t));
+                       for (unsigned int j = 0; j < num_opts; j++)
+                               if (hwopts[j] == SR_CONF_SAMPLERATE) {
                                        supported_device = true;
                                        break;
                                }
+               }
 
-               if(supported_device)
+               if (supported_device)
                        _drivers.addItem(QString("%1 (%2)").arg(
                                drivers[i]->longname).arg(drivers[i]->name),
                                qVariantFromValue((void*)drivers[i]));
@@ -103,6 +125,7 @@ void Connect::unset_connection()
        _device_list.clear();
        _serial_device.hide();
        _form_layout.labelForField(&_serial_device)->hide();
+       _button_box.button(QDialogButtonBox::Ok)->setDisabled(true);
 }
 
 void Connect::set_serial_connection()
@@ -116,7 +139,7 @@ void Connect::scan_pressed()
        _device_list.clear();
 
        const int index = _drivers.currentIndex();
-       if(index == -1)
+       if (index == -1)
                return;
 
        sr_dev_driver *const driver = (sr_dev_driver*)_drivers.itemData(
@@ -128,47 +151,50 @@ void Connect::scan_pressed()
                sr_config *const src = (sr_config*)g_try_malloc(sizeof(sr_config));
                src->key = SR_CONF_CONN;
                const QByteArray byteArray = _serial_device.text().toUtf8();
-               src->value = g_strdup((const gchar*)byteArray.constData());
+               src->data = g_variant_new_string((const gchar*)byteArray.constData());
                drvopts = g_slist_append(drvopts, src);
        }
 
-       GSList *const devices = sr_driver_scan(driver, drvopts);
+       const list<sr_dev_inst*> devices = _device_manager.driver_scan(
+               driver, drvopts);
 
-       for (GSList *l = devices; l; l = l->next) {
-
-               sr_dev_inst *const sdi = (sr_dev_inst*)l->data;
+       g_slist_free_full(drvopts, (GDestroyNotify)free_drvopts);
 
-               QString text;
-               if (sdi->vendor && sdi->vendor[0])
-                       text += QString("%1 ").arg(sdi->vendor);
-               if (sdi->model && sdi->model[0])
-                       text += QString("%1 ").arg(sdi->model);
-               if (sdi->version && sdi->version[0])
-                       text += QString("%1 ").arg(sdi->version);
+       BOOST_FOREACH(sr_dev_inst *const sdi, devices)
+       {
+               const string title = DeviceManager::format_device_title(sdi);
+               QString text(title.c_str());
                if (sdi->probes) {
-                       text += QString("with %1 probes").arg(
+                       text += QString(" with %1 probes").arg(
                                g_slist_length(sdi->probes));
                }
 
-               _device_list.addItem(text);
+               QListWidgetItem *const item = new QListWidgetItem(text,
+                       &_device_list);
+               item->setData(Qt::UserRole, qVariantFromValue((void*)sdi));
+               _device_list.addItem(item);
        }
 
-       g_slist_free(devices);
-       g_slist_free_full(drvopts, (GDestroyNotify)free_drvopts);
+       _device_list.setCurrentRow(0);
+       _button_box.button(QDialogButtonBox::Ok)->setDisabled(false);
 }
 
 void Connect::device_selected(int index)
 {
-       const int *hwopts;
+       gsize num_opts = 0;
+       const int32_t *hwopts;
+       GVariant *gvar_list;
        sr_dev_driver *const driver = (sr_dev_driver*)_drivers.itemData(
                index).value<void*>();
 
        unset_connection();
 
-       if ((sr_config_list(driver, SR_CONF_SCAN_OPTIONS,
-               (const void **)&hwopts, NULL) == SR_OK) && hwopts) {
+       if ((sr_config_list(driver, NULL, NULL,
+                               SR_CONF_SCAN_OPTIONS, &gvar_list) == SR_OK)) {
+               hwopts = (const int32_t *)g_variant_get_fixed_array(gvar_list,
+                               &num_opts, sizeof(int32_t));
 
-               for (int i = 0; hwopts[i]; i++) {
+               for (unsigned int i = 0; i < num_opts; i++) {
                        switch(hwopts[i]) {
                        case SR_CONF_SERIALCOMM:
                                set_serial_connection();
@@ -180,12 +206,13 @@ void Connect::device_selected(int index)
 
                        break;
                }
+               g_variant_unref(gvar_list);
        }
 }
 
 void Connect::free_drvopts(struct sr_config *src)
 {
-       g_free((void *)src->value);
+       g_variant_unref(src->data);
        g_free(src);
 }