X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fdialogs%2Fconnect.cpp;h=46df783dbe1361092f76b4ddacd0bb5f438bf9ef;hp=f7b0fc76004b9bf7e95b09aff53371b0f7deb5ac;hb=09f55d9665efb3b17ba7de4bae47be6989e884fe;hpb=55ab5e32cd4c8b750857fecf3b8ebb55af64c5fa diff --git a/pv/dialogs/connect.cpp b/pv/dialogs/connect.cpp index f7b0fc76..46df783d 100644 --- a/pv/dialogs/connect.cpp +++ b/pv/dialogs/connect.cpp @@ -14,17 +14,21 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + * along with this program; if not, see . */ #include -#include +#include + +#include +#include +#include #include "connect.hpp" -#include "pv/devicemanager.hpp" +#include +#include using std::list; using std::map; @@ -38,7 +42,8 @@ using Glib::VariantBase; using sigrok::ConfigKey; using sigrok::Driver; using sigrok::Error; -using sigrok::HardwareDevice; + +using pv::devices::HardwareDevice; namespace pv { namespace dialogs { @@ -50,8 +55,8 @@ Connect::Connect(QWidget *parent, pv::DeviceManager &device_manager) : form_(this), form_layout_(&form_), drivers_(&form_), - serial_device_(&form_), - scan_button_(tr("Scan for Devices"), this), + serial_devices_(&form_), + scan_button_(tr("&Scan for devices using driver above"), this), device_list_(this), button_box_(QDialogButtonBox::Ok | QDialogButtonBox::Cancel, Qt::Horizontal, this) @@ -62,23 +67,74 @@ Connect::Connect(QWidget *parent, pv::DeviceManager &device_manager) : connect(&button_box_, SIGNAL(rejected()), this, SLOT(reject())); populate_drivers(); - connect(&drivers_, SIGNAL(activated(int)), - this, SLOT(device_selected(int))); + connect(&drivers_, SIGNAL(activated(int)), this, SLOT(driver_selected(int))); form_.setLayout(&form_layout_); - form_layout_.addRow(tr("Driver"), &drivers_); - form_layout_.addRow(tr("Serial Port"), &serial_device_); + QVBoxLayout *vbox_drv = new QVBoxLayout; + vbox_drv->addWidget(&drivers_); + QGroupBox *groupbox_drv = new QGroupBox(tr("Step 1: Choose the driver")); + groupbox_drv->setLayout(vbox_drv); + form_layout_.addRow(groupbox_drv); + + QRadioButton *radiobtn_usb = new QRadioButton(tr("&USB"), this); + QRadioButton *radiobtn_serial = new QRadioButton(tr("Serial &Port"), this); + QRadioButton *radiobtn_tcp = new QRadioButton(tr("&TCP/IP"), this); + + radiobtn_usb->setChecked(true); + + serial_devices_.setEditable(true); + serial_devices_.setEnabled(false); + + tcp_config_ = new QWidget(); + QHBoxLayout *tcp_config_layout = new QHBoxLayout(tcp_config_); + tcp_host_ = new QLineEdit; + tcp_host_->setText("192.168.1.100"); + tcp_config_layout->addWidget(tcp_host_); + tcp_config_layout->addWidget(new QLabel(":")); + tcp_port_ = new QSpinBox; + tcp_port_->setRange(1, 65535); + tcp_port_->setValue(5555); + tcp_config_layout->addWidget(tcp_port_); + tcp_use_vxi_ = new QCheckBox(); + tcp_use_vxi_->setText(tr("Use VXI")); + tcp_config_layout->addSpacing(30); + tcp_config_layout->addWidget(tcp_use_vxi_); + tcp_config_layout->setContentsMargins(0, 0, 0, 0); + tcp_config_->setEnabled(false); + + QVBoxLayout *vbox_if = new QVBoxLayout; + vbox_if->addWidget(radiobtn_usb); + vbox_if->addWidget(radiobtn_serial); + vbox_if->addWidget(&serial_devices_); + vbox_if->addWidget(radiobtn_tcp); + vbox_if->addWidget(tcp_config_); + + QGroupBox *groupbox_if = new QGroupBox(tr("Step 2: Choose the interface")); + groupbox_if->setLayout(vbox_if); + form_layout_.addRow(groupbox_if); + + QVBoxLayout *vbox_scan = new QVBoxLayout; + vbox_scan->addWidget(&scan_button_); + QGroupBox *groupbox_scan = new QGroupBox(tr("Step 3: Scan for devices")); + groupbox_scan->setLayout(vbox_scan); + form_layout_.addRow(groupbox_scan); + + QVBoxLayout *vbox_select = new QVBoxLayout; + vbox_select->addWidget(&device_list_); + QGroupBox *groupbox_select = new QGroupBox(tr("Step 4: Select the device")); + groupbox_select->setLayout(vbox_select); + form_layout_.addRow(groupbox_select); unset_connection(); - connect(&scan_button_, SIGNAL(pressed()), - this, SLOT(scan_pressed())); + connect(radiobtn_serial, SIGNAL(toggled(bool)), this, SLOT(serial_toggled(bool))); + connect(radiobtn_tcp, SIGNAL(toggled(bool)), this, SLOT(tcp_toggled(bool))); + 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_); } @@ -103,30 +159,41 @@ void Connect::populate_drivers() * @todo Add support for non-monotonic devices i.e. DMMs * and sensors. */ - bool supported_device = driver->config_check( - ConfigKey::LOGIC_ANALYZER, ConfigKey::DEVICE_OPTIONS) | - driver->config_check( - ConfigKey::OSCILLOSCOPE, ConfigKey::DEVICE_OPTIONS); + const auto keys = driver->config_keys(); + + bool supported_device = keys.count(ConfigKey::LOGIC_ANALYZER) | + keys.count(ConfigKey::OSCILLOSCOPE); if (supported_device) drivers_.addItem(QString("%1 (%2)").arg( - driver->long_name().c_str()).arg(name.c_str()), + driver->long_name().c_str(), 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(), 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); } -void Connect::set_serial_connection() +void Connect::serial_toggled(bool checked) { - serial_device_.show(); - form_layout_.labelForField(&serial_device_)->show(); + serial_devices_.setEnabled(checked); +} + +void Connect::tcp_toggled(bool checked) +{ + tcp_config_->setEnabled(checked); } void Connect::scan_pressed() @@ -144,20 +211,43 @@ void Connect::scan_pressed() map drvopts; - if (serial_device_.isVisible()) + if (serial_devices_.isEnabled()) { + 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()); + } + + if (tcp_config_->isEnabled()) { + QString host = tcp_host_->text(); + QString port = tcp_port_->text(); + if (!host.isEmpty()) { + QString conn; + if (tcp_use_vxi_->isChecked()) + conn = QString("vxi/%1/%2").arg(host, port); + else + conn = QString("tcp-raw/%1/%2").arg(host, port); + + drvopts[ConfigKey::CONN] = Variant::create( + conn.toUtf8().constData()); + } + } - list< shared_ptr > devices = + 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_.get_display_name(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_); @@ -169,15 +259,14 @@ void Connect::scan_pressed() button_box_.button(QDialogButtonBox::Ok)->setDisabled(device_list_.count() == 0); } -void Connect::device_selected(int index) +void Connect::driver_selected(int index) { shared_ptr driver = drivers_.itemData(index).value>(); unset_connection(); - if (driver->config_check(ConfigKey::SERIALCOMM, ConfigKey::SCAN_OPTIONS)) - set_serial_connection(); + populate_serials(driver); } } // namespace dialogs