[Commit-gnuradio] r9242 - in gnuradio/branches/features/experimental-gui: . plotter

[jblum]

Author: jblum
Date: 2008-08-11 17:30:04 -0600 (Mon, 11 Aug 2008)
New Revision: 9242

Modified:
   gnuradio/branches/features/experimental-gui/fft_window.py
   gnuradio/branches/features/experimental-gui/fftsink.py
   gnuradio/branches/features/experimental-gui/plotter/plotter_base.py
Log:
getting ready for merge

Modified: gnuradio/branches/features/experimental-gui/fft_window.py
===================================================================
--- gnuradio/branches/features/experimental-gui/fft_window.py   2008-08-11 
23:27:00 UTC (rev 9241)
+++ gnuradio/branches/features/experimental-gui/fft_window.py   2008-08-11 
23:30:04 UTC (rev 9242)
@@ -35,7 +35,6 @@
 ##################################################
 SLIDER_STEPS = 100
 AVG_ALPHA_MIN_EXP, AVG_ALPHA_MAX_EXP = -3, 0
-DEFAULT_FRAME_RATE = 30
 DEFAULT_WIN_SIZE = (600, 300)
 DIV_LEVELS = (1, 2, 5, 10, 20)
 FFT_PLOT_COLOR_SPEC = (0, 0, 1)

Modified: gnuradio/branches/features/experimental-gui/fftsink.py
===================================================================
--- gnuradio/branches/features/experimental-gui/fftsink.py      2008-08-11 
23:27:00 UTC (rev 9241)
+++ gnuradio/branches/features/experimental-gui/fftsink.py      2008-08-11 
23:30:04 UTC (rev 9242)
@@ -46,7 +46,7 @@
                ref_level=50,
                sample_rate=1,
                fft_size=512,
-               fft_rate=fft_window.DEFAULT_FRAME_RATE,
+               fft_rate=gr.prefs().get_long('wxgui', 'fft_rate', 30),
                average=False,
                avg_alpha=None,
                title='',

Modified: gnuradio/branches/features/experimental-gui/plotter/plotter_base.py
===================================================================
--- gnuradio/branches/features/experimental-gui/plotter/plotter_base.py 
2008-08-11 23:27:00 UTC (rev 9241)
+++ gnuradio/branches/features/experimental-gui/plotter/plotter_base.py 
2008-08-11 23:30:04 UTC (rev 9242)
@@ -255,8 +255,10 @@
                #format
                if tick == 0: exp = 0
                else: exp = int(math.floor(math.log10(abs(tick))))
+               old_exp = exp
+               exp = exp - exp%3
                base = tick/10**exp
-               if abs(exp) >= 3: tick_str = '%ge%d'%(base, exp)
+               if abs(old_exp) >= 3: tick_str = '%ge%d'%(base, exp)
                else: tick_str = '%g'%tick
                #draw
                txt = gltext.Text(tick_str, font_size=TICK_TEXT_FONT_SIZE, 
centered=True)