sdr/sdrangelove
sdr
/
sdrangelove
8
0
Fork 1
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'hoernchen/qt5' of git.osmocom.org:sdrangelove into hoernchen/qt5

This commit is contained in:
Christian Daniel 2013-09-26 23:19:13 +02:00
parent cab9869fa0 3f2498af40
commit 3119c17e2c
3 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
plugins/samplesource/gnuradio/gnuradiogui.cpp
View File

@ -237,7 +237,7 @@ void GNURadioGui::displaySettings()
ui->cboSampleRate->clear();
for ( int i = 0; i < m_sampRates.size(); i++ )
ui->cboSampleRate->addItem( QString::number(m_sampRates[i] / 1e3, '.', 3) );
ui->cboSampleRate->addItem( QString::number(m_sampRates[i] / 1e6) );
if ( oldIndex > ui->cboSampleRate->count() - 1 )
oldIndex = 0;
@ -306,7 +306,7 @@ void GNURadioGui::displaySettings()
if ( 0.0 == m_bandwidths[i] )
ui->cboBandwidth->addItem( "Auto" );
else
ui->cboBandwidth->addItem( QString::number(m_bandwidths[i] / 1e3, '.', 3) );
ui->cboBandwidth->addItem( QString::number(m_bandwidths[i] / 1e6) );
if ( oldIndex > ui->cboBandwidth->count() - 1 )
oldIndex = 0;

10
plugins/samplesource/gnuradio/gnuradiogui.ui
View File

@ -204,7 +204,7 @@
<item>
<widget class="QLabel" name="label_2">
<property name="text">
<string>Sample Rate (kHz)</string>
<string>Sample Rate (MHz)</string>
</property>
<property name="textFormat">
<enum>Qt::AutoText</enum>
@ -233,7 +233,11 @@
</widget>
</item>
<item>
<widget class="QComboBox" name="cboAntennas"/>
<widget class="QComboBox" name="cboAntennas">
<property name="frame">
<bool>true</bool>
</property>
</widget>
</item>
</layout>
</item>
@ -273,7 +277,7 @@
<item>
<widget class="QLabel" name="label_5">
<property name="text">
<string>Bandwidth (kHz)</string>
<string>Bandwidth (MHz)</string>
</property>
</widget>
</item>

4
plugins/samplesource/gnuradio/gnuradioplugin.cpp
View File

@ -7,9 +7,9 @@
const PluginDescriptor GNURadioPlugin::m_pluginDescriptor = {
QString("GR-OsmoSDR Input"),
QString("---"),
QString("1.0"),
QString("(c) Dimitri Stolnikov <horiz0n@gmx.net>"),
QString("http://sdr.osmocom.org/trac/wiki/gr-osmosdr"),
QString("http://sdr.osmocom.org/trac/wiki/GrOsmoSDR"),
true,
QString("http://cgit.osmocom.org/cgit/gr-osmosdr")
};