VE7UWU/sdrangel
1
0
Fork 0
mirror of https://github.com/f4exb/sdrangel.git synced 2025-09-06 07:07:48 -04:00
Code Issues Projects Releases Wiki Activity

Normalize device name displays

Browse Source
This commit is contained in:
f4exb 2015-10-01 05:44:33 +02:00
parent df2077caa7
commit 6d3f975124
8 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
plugins/samplesource/airspy/airspyplugin.cpp
View File

@ -92,7 +92,7 @@ PluginInterface::SampleSourceDevices AirspyPlugin::enumSampleSources()
QString serial_str = QString::number(serial_msb, 16) + QString::number(serial_lsb, 16); QString serial_str = QString::number(serial_msb, 16) + QString::number(serial_lsb, 16);
uint64_t serial_num = (((uint64_t) serial_msb)<<32) + serial_lsb; 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, result.append(SampleSourceDevice(displayedName,
m_deviceTypeID, m_deviceTypeID,

2
plugins/samplesource/bladerf/bladerfplugin.cpp
View File

@ -57,7 +57,7 @@ PluginInterface::SampleSourceDevices BlderfPlugin::enumSampleSources()
for(int i = 0; i < count; i++) 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, result.append(SampleSourceDevice(displayedName,
"org.osmocom.sdr.samplesource.bladerf", "org.osmocom.sdr.samplesource.bladerf",

4
plugins/samplesource/fcdpro/fcdproplugin.cpp
View File

@ -60,11 +60,11 @@ PluginInterface::SampleSourceDevices FCDProPlugin::enumSampleSources()
while (device_info != 0) while (device_info != 0)
{ {
QString serialNumber = QString::fromWCharArray(device_info->serial_number); QString serialNumber = QString::fromWCharArray(device_info->serial_number);
QString displayedName(QString("%1 #%2 %3").arg(fcd_traits<Pro>::displayedName).arg(i).arg(serialNumber)); QString displayedName(QString("%1[%2] %3").arg(fcd_traits<Pro>::displayedName).arg(i).arg(serialNumber));
result.append(SampleSourceDevice(displayedName, result.append(SampleSourceDevice(displayedName,
fcd_traits<Pro>::interfaceIID, fcd_traits<Pro>::interfaceIID,
QString::null, serialNumber,
i)); i));
device_info = device_info->next; device_info = device_info->next;

4
plugins/samplesource/fcdproplus/fcdproplusplugin.cpp
View File

@ -60,11 +60,11 @@ PluginInterface::SampleSourceDevices FCDProPlusPlugin::enumSampleSources()
while (device_info != 0) while (device_info != 0)
{ {
QString serialNumber = QString::fromWCharArray(device_info->serial_number); QString serialNumber = QString::fromWCharArray(device_info->serial_number);
QString displayedName(QString("%1 #%2 %3").arg(fcd_traits<ProPlus>::displayedName).arg(i).arg(serialNumber)); QString displayedName(QString("%1[%2] %3").arg(fcd_traits<ProPlus>::displayedName).arg(i).arg(serialNumber));
result.append(SampleSourceDevice(displayedName, result.append(SampleSourceDevice(displayedName,
fcd_traits<ProPlus>::interfaceIID, fcd_traits<ProPlus>::interfaceIID,
QString::null, serialNumber,
i)); i));
device_info = device_info->next; device_info = device_info->next;

2
plugins/samplesource/filesource/filesourceplugin.cpp
View File

@ -56,7 +56,7 @@ PluginInterface::SampleSourceDevices FileSourcePlugin::enumSampleSources()
for(int i = 0; i < count; i++) 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, result.append(SampleSourceDevice(displayedName,
m_deviceTypeID, m_deviceTypeID,

2
plugins/samplesource/hackrf/hackrfplugin.cpp
View File

@ -93,7 +93,7 @@ PluginInterface::SampleSourceDevices HackRFPlugin::enumSampleSources()
QString serial_str = QString::number(serial_msb, 16) + QString::number(serial_lsb, 16); QString serial_str = QString::number(serial_msb, 16) + QString::number(serial_lsb, 16);
uint64_t serial_num = (((uint64_t) serial_msb)<<32) + serial_lsb; 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, result.append(SampleSourceDevice(displayedName, m_deviceTypeID,
serial_str, serial_str,

2
plugins/samplesource/rtlsdr/rtlsdrgui.cpp
View File

@ -14,7 +14,7 @@ RTLSDRGui::RTLSDRGui(PluginAPI* pluginAPI, QWidget* parent) :
{ {
ui->setupUi(this); ui->setupUi(this);
ui->centerFrequency->setColorMapper(ColorMapper(ColorMapper::ReverseGold)); 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())); connect(&m_updateTimer, SIGNAL(timeout()), this, SLOT(updateHardware()));
displaySettings(); displaySettings();

2
plugins/samplesource/rtlsdr/rtlsdrplugin.cpp
View File

@ -49,7 +49,7 @@ PluginInterface::SampleSourceDevices RTLSDRPlugin::enumSampleSources()
if(rtlsdr_get_device_usb_strings((uint32_t)i, vendor, product, serial) != 0) if(rtlsdr_get_device_usb_strings((uint32_t)i, vendor, product, serial) != 0)
continue; 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, result.append(SampleSourceDevice(displayedName,
m_deviceTypeID, m_deviceTypeID,