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

Enhance channel power display

Browse Source
This commit is contained in:
f4exb 2015-10-05 02:18:32 +02:00
parent 6a9743bb3d
commit 360b94966b
6 changed files with 364 additions and 276 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CMakeLists.txt
View File

@ -33,8 +33,8 @@ ENDIF()
############################################################################## ##############################################################################
#include(${QT_USE_FILE}) #include(${QT_USE_FILE})
#set( QT_DEFINITIONS "${QT_DEFINITIONS} -DQT_NO_DEBUG_OUTPUT" ) set( QT_DEFINITIONS "${QT_DEFINITIONS} -DQT_NO_DEBUG_OUTPUT" )
set( QT_DEFINITIONS "${QT_DEFINITIONS}" ) #set( QT_DEFINITIONS "${QT_DEFINITIONS}" )
add_definitions(${QT_DEFINITIONS}) add_definitions(${QT_DEFINITIONS})
if(MSVC) if(MSVC)

25
plugins/channel/am/amdemodgui.ui
View File

@ -7,7 +7,7 @@
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>302</width> <width>302</width>
<height>390</height> <height>395</height>
</rect> </rect>
</property> </property>
<property name="focusPolicy"> <property name="focusPolicy">
@ -21,7 +21,7 @@
<rect> <rect>
<x>35</x> <x>35</x>
<y>35</y> <y>35</y>
<width>106</width> <width>235</width>
<height>349</height> <height>349</height>
</rect> </rect>
</property> </property>
@ -44,6 +44,8 @@
<property name="bottomMargin"> <property name="bottomMargin">
<number>2</number> <number>2</number>
</property> </property>
<item>
<layout class="QHBoxLayout" name="deltaFreqPowLayout">
<item> <item>
<layout class="QHBoxLayout" name="deltaFrequencyLayout"> <layout class="QHBoxLayout" name="deltaFrequencyLayout">
<item> <item>
@ -100,6 +102,23 @@
</property> </property>
</widget> </widget>
</item> </item>
<item>
<spacer name="horizontalSpacer">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
</layout>
</item>
<item>
<layout class="QHBoxLayout" name="channelPowerLayout">
<item> <item>
<widget class="QLabel" name="channelPower"> <widget class="QLabel" name="channelPower">
<property name="toolTip"> <property name="toolTip">
@ -122,6 +141,8 @@
</item> </item>
</layout> </layout>
</item> </item>
</layout>
</item>
<item> <item>
<layout class="QHBoxLayout" name="rfBandwidthLayout"> <layout class="QHBoxLayout" name="rfBandwidthLayout">
<item> <item>

28
plugins/channel/nfm/nfmdemodgui.ui
View File

@ -6,7 +6,7 @@
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>167</width> <width>281</width>
<height>433</height> <height>433</height>
</rect> </rect>
</property> </property>
@ -18,7 +18,7 @@
<rect> <rect>
<x>6</x> <x>6</x>
<y>35</y> <y>35</y>
<width>122</width> <width>235</width>
<height>395</height> <height>395</height>
</rect> </rect>
</property> </property>
@ -41,6 +41,8 @@
<property name="bottomMargin"> <property name="bottomMargin">
<number>2</number> <number>2</number>
</property> </property>
<item>
<layout class="QHBoxLayout" name="deltaFreqPowerLayout">
<item> <item>
<layout class="QHBoxLayout" name="DeltaFrequencyLayout"> <layout class="QHBoxLayout" name="DeltaFrequencyLayout">
<item> <item>
@ -100,6 +102,23 @@
</property> </property>
</widget> </widget>
</item> </item>
</layout>
</item>
<item>
<spacer name="horizontalSpacer">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
<item>
<layout class="QHBoxLayout" name="channnelPowerLayout">
<item> <item>
<widget class="QLabel" name="channelPower"> <widget class="QLabel" name="channelPower">
<property name="toolTip"> <property name="toolTip">
@ -122,6 +141,8 @@
</item> </item>
</layout> </layout>
</item> </item>
</layout>
</item>
<item> <item>
<layout class="QHBoxLayout" name="rfBWLayout"> <layout class="QHBoxLayout" name="rfBWLayout">
<item> <item>
@ -353,6 +374,9 @@
</item> </item>
</layout> </layout>
</widget> </widget>
<zorder>settingsContainer</zorder>
<zorder>horizontalLayoutWidget_2</zorder>
<zorder>horizontalLayoutWidget_2</zorder>
</widget> </widget>
<customwidgets> <customwidgets>
<customwidget> <customwidget>

1
plugins/channel/ssb/ssbdemod.cpp
View File

@ -50,6 +50,7 @@ SSBDemod::SSBDemod(SampleSink* sampleSink) :
m_undersampleCount = 0; m_undersampleCount = 0;
m_usb = true; m_usb = true;
m_magsq = 0.0f;
SSBFilter = new fftfilt(m_LowCutoff / m_audioSampleRate, m_Bandwidth / m_audioSampleRate, ssbFftLen); SSBFilter = new fftfilt(m_LowCutoff / m_audioSampleRate, m_Bandwidth / m_audioSampleRate, ssbFftLen);
DSPEngine::instance()->addAudioSink(&m_audioFifo); DSPEngine::instance()->addAudioSink(&m_audioFifo);

21
plugins/channel/ssb/ssbdemodgui.ui
View File

@ -47,6 +47,8 @@
<property name="bottomMargin"> <property name="bottomMargin">
<number>2</number> <number>2</number>
</property> </property>
<item>
<layout class="QHBoxLayout" name="deltaFreqPowLayout">
<item> <item>
<layout class="QHBoxLayout" name="deltaFrequencyLayout"> <layout class="QHBoxLayout" name="deltaFrequencyLayout">
<item> <item>
@ -103,6 +105,23 @@
</property> </property>
</widget> </widget>
</item> </item>
</layout>
</item>
<item>
<spacer name="freqPowSpacer">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
<item>
<layout class="QHBoxLayout" name="channelPoweLayout">
<item> <item>
<widget class="QLabel" name="channelPower"> <widget class="QLabel" name="channelPower">
<property name="toolTip"> <property name="toolTip">
@ -125,6 +144,8 @@
</item> </item>
</layout> </layout>
</item> </item>
</layout>
</item>
<item> <item>
<layout class="QHBoxLayout" name="spanLayout"> <layout class="QHBoxLayout" name="spanLayout">
<item> <item>

23
plugins/channel/wfm/wfmdemodgui.ui
View File

@ -18,7 +18,7 @@
<rect> <rect>
<x>35</x> <x>35</x>
<y>35</y> <y>35</y>
<width>106</width> <width>235</width>
<height>349</height> <height>349</height>
</rect> </rect>
</property> </property>
@ -41,6 +41,8 @@
<property name="bottomMargin"> <property name="bottomMargin">
<number>2</number> <number>2</number>
</property> </property>
<item>
<layout class="QHBoxLayout" name="deltaFreqPowLayout">
<item> <item>
<layout class="QHBoxLayout" name="deltaFreqiencyLayout"> <layout class="QHBoxLayout" name="deltaFreqiencyLayout">
<item> <item>
@ -97,6 +99,23 @@
</property> </property>
</widget> </widget>
</item> </item>
</layout>
</item>
<item>
<spacer name="horizontalSpacer">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
<item>
<layout class="QHBoxLayout" name="channelPowerLayout">
<item> <item>
<widget class="QLabel" name="channelPower"> <widget class="QLabel" name="channelPower">
<property name="toolTip"> <property name="toolTip">
@ -119,6 +138,8 @@
</item> </item>
</layout> </layout>
</item> </item>
</layout>
</item>
<item> <item>
<layout class="QHBoxLayout" name="rfBandwidthLayout"> <layout class="QHBoxLayout" name="rfBandwidthLayout">
<item> <item>