Use vertical tab for channel tabs

pull/6/head
f4exb 2015-10-09 08:45:29 +02:00
rodzic 7742c0de2d
commit 76a60a8cb2
4 zmienionych plików z 43 dodań i 19 usunięć

Wyświetl plik

@ -122,7 +122,7 @@ void NFMDemod::feed(const SampleVector::const_iterator& begin, const SampleVecto
for (SampleVector::const_iterator it = begin; it != end; ++it) 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(); c *= m_nco.nextIQ();
{ {

Wyświetl plik

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

Wyświetl plik

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

Wyświetl plik

@ -408,6 +408,14 @@
</property> </property>
<item> <item>
<widget class="QTabWidget" name="tabChannels"> <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"> <property name="currentIndex">
<number>-1</number> <number>-1</number>
</property> </property>