From 6d3f975124d44e78e3c2a7a5b254c3c79240868b Mon Sep 17 00:00:00 2001 From: f4exb Date: Thu, 1 Oct 2015 05:44:33 +0200 Subject: [PATCH] Normalize device name displays --- plugins/samplesource/airspy/airspyplugin.cpp | 2 +- plugins/samplesource/bladerf/bladerfplugin.cpp | 2 +- plugins/samplesource/fcdpro/fcdproplugin.cpp | 4 ++-- plugins/samplesource/fcdproplus/fcdproplusplugin.cpp | 4 ++-- plugins/samplesource/filesource/filesourceplugin.cpp | 2 +- plugins/samplesource/hackrf/hackrfplugin.cpp | 2 +- plugins/samplesource/rtlsdr/rtlsdrgui.cpp | 2 +- plugins/samplesource/rtlsdr/rtlsdrplugin.cpp | 2 +- 8 files changed, 10 insertions(+), 10 deletions(-) diff --git a/plugins/samplesource/airspy/airspyplugin.cpp b/plugins/samplesource/airspy/airspyplugin.cpp index 60343b1d0..ed0a9be03 100644 --- a/plugins/samplesource/airspy/airspyplugin.cpp +++ b/plugins/samplesource/airspy/airspyplugin.cpp @@ -92,7 +92,7 @@ PluginInterface::SampleSourceDevices AirspyPlugin::enumSampleSources() QString serial_str = QString::number(serial_msb, 16) + QString::number(serial_lsb, 16); uint64_t serial_num = (((uint64_t) serial_msb)<<32) + serial_lsb; - QString displayedName(QString("Airspy #%1 0x%2").arg(i).arg(serial_str)); + QString displayedName(QString("Airspy[%1] %2").arg(i).arg(serial_str)); result.append(SampleSourceDevice(displayedName, m_deviceTypeID, diff --git a/plugins/samplesource/bladerf/bladerfplugin.cpp b/plugins/samplesource/bladerf/bladerfplugin.cpp index 1fbe0767c..1ef944127 100644 --- a/plugins/samplesource/bladerf/bladerfplugin.cpp +++ b/plugins/samplesource/bladerf/bladerfplugin.cpp @@ -57,7 +57,7 @@ PluginInterface::SampleSourceDevices BlderfPlugin::enumSampleSources() for(int i = 0; i < count; i++) { - QString displayedName(QString("BladeRF #%1 %2 (%3,%4)").arg(devinfo[i].instance).arg(devinfo[i].serial).arg(devinfo[i].usb_bus).arg(devinfo[i].usb_addr)); + QString displayedName(QString("BladeRF[%1] %2").arg(devinfo[i].instance).arg(devinfo[i].serial)); result.append(SampleSourceDevice(displayedName, "org.osmocom.sdr.samplesource.bladerf", diff --git a/plugins/samplesource/fcdpro/fcdproplugin.cpp b/plugins/samplesource/fcdpro/fcdproplugin.cpp index c7f53acf1..c0b6cb177 100644 --- a/plugins/samplesource/fcdpro/fcdproplugin.cpp +++ b/plugins/samplesource/fcdpro/fcdproplugin.cpp @@ -60,11 +60,11 @@ PluginInterface::SampleSourceDevices FCDProPlugin::enumSampleSources() while (device_info != 0) { QString serialNumber = QString::fromWCharArray(device_info->serial_number); - QString displayedName(QString("%1 #%2 %3").arg(fcd_traits::displayedName).arg(i).arg(serialNumber)); + QString displayedName(QString("%1[%2] %3").arg(fcd_traits::displayedName).arg(i).arg(serialNumber)); result.append(SampleSourceDevice(displayedName, fcd_traits::interfaceIID, - QString::null, + serialNumber, i)); device_info = device_info->next; diff --git a/plugins/samplesource/fcdproplus/fcdproplusplugin.cpp b/plugins/samplesource/fcdproplus/fcdproplusplugin.cpp index 307240a89..7092e9421 100644 --- a/plugins/samplesource/fcdproplus/fcdproplusplugin.cpp +++ b/plugins/samplesource/fcdproplus/fcdproplusplugin.cpp @@ -60,11 +60,11 @@ PluginInterface::SampleSourceDevices FCDProPlusPlugin::enumSampleSources() while (device_info != 0) { QString serialNumber = QString::fromWCharArray(device_info->serial_number); - QString displayedName(QString("%1 #%2 %3").arg(fcd_traits::displayedName).arg(i).arg(serialNumber)); + QString displayedName(QString("%1[%2] %3").arg(fcd_traits::displayedName).arg(i).arg(serialNumber)); result.append(SampleSourceDevice(displayedName, fcd_traits::interfaceIID, - QString::null, + serialNumber, i)); device_info = device_info->next; diff --git a/plugins/samplesource/filesource/filesourceplugin.cpp b/plugins/samplesource/filesource/filesourceplugin.cpp index c299f3df1..38e641a35 100644 --- a/plugins/samplesource/filesource/filesourceplugin.cpp +++ b/plugins/samplesource/filesource/filesourceplugin.cpp @@ -56,7 +56,7 @@ PluginInterface::SampleSourceDevices FileSourcePlugin::enumSampleSources() for(int i = 0; i < count; i++) { - QString displayedName(QString("FileSource #%1 choose file").arg(i)); + QString displayedName(QString("FileSource[%1]").arg(i)); result.append(SampleSourceDevice(displayedName, m_deviceTypeID, diff --git a/plugins/samplesource/hackrf/hackrfplugin.cpp b/plugins/samplesource/hackrf/hackrfplugin.cpp index 376410804..b7af17a67 100644 --- a/plugins/samplesource/hackrf/hackrfplugin.cpp +++ b/plugins/samplesource/hackrf/hackrfplugin.cpp @@ -93,7 +93,7 @@ PluginInterface::SampleSourceDevices HackRFPlugin::enumSampleSources() QString serial_str = QString::number(serial_msb, 16) + QString::number(serial_lsb, 16); uint64_t serial_num = (((uint64_t) serial_msb)<<32) + serial_lsb; - QString displayedName(QString("HackRF #%1 0x%2").arg(i).arg(serial_str)); + QString displayedName(QString("HackRF[%1] %2").arg(i).arg(serial_str)); result.append(SampleSourceDevice(displayedName, m_deviceTypeID, serial_str, diff --git a/plugins/samplesource/rtlsdr/rtlsdrgui.cpp b/plugins/samplesource/rtlsdr/rtlsdrgui.cpp index 24f7a1676..34d6e84ec 100644 --- a/plugins/samplesource/rtlsdr/rtlsdrgui.cpp +++ b/plugins/samplesource/rtlsdr/rtlsdrgui.cpp @@ -14,7 +14,7 @@ RTLSDRGui::RTLSDRGui(PluginAPI* pluginAPI, QWidget* parent) : { ui->setupUi(this); ui->centerFrequency->setColorMapper(ColorMapper(ColorMapper::ReverseGold)); - ui->centerFrequency->setValueRange(7, 28500U, 1700000U); + ui->centerFrequency->setValueRange(7, 24000U, 1900000U); connect(&m_updateTimer, SIGNAL(timeout()), this, SLOT(updateHardware())); displaySettings(); diff --git a/plugins/samplesource/rtlsdr/rtlsdrplugin.cpp b/plugins/samplesource/rtlsdr/rtlsdrplugin.cpp index 61b40b352..67f28589a 100644 --- a/plugins/samplesource/rtlsdr/rtlsdrplugin.cpp +++ b/plugins/samplesource/rtlsdr/rtlsdrplugin.cpp @@ -49,7 +49,7 @@ PluginInterface::SampleSourceDevices RTLSDRPlugin::enumSampleSources() if(rtlsdr_get_device_usb_strings((uint32_t)i, vendor, product, serial) != 0) continue; - QString displayedName(QString("RTL-SDR #%1 %2").arg(i).arg(serial)); + QString displayedName(QString("RTL-SDR[%1] %2").arg(i).arg(serial)); result.append(SampleSourceDevice(displayedName, m_deviceTypeID,