X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fdialogs%2Fconnect.cpp;h=d554b4c181fefc9b12f56ee214e5acc839777766;hp=284ce07240c2a279d247252aac081cab66333d07;hb=f9abf97e78bc4825d80926b0ebc6cbaef40768b1;hpb=3093830343c9d3b3220c2874a942c843d7a05cf7 diff --git a/pv/dialogs/connect.cpp b/pv/dialogs/connect.cpp index 284ce072..d554b4c1 100644 --- a/pv/dialogs/connect.cpp +++ b/pv/dialogs/connect.cpp @@ -18,8 +18,15 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ +#include + +#include + #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++). */ #define __STDC_FORMAT_MACROS @@ -27,16 +34,25 @@ extern "C" { #include } +using std::list; +using std::shared_ptr; +using std::string; + +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), _drivers(&_form), _serial_device(&_form), + _scan_button(tr("Scan for Devices"), this), + _device_list(this), _button_box(QDialogButtonBox::Ok | QDialogButtonBox::Cancel, Qt::Horizontal, this) { @@ -56,15 +72,39 @@ Connect::Connect(QWidget *parent) : unset_connection(); + 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); } +shared_ptr Connect::get_selected_device() const +{ + const QListWidgetItem *const item = _device_list.currentItem(); + if (!item) + return shared_ptr(); + + const sr_dev_inst *const sdi = (sr_dev_inst*)item->data( + Qt::UserRole).value(); + assert(sdi); + + const auto iter = _device_map.find(sdi); + assert(iter != _device_map.end()); + + return (*iter).second; +} + 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 @@ -74,34 +114,107 @@ 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])); } } +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); +} + +void Connect::set_serial_connection() +{ + _serial_device.show(); + _form_layout.labelForField(&_serial_device)->show(); +} + +void Connect::scan_pressed() +{ + _device_list.clear(); + _device_map.clear(); + + const int index = _drivers.currentIndex(); + if (index == -1) + return; + + sr_dev_driver *const driver = (sr_dev_driver*)_drivers.itemData( + index).value(); + + GSList *drvopts = NULL; + + if (_serial_device.isVisible()) { + 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->data = g_variant_new_string((const gchar*)byteArray.constData()); + drvopts = g_slist_append(drvopts, src); + } + + const list< shared_ptr > devices = + _device_manager.driver_scan(driver, drvopts); + + g_slist_free_full(drvopts, (GDestroyNotify)free_drvopts); + + for (shared_ptr dev_inst : devices) + { + 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->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(_device_list.count() == 0); +} + void Connect::device_selected(int index) { - const int *hwopts; - const struct sr_hwcap_option *hwo; + gsize num_opts = 0; + const int32_t *hwopts; + GVariant *gvar_list; sr_dev_driver *const driver = (sr_dev_driver*)_drivers.itemData( index).value(); 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(); @@ -113,21 +226,15 @@ void Connect::device_selected(int index) break; } + g_variant_unref(gvar_list); } } -void Connect::unset_connection() -{ - _serial_device.hide(); - _form_layout.labelForField(&_serial_device)->hide(); -} - -void Connect::set_serial_connection() +void Connect::free_drvopts(struct sr_config *src) { - _serial_device.show(); - _form_layout.labelForField(&_serial_device)->show(); + g_variant_unref(src->data); + g_free(src); } - } // namespace dialogs } // namespace pv