diff options
author | Don Ward | 2010-04-30 17:00:33 -0400 |
---|---|---|
committer | Don Ward | 2010-04-30 17:00:33 -0400 |
commit | dda6ed353551d3493983bd56e0ca8ee8ed4407c5 (patch) | |
tree | ad6e304c1843953ca88dd944bda4498b5fe62570 /gr-wxgui/src/python/scope_window.py | |
parent | 04d3f1954b589656b34298b98e36b8667700d89a (diff) | |
parent | 9038b3530d0ec746f401f3c443e2f862fff5a18e (diff) | |
download | gnuradio-dda6ed353551d3493983bd56e0ca8ee8ed4407c5.tar.gz gnuradio-dda6ed353551d3493983bd56e0ca8ee8ed4407c5.tar.bz2 gnuradio-dda6ed353551d3493983bd56e0ca8ee8ed4407c5.zip |
Merge branch 'master' into udp
Diffstat (limited to 'gr-wxgui/src/python/scope_window.py')
-rw-r--r-- | gr-wxgui/src/python/scope_window.py | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/gr-wxgui/src/python/scope_window.py b/gr-wxgui/src/python/scope_window.py index 08a025e1e..f7c0ffa82 100644 --- a/gr-wxgui/src/python/scope_window.py +++ b/gr-wxgui/src/python/scope_window.py @@ -55,6 +55,9 @@ CHANNEL_COLOR_SPECS = ( (0.0, 0.8, 0.0), (1.0, 0.0, 0.0), (0.8, 0.0, 0.8), + (0.7, 0.7, 0.0), + (0.15, 0.90, 0.98), + ) TRIGGER_COLOR_SPEC = (1.0, 0.4, 0.0) AUTORANGE_UPDATE_RATE = 0.5 #sec |