VE7UWU/sdrangel
1
0
Fork 0
mirror of https://github.com/f4exb/sdrangel.git synced 2024-11-15 12:51:49 -05:00
Code Issues Projects Releases Wiki Activity

Use vertical tab for channel tabs

Browse Source
This commit is contained in:
f4exb 2015-10-09 08:45:29 +02:00
parent 7742c0de2d
commit 76a60a8cb2
4 changed files with 43 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
plugins/channel/nfm/nfmdemod.cpp
View File

@ -122,7 +122,7 @@ void NFMDemod::feed(const SampleVector::const_iterator& begin, const SampleVecto
for (SampleVector::const_iterator it = begin; it != end; ++it)
{
Complex c(it->real() / 32768.0, it->imag() / 32768.0);
Complex c(it->real() / 32768.0f, it->imag() / 32768.0f);
c *= m_nco.nextIQ();
{

4
sdrbase/dsp/scopevis.cpp
View File

@ -196,7 +196,7 @@ void ScopeVis::feed(const SampleVector::const_iterator& cbegin, const SampleVect
for(int i = 0; i < count; ++i)
{
*it++ = Complex(begin->real() / 32768.0, begin->imag() / 32768.0);
*it++ = Complex(begin->real() / 32768.0f, begin->imag() / 32768.0f);
++begin;
}
@ -293,7 +293,7 @@ void ScopeVis::setSampleRate(int sampleRate)
bool ScopeVis::triggerCondition(SampleVector::const_iterator& it)
{
Complex c(it->real()/32768.0, it->imag()/32768.0);
Complex c(it->real()/32768.0f, it->imag()/32768.0f);
m_traceback.push_back(c); // store into trace memory FIFO
if (m_tracebackCount < m_traceback.size()) { // increment count up to trace memory size

30
sdrbase/gui/glspectrum.cpp
View File

@ -358,26 +358,42 @@ void GLSpectrum::updateHistogram(const std::vector<Real>& spectrum)
if(m_decay > 0)
sub += m_decay;
if (m_displayHistogram || m_displayMaxHold)
{
m_histogramHoldoffCount--;
if(m_histogramHoldoffCount <= 0) {
for(int i = 0; i < fftMulSize; i++) {
if((*b>>4) > 0) { // *b > 16
if(m_histogramHoldoffCount <= 0)
{
for(int i = 0; i < fftMulSize; i++)
{
if((*b>>4) > 0) // *b > 16
{
*b = *b - sub;
} else if(*b > 0) {
if(*h >= sub) {
}
else if(*b > 0)
{
if(*h >= sub)
{
*h = *h - sub;
} else if(*h > 0) {
}
else if(*h > 0)
{
*h = *h - 1;
} else {
}
else
{
*b = *b - 1;
*h = m_histogramLateHoldoff;
}
}
b++;
h++;
}
m_histogramHoldoffCount = m_histogramHoldoffBase;
}
}
m_currentSpectrum = &spectrum; // Store spectrum for current spectrum line display

8
sdrbase/mainwindow.ui
View File

@ -408,6 +408,14 @@
</property>
<item>
<widget class="QTabWidget" name="tabChannels">
<property name="font">
<font>
<pointsize>8</pointsize>
</font>
</property>
<property name="tabPosition">
<enum>QTabWidget::East</enum>
</property>
<property name="currentIndex">
<number>-1</number>
</property>