From: jblum <jblum@221aa14e-8319-0410-a670-987f0aec2ac5>
Date: Fri, 17 Jul 2009 00:36:11 +0000 (+0000)
Subject: fixed fft reording
X-Git-Url: https://git.gag.com/?a=commitdiff_plain;h=599279169ecbd363ccbaacaafd8b4bfc9b837c21;p=debian%2Fgnuradio

fixed fft reording

git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@11450 221aa14e-8319-0410-a670-987f0aec2ac5
---

diff --git a/gr-wxgui/src/python/fft_window.py b/gr-wxgui/src/python/fft_window.py
index fded1a8f..ba5711d1 100644
--- a/gr-wxgui/src/python/fft_window.py
+++ b/gr-wxgui/src/python/fft_window.py
@@ -239,8 +239,8 @@ class fft_window(wx.Panel, pubsub.pubsub):
 		samples = numpy.fromstring(msg, numpy.float32)[:self.fft_size] #only take first frame
 		num_samps = len(samples)
 		#reorder fft
-		if self.real: samples = samples[:num_samps/2]
-		else: samples = numpy.concatenate((samples[num_samps/2:], samples[:num_samps/2]))
+		if self.real: samples = samples[:(num_samps+1)/2]
+		else: samples = numpy.concatenate((samples[num_samps/2+1:], samples[:(num_samps+1)/2]))
 		self.samples = samples
 		#peak hold calculation
 		if self[PEAK_HOLD_KEY]:
diff --git a/gr-wxgui/src/python/waterfall_window.py b/gr-wxgui/src/python/waterfall_window.py
index 77819b73..c00992e1 100644
--- a/gr-wxgui/src/python/waterfall_window.py
+++ b/gr-wxgui/src/python/waterfall_window.py
@@ -261,8 +261,8 @@ class waterfall_window(wx.Panel, pubsub.pubsub):
 		self.samples = samples = numpy.fromstring(msg, numpy.float32)[:self.fft_size] #only take first frame
 		num_samps = len(samples)
 		#reorder fft
-		if self.real: samples = samples[:num_samps/2]
-		else: samples = numpy.concatenate((samples[num_samps/2:], samples[:num_samps/2]))
+		if self.real: samples = samples[:(num_samps+1)/2]
+		else: samples = numpy.concatenate((samples[num_samps/2+1:], samples[:(num_samps+1)/2]))
 		#plot the fft
 		self.plotter.set_samples(
 			samples=samples,