summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristian Daniel <cd@maintech.de>2013-09-26 23:19:13 +0200
committerChristian Daniel <cd@maintech.de>2013-09-26 23:19:13 +0200
commit3119c17e2c68381444634c999858b10e5df79daa (patch)
treeec271cdfb32551e0dcd22e6720daf221bdc1b788
parentcab9869fa0eed5762e571c54ba07cb72be96d131 (diff)
parent3f2498af40c5823aaf40adaf861af61fbd481b73 (diff)
Merge branch 'hoernchen/qt5' of git.osmocom.org:sdrangelove into hoernchen/qt5
-rw-r--r--plugins/samplesource/gnuradio/gnuradiogui.cpp4
-rw-r--r--plugins/samplesource/gnuradio/gnuradiogui.ui10
-rw-r--r--plugins/samplesource/gnuradio/gnuradioplugin.cpp4
3 files changed, 11 insertions, 7 deletions
diff --git a/plugins/samplesource/gnuradio/gnuradiogui.cpp b/plugins/samplesource/gnuradio/gnuradiogui.cpp
index 037e29d..80e0b25 100644
--- a/plugins/samplesource/gnuradio/gnuradiogui.cpp
+++ b/plugins/samplesource/gnuradio/gnuradiogui.cpp
@@ -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;
diff --git a/plugins/samplesource/gnuradio/gnuradiogui.ui b/plugins/samplesource/gnuradio/gnuradiogui.ui
index 1256f2a..fe1aaef 100644
--- a/plugins/samplesource/gnuradio/gnuradiogui.ui
+++ b/plugins/samplesource/gnuradio/gnuradiogui.ui
@@ -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>
diff --git a/plugins/samplesource/gnuradio/gnuradioplugin.cpp b/plugins/samplesource/gnuradio/gnuradioplugin.cpp
index ad18c9d..8ad2180 100644
--- a/plugins/samplesource/gnuradio/gnuradioplugin.cpp
+++ b/plugins/samplesource/gnuradio/gnuradioplugin.cpp
@@ -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")
};