X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fdialogs%2Fconnect.cpp;h=3af93f1476f2433a5b593b865fa1f15647a69e96;hb=c9f573751bab3f53066aa87486f38216fde67ac8;hp=43112ae5537f9e99cfeef0edc31c93aed13bd6de;hpb=1ebe875c5a51548c5182353e76c090215a3e5930;p=pulseview.git
diff --git a/pv/dialogs/connect.cpp b/pv/dialogs/connect.cpp
index 43112ae..3af93f1 100644
--- a/pv/dialogs/connect.cpp
+++ b/pv/dialogs/connect.cpp
@@ -14,16 +14,15 @@
* 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"
@@ -42,7 +41,6 @@ using Glib::VariantBase;
using sigrok::ConfigKey;
using sigrok::Driver;
-using sigrok::Error;
using pv::devices::HardwareDevice;
@@ -84,8 +82,23 @@ Connect::Connect(QWidget *parent, pv::DeviceManager &device_manager) :
radiobtn_usb->setChecked(true);
+ serial_config_ = new QWidget();
+ QHBoxLayout *serial_config_layout = new QHBoxLayout(serial_config_);
+
serial_devices_.setEditable(true);
- serial_devices_.setEnabled(false);
+ serial_devices_.setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Preferred);
+
+ serial_baudrate_.setEditable(true);
+ serial_baudrate_.addItem("");
+ serial_baudrate_.addItem("921600");
+ serial_baudrate_.addItem("115200");
+ serial_baudrate_.addItem("57600");
+ serial_baudrate_.addItem("19200");
+ serial_baudrate_.addItem("9600");
+
+ serial_config_layout->addWidget(&serial_devices_);
+ serial_config_layout->addWidget(&serial_baudrate_);
+ serial_config_layout->addWidget(new QLabel("baud"));
tcp_config_ = new QWidget();
QHBoxLayout *tcp_config_layout = new QHBoxLayout(tcp_config_);
@@ -97,17 +110,23 @@ Connect::Connect(QWidget *parent, pv::DeviceManager &device_manager) :
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->addWidget(new QLabel(tr("Protocol:")));
+ tcp_protocol_ = new QComboBox();
+ tcp_protocol_->addItem("Raw TCP", QVariant("tcp-raw/%1/%2"));
+ tcp_protocol_->addItem("VXI", QVariant("vxi/%1/%2"));
+ tcp_config_layout->addWidget(tcp_protocol_);
tcp_config_layout->setContentsMargins(0, 0, 0, 0);
tcp_config_->setEnabled(false);
+ // Let the device list occupy only the minimum space needed
+ device_list_.setMaximumHeight(device_list_.minimumSizeHint().height());
+
QVBoxLayout *vbox_if = new QVBoxLayout;
vbox_if->addWidget(radiobtn_usb);
vbox_if->addWidget(radiobtn_serial);
- vbox_if->addWidget(&serial_devices_);
+ vbox_if->addWidget(serial_config_);
vbox_if->addWidget(radiobtn_tcp);
vbox_if->addWidget(tcp_config_);
@@ -150,7 +169,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;
/**
@@ -175,7 +194,7 @@ void Connect::populate_drivers()
void Connect::populate_serials(shared_ptr driver)
{
serial_devices_.clear();
- for (auto serial : device_manager_.context()->serials(driver))
+ 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));
@@ -190,6 +209,7 @@ void Connect::unset_connection()
void Connect::serial_toggled(bool checked)
{
serial_devices_.setEnabled(checked);
+ serial_baudrate_.setEnabled(checked);
}
void Connect::tcp_toggled(bool checked)
@@ -212,27 +232,32 @@ void Connect::scan_pressed()
map drvopts;
- if (serial_devices_.isEnabled()) {
+ if (serial_config_->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();
+ serial = serial_devices_.itemData(index).toString();
else
serial = serial_devices_.currentText();
+
drvopts[ConfigKey::CONN] = Variant::create(
serial.toUtf8().constData());
+
+ // Set baud rate if specified
+ if (serial_baudrate_.currentText().length() > 0)
+ drvopts[ConfigKey::SERIALCOMM] = Variant::create(
+ QString("%1/8n1").arg(serial_baudrate_.currentText()).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);
+ QString conn =
+ tcp_protocol_->itemData(tcp_protocol_->currentIndex()).toString();
+
+ conn = conn.arg(host, port);
drvopts[ConfigKey::CONN] = Variant::create(
conn.toUtf8().constData());
@@ -242,16 +267,13 @@ void Connect::scan_pressed()
const list< shared_ptr > devices =
device_manager_.driver_scan(driver, drvopts);
- for (shared_ptr device : devices) {
+ for (const shared_ptr& device : devices) {
assert(device);
- QString text = QString::fromStdString(
- device->display_name(device_manager_));
- text += QString(" with %1 channels").arg(
- device->device()->channels().size());
+ QString text = QString::fromStdString(device->display_name(device_manager_));
+ text += QString(" with %1 channels").arg(device->device()->channels().size());
- QListWidgetItem *const item = new QListWidgetItem(text,
- &device_list_);
+ QListWidgetItem *const item = new QListWidgetItem(text, &device_list_);
item->setData(Qt::UserRole, qVariantFromValue(device));
device_list_.addItem(item);
}