From 76a60a8cb25bd2003b4ccea2cc89408fe2d9390e Mon Sep 17 00:00:00 2001
From: f4exb <f4exb06@gmail.com>
Date: Fri, 9 Oct 2015 08:45:29 +0200
Subject: [PATCH] Use vertical tab for channel tabs

---
 plugins/channel/nfm/nfmdemod.cpp |  2 +-
 sdrbase/dsp/scopevis.cpp         |  4 +--
 sdrbase/gui/glspectrum.cpp       | 48 +++++++++++++++++++++-----------
 sdrbase/mainwindow.ui            |  8 ++++++
 4 files changed, 43 insertions(+), 19 deletions(-)

diff --git a/plugins/channel/nfm/nfmdemod.cpp b/plugins/channel/nfm/nfmdemod.cpp
index dc74250d6..b9ef6cdff 100644
--- a/plugins/channel/nfm/nfmdemod.cpp
+++ b/plugins/channel/nfm/nfmdemod.cpp
@@ -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();
 
 		{
diff --git a/sdrbase/dsp/scopevis.cpp b/sdrbase/dsp/scopevis.cpp
index 9bab9af68..0fd24bad6 100644
--- a/sdrbase/dsp/scopevis.cpp
+++ b/sdrbase/dsp/scopevis.cpp
@@ -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
diff --git a/sdrbase/gui/glspectrum.cpp b/sdrbase/gui/glspectrum.cpp
index 928f2be10..4d68fb97e 100644
--- a/sdrbase/gui/glspectrum.cpp
+++ b/sdrbase/gui/glspectrum.cpp
@@ -358,25 +358,41 @@ void GLSpectrum::updateHistogram(const std::vector<Real>& spectrum)
 	if(m_decay > 0)
 		sub += m_decay;
 
-	m_histogramHoldoffCount--;
-	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) {
-					*h = *h - sub;
-				} else if(*h > 0) {
-					*h = *h - 1;
-				} else {
-					*b = *b - 1;
-					*h = m_histogramLateHoldoff;
+	if (m_displayHistogram || m_displayMaxHold)
+	{
+		m_histogramHoldoffCount--;
+
+		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)
+					{
+						*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
diff --git a/sdrbase/mainwindow.ui b/sdrbase/mainwindow.ui
index 31d08496e..1db6c9e76 100644
--- a/sdrbase/mainwindow.ui
+++ b/sdrbase/mainwindow.ui
@@ -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>