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

Corrected spectrum grid horizontal position

Browse Source
This commit is contained in:
f4exb 2015-07-17 01:00:48 +02:00
parent 7ee44dfd27
commit bda4456267
2 changed files with 38 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sdrbase/gui/glspectrum.cpp
View File

@ -855,7 +855,7 @@ void GLSpectrum::paintGL()
glPopMatrix(); glPopMatrix();
} }
// paint histogram grid // TODO: paint histogram grid
if((m_displayHistogram || m_displayMaxHold || m_displayCurrent) && (m_displayGrid)) { if((m_displayHistogram || m_displayMaxHold || m_displayCurrent) && (m_displayGrid)) {
glEnable(GL_BLEND); glEnable(GL_BLEND);
glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
@ -876,8 +876,8 @@ void GLSpectrum::paintGL()
if(tick->textSize > 0) { if(tick->textSize > 0) {
float y = tick->pos / m_powerScale.getSize(); float y = tick->pos / m_powerScale.getSize();
glBegin(GL_LINE_LOOP); glBegin(GL_LINE_LOOP);
glVertex2f(0, y); glVertex2f(0, 1-y);
glVertex2f(1, y); glVertex2f(1, 1-y);
glEnd(); glEnd();
} }
} }

71
sdrbase/gui/glspectrumgui.ui
View File

@ -285,41 +285,6 @@
</property> </property>
</widget> </widget>
</item> </item>
<item>
<widget class="ButtonSwitch" name="waterfall">
<property name="sizePolicy">
<sizepolicy hsizetype="MinimumExpanding" vsizetype="MinimumExpanding">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize">
<size>
<width>24</width>
<height>24</height>
</size>
</property>
<property name="toolTip">
<string>Display waterfall</string>
</property>
<property name="text">
<string>Waterfall</string>
</property>
<property name="icon">
<iconset resource="../resources/res.qrc">
<normaloff>:/waterfall.png</normaloff>:/waterfall.png</iconset>
</property>
<property name="iconSize">
<size>
<width>16</width>
<height>16</height>
</size>
</property>
<property name="checkable">
<bool>true</bool>
</property>
</widget>
</item>
<item> <item>
<widget class="ButtonSwitch" name="histogram"> <widget class="ButtonSwitch" name="histogram">
<property name="sizePolicy"> <property name="sizePolicy">
@ -460,6 +425,41 @@
</property> </property>
</widget> </widget>
</item> </item>
<item>
<widget class="ButtonSwitch" name="waterfall">
<property name="sizePolicy">
<sizepolicy hsizetype="MinimumExpanding" vsizetype="MinimumExpanding">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize">
<size>
<width>24</width>
<height>24</height>
</size>
</property>
<property name="toolTip">
<string>Display waterfall</string>
</property>
<property name="text">
<string>Waterfall</string>
</property>
<property name="icon">
<iconset resource="../resources/res.qrc">
<normaloff>:/waterfall.png</normaloff>:/waterfall.png</iconset>
</property>
<property name="iconSize">
<size>
<width>16</width>
<height>16</height>
</size>
</property>
<property name="checkable">
<bool>true</bool>
</property>
</widget>
</item>
<item> <item>
<widget class="ButtonSwitch" name="grid"> <widget class="ButtonSwitch" name="grid">
<property name="sizePolicy"> <property name="sizePolicy">
@ -536,7 +536,6 @@
<tabstop>fftSize</tabstop> <tabstop>fftSize</tabstop>
<tabstop>refLevel</tabstop> <tabstop>refLevel</tabstop>
<tabstop>levelRange</tabstop> <tabstop>levelRange</tabstop>
<tabstop>waterfall</tabstop>
<tabstop>histogram</tabstop> <tabstop>histogram</tabstop>
<tabstop>maxHold</tabstop> <tabstop>maxHold</tabstop>
<tabstop>invert</tabstop> <tabstop>invert</tabstop>