X-Git-Url: http://git.code-monkey.de/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fdialogs%2Fconnect.cpp;h=bf92998b9b9e65fd7cd1ecf0d1d1c1564914f347;hp=19dfde8d1a3f227065e39cd1499b2300212f3d8a;hb=2ad82c2e40b6865481733913a2c32735602f63c4;hpb=e8d009288de28cb194bc7964f96677c2baf900c9 diff --git a/pv/dialogs/connect.cpp b/pv/dialogs/connect.cpp index 19dfde8..bf92998 100644 --- a/pv/dialogs/connect.cpp +++ b/pv/dialogs/connect.cpp @@ -20,11 +20,12 @@ #include -#include +#include -#include "connect.h" +#include "connect.hpp" -#include "pv/devicemanager.h" +#include +#include using std::list; using std::map; @@ -38,53 +39,55 @@ using Glib::VariantBase; using sigrok::ConfigKey; using sigrok::Driver; using sigrok::Error; -using sigrok::HardwareDevice; + +using pv::devices::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_devices_(&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_devices_); + serial_devices_.setEditable(true); 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 { - const QListWidgetItem *const item = _device_list.currentItem(); + const QListWidgetItem *const item = device_list_.currentItem(); if (!item) return shared_ptr(); @@ -93,7 +96,7 @@ shared_ptr Connect::get_selected_device() const void Connect::populate_drivers() { - for (auto entry : _device_manager.context()->drivers()) { + for (auto entry : device_manager_.context()->drivers()) { auto name = entry.first; auto driver = entry.second; /** @@ -104,78 +107,98 @@ void Connect::populate_drivers() * and sensors. */ bool supported_device = driver->config_check( - ConfigKey::SAMPLERATE, ConfigKey::DEVICE_OPTIONS); + ConfigKey::LOGIC_ANALYZER, ConfigKey::DEVICE_OPTIONS) | + driver->config_check( + ConfigKey::OSCILLOSCOPE, ConfigKey::DEVICE_OPTIONS); if (supported_device) - _drivers.addItem(QString("%1 (%2)").arg( + drivers_.addItem(QString("%1 (%2)").arg( driver->long_name().c_str()).arg(name.c_str()), qVariantFromValue(driver)); } } +void Connect::populate_serials(shared_ptr driver) +{ + serial_devices_.clear(); + for (auto serial : device_manager_.context()->serials(driver)) + serial_devices_.addItem(QString("%1 (%2)").arg( + serial.first.c_str()).arg(serial.second.c_str()), + QString::fromStdString(serial.first)); +} + void Connect::unset_connection() { - _device_list.clear(); - _serial_device.hide(); - _form_layout.labelForField(&_serial_device)->hide(); - _button_box.button(QDialogButtonBox::Ok)->setDisabled(true); + device_list_.clear(); + 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) { - _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() { - _device_list.clear(); + device_list_.clear(); - const int index = _drivers.currentIndex(); + const int index = drivers_.currentIndex(); if (index == -1) return; shared_ptr driver = - _drivers.itemData(index).value>(); + drivers_.itemData(index).value>(); assert(driver); map 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(); + else + serial = serial_devices_.currentText(); drvopts[ConfigKey::CONN] = Variant::create( - _serial_device.text().toUtf8().constData()); + serial.toUtf8().constData()); + } - list< shared_ptr > devices = - _device_manager.driver_scan(driver, drvopts); + const list< shared_ptr > devices = + device_manager_.driver_scan(driver, drvopts); - for (shared_ptr device : devices) - { + for (shared_ptr device : devices) { assert(device); QString text = QString::fromStdString( - _device_manager.device_description(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); + &device_list_); item->setData(Qt::UserRole, qVariantFromValue(device)); - _device_list.addItem(item); + 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) { shared_ptr driver = - _drivers.itemData(index).value>(); + drivers_.itemData(index).value>(); unset_connection(); if (driver->config_check(ConfigKey::SERIALCOMM, ConfigKey::SCAN_OPTIONS)) - set_serial_connection(); + set_serial_connection(driver); } } // namespace dialogs