X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fdialogs%2Fconnect.cpp;h=2700672af501e9456e4ed95ae391cfbea5dcdc33;hp=7b31942d974e5ca28e8aab2d33e54a5db7d608af;hb=2acdb232d6bb452cfdfaea3ef5218fb4da592329;hpb=945745012eb57cefa1ef457daf48cfffa99f9ec2 diff --git a/pv/dialogs/connect.cpp b/pv/dialogs/connect.cpp index 7b31942d..2700672a 100644 --- a/pv/dialogs/connect.cpp +++ b/pv/dialogs/connect.cpp @@ -18,95 +18,84 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#include +#include -#include +#include -#include "connect.h" +#include "connect.hpp" -#include "pv/devicemanager.h" -#include "pv/device/devinst.h" +#include "pv/devicemanager.hpp" -extern "C" { -/* __STDC_FORMAT_MACROS is required for PRIu64 and friends (in C++). */ -#define __STDC_FORMAT_MACROS -#include -#include -} - -using boost::shared_ptr; using std::list; +using std::map; +using std::shared_ptr; using std::string; -extern sr_context *sr_ctx; +using Glib::ustring; +using Glib::Variant; +using Glib::VariantBase; + +using sigrok::ConfigKey; +using sigrok::Driver; +using sigrok::Error; +using sigrok::HardwareDevice; namespace pv { namespace dialogs { 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, + 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) { setWindowTitle(tr("Connect to Device")); - connect(&_button_box, SIGNAL(accepted()), this, SLOT(accept())); - connect(&_button_box, SIGNAL(rejected()), this, SLOT(reject())); + connect(&button_box_, SIGNAL(accepted()), this, SLOT(accept())); + connect(&button_box_, SIGNAL(rejected()), this, SLOT(reject())); populate_drivers(); - connect(&_drivers, SIGNAL(activated(int)), + connect(&drivers_, SIGNAL(activated(int)), this, SLOT(device_selected(int))); - _form.setLayout(&_form_layout); - _form_layout.addRow(tr("Driver"), &_drivers); + form_.setLayout(&form_layout_); + form_layout_.addRow(tr("Driver"), &drivers_); - _form_layout.addRow(tr("Serial Port"), &_serial_device); + form_layout_.addRow(tr("Serial Port"), &serial_device_); unset_connection(); - connect(&_scan_button, SIGNAL(pressed()), + 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); + setLayout(&layout_); + layout_.addWidget(&form_); + layout_.addWidget(&scan_button_); + layout_.addWidget(&device_list_); + layout_.addWidget(&button_box_); } -shared_ptr Connect::get_selected_device() const +shared_ptr Connect::get_selected_device() const { - const QListWidgetItem *const item = _device_list.currentItem(); + 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); + return shared_ptr(); - std::map >:: - const_iterator iter = _device_map.find(sdi); - assert(iter != _device_map.end()); - - return (*iter).second; + return item->data(Qt::UserRole).value>(); } void Connect::populate_drivers() { - 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) { + for (auto entry : device_manager_.context()->drivers()) { + auto name = entry.first; + auto driver = entry.second; /** * We currently only support devices that can deliver * samples at a fixed samplerate i.e. oscilloscopes and @@ -114,127 +103,79 @@ void Connect::populate_drivers() * @todo Add support for non-monotonic devices i.e. DMMs * and sensors. */ - bool supported_device = false; - 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; - } - } + bool supported_device = driver->config_check( + ConfigKey::SAMPLERATE, ConfigKey::DEVICE_OPTIONS); if (supported_device) - _drivers.addItem(QString("%1 (%2)").arg( - drivers[i]->longname).arg(drivers[i]->name), - qVariantFromValue((void*)drivers[i])); + drivers_.addItem(QString("%1 (%2)").arg( + driver->long_name().c_str()).arg(name.c_str()), + qVariantFromValue(driver)); } } 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); + device_list_.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(); + serial_device_.show(); + form_layout_.labelForField(&serial_device_)->show(); } void Connect::scan_pressed() { - _device_list.clear(); - _device_map.clear(); + device_list_.clear(); - const int index = _drivers.currentIndex(); + const int index = drivers_.currentIndex(); if (index == -1) return; - sr_dev_driver *const driver = (sr_dev_driver*)_drivers.itemData( - index).value(); + shared_ptr driver = + drivers_.itemData(index).value>(); - GSList *drvopts = NULL; + assert(driver); - 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); - } + map drvopts; - const list< shared_ptr > devices = - _device_manager.driver_scan(driver, drvopts); + if (serial_device_.isVisible()) + drvopts[ConfigKey::CONN] = Variant::create( + serial_device_.text().toUtf8().constData()); - g_slist_free_full(drvopts, (GDestroyNotify)free_drvopts); + list< shared_ptr > devices = + device_manager_.driver_scan(driver, drvopts); - BOOST_FOREACH(shared_ptr dev_inst, devices) + for (shared_ptr device : 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()); + assert(device); - if (sdi->probes) { - text += QString(" with %1 probes").arg( - g_slist_length(sdi->probes)); - } + QString text = QString::fromStdString( + device_manager_.get_display_name(device)); + text += QString(" with %1 channels").arg(device->channels().size()); 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_); + item->setData(Qt::UserRole, qVariantFromValue(device)); + device_list_.addItem(item); } - _device_list.setCurrentRow(0); - _button_box.button(QDialogButtonBox::Ok)->setDisabled(_device_list.count() == 0); + device_list_.setCurrentRow(0); + button_box_.button(QDialogButtonBox::Ok)->setDisabled(device_list_.count() == 0); } void Connect::device_selected(int index) { - gsize num_opts = 0; - const int32_t *hwopts; - GVariant *gvar_list; - sr_dev_driver *const driver = (sr_dev_driver*)_drivers.itemData( - index).value(); + shared_ptr driver = + drivers_.itemData(index).value>(); unset_connection(); - 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 (unsigned int i = 0; i < num_opts; i++) { - switch(hwopts[i]) { - case SR_CONF_SERIALCOMM: - set_serial_connection(); - break; - - default: - continue; - } - - break; - } - g_variant_unref(gvar_list); - } -} - -void Connect::free_drvopts(struct sr_config *src) -{ - g_variant_unref(src->data); - g_free(src); + if (driver->config_check(ConfigKey::SERIALCOMM, ConfigKey::SCAN_OPTIONS)) + set_serial_connection(); } } // namespace dialogs