1
0
mirror of https://github.com/f4exb/sdrangel.git synced 2025-08-06 07:42:27 -04:00

Enhance channel power display

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

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)

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>
@ -45,80 +45,101 @@
<number>2</number> <number>2</number>
</property> </property>
<item> <item>
<layout class="QHBoxLayout" name="deltaFrequencyLayout"> <layout class="QHBoxLayout" name="deltaFreqPowLayout">
<item> <item>
<widget class="QToolButton" name="deltaMinus"> <layout class="QHBoxLayout" name="deltaFrequencyLayout">
<property name="text"> <item>
<string>...</string> <widget class="QToolButton" name="deltaMinus">
</property> <property name="text">
<property name="icon"> <string>...</string>
<iconset> </property>
<selectedoff>:/plus.png</selectedoff> <property name="icon">
<selectedon>:/minus.png</selectedon> <iconset>
</iconset> <selectedoff>:/plus.png</selectedoff>
</property> <selectedon>:/minus.png</selectedon>
<property name="checkable"> </iconset>
<bool>true</bool> </property>
</property> <property name="checkable">
</widget> <bool>true</bool>
</property>
</widget>
</item>
<item>
<widget class="ValueDial" name="deltaFrequency" native="true">
<property name="sizePolicy">
<sizepolicy hsizetype="Maximum" vsizetype="Maximum">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize">
<size>
<width>32</width>
<height>16</height>
</size>
</property>
<property name="font">
<font>
<family>Monospace</family>
<pointsize>12</pointsize>
</font>
</property>
<property name="cursor">
<cursorShape>SizeVerCursor</cursorShape>
</property>
<property name="focusPolicy">
<enum>Qt::StrongFocus</enum>
</property>
<property name="toolTip">
<string>Demod shift frequency from center in Hz</string>
</property>
</widget>
</item>
<item>
<widget class="QLabel" name="deltaUnits">
<property name="text">
<string>Hz </string>
</property>
</widget>
</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>
<item> <item>
<widget class="ValueDial" name="deltaFrequency" native="true"> <layout class="QHBoxLayout" name="channelPowerLayout">
<property name="sizePolicy"> <item>
<sizepolicy hsizetype="Maximum" vsizetype="Maximum"> <widget class="QLabel" name="channelPower">
<horstretch>0</horstretch> <property name="toolTip">
<verstretch>0</verstretch> <string>Channel power</string>
</sizepolicy> </property>
</property> <property name="layoutDirection">
<property name="minimumSize"> <enum>Qt::RightToLeft</enum>
<size> </property>
<width>32</width> <property name="text">
<height>16</height> <string>0.0</string>
</size> </property>
</property> </widget>
<property name="font"> </item>
<font> <item>
<family>Monospace</family> <widget class="QLabel" name="channelPowerUnits">
<pointsize>12</pointsize> <property name="text">
</font> <string> dB</string>
</property> </property>
<property name="cursor"> </widget>
<cursorShape>SizeVerCursor</cursorShape> </item>
</property> </layout>
<property name="focusPolicy">
<enum>Qt::StrongFocus</enum>
</property>
<property name="toolTip">
<string>Demod shift frequency from center in Hz</string>
</property>
</widget>
</item>
<item>
<widget class="QLabel" name="deltaUnits">
<property name="text">
<string>Hz </string>
</property>
</widget>
</item>
<item>
<widget class="QLabel" name="channelPower">
<property name="toolTip">
<string>Channel power</string>
</property>
<property name="layoutDirection">
<enum>Qt::RightToLeft</enum>
</property>
<property name="text">
<string>0.0</string>
</property>
</widget>
</item>
<item>
<widget class="QLabel" name="channelPowerUnits">
<property name="text">
<string> dB</string>
</property>
</widget>
</item> </item>
</layout> </layout>
</item> </item>

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>
@ -42,83 +42,104 @@
<number>2</number> <number>2</number>
</property> </property>
<item> <item>
<layout class="QHBoxLayout" name="DeltaFrequencyLayout"> <layout class="QHBoxLayout" name="deltaFreqPowerLayout">
<item> <item>
<widget class="QToolButton" name="deltaMinus"> <layout class="QHBoxLayout" name="DeltaFrequencyLayout">
<property name="text"> <item>
<string>...</string> <widget class="QToolButton" name="deltaMinus">
</property> <property name="text">
<property name="icon"> <string>...</string>
<iconset> </property>
<selectedoff>:/plus.png</selectedoff> <property name="icon">
<selectedon>:/minus.png</selectedon> <iconset>
</iconset> <selectedoff>:/plus.png</selectedoff>
</property> <selectedon>:/minus.png</selectedon>
<property name="checkable"> </iconset>
<bool>true</bool> </property>
</property> <property name="checkable">
</widget> <bool>true</bool>
</property>
</widget>
</item>
<item>
<widget class="ValueDial" name="deltaFrequency" native="true">
<property name="sizePolicy">
<sizepolicy hsizetype="Maximum" vsizetype="Maximum">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize">
<size>
<width>32</width>
<height>16</height>
</size>
</property>
<property name="font">
<font>
<family>Monospace</family>
<pointsize>12</pointsize>
</font>
</property>
<property name="cursor">
<cursorShape>SizeVerCursor</cursorShape>
</property>
<property name="focusPolicy">
<enum>Qt::StrongFocus</enum>
</property>
<property name="toolTip">
<string>Demod shift frequency from center in Hz</string>
</property>
</widget>
</item>
<item>
<widget class="QLabel" name="deltaUnits">
<property name="text">
<string>Hz </string>
</property>
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
</widget>
</item>
</layout>
</item> </item>
<item> <item>
<widget class="ValueDial" name="deltaFrequency" native="true"> <spacer name="horizontalSpacer">
<property name="sizePolicy"> <property name="orientation">
<sizepolicy hsizetype="Maximum" vsizetype="Maximum"> <enum>Qt::Horizontal</enum>
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property> </property>
<property name="minimumSize"> <property name="sizeHint" stdset="0">
<size> <size>
<width>32</width> <width>40</width>
<height>16</height> <height>20</height>
</size> </size>
</property> </property>
<property name="font"> </spacer>
<font>
<family>Monospace</family>
<pointsize>12</pointsize>
</font>
</property>
<property name="cursor">
<cursorShape>SizeVerCursor</cursorShape>
</property>
<property name="focusPolicy">
<enum>Qt::StrongFocus</enum>
</property>
<property name="toolTip">
<string>Demod shift frequency from center in Hz</string>
</property>
</widget>
</item> </item>
<item> <item>
<widget class="QLabel" name="deltaUnits"> <layout class="QHBoxLayout" name="channnelPowerLayout">
<property name="text"> <item>
<string>Hz </string> <widget class="QLabel" name="channelPower">
</property> <property name="toolTip">
<property name="alignment"> <string>Channel power</string>
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set> </property>
</property> <property name="layoutDirection">
</widget> <enum>Qt::RightToLeft</enum>
</item> </property>
<item> <property name="text">
<widget class="QLabel" name="channelPower"> <string>0.0</string>
<property name="toolTip"> </property>
<string>Channel power</string> </widget>
</property> </item>
<property name="layoutDirection"> <item>
<enum>Qt::RightToLeft</enum> <widget class="QLabel" name="channelPowerUnits">
</property> <property name="text">
<property name="text"> <string> dB</string>
<string>0.0</string> </property>
</property> </widget>
</widget> </item>
</item> </layout>
<item>
<widget class="QLabel" name="channelPowerUnits">
<property name="text">
<string> dB</string>
</property>
</widget>
</item> </item>
</layout> </layout>
</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>

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);

View File

@ -48,80 +48,101 @@
<number>2</number> <number>2</number>
</property> </property>
<item> <item>
<layout class="QHBoxLayout" name="deltaFrequencyLayout"> <layout class="QHBoxLayout" name="deltaFreqPowLayout">
<item> <item>
<widget class="QToolButton" name="deltaMinus"> <layout class="QHBoxLayout" name="deltaFrequencyLayout">
<property name="text"> <item>
<string>...</string> <widget class="QToolButton" name="deltaMinus">
</property> <property name="text">
<property name="icon"> <string>...</string>
<iconset> </property>
<selectedoff>:/plus.png</selectedoff> <property name="icon">
<selectedon>:/minus.png</selectedon> <iconset>
</iconset> <selectedoff>:/plus.png</selectedoff>
</property> <selectedon>:/minus.png</selectedon>
<property name="checkable"> </iconset>
<bool>true</bool> </property>
</property> <property name="checkable">
</widget> <bool>true</bool>
</property>
</widget>
</item>
<item>
<widget class="ValueDial" name="deltaFrequency" native="true">
<property name="sizePolicy">
<sizepolicy hsizetype="Maximum" vsizetype="Maximum">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize">
<size>
<width>32</width>
<height>16</height>
</size>
</property>
<property name="font">
<font>
<family>Monospace</family>
<pointsize>12</pointsize>
</font>
</property>
<property name="cursor">
<cursorShape>SizeVerCursor</cursorShape>
</property>
<property name="focusPolicy">
<enum>Qt::StrongFocus</enum>
</property>
<property name="toolTip">
<string>Demod shift frequency from center in Hz</string>
</property>
</widget>
</item>
<item>
<widget class="QLabel" name="deltaUnits">
<property name="text">
<string>Hz </string>
</property>
</widget>
</item>
</layout>
</item> </item>
<item> <item>
<widget class="ValueDial" name="deltaFrequency" native="true"> <spacer name="freqPowSpacer">
<property name="sizePolicy"> <property name="orientation">
<sizepolicy hsizetype="Maximum" vsizetype="Maximum"> <enum>Qt::Horizontal</enum>
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property> </property>
<property name="minimumSize"> <property name="sizeHint" stdset="0">
<size> <size>
<width>32</width> <width>40</width>
<height>16</height> <height>20</height>
</size> </size>
</property> </property>
<property name="font"> </spacer>
<font>
<family>Monospace</family>
<pointsize>12</pointsize>
</font>
</property>
<property name="cursor">
<cursorShape>SizeVerCursor</cursorShape>
</property>
<property name="focusPolicy">
<enum>Qt::StrongFocus</enum>
</property>
<property name="toolTip">
<string>Demod shift frequency from center in Hz</string>
</property>
</widget>
</item> </item>
<item> <item>
<widget class="QLabel" name="deltaUnits"> <layout class="QHBoxLayout" name="channelPoweLayout">
<property name="text"> <item>
<string>Hz </string> <widget class="QLabel" name="channelPower">
</property> <property name="toolTip">
</widget> <string>Channel power</string>
</item> </property>
<item> <property name="layoutDirection">
<widget class="QLabel" name="channelPower"> <enum>Qt::RightToLeft</enum>
<property name="toolTip"> </property>
<string>Channel power</string> <property name="text">
</property> <string>0.0</string>
<property name="layoutDirection"> </property>
<enum>Qt::RightToLeft</enum> </widget>
</property> </item>
<property name="text"> <item>
<string>0.0</string> <widget class="QLabel" name="channelPowerUnits">
</property> <property name="text">
</widget> <string> dB</string>
</item> </property>
<item> </widget>
<widget class="QLabel" name="channelPowerUnits"> </item>
<property name="text"> </layout>
<string> dB</string>
</property>
</widget>
</item> </item>
</layout> </layout>
</item> </item>

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>
@ -42,80 +42,101 @@
<number>2</number> <number>2</number>
</property> </property>
<item> <item>
<layout class="QHBoxLayout" name="deltaFreqiencyLayout"> <layout class="QHBoxLayout" name="deltaFreqPowLayout">
<item> <item>
<widget class="QToolButton" name="deltaMinus"> <layout class="QHBoxLayout" name="deltaFreqiencyLayout">
<property name="text"> <item>
<string>...</string> <widget class="QToolButton" name="deltaMinus">
</property> <property name="text">
<property name="icon"> <string>...</string>
<iconset> </property>
<selectedoff>:/plus.png</selectedoff> <property name="icon">
<selectedon>:/minus.png</selectedon> <iconset>
</iconset> <selectedoff>:/plus.png</selectedoff>
</property> <selectedon>:/minus.png</selectedon>
<property name="checkable"> </iconset>
<bool>true</bool> </property>
</property> <property name="checkable">
</widget> <bool>true</bool>
</property>
</widget>
</item>
<item>
<widget class="ValueDial" name="deltaFrequency" native="true">
<property name="sizePolicy">
<sizepolicy hsizetype="Maximum" vsizetype="Maximum">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize">
<size>
<width>32</width>
<height>16</height>
</size>
</property>
<property name="font">
<font>
<family>Monospace</family>
<pointsize>12</pointsize>
</font>
</property>
<property name="cursor">
<cursorShape>SizeVerCursor</cursorShape>
</property>
<property name="focusPolicy">
<enum>Qt::StrongFocus</enum>
</property>
<property name="toolTip">
<string>Demod shift frequency from center in Hz</string>
</property>
</widget>
</item>
<item>
<widget class="QLabel" name="deltaUnits">
<property name="text">
<string>Hz </string>
</property>
</widget>
</item>
</layout>
</item> </item>
<item> <item>
<widget class="ValueDial" name="deltaFrequency" native="true"> <spacer name="horizontalSpacer">
<property name="sizePolicy"> <property name="orientation">
<sizepolicy hsizetype="Maximum" vsizetype="Maximum"> <enum>Qt::Horizontal</enum>
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property> </property>
<property name="minimumSize"> <property name="sizeHint" stdset="0">
<size> <size>
<width>32</width> <width>40</width>
<height>16</height> <height>20</height>
</size> </size>
</property> </property>
<property name="font"> </spacer>
<font>
<family>Monospace</family>
<pointsize>12</pointsize>
</font>
</property>
<property name="cursor">
<cursorShape>SizeVerCursor</cursorShape>
</property>
<property name="focusPolicy">
<enum>Qt::StrongFocus</enum>
</property>
<property name="toolTip">
<string>Demod shift frequency from center in Hz</string>
</property>
</widget>
</item> </item>
<item> <item>
<widget class="QLabel" name="deltaUnits"> <layout class="QHBoxLayout" name="channelPowerLayout">
<property name="text"> <item>
<string>Hz </string> <widget class="QLabel" name="channelPower">
</property> <property name="toolTip">
</widget> <string>Channel power</string>
</item> </property>
<item> <property name="layoutDirection">
<widget class="QLabel" name="channelPower"> <enum>Qt::RightToLeft</enum>
<property name="toolTip"> </property>
<string>Channel power</string> <property name="text">
</property> <string>0.0</string>
<property name="layoutDirection"> </property>
<enum>Qt::RightToLeft</enum> </widget>
</property> </item>
<property name="text"> <item>
<string>0.0</string> <widget class="QLabel" name="channelPowerUnits">
</property> <property name="text">
</widget> <string> dB</string>
</item> </property>
<item> </widget>
<widget class="QLabel" name="channelPowerUnits"> </item>
<property name="text"> </layout>
<string> dB</string>
</property>
</widget>
</item> </item>
</layout> </layout>
</item> </item>