diff options
| author | Johnathan Corgan | 2009-09-02 14:38:37 -0700 |
|---|---|---|
| committer | Johnathan Corgan | 2009-09-02 14:38:37 -0700 |
| commit | 72afd843cfa4037eb0a059a647c952b7e5ddf25c (patch) | |
| tree | e70794c5f51fec80e90c76456ce96e27193aafa8 /gr-wxgui/src/python/plotter/waterfall_plotter.py | |
| parent | a36c92ed48fb80c78a97a200b92b98d36a7d4c05 (diff) | |
| parent | a70c291e3cd4fc3d51f2eebb6b39cdb9d46862da (diff) | |
| download | gnuradio-72afd843cfa4037eb0a059a647c952b7e5ddf25c.tar.gz gnuradio-72afd843cfa4037eb0a059a647c952b7e5ddf25c.tar.bz2 gnuradio-72afd843cfa4037eb0a059a647c952b7e5ddf25c.zip | |
Merge branch 'wxgui_fix' from http://gnuradio.org/git/jblum.git into master
* waterfall and fft use a common autoscale function
* Fix so that the waterfall texture is initialized with a buffer of the same size.
Diffstat (limited to 'gr-wxgui/src/python/plotter/waterfall_plotter.py')
| -rw-r--r-- | gr-wxgui/src/python/plotter/waterfall_plotter.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/gr-wxgui/src/python/plotter/waterfall_plotter.py b/gr-wxgui/src/python/plotter/waterfall_plotter.py index 2e0669961..d32b0ca0a 100644 --- a/gr-wxgui/src/python/plotter/waterfall_plotter.py +++ b/gr-wxgui/src/python/plotter/waterfall_plotter.py @@ -209,7 +209,7 @@ class waterfall_plotter(grid_plotter_base): self._pointer = 0 if self._num_lines and self._fft_size: GL.glBindTexture(GL.GL_TEXTURE_2D, self._waterfall_texture) - data = numpy.zeros(self._num_lines*self._fft_size*4, numpy.uint8).tostring() + data = numpy.zeros(self._num_lines*ceil_log2(self._fft_size)*4, numpy.uint8).tostring() GL.glTexImage2D(GL.GL_TEXTURE_2D, 0, GL.GL_RGBA, ceil_log2(self._fft_size), self._num_lines, 0, GL.GL_RGBA, GL.GL_UNSIGNED_BYTE, data) self._resize_texture_flag = False |