diff options
| author | Johnathan Corgan <jcorgan@corganenterprises.com> | 2009-09-04 15:47:49 -0700 |
|---|---|---|
| committer | Johnathan Corgan <jcorgan@corganenterprises.com> | 2009-09-04 15:47:49 -0700 |
| commit | d80add605536891da950126b25b16ab89d8e7cae (patch) | |
| tree | 10777578472d39e25a821284e1409be7a6caae89 /gr-wxgui | |
| parent | 20006003431d7260b04964eb684b1746ffb0a85f (diff) | |
| parent | 6b47cc3dc64d86cb19eb28ab4843a0f278db6d0a (diff) | |
Merge branch 'grc' from http://gnuradio.org/git/jblum.git into master
we dont use test() -> remove it
Made the window for the pass band filters integers (take firdes.WIN_XXX).
Evaluation fix in param.to_code().
Removed the flagging api and usage from the base classes.
added ref scale param to fft and waterfall
Switched the python classes to inherit from the base and gui classes.
port and param types from an overloaded method
todo
Replaced TYPES in Port and Param with types parameter.
made is_virtual_xxx a block level function, used by port and param classes
added stream id type and checking in evaluate
avoid loops
Recursive resolution of virtual sources.
added virtual source and added stream ids, logic to clone in port
added rewrite methods to element to separate from validation logic
Added virtual sink and logic to clone port.
removed repurposing of pads
Work on command line options for generated code.
renamed the colors dialog to types
use pkgpythondir
...
Diffstat (limited to 'gr-wxgui')
| -rw-r--r-- | gr-wxgui/src/python/fft_window.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/gr-wxgui/src/python/fft_window.py b/gr-wxgui/src/python/fft_window.py index 237c8940c2..e025c28dd7 100644 --- a/gr-wxgui/src/python/fft_window.py +++ b/gr-wxgui/src/python/fft_window.py @@ -1,5 +1,5 @@ # -# Copyright 2008 Free Software Foundation, Inc. +# Copyright 2008, 2009 Free Software Foundation, Inc. # # This file is part of GNU Radio # @@ -156,9 +156,9 @@ class control_panel(wx.Panel): def _on_decr_ref_level(self, event): self.parent[REF_LEVEL_KEY] = self.parent[REF_LEVEL_KEY] - self.parent[Y_PER_DIV_KEY] def _on_incr_db_div(self, event): - self.parent[Y_PER_DIV_KEY] = min(DB_DIV_MAX, self.parent[Y_PER_DIV_KEY]*2) + self.parent[Y_PER_DIV_KEY] = min(DB_DIV_MAX, common.get_clean_incr(self.parent[Y_PER_DIV_KEY])) def _on_decr_db_div(self, event): - self.parent[Y_PER_DIV_KEY] = max(DB_DIV_MIN, self.parent[Y_PER_DIV_KEY]/2) + self.parent[Y_PER_DIV_KEY] = max(DB_DIV_MIN, common.get_clean_decr(self.parent[Y_PER_DIV_KEY])) ################################################## # FFT window with plotter and control panel |