[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Commit-gnuradio] r11095 - in gnuradio/branches/releases/3.2: . gnuradio
|
From: |
jcorgan |
|
Subject: |
[Commit-gnuradio] r11095 - in gnuradio/branches/releases/3.2: . gnuradio-core/src/python/gnuradio/gr gnuradio-examples/python/digital gr-qtgui/src/python gr-wxgui/src/python/plotter grc grc/data/platforms/python grc/data/platforms/python/blocks grc/examples grc/examples/simple grc/src/grc_gnuradio/blks2 grc/src/grc_gnuradio/wxgui/forms grc/src/gui grc/src/platforms/gui grc/src/platforms/python grc/src/platforms/python/utils grc/src/utils |
|
Date: |
Sat, 23 May 2009 12:31:03 -0600 (MDT) |
Author: jcorgan
Date: 2009-05-23 12:31:02 -0600 (Sat, 23 May 2009)
New Revision: 11095
Added:
gnuradio/branches/releases/3.2/grc/data/platforms/python/blocks/blks2_tcp_sink.xml
gnuradio/branches/releases/3.2/grc/data/platforms/python/blocks/blks2_tcp_source.xml
gnuradio/branches/releases/3.2/grc/data/platforms/python/blocks/blks2_variable_sink_x.xml
gnuradio/branches/releases/3.2/grc/examples/simple/var_sink_taps.grc
gnuradio/branches/releases/3.2/grc/src/grc_gnuradio/blks2/tcp.py
gnuradio/branches/releases/3.2/grc/src/grc_gnuradio/blks2/variable_sink.py
Removed:
gnuradio/branches/releases/3.2/grc/data/platforms/python/blocks/variable_sink.xml
Modified:
gnuradio/branches/releases/3.2/
gnuradio/branches/releases/3.2/gnuradio-core/src/python/gnuradio/gr/pubsub.py
gnuradio/branches/releases/3.2/gnuradio-examples/python/digital/
gnuradio/branches/releases/3.2/gr-qtgui/src/python/usrp_display.py
gnuradio/branches/releases/3.2/gr-wxgui/src/python/plotter/grid_plotter_base.py
gnuradio/branches/releases/3.2/grc/data/platforms/python/block_tree.xml
gnuradio/branches/releases/3.2/grc/data/platforms/python/blocks/Makefile.am
gnuradio/branches/releases/3.2/grc/data/platforms/python/blocks/blks2_standard_squelch.xml
gnuradio/branches/releases/3.2/grc/data/platforms/python/blocks/gr_add_xx.xml
gnuradio/branches/releases/3.2/grc/data/platforms/python/blocks/gr_channel_model.xml
gnuradio/branches/releases/3.2/grc/data/platforms/python/blocks/gr_multiply_xx.xml
gnuradio/branches/releases/3.2/grc/data/platforms/python/blocks/options.xml
gnuradio/branches/releases/3.2/grc/examples/Makefile.am
gnuradio/branches/releases/3.2/grc/src/grc_gnuradio/blks2/Makefile.am
gnuradio/branches/releases/3.2/grc/src/grc_gnuradio/blks2/__init__.py
gnuradio/branches/releases/3.2/grc/src/grc_gnuradio/wxgui/forms/forms.py
gnuradio/branches/releases/3.2/grc/src/gui/ActionHandler.py
gnuradio/branches/releases/3.2/grc/src/gui/DrawingArea.py
gnuradio/branches/releases/3.2/grc/src/gui/MainWindow.py
gnuradio/branches/releases/3.2/grc/src/gui/NotebookPage.py
gnuradio/branches/releases/3.2/grc/src/platforms/gui/Block.py
gnuradio/branches/releases/3.2/grc/src/platforms/gui/FlowGraph.py
gnuradio/branches/releases/3.2/grc/src/platforms/gui/Port.py
gnuradio/branches/releases/3.2/grc/src/platforms/python/Param.py
gnuradio/branches/releases/3.2/grc/src/platforms/python/utils/extract_docs.py
gnuradio/branches/releases/3.2/grc/src/utils/odict.py
gnuradio/branches/releases/3.2/grc/todo.txt
Log:
Applied changesets r11028:11033, r11061:11063, and r11087 to release-3.2 branch
Property changes on: gnuradio/branches/releases/3.2
___________________________________________________________________
Modified: svn:mergeinfo
- /gnuradio/branches/developers/eb/t348:10638-10648
/gnuradio/branches/developers/eb/t364:11016-11017
/gnuradio/branches/developers/eb/t367:11021-11025
/gnuradio/branches/developers/eb/t371:10958-10971
/gnuradio/branches/developers/eb/t378:10683-10688
/gnuradio/branches/developers/jblum/grc:10680-10938
/gnuradio/branches/developers/jblum/gui_guts:10464-10658
/gnuradio/branches/developers/jblum/vlen:10667-10677
/gnuradio/branches/developers/jcorgan/cpphier:10818-10858
/gnuradio/branches/developers/jcorgan/deb:10949-10959
/gnuradio/branches/developers/jcorgan/fw-optimize:10428-10429
/gnuradio/branches/developers/jcorgan/gpio2:10713-10765
/gnuradio/branches/developers/jcorgan/t161:10876-10880
/gnuradio/branches/developers/michaelld/am_swig_4:10555-10595
/gnuradio/branches/developers/michaelld/two_mods:10540-10546
/gnuradio/trunk:10356-10359,10481-10482,10497-10499,10506-10507,10511,10514,10521,10523-10524,10529,10531,10535,10537-10538,10550-10551,10556,10558-10560,10562-10563,10565,10574-10576,10578-10579,10581-10582,10585,10587,10596-10600,10623-10624,10629,10632-10634,10645-10646,10649-10650,10653-10655,10660-10661,10671,10673,10678,10681,10686,10689,10691,10701-10702,10707-10710,10714-10721,10725,10728-10736,10739-10751,10759-10762,10766,10768-10769,10778-10779,10787-10789,10793,10826,10847-10848,10850,10852-10853,10859,10861-10862,10864-10865,10869,10871-10872,10877-10878,10881,10884,10890,10907-10908,10919-10923,10925,10932,10941-10944,10946-10947,10958,10969-10970,10972,10974-10975,10978-10981,10992,10998-11001,11014,11018,11027
+ /gnuradio/branches/developers/eb/t348:10638-10648
/gnuradio/branches/developers/eb/t364:11016-11017
/gnuradio/branches/developers/eb/t367:11021-11025
/gnuradio/branches/developers/eb/t371:10958-10971
/gnuradio/branches/developers/eb/t378:10683-10688
/gnuradio/branches/developers/jblum/grc:10680-10938
/gnuradio/branches/developers/jblum/gui_guts:10464-10658
/gnuradio/branches/developers/jblum/vlen:10667-10677
/gnuradio/branches/developers/jcorgan/cpphier:10818-10858
/gnuradio/branches/developers/jcorgan/deb:10949-10959
/gnuradio/branches/developers/jcorgan/fw-optimize:10428-10429
/gnuradio/branches/developers/jcorgan/gpio2:10713-10765
/gnuradio/branches/developers/jcorgan/t161:10876-10880
/gnuradio/branches/developers/michaelld/am_swig_4:10555-10595
/gnuradio/branches/developers/michaelld/two_mods:10540-10546
/gnuradio/trunk:10356-10359,10481-10482,10497-10499,10506-10507,10511,10514,10521,10523-10524,10529,10531,10535,10537-10538,10550-10551,10556,10558-10560,10562-10563,10565,10574-10576,10578-10579,10581-10582,10585,10587,10596-10600,10623-10624,10629,10632-10634,10645-10646,10649-10650,10653-10655,10660-10661,10671,10673,10678,10681,10686,10689,10691,10701-10702,10707-10710,10714-10721,10725,10728-10736,10739-10751,10759-10762,10766,10768-10769,10778-10779,10787-10789,10793,10826,10847-10848,10850,10852-10853,10859,10861-10862,10864-10865,10869,10871-10872,10877-10878,10881,10884,10890,10907-10908,10919-10923,10925,10932,10941-10944,10946-10947,10958,10969-10970,10972,10974-10975,10978-10981,10992,10998-11001,11014,11018,11027,11029-11033,11062-11063,11087
Property changes on:
gnuradio/branches/releases/3.2/gnuradio-core/src/python/gnuradio/gr/pubsub.py
___________________________________________________________________
Modified: svn:mergeinfo
-
/gnuradio/branches/developers/eb/t348/gnuradio-core/src/python/gnuradio/gr/pubsub.py:10638-10648
/gnuradio/branches/developers/eb/t364/gnuradio-core/src/python/gnuradio/gr/pubsub.py:11016-11017
/gnuradio/branches/developers/eb/t367/gnuradio-core/src/python/gnuradio/gr/pubsub.py:11021-11025
/gnuradio/branches/developers/eb/t371/gnuradio-core/src/python/gnuradio/gr/pubsub.py:10958-10971
/gnuradio/branches/developers/eb/t378/gnuradio-core/src/python/gnuradio/gr/pubsub.py:10683-10688
/gnuradio/branches/developers/jblum/grc/gnuradio-core/src/python/gnuradio/gr/pubsub.py:10680-10938
/gnuradio/branches/developers/jblum/vlen/gnuradio-core/src/python/gnuradio/gr/pubsub.py:10667-10677
/gnuradio/branches/developers/jcorgan/cpphier/gnuradio-core/src/python/gnuradio/gr/pubsub.py:10818-10858
/gnuradio/branches/developers/jcorgan/deb/gnuradio-core/src/python/gnuradio/gr/pubsub.py:10949-10959
/gnuradio/branches/developers/jcorgan/gpio2/gnuradio-core/src/python/gnuradio/gr/pubsub.py:10713-10765
/gnuradio/branches/developers/jcorgan/t161/gnuradio-core/src/python/gnuradio/gr/pubsub.py:10876-10880
/gnuradio/trunk/gnuradio-core/src/python/gnuradio/gr/pubsub.py:10653-10655,10660-10661,10671,10673,10678,10681,10686,10689,10691,10701-10702,10707-10710,10714-10721,10725,10728-10736,10739-10751,10759-10762,10766,10768-10769,10778-10779,10787-10789,10793,10826,10847-10848,10850,10852-10853,10859,10861-10862,10864-10865,10869,10871-10872,10877-10878,10881,10884,10890,10907-10908,10919-10923,10925,10932,10941-10944,10946-10947,10958,10969-10970,10972,10974-10975,10978-10981,10992,10998-11001,11014,11018,11027
+
/gnuradio/branches/developers/eb/t348/gnuradio-core/src/python/gnuradio/gr/pubsub.py:10638-10648
/gnuradio/branches/developers/eb/t364/gnuradio-core/src/python/gnuradio/gr/pubsub.py:11016-11017
/gnuradio/branches/developers/eb/t367/gnuradio-core/src/python/gnuradio/gr/pubsub.py:11021-11025
/gnuradio/branches/developers/eb/t371/gnuradio-core/src/python/gnuradio/gr/pubsub.py:10958-10971
/gnuradio/branches/developers/eb/t378/gnuradio-core/src/python/gnuradio/gr/pubsub.py:10683-10688
/gnuradio/branches/developers/jblum/grc/gnuradio-core/src/python/gnuradio/gr/pubsub.py:10680-10938
/gnuradio/branches/developers/jblum/vlen/gnuradio-core/src/python/gnuradio/gr/pubsub.py:10667-10677
/gnuradio/branches/developers/jcorgan/cpphier/gnuradio-core/src/python/gnuradio/gr/pubsub.py:10818-10858
/gnuradio/branches/developers/jcorgan/deb/gnuradio-core/src/python/gnuradio/gr/pubsub.py:10949-10959
/gnuradio/branches/developers/jcorgan/gpio2/gnuradio-core/src/python/gnuradio/gr/pubsub.py:10713-10765
/gnuradio/branches/developers/jcorgan/t161/gnuradio-core/src/python/gnuradio/gr/pubsub.py:10876-10880
/gnuradio/trunk/gnuradio-core/src/python/gnuradio/gr/pubsub.py:10653-10655,10660-10661,10671,10673,10678,10681,10686,10689,10691,10701-10702,10707-10710,10714-10721,10725,10728-10736,10739-10751,10759-10762,10766,10768-10769,10778-10779,10787-10789,10793,10826,10847-10848,10850,10852-10853,10859,10861-10862,10864-10865,10869,10871-10872,10877-10878,10881,10884,10890,10907-10908,10919-10923,10925,10932,10941-10944,10946-10947,10958,10969-10970,10972,10974-10975,10978-10981,10992,10998-11001,11014,11018,11027,11029-11033,11062-11063,11087
Property changes on:
gnuradio/branches/releases/3.2/gnuradio-examples/python/digital
___________________________________________________________________
Modified: svn:mergeinfo
-
/gnuradio/branches/developers/eb/t348/gnuradio-examples/python/digital:10638-10648
/gnuradio/branches/developers/eb/t364/gnuradio-examples/python/digital:11016-11017
/gnuradio/branches/developers/eb/t367/gnuradio-examples/python/digital:11021-11025
/gnuradio/branches/developers/eb/t371/gnuradio-examples/python/digital:10958-10971
/gnuradio/branches/developers/eb/t378/gnuradio-examples/python/digital:10683-10688
/gnuradio/branches/developers/jblum/digital:10901-10941
/gnuradio/branches/developers/jblum/grc/gnuradio-examples/python/digital:10680-10938
/gnuradio/branches/developers/jblum/gui_guts/gnuradio-examples/python/digital:10464-10658
/gnuradio/branches/developers/jblum/vlen/gnuradio-examples/python/digital:10667-10677
/gnuradio/branches/developers/jcorgan/cpphier/gnuradio-examples/python/digital:10818-10858
/gnuradio/branches/developers/jcorgan/deb/gnuradio-examples/python/digital:10949-10959
/gnuradio/branches/developers/jcorgan/fw-optimize/gnuradio-examples/python/digital:10428-10429
/gnuradio/branches/developers/jcorgan/gpio2/gnuradio-examples/python/digital:10713-10765
/gnuradio/branches/developers/jcorgan/iad2/gnuradio-examples/python/digital:10771-10887
/gnuradio/branches/developers/jcorgan/t161/gnuradio-examples/python/digital:10876-10880
/gnuradio/branches/developers/michaelld/am_swig_4/gnuradio-examples/python/digital:10555-10595
/gnuradio/branches/developers/michaelld/two_mods/gnuradio-examples/python/digital:10540-10546
/gnuradio/trunk/gnuradio-examples/python/digital:10942,10972,10975,10979,10981,11000-11001,11014,11018,11027
+
/gnuradio/branches/developers/eb/t348/gnuradio-examples/python/digital:10638-10648
/gnuradio/branches/developers/eb/t364/gnuradio-examples/python/digital:11016-11017
/gnuradio/branches/developers/eb/t367/gnuradio-examples/python/digital:11021-11025
/gnuradio/branches/developers/eb/t371/gnuradio-examples/python/digital:10958-10971
/gnuradio/branches/developers/eb/t378/gnuradio-examples/python/digital:10683-10688
/gnuradio/branches/developers/jblum/digital:10901-10941
/gnuradio/branches/developers/jblum/grc/gnuradio-examples/python/digital:10680-10938
/gnuradio/branches/developers/jblum/gui_guts/gnuradio-examples/python/digital:10464-10658
/gnuradio/branches/developers/jblum/vlen/gnuradio-examples/python/digital:10667-10677
/gnuradio/branches/developers/jcorgan/cpphier/gnuradio-examples/python/digital:10818-10858
/gnuradio/branches/developers/jcorgan/deb/gnuradio-examples/python/digital:10949-10959
/gnuradio/branches/developers/jcorgan/fw-optimize/gnuradio-examples/python/digital:10428-10429
/gnuradio/branches/developers/jcorgan/gpio2/gnuradio-examples/python/digital:10713-10765
/gnuradio/branches/developers/jcorgan/iad2/gnuradio-examples/python/digital:10771-10887
/gnuradio/branches/developers/jcorgan/t161/gnuradio-examples/python/digital:10876-10880
/gnuradio/branches/developers/michaelld/am_swig_4/gnuradio-examples/python/digital:10555-10595
/gnuradio/branches/developers/michaelld/two_mods/gnuradio-examples/python/digital:10540-10546
/gnuradio/trunk/gnuradio-examples/python/digital:10942,10972,10975,10979,10981,11000-11001,11014,11018,11027,11029-11033,11062-11063,11087
Property changes on:
gnuradio/branches/releases/3.2/gr-qtgui/src/python/usrp_display.py
___________________________________________________________________
Modified: svn:mergeinfo
-
/gnuradio/branches/developers/eb/t364/gr-qtgui/src/python/usrp_display.py:11016-11017
/gnuradio/branches/developers/eb/t367/gr-qtgui/src/python/usrp_display.py:11021-11025
/gnuradio/branches/developers/eb/t371/gr-qtgui/src/python/usrp_display.py:10958-10971
/gnuradio/branches/developers/jcorgan/cpphier/gr-qtgui/src/python/usrp_display.py:10818-10858
/gnuradio/branches/developers/jcorgan/deb/gr-qtgui/src/python/usrp_display.py:10949-10959
/gnuradio/branches/developers/jcorgan/t161/gr-qtgui/src/python/usrp_display.py:10876-10880
/gnuradio/trunk/gr-qtgui/src/python/usrp_display.py:10826,10853,10859,10861-10862,10864-10865,10869,10871-10872,10877-10878,10881,10884,10890,10907-10908,10919-10923,10925,10932,10941-10944,10946-10947,10958,10969-10970,10972,10974-10975,10978-10981,10992,10998-11001,11014,11018,11027
+
/gnuradio/branches/developers/eb/t364/gr-qtgui/src/python/usrp_display.py:11016-11017
/gnuradio/branches/developers/eb/t367/gr-qtgui/src/python/usrp_display.py:11021-11025
/gnuradio/branches/developers/eb/t371/gr-qtgui/src/python/usrp_display.py:10958-10971
/gnuradio/branches/developers/jcorgan/cpphier/gr-qtgui/src/python/usrp_display.py:10818-10858
/gnuradio/branches/developers/jcorgan/deb/gr-qtgui/src/python/usrp_display.py:10949-10959
/gnuradio/branches/developers/jcorgan/t161/gr-qtgui/src/python/usrp_display.py:10876-10880
/gnuradio/trunk/gr-qtgui/src/python/usrp_display.py:10826,10853,10859,10861-10862,10864-10865,10869,10871-10872,10877-10878,10881,10884,10890,10907-10908,10919-10923,10925,10932,10941-10944,10946-10947,10958,10969-10970,10972,10974-10975,10978-10981,10992,10998-11001,11014,11018,11027,11029-11033,11062-11063,11087
Property changes on:
gnuradio/branches/releases/3.2/gr-wxgui/src/python/plotter/grid_plotter_base.py
___________________________________________________________________
Modified: svn:mergeinfo
-
/gnuradio/branches/developers/eb/t364/gr-wxgui/src/python/plotter/grid_plotter_base.py:11016-11017
/gnuradio/branches/developers/eb/t367/gr-wxgui/src/python/plotter/grid_plotter_base.py:11021-11025
/gnuradio/branches/developers/eb/t371/gr-wxgui/src/python/plotter/grid_plotter_base.py:10958-10971
/gnuradio/branches/developers/eb/t378/gr-wxgui/src/python/plotter/grid_plotter_base.py:10683-10688
/gnuradio/branches/developers/jblum/grc/gr-wxgui/src/python/plotter/grid_plotter_base.py:10680-10938
/gnuradio/branches/developers/jblum/vlen/gr-wxgui/src/python/plotter/grid_plotter_base.py:10667-10677
/gnuradio/branches/developers/jcorgan/cpphier/gr-wxgui/src/python/plotter/grid_plotter_base.py:10818-10858
/gnuradio/branches/developers/jcorgan/deb/gr-wxgui/src/python/plotter/grid_plotter_base.py:10949-10959
/gnuradio/branches/developers/jcorgan/gpio2/gr-wxgui/src/python/plotter/grid_plotter_base.py:10713-10765
/gnuradio/branches/developers/jcorgan/t161/gr-wxgui/src/python/plotter/grid_plotter_base.py:10876-10880
/gnuradio/trunk/gr-wxgui/src/python/plotter/grid_plotter_base.py:10673,10678,10681,10686,10689,10691,10701-10702,10707-10710,10714-10721,10725,10728-10736,10739-10751,10759-10762,10766,10768-10769,10778-10779,10787-10789,10793,10826,10847-10848,10850,10852-10853,10859,10861-10862,10864-10865,10869,10871-10872,10877-10878,10881,10884,10890,10907-10908,10919-10923,10925,10932,10941-10944,10946-10947,10958,10969-10970,10972,10974-10975,10978-10981,10992,10998-11001,11014,11018,11027
+
/gnuradio/branches/developers/eb/t364/gr-wxgui/src/python/plotter/grid_plotter_base.py:11016-11017
/gnuradio/branches/developers/eb/t367/gr-wxgui/src/python/plotter/grid_plotter_base.py:11021-11025
/gnuradio/branches/developers/eb/t371/gr-wxgui/src/python/plotter/grid_plotter_base.py:10958-10971
/gnuradio/branches/developers/eb/t378/gr-wxgui/src/python/plotter/grid_plotter_base.py:10683-10688
/gnuradio/branches/developers/jblum/grc/gr-wxgui/src/python/plotter/grid_plotter_base.py:10680-10938
/gnuradio/branches/developers/jblum/vlen/gr-wxgui/src/python/plotter/grid_plotter_base.py:10667-10677
/gnuradio/branches/developers/jcorgan/cpphier/gr-wxgui/src/python/plotter/grid_plotter_base.py:10818-10858
/gnuradio/branches/developers/jcorgan/deb/gr-wxgui/src/python/plotter/grid_plotter_base.py:10949-10959
/gnuradio/branches/developers/jcorgan/gpio2/gr-wxgui/src/python/plotter/grid_plotter_base.py:10713-10765
/gnuradio/branches/developers/jcorgan/t161/gr-wxgui/src/python/plotter/grid_plotter_base.py:10876-10880
/gnuradio/trunk/gr-wxgui/src/python/plotter/grid_plotter_base.py:10673,10678,10681,10686,10689,10691,10701-10702,10707-10710,10714-10721,10725,10728-10736,10739-10751,10759-10762,10766,10768-10769,10778-10779,10787-10789,10793,10826,10847-10848,10850,10852-10853,10859,10861-10862,10864-10865,10869,10871-10872,10877-10878,10881,10884,10890,10907-10908,10919-10923,10925,10932,10941-10944,10946-10947,10958,10969-10970,10972,10974-10975,10978-10981,10992,10998-11001,11014,11018,11027,11029-11033,11062-11063,11087
Modified:
gnuradio/branches/releases/3.2/grc/data/platforms/python/block_tree.xml
===================================================================
--- gnuradio/branches/releases/3.2/grc/data/platforms/python/block_tree.xml
2009-05-23 18:25:05 UTC (rev 11094)
+++ gnuradio/branches/releases/3.2/grc/data/platforms/python/block_tree.xml
2009-05-23 18:31:02 UTC (rev 11095)
@@ -16,6 +16,7 @@
<block>gr_glfsr_source_x</block>
<block>gr_null_source</block>
<block>gr_file_source</block>
+ <block>blks2_tcp_source</block>
<block>gr_udp_source</block>
<block>audio_source</block>
<block>gr_wavfile_source</block>
@@ -23,9 +24,11 @@
</cat>
<cat>
<name>Sinks</name>
+ <block>blks2_variable_sink_x</block>
<block>gr_vector_sink_x</block>
<block>gr_null_sink</block>
<block>gr_file_sink</block>
+ <block>blks2_tcp_sink</block>
<block>gr_udp_sink</block>
<block>audio_sink</block>
<block>gr_wavfile_sink</block>
@@ -167,6 +170,9 @@
<block>gr_iir_filter_ffd</block>
<block>gr_filter_delay_fc</block>
<block>gr_channel_model</block>
+ <!-- Filter banks -->
+ <block>blks2_synthesis_filterbank</block>
+ <block>blks2_analysis_filterbank</block>
<!-- Other filters -->
<block>gr_single_pole_iir_filter_xx</block>
<block>gr_hilbert_fc</block>
@@ -216,9 +222,6 @@
<block>blks2_ofdm_mod</block>
<block>blks2_ofdm_demod</block>
-
- <block>blks2_synthesis_filterbank</block>
- <block>blks2_analysis_filterbank</block>
</cat>
<cat>
<name>Error Correction</name>
@@ -263,7 +266,6 @@
<block>variable_slider</block>
<block>variable_chooser</block>
<block>variable_text_box</block>
- <block>variable_sink</block>
<block>parameter</block>
</cat>
<cat>
Modified:
gnuradio/branches/releases/3.2/grc/data/platforms/python/blocks/Makefile.am
===================================================================
--- gnuradio/branches/releases/3.2/grc/data/platforms/python/blocks/Makefile.am
2009-05-23 18:25:05 UTC (rev 11094)
+++ gnuradio/branches/releases/3.2/grc/data/platforms/python/blocks/Makefile.am
2009-05-23 18:31:02 UTC (rev 11095)
@@ -52,7 +52,10 @@
blks2_standard_squelch.xml \
blks2_stream_to_vector_decimator.xml \
blks2_synthesis_filterbank.xml \
+ blks2_tcp_sink.xml \
+ blks2_tcp_source.xml \
blks2_valve.xml \
+ blks2_variable_sink_x.xml \
blks2_wfm_rcv.xml \
blks2_wfm_rcv_pll.xml \
blks2_wfm_tx.xml \
@@ -205,7 +208,6 @@
usrp_simple_source_x.xml \
variable.xml \
variable_chooser.xml \
- variable_sink.xml \
variable_slider.xml \
variable_text_box.xml \
wxgui_constellationsink2.xml \
Modified:
gnuradio/branches/releases/3.2/grc/data/platforms/python/blocks/blks2_standard_squelch.xml
===================================================================
---
gnuradio/branches/releases/3.2/grc/data/platforms/python/blocks/blks2_standard_squelch.xml
2009-05-23 18:25:05 UTC (rev 11094)
+++
gnuradio/branches/releases/3.2/grc/data/platforms/python/blocks/blks2_standard_squelch.xml
2009-05-23 18:31:02 UTC (rev 11095)
@@ -9,7 +9,7 @@
<key>blks2_standard_squelch</key>
<import>from gnuradio import blks2</import>
<make>blks2.standard_squelch(audio_rate=$audio_rate)
-$id.set_threshold($threshold)</make>
+$(id).set_threshold($threshold)</make>
<callback>set_threshold($threshold)</callback>
<param>
<name>Audio Rate</name>
Copied:
gnuradio/branches/releases/3.2/grc/data/platforms/python/blocks/blks2_tcp_sink.xml
(from rev 11063,
gnuradio/trunk/grc/data/platforms/python/blocks/blks2_tcp_sink.xml)
===================================================================
---
gnuradio/branches/releases/3.2/grc/data/platforms/python/blocks/blks2_tcp_sink.xml
(rev 0)
+++
gnuradio/branches/releases/3.2/grc/data/platforms/python/blocks/blks2_tcp_sink.xml
2009-05-23 18:31:02 UTC (rev 11095)
@@ -0,0 +1,89 @@
+<?xml version="1.0"?>
+<!--
+###################################################
+##TCP Sink: Custom blks2 block
+###################################################
+ -->
+<block>
+ <name>TCP Sink</name>
+ <key>blks2_tcp_sink</key>
+ <import>from grc_gnuradio import blks2 as grc_blks2</import>
+ <make>grc_blks2.tcp_sink(
+ itemsize=$type.size*$vlen,
+ addr=$addr,
+ port=$port,
+ server=$server,
+)</make>
+ <param>
+ <name>Input Type</name>
+ <key>type</key>
+ <type>enum</type>
+ <option>
+ <name>Complex</name>
+ <key>complex</key>
+ <opt>size:gr.sizeof_gr_complex</opt>
+ </option>
+ <option>
+ <name>Float</name>
+ <key>float</key>
+ <opt>size:gr.sizeof_float</opt>
+ </option>
+ <option>
+ <name>Int</name>
+ <key>int</key>
+ <opt>size:gr.sizeof_int</opt>
+ </option>
+ <option>
+ <name>Short</name>
+ <key>short</key>
+ <opt>size:gr.sizeof_short</opt>
+ </option>
+ <option>
+ <name>Byte</name>
+ <key>byte</key>
+ <opt>size:gr.sizeof_char</opt>
+ </option>
+ </param>
+ <param>
+ <name>Address</name>
+ <key>addr</key>
+ <value>127.0.0.1</value>
+ <type>string</type>
+ </param>
+ <param>
+ <name>Port</name>
+ <key>port</key>
+ <value>0</value>
+ <type>int</type>
+ </param>
+ <param>
+ <name>Mode</name>
+ <key>server</key>
+ <value>False</value>
+ <type>enum</type>
+ <option>
+ <name>Server</name>
+ <key>True</key>
+ </option>
+ <option>
+ <name>Client</name>
+ <key>False</key>
+ </option>
+ </param>
+ <param>
+ <name>Vec Length</name>
+ <key>vlen</key>
+ <value>1</value>
+ <type>int</type>
+ </param>
+ <check>$vlen > 0</check>
+ <sink>
+ <name>in</name>
+ <type>$type</type>
+ <vlen>$vlen</vlen>
+ </sink>
+ <doc>
+In client mode, we attempt to connect to a server at the given address and
port. \
+In server mode, we bind a socket to the given address and port and accept the
first client.
+ </doc>
+</block>
Property changes on:
gnuradio/branches/releases/3.2/grc/data/platforms/python/blocks/blks2_tcp_sink.xml
___________________________________________________________________
Added: svn:mergeinfo
+
/gnuradio/branches/developers/eb/t348/grc/data/platforms/python/blocks/gr_udp_sink.xml:10638-10648
/gnuradio/branches/developers/eb/t364/grc/data/platforms/python/blocks/gr_udp_sink.xml:11016-11017
/gnuradio/branches/developers/eb/t367/grc/data/platforms/python/blocks/gr_udp_sink.xml:11021-11025
/gnuradio/branches/developers/eb/t371/grc/data/platforms/python/blocks/gr_udp_sink.xml:10958-10971
/gnuradio/branches/developers/eb/t378/grc/data/platforms/python/blocks/gr_udp_sink.xml:10683-10688
/gnuradio/branches/developers/jblum/grc/grc/data/platforms/python/blocks/gr_udp_sink.xml:10680-10938
/gnuradio/branches/developers/jblum/gui_guts/grc/data/platforms/python/blocks/gr_udp_sink.xml:10464-10658
/gnuradio/branches/developers/jblum/vlen/grc/data/platforms/python/blocks/gr_udp_sink.xml:10667-10677
/gnuradio/branches/developers/jcorgan/cpphier/grc/data/platforms/python/blocks/gr_udp_sink.xml:10818-10858
/gnuradio/branches/developers/jcorgan/deb/grc/data/platforms/python/blocks/gr_udp_sink.xml:10949-10959,11013-11022
/gnuradio/branches/developers/jcorgan/fw-optimize/grc/data/platforms/python/blocks/gr_udp_sink.xml:10428-10429
/gnuradio/branches/developers/jcorgan/gpio2/grc/data/platforms/python/blocks/gr_udp_sink.xml:10713-10765
/gnuradio/branches/developers/jcorgan/iad2/grc/data/platforms/python/blocks/gr_udp_sink.xml:10771-10887
/gnuradio/branches/developers/jcorgan/t161/grc/data/platforms/python/blocks/gr_udp_sink.xml:10876-10880
/gnuradio/branches/developers/michaelld/am_swig_4/grc/data/platforms/python/blocks/gr_udp_sink.xml:10555-10595
/gnuradio/branches/developers/michaelld/two_mods/grc/data/platforms/python/blocks/gr_udp_sink.xml:10540-10546
/gnuradio/trunk/grc/data/platforms/python/blocks/blks2_tcp_sink.xml:11087
Copied:
gnuradio/branches/releases/3.2/grc/data/platforms/python/blocks/blks2_tcp_source.xml
(from rev 11063,
gnuradio/trunk/grc/data/platforms/python/blocks/blks2_tcp_source.xml)
===================================================================
---
gnuradio/branches/releases/3.2/grc/data/platforms/python/blocks/blks2_tcp_source.xml
(rev 0)
+++
gnuradio/branches/releases/3.2/grc/data/platforms/python/blocks/blks2_tcp_source.xml
2009-05-23 18:31:02 UTC (rev 11095)
@@ -0,0 +1,89 @@
+<?xml version="1.0"?>
+<!--
+###################################################
+##TCP Source: Custom blks2 block
+###################################################
+ -->
+<block>
+ <name>TCP Source</name>
+ <key>blks2_tcp_source</key>
+ <import>from grc_gnuradio import blks2 as grc_blks2</import>
+ <make>grc_blks2.tcp_source(
+ itemsize=$type.size*$vlen,
+ addr=$addr,
+ port=$port,
+ server=$server,
+)</make>
+ <param>
+ <name>Output Type</name>
+ <key>type</key>
+ <type>enum</type>
+ <option>
+ <name>Complex</name>
+ <key>complex</key>
+ <opt>size:gr.sizeof_gr_complex</opt>
+ </option>
+ <option>
+ <name>Float</name>
+ <key>float</key>
+ <opt>size:gr.sizeof_float</opt>
+ </option>
+ <option>
+ <name>Int</name>
+ <key>int</key>
+ <opt>size:gr.sizeof_int</opt>
+ </option>
+ <option>
+ <name>Short</name>
+ <key>short</key>
+ <opt>size:gr.sizeof_short</opt>
+ </option>
+ <option>
+ <name>Byte</name>
+ <key>byte</key>
+ <opt>size:gr.sizeof_char</opt>
+ </option>
+ </param>
+ <param>
+ <name>Address</name>
+ <key>addr</key>
+ <value>127.0.0.1</value>
+ <type>string</type>
+ </param>
+ <param>
+ <name>Port</name>
+ <key>port</key>
+ <value>0</value>
+ <type>int</type>
+ </param>
+ <param>
+ <name>Mode</name>
+ <key>server</key>
+ <value>True</value>
+ <type>enum</type>
+ <option>
+ <name>Server</name>
+ <key>True</key>
+ </option>
+ <option>
+ <name>Client</name>
+ <key>False</key>
+ </option>
+ </param>
+ <param>
+ <name>Vec Length</name>
+ <key>vlen</key>
+ <value>1</value>
+ <type>int</type>
+ </param>
+ <check>$vlen > 0</check>
+ <source>
+ <name>out</name>
+ <type>$type</type>
+ <vlen>$vlen</vlen>
+ </source>
+ <doc>
+In client mode, we attempt to connect to a server at the given address and
port. \
+In server mode, we bind a socket to the given address and port and accept the
first client.
+ </doc>
+</block>
Property changes on:
gnuradio/branches/releases/3.2/grc/data/platforms/python/blocks/blks2_tcp_source.xml
___________________________________________________________________
Added: svn:mergeinfo
+
/gnuradio/branches/developers/eb/t348/grc/data/platforms/python/blocks/gr_udp_source.xml:10638-10648
/gnuradio/branches/developers/eb/t364/grc/data/platforms/python/blocks/gr_udp_source.xml:11016-11017
/gnuradio/branches/developers/eb/t367/grc/data/platforms/python/blocks/gr_udp_source.xml:11021-11025
/gnuradio/branches/developers/eb/t371/grc/data/platforms/python/blocks/gr_udp_source.xml:10958-10971
/gnuradio/branches/developers/eb/t378/grc/data/platforms/python/blocks/gr_udp_source.xml:10683-10688
/gnuradio/branches/developers/jblum/grc/grc/data/platforms/python/blocks/gr_udp_source.xml:10680-10938
/gnuradio/branches/developers/jblum/gui_guts/grc/data/platforms/python/blocks/gr_udp_source.xml:10464-10658
/gnuradio/branches/developers/jblum/vlen/grc/data/platforms/python/blocks/gr_udp_source.xml:10667-10677
/gnuradio/branches/developers/jcorgan/cpphier/grc/data/platforms/python/blocks/gr_udp_source.xml:10818-10858
/gnuradio/branches/developers/jcorgan/deb/grc/data/platforms/python/blocks/gr_udp_source.xml:10949-10959,11013-11022
/gnuradio/branches/developers/jcorgan/fw-optimize/grc/data/platforms/python/blocks/gr_udp_source.xml:10428-10429
/gnuradio/branches/developers/jcorgan/gpio2/grc/data/platforms/python/blocks/gr_udp_source.xml:10713-10765
/gnuradio/branches/developers/jcorgan/iad2/grc/data/platforms/python/blocks/gr_udp_source.xml:10771-10887
/gnuradio/branches/developers/jcorgan/t161/grc/data/platforms/python/blocks/gr_udp_source.xml:10876-10880
/gnuradio/branches/developers/michaelld/am_swig_4/grc/data/platforms/python/blocks/gr_udp_source.xml:10555-10595
/gnuradio/branches/developers/michaelld/two_mods/grc/data/platforms/python/blocks/gr_udp_source.xml:10540-10546
/gnuradio/trunk/grc/data/platforms/python/blocks/blks2_tcp_source.xml:11087
Copied:
gnuradio/branches/releases/3.2/grc/data/platforms/python/blocks/blks2_variable_sink_x.xml
(from rev 11063,
gnuradio/trunk/grc/data/platforms/python/blocks/blks2_variable_sink_x.xml)
===================================================================
---
gnuradio/branches/releases/3.2/grc/data/platforms/python/blocks/blks2_variable_sink_x.xml
(rev 0)
+++
gnuradio/branches/releases/3.2/grc/data/platforms/python/blocks/blks2_variable_sink_x.xml
2009-05-23 18:31:02 UTC (rev 11095)
@@ -0,0 +1,77 @@
+<?xml version="1.0"?>
+<!--
+###################################################
+##Variable Sink: Custom blks2 block
+###################################################
+ -->
+<block>
+ <name>Variable Sink</name>
+ <key>blks2_variable_sink_x</key>
+ <import>from grc_gnuradio import blks2 as grc_blks2</import>
+ <make>grc_blks2.variable_sink_$(type.fcn)(
+ vlen=$vlen,
+ decim=$decim,
+ callback=self.set_$(variable()),
+)</make>
+ <callback>set_decim($decim)</callback>
+ <param>
+ <name>Type</name>
+ <key>type</key>
+ <type>enum</type>
+ <option>
+ <name>Complex</name>
+ <key>complex</key>
+ <opt>fcn:c</opt>
+ </option>
+ <option>
+ <name>Float</name>
+ <key>float</key>
+ <opt>fcn:f</opt>
+ </option>
+ <option>
+ <name>Int</name>
+ <key>int</key>
+ <opt>fcn:i</opt>
+ </option>
+ <option>
+ <name>Short</name>
+ <key>short</key>
+ <opt>fcn:s</opt>
+ </option>
+ <option>
+ <name>Byte</name>
+ <key>byte</key>
+ <opt>fcn:b</opt>
+ </option>
+ </param>
+ <param>
+ <name>Variable</name>
+ <key>variable</key>
+ <value></value>
+ <type>string</type>
+ </param>
+ <param>
+ <name>Decimation</name>
+ <key>decim</key>
+ <value>1</value>
+ <type>int</type>
+ </param>
+ <param>
+ <name>Vec Length</name>
+ <key>vlen</key>
+ <value>1</value>
+ <type>int</type>
+ </param>
+ <check>$vlen > 0</check>
+ <sink>
+ <name>in</name>
+ <type>$type</type>
+ <vlen>$vlen</vlen>
+ </sink>
+ <doc>
+Read samples from the input stream and \
+write one in every decimation samples to the variable.
+
+The variable must be the id of an existing variable block.
+ </doc>
+</block>
Property changes on:
gnuradio/branches/releases/3.2/grc/data/platforms/python/blocks/blks2_variable_sink_x.xml
___________________________________________________________________
Added: svn:mergeinfo
+
/gnuradio/branches/developers/eb/t348/grc/data/platforms/python/blocks/variable_sink.xml:10638-10648
/gnuradio/branches/developers/eb/t364/grc/data/platforms/python/blocks/variable_sink.xml:11016-11017
/gnuradio/branches/developers/eb/t367/grc/data/platforms/python/blocks/variable_sink.xml:11021-11025
/gnuradio/branches/developers/eb/t371/grc/data/platforms/python/blocks/variable_sink.xml:10958-10971
/gnuradio/branches/developers/eb/t378/grc/data/platforms/python/blocks/variable_sink.xml:10683-10688
/gnuradio/branches/developers/jblum/grc/grc/data/platforms/python/blocks/variable_sink.xml:10680-10938
/gnuradio/branches/developers/jblum/gui_guts/grc/data/platforms/python/blocks/variable_sink.xml:10464-10658
/gnuradio/branches/developers/jblum/vlen/grc/data/platforms/python/blocks/variable_sink.xml:10667-10677
/gnuradio/branches/developers/jcorgan/cpphier/grc/data/platforms/python/blocks/variable_sink.xml:10818-10858
/gnuradio/branches/developers/jcorgan/deb/grc/data/platforms/python/blocks/variable_sink.xml:10949-10959,11013-11022
/gnuradio/branches/developers/jcorgan/fw-optimize/grc/data/platforms/python/blocks/variable_sink.xml:10428-10429
/gnuradio/branches/developers/jcorgan/gpio2/grc/data/platforms/python/blocks/variable_sink.xml:10713-10765
/gnuradio/branches/developers/jcorgan/iad2/grc/data/platforms/python/blocks/variable_sink.xml:10771-10887
/gnuradio/branches/developers/jcorgan/t161/grc/data/platforms/python/blocks/variable_sink.xml:10876-10880
/gnuradio/branches/developers/michaelld/am_swig_4/grc/data/platforms/python/blocks/variable_sink.xml:10555-10595
/gnuradio/branches/developers/michaelld/two_mods/grc/data/platforms/python/blocks/variable_sink.xml:10540-10546
/gnuradio/trunk/grc/data/platforms/python/blocks/blks2_variable_sink_x.xml:11087
Property changes on:
gnuradio/branches/releases/3.2/grc/data/platforms/python/blocks/gr_add_xx.xml
___________________________________________________________________
Modified: svn:mergeinfo
-
/gnuradio/branches/developers/eb/t348/grc/data/platforms/python/blocks/gr_add_vxx.xml:10638-10648
/gnuradio/branches/developers/eb/t364/grc/data/platforms/python/blocks/gr_add_xx.xml:11016-11017
/gnuradio/branches/developers/eb/t367/grc/data/platforms/python/blocks/gr_add_xx.xml:11021-11025
/gnuradio/branches/developers/eb/t371/grc/data/platforms/python/blocks/gr_add_xx.xml:10958-10971
/gnuradio/branches/developers/eb/t378/grc/data/platforms/python/blocks/gr_add_xx.xml:10683-10688
/gnuradio/branches/developers/jblum/grc/grc/data/platforms/python/blocks/gr_add_xx.xml:10680-10938
/gnuradio/branches/developers/jblum/gui_guts/grc/data/platforms/python/blocks/gr_add_vxx.xml:10464-10658
/gnuradio/branches/developers/jcorgan/cpphier/grc/data/platforms/python/blocks/gr_add_xx.xml:10818-10858
/gnuradio/branches/developers/jcorgan/deb/grc/data/platforms/python/blocks/gr_add_xx.xml:10949-10959
/gnuradio/branches/developers/jcorgan/gpio2/grc/data/platforms/python/blocks/gr_add_xx.xml:10713-10765
/gnuradio/branches/developers/jcorgan/t161/grc/data/platforms/python/blocks/gr_add_xx.xml:10876-10880
/gnuradio/branches/developers/michaelld/am_swig_4/grc/data/platforms/python/blocks/gr_add_vxx.xml:10555-10595
/gnuradio/branches/developers/michaelld/two_mods/grc/data/platforms/python/blocks/gr_add_vxx.xml:10540-10546
/gnuradio/trunk/grc/data/platforms/python/blocks/gr_add_xx.xml:10681,10686,10689,10691,10701-10702,10707-10710,10714-10721,10725,10728-10736,10739-10751,10759-10762,10766,10768-10769,10778-10779,10787-10789,10793,10826,10847-10848,10850,10852-10853,10859,10861-10862,10864-10865,10869,10871-10872,10877-10878,10881,10884,10890,10907-10908,10919-10923,10925,10932,10941-10944,10946-10947,10958,10969-10970,10972,10974-10975,10978-10981,10992,10998-11001,11014,11018,11027
+
/gnuradio/branches/developers/eb/t348/grc/data/platforms/python/blocks/gr_add_vxx.xml:10638-10648
/gnuradio/branches/developers/eb/t364/grc/data/platforms/python/blocks/gr_add_xx.xml:11016-11017
/gnuradio/branches/developers/eb/t367/grc/data/platforms/python/blocks/gr_add_xx.xml:11021-11025
/gnuradio/branches/developers/eb/t371/grc/data/platforms/python/blocks/gr_add_xx.xml:10958-10971
/gnuradio/branches/developers/eb/t378/grc/data/platforms/python/blocks/gr_add_xx.xml:10683-10688
/gnuradio/branches/developers/jblum/grc/grc/data/platforms/python/blocks/gr_add_xx.xml:10680-10938
/gnuradio/branches/developers/jblum/gui_guts/grc/data/platforms/python/blocks/gr_add_vxx.xml:10464-10658
/gnuradio/branches/developers/jcorgan/cpphier/grc/data/platforms/python/blocks/gr_add_xx.xml:10818-10858
/gnuradio/branches/developers/jcorgan/deb/grc/data/platforms/python/blocks/gr_add_xx.xml:10949-10959
/gnuradio/branches/developers/jcorgan/gpio2/grc/data/platforms/python/blocks/gr_add_xx.xml:10713-10765
/gnuradio/branches/developers/jcorgan/t161/grc/data/platforms/python/blocks/gr_add_xx.xml:10876-10880
/gnuradio/branches/developers/michaelld/am_swig_4/grc/data/platforms/python/blocks/gr_add_vxx.xml:10555-10595
/gnuradio/branches/developers/michaelld/two_mods/grc/data/platforms/python/blocks/gr_add_vxx.xml:10540-10546
/gnuradio/trunk/grc/data/platforms/python/blocks/gr_add_xx.xml:10681,10686,10689,10691,10701-10702,10707-10710,10714-10721,10725,10728-10736,10739-10751,10759-10762,10766,10768-10769,10778-10779,10787-10789,10793,10826,10847-10848,10850,10852-10853,10859,10861-10862,10864-10865,10869,10871-10872,10877-10878,10881,10884,10890,10907-10908,10919-10923,10925,10932,10941-10944,10946-10947,10958,10969-10970,10972,10974-10975,10978-10981,10992,10998-11001,11014,11018,11027,11029-11033,11062-11063,11087
Property changes on:
gnuradio/branches/releases/3.2/grc/data/platforms/python/blocks/gr_channel_model.xml
___________________________________________________________________
Modified: svn:mergeinfo
-
/gnuradio/branches/developers/eb/t348/grc/data/platforms/python/blocks/blks2_channel_model.xml:10638-10648
/gnuradio/branches/developers/eb/t364/grc/data/platforms/python/blocks/gr_channel_model.xml:11016-11017
/gnuradio/branches/developers/eb/t367/grc/data/platforms/python/blocks/gr_channel_model.xml:11021-11025
/gnuradio/branches/developers/eb/t371/grc/data/platforms/python/blocks/gr_channel_model.xml:10958-10971
/gnuradio/branches/developers/eb/t378/grc/data/platforms/python/blocks/blks2_channel_model.xml:10683-10688
/gnuradio/branches/developers/jblum/gui_guts/grc/data/platforms/python/blocks/blks2_channel_model.xml:10464-10658
/gnuradio/branches/developers/jblum/vlen/grc/data/platforms/python/blocks/blks2_channel_model.xml:10667-10677
/gnuradio/branches/developers/jcorgan/cpphier/grc/data/platforms/python/blocks/blks2_channel_model.xml:10818-10858
/gnuradio/branches/developers/jcorgan/deb/grc/data/platforms/python/blocks/gr_channel_model.xml:10949-10959
/gnuradio/branches/developers/jcorgan/fw-optimize/grc/data/platforms/python/blocks/blks2_channel_model.xml:10428-10429
/gnuradio/branches/developers/jcorgan/gpio2/grc/data/platforms/python/blocks/blks2_channel_model.xml:10713-10765
/gnuradio/branches/developers/jcorgan/t161/grc/data/platforms/python/blocks/gr_channel_model.xml:10876-10880
/gnuradio/branches/developers/michaelld/am_swig_4/grc/data/platforms/python/blocks/blks2_channel_model.xml:10555-10595
/gnuradio/branches/developers/michaelld/two_mods/grc/data/platforms/python/blocks/blks2_channel_model.xml:10540-10546
/gnuradio/trunk/grc/data/platforms/python/blocks/gr_channel_model.xml:10826,10853,10864-10865,10869,10871-10872,10877-10878,10881,10884,10890,10907-10908,10919-10923,10925,10932,10941-10944,10946-10947,10958,10969-10970,10972,10974-10975,10978-10981,10992,10998-11001,11014,11018,11027
+
/gnuradio/branches/developers/eb/t348/grc/data/platforms/python/blocks/blks2_channel_model.xml:10638-10648
/gnuradio/branches/developers/eb/t364/grc/data/platforms/python/blocks/gr_channel_model.xml:11016-11017
/gnuradio/branches/developers/eb/t367/grc/data/platforms/python/blocks/gr_channel_model.xml:11021-11025
/gnuradio/branches/developers/eb/t371/grc/data/platforms/python/blocks/gr_channel_model.xml:10958-10971
/gnuradio/branches/developers/eb/t378/grc/data/platforms/python/blocks/blks2_channel_model.xml:10683-10688
/gnuradio/branches/developers/jblum/gui_guts/grc/data/platforms/python/blocks/blks2_channel_model.xml:10464-10658
/gnuradio/branches/developers/jblum/vlen/grc/data/platforms/python/blocks/blks2_channel_model.xml:10667-10677
/gnuradio/branches/developers/jcorgan/cpphier/grc/data/platforms/python/blocks/blks2_channel_model.xml:10818-10858
/gnuradio/branches/developers/jcorgan/deb/grc/data/platforms/python/blocks/gr_channel_model.xml:10949-10959
/gnuradio/branches/developers/jcorgan/fw-optimize/grc/data/platforms/python/blocks/blks2_channel_model.xml:10428-10429
/gnuradio/branches/developers/jcorgan/gpio2/grc/data/platforms/python/blocks/blks2_channel_model.xml:10713-10765
/gnuradio/branches/developers/jcorgan/t161/grc/data/platforms/python/blocks/gr_channel_model.xml:10876-10880
/gnuradio/branches/developers/michaelld/am_swig_4/grc/data/platforms/python/blocks/blks2_channel_model.xml:10555-10595
/gnuradio/branches/developers/michaelld/two_mods/grc/data/platforms/python/blocks/blks2_channel_model.xml:10540-10546
/gnuradio/trunk/grc/data/platforms/python/blocks/gr_channel_model.xml:10826,10853,10864-10865,10869,10871-10872,10877-10878,10881,10884,10890,10907-10908,10919-10923,10925,10932,10941-10944,10946-10947,10958,10969-10970,10972,10974-10975,10978-10981,10992,10998-11001,11014,11018,11027,11029-11033,11062-11063,11087
Property changes on:
gnuradio/branches/releases/3.2/grc/data/platforms/python/blocks/gr_multiply_xx.xml
___________________________________________________________________
Modified: svn:mergeinfo
-
/gnuradio/branches/developers/eb/t348/grc/data/platforms/python/blocks/gr_multiply_vxx.xml:10638-10648
/gnuradio/branches/developers/eb/t364/grc/data/platforms/python/blocks/gr_multiply_xx.xml:11016-11017
/gnuradio/branches/developers/eb/t367/grc/data/platforms/python/blocks/gr_multiply_xx.xml:11021-11025
/gnuradio/branches/developers/eb/t371/grc/data/platforms/python/blocks/gr_multiply_xx.xml:10958-10971
/gnuradio/branches/developers/eb/t378/grc/data/platforms/python/blocks/gr_multiply_xx.xml:10683-10688
/gnuradio/branches/developers/jblum/grc/grc/data/platforms/python/blocks/gr_multiply_xx.xml:10680-10938
/gnuradio/branches/developers/jblum/gui_guts/grc/data/platforms/python/blocks/gr_multiply_vxx.xml:10464-10658
/gnuradio/branches/developers/jcorgan/cpphier/grc/data/platforms/python/blocks/gr_multiply_xx.xml:10818-10858
/gnuradio/branches/developers/jcorgan/deb/grc/data/platforms/python/blocks/gr_multiply_xx.xml:10949-10959
/gnuradio/branches/developers/jcorgan/gpio2/grc/data/platforms/python/blocks/gr_multiply_xx.xml:10713-10765
/gnuradio/branches/developers/jcorgan/t161/grc/data/platforms/python/blocks/gr_multiply_xx.xml:10876-10880
/gnuradio/branches/developers/michaelld/am_swig_4/grc/data/platforms/python/blocks/gr_multiply_vxx.xml:10555-10595
/gnuradio/branches/developers/michaelld/two_mods/grc/data/platforms/python/blocks/gr_multiply_vxx.xml:10540-10546
/gnuradio/trunk/grc/data/platforms/python/blocks/gr_multiply_xx.xml:10681,10686,10689,10691,10701-10702,10707-10710,10714-10721,10725,10728-10736,10739-10751,10759-10762,10766,10768-10769,10778-10779,10787-10789,10793,10826,10847-10848,10850,10852-10853,10859,10861-10862,10864-10865,10869,10871-10872,10877-10878,10881,10884,10890,10907-10908,10919-10923,10925,10932,10941-10944,10946-10947,10958,10969-10970,10972,10974-10975,10978-10981,10992,10998-11001,11014,11018,11027
+
/gnuradio/branches/developers/eb/t348/grc/data/platforms/python/blocks/gr_multiply_vxx.xml:10638-10648
/gnuradio/branches/developers/eb/t364/grc/data/platforms/python/blocks/gr_multiply_xx.xml:11016-11017
/gnuradio/branches/developers/eb/t367/grc/data/platforms/python/blocks/gr_multiply_xx.xml:11021-11025
/gnuradio/branches/developers/eb/t371/grc/data/platforms/python/blocks/gr_multiply_xx.xml:10958-10971
/gnuradio/branches/developers/eb/t378/grc/data/platforms/python/blocks/gr_multiply_xx.xml:10683-10688
/gnuradio/branches/developers/jblum/grc/grc/data/platforms/python/blocks/gr_multiply_xx.xml:10680-10938
/gnuradio/branches/developers/jblum/gui_guts/grc/data/platforms/python/blocks/gr_multiply_vxx.xml:10464-10658
/gnuradio/branches/developers/jcorgan/cpphier/grc/data/platforms/python/blocks/gr_multiply_xx.xml:10818-10858
/gnuradio/branches/developers/jcorgan/deb/grc/data/platforms/python/blocks/gr_multiply_xx.xml:10949-10959
/gnuradio/branches/developers/jcorgan/gpio2/grc/data/platforms/python/blocks/gr_multiply_xx.xml:10713-10765
/gnuradio/branches/developers/jcorgan/t161/grc/data/platforms/python/blocks/gr_multiply_xx.xml:10876-10880
/gnuradio/branches/developers/michaelld/am_swig_4/grc/data/platforms/python/blocks/gr_multiply_vxx.xml:10555-10595
/gnuradio/branches/developers/michaelld/two_mods/grc/data/platforms/python/blocks/gr_multiply_vxx.xml:10540-10546
/gnuradio/trunk/grc/data/platforms/python/blocks/gr_multiply_xx.xml:10681,10686,10689,10691,10701-10702,10707-10710,10714-10721,10725,10728-10736,10739-10751,10759-10762,10766,10768-10769,10778-10779,10787-10789,10793,10826,10847-10848,10850,10852-10853,10859,10861-10862,10864-10865,10869,10871-10872,10877-10878,10881,10884,10890,10907-10908,10919-10923,10925,10932,10941-10944,10946-10947,10958,10969-10970,10972,10974-10975,10978-10981,10992,10998-11001,11014,11018,11027,11029-11033,11062-11063,11087
Modified:
gnuradio/branches/releases/3.2/grc/data/platforms/python/blocks/options.xml
===================================================================
--- gnuradio/branches/releases/3.2/grc/data/platforms/python/blocks/options.xml
2009-05-23 18:25:05 UTC (rev 11094)
+++ gnuradio/branches/releases/3.2/grc/data/platforms/python/blocks/options.xml
2009-05-23 18:31:02 UTC (rev 11095)
@@ -92,8 +92,8 @@
</option>
</param>
<check>len($window_size) == 2</check>
- <check>300 <= $(window_size)[0] <= 2048</check>
- <check>300 <= $(window_size)[1] <= 2048</check>
+ <check>300 <= $(window_size)[0] <= 4096</check>
+ <check>300 <= $(window_size)[1] <= 4096</check>
<doc>
The options block sets special parameters for the flow graph. \
Only one option block is allowed per flow graph.
@@ -101,7 +101,7 @@
Title, author, and description parameters are for identification purposes.
The window size controls the dimensions of the flow graph editor. \
-The window size (width, height) must be between (300, 300) and (2048, 2048).
+The window size (width, height) must be between (300, 300) and (4096, 4096).
The generate options controls the type of code generated. \
Non-graphical flow graphs should avoid using graphical sinks or graphical
variable controls.
Modified: gnuradio/branches/releases/3.2/grc/examples/Makefile.am
===================================================================
--- gnuradio/branches/releases/3.2/grc/examples/Makefile.am 2009-05-23
18:25:05 UTC (rev 11094)
+++ gnuradio/branches/releases/3.2/grc/examples/Makefile.am 2009-05-23
18:31:02 UTC (rev 11095)
@@ -30,7 +30,8 @@
simpledatadir = $(grc_examples_prefix)/simple
dist_simpledata_DATA = \
simple/ber_simulation.grc \
- simple/dpsk_loopback.grc
+ simple/dpsk_loopback.grc \
+ simple/var_sink_taps.grc
trellisdatadir = $(grc_examples_prefix)/trellis
dist_trellisdata_DATA = \
Copied: gnuradio/branches/releases/3.2/grc/examples/simple/var_sink_taps.grc
(from rev 11063, gnuradio/trunk/grc/examples/simple/var_sink_taps.grc)
===================================================================
--- gnuradio/branches/releases/3.2/grc/examples/simple/var_sink_taps.grc
(rev 0)
+++ gnuradio/branches/releases/3.2/grc/examples/simple/var_sink_taps.grc
2009-05-23 18:31:02 UTC (rev 11095)
@@ -0,0 +1,488 @@
+<?xml version='1.0' encoding='ASCII'?>
+<flow_graph>
+ <timestamp>Tue May 19 16:45:51 2009</timestamp>
+ <block>
+ <key>options</key>
+ <param>
+ <key>id</key>
+ <value>var_sink_taps</value>
+ </param>
+ <param>
+ <key>_enabled</key>
+ <value>True</value>
+ </param>
+ <param>
+ <key>title</key>
+ <value>Variable Sink + Taps</value>
+ </param>
+ <param>
+ <key>author</key>
+ <value>Example</value>
+ </param>
+ <param>
+ <key>description</key>
+ <value>gnuradio flow graph</value>
+ </param>
+ <param>
+ <key>window_size</key>
+ <value>1280, 1024</value>
+ </param>
+ <param>
+ <key>generate_options</key>
+ <value>wx_gui</value>
+ </param>
+ <param>
+ <key>category</key>
+ <value>Custom</value>
+ </param>
+ <param>
+ <key>realtime_scheduling</key>
+ <value></value>
+ </param>
+ <param>
+ <key>_coordinate</key>
+ <value>(10, 10)</value>
+ </param>
+ <param>
+ <key>_rotation</key>
+ <value>0</value>
+ </param>
+ </block>
+ <block>
+ <key>gr_noise_source_x</key>
+ <param>
+ <key>id</key>
+ <value>gr_noise_source_x_0</value>
+ </param>
+ <param>
+ <key>_enabled</key>
+ <value>True</value>
+ </param>
+ <param>
+ <key>type</key>
+ <value>complex</value>
+ </param>
+ <param>
+ <key>noise_type</key>
+ <value>gr.GR_GAUSSIAN</value>
+ </param>
+ <param>
+ <key>amp</key>
+ <value>1</value>
+ </param>
+ <param>
+ <key>seed</key>
+ <value>42</value>
+ </param>
+ <param>
+ <key>_coordinate</key>
+ <value>(619, 36)</value>
+ </param>
+ <param>
+ <key>_rotation</key>
+ <value>0</value>
+ </param>
+ </block>
+ <block>
+ <key>gr_fir_filter_xxx</key>
+ <param>
+ <key>id</key>
+ <value>gr_fir_filter_xxx_0</value>
+ </param>
+ <param>
+ <key>_enabled</key>
+ <value>True</value>
+ </param>
+ <param>
+ <key>type</key>
+ <value>ccc</value>
+ </param>
+ <param>
+ <key>decim</key>
+ <value>1</value>
+ </param>
+ <param>
+ <key>taps</key>
+ <value>dest_taps</value>
+ </param>
+ <param>
+ <key>_coordinate</key>
+ <value>(831, 47)</value>
+ </param>
+ <param>
+ <key>_rotation</key>
+ <value>0</value>
+ </param>
+ </block>
+ <block>
+ <key>gr_throttle</key>
+ <param>
+ <key>id</key>
+ <value>gr_throttle_0</value>
+ </param>
+ <param>
+ <key>_enabled</key>
+ <value>True</value>
+ </param>
+ <param>
+ <key>type</key>
+ <value>complex</value>
+ </param>
+ <param>
+ <key>samples_per_second</key>
+ <value>samp_rate</value>
+ </param>
+ <param>
+ <key>vlen</key>
+ <value>1</value>
+ </param>
+ <param>
+ <key>_coordinate</key>
+ <value>(999, 198)</value>
+ </param>
+ <param>
+ <key>_rotation</key>
+ <value>270</value>
+ </param>
+ </block>
+ <block>
+ <key>wxgui_fftsink2</key>
+ <param>
+ <key>id</key>
+ <value>wxgui_fftsink2_0</value>
+ </param>
+ <param>
+ <key>_enabled</key>
+ <value>True</value>
+ </param>
+ <param>
+ <key>type</key>
+ <value>complex</value>
+ </param>
+ <param>
+ <key>title</key>
+ <value>FFT Plot</value>
+ </param>
+ <param>
+ <key>samp_rate</key>
+ <value>samp_rate</value>
+ </param>
+ <param>
+ <key>baseband_freq</key>
+ <value>0</value>
+ </param>
+ <param>
+ <key>y_per_div</key>
+ <value>10</value>
+ </param>
+ <param>
+ <key>y_divs</key>
+ <value>10</value>
+ </param>
+ <param>
+ <key>ref_level</key>
+ <value>50</value>
+ </param>
+ <param>
+ <key>fft_size</key>
+ <value>1024</value>
+ </param>
+ <param>
+ <key>fft_rate</key>
+ <value>30</value>
+ </param>
+ <param>
+ <key>peak_hold</key>
+ <value>False</value>
+ </param>
+ <param>
+ <key>average</key>
+ <value>False</value>
+ </param>
+ <param>
+ <key>avg_alpha</key>
+ <value>0</value>
+ </param>
+ <param>
+ <key>grid_pos</key>
+ <value></value>
+ </param>
+ <param>
+ <key>_coordinate</key>
+ <value>(629, 184)</value>
+ </param>
+ <param>
+ <key>_rotation</key>
+ <value>180</value>
+ </param>
+ </block>
+ <block>
+ <key>import</key>
+ <param>
+ <key>id</key>
+ <value>import_0</value>
+ </param>
+ <param>
+ <key>_enabled</key>
+ <value>True</value>
+ </param>
+ <param>
+ <key>import</key>
+ <value>from gnuradio.gr import firdes</value>
+ </param>
+ <param>
+ <key>_coordinate</key>
+ <value>(330, 120)</value>
+ </param>
+ <param>
+ <key>_rotation</key>
+ <value>0</value>
+ </param>
+ </block>
+ <block>
+ <key>variable</key>
+ <param>
+ <key>id</key>
+ <value>dest_taps</value>
+ </param>
+ <param>
+ <key>_enabled</key>
+ <value>True</value>
+ </param>
+ <param>
+ <key>value</key>
+ <value>[0]</value>
+ </param>
+ <param>
+ <key>_coordinate</key>
+ <value>(836, 223)</value>
+ </param>
+ <param>
+ <key>_rotation</key>
+ <value>0</value>
+ </param>
+ </block>
+ <block>
+ <key>variable</key>
+ <param>
+ <key>id</key>
+ <value>samp_rate</value>
+ </param>
+ <param>
+ <key>_enabled</key>
+ <value>True</value>
+ </param>
+ <param>
+ <key>value</key>
+ <value>32000</value>
+ </param>
+ <param>
+ <key>_coordinate</key>
+ <value>(831, 130)</value>
+ </param>
+ <param>
+ <key>_rotation</key>
+ <value>0</value>
+ </param>
+ </block>
+ <block>
+ <key>variable</key>
+ <param>
+ <key>id</key>
+ <value>source_taps</value>
+ </param>
+ <param>
+ <key>_enabled</key>
+ <value>True</value>
+ </param>
+ <param>
+ <key>value</key>
+ <value>firdes.low_pass(1, samp_rate, 4000, 2000)</value>
+ </param>
+ <param>
+ <key>_coordinate</key>
+ <value>(397, 191)</value>
+ </param>
+ <param>
+ <key>_rotation</key>
+ <value>0</value>
+ </param>
+ </block>
+ <block>
+ <key>variable</key>
+ <param>
+ <key>id</key>
+ <value>taps_rate</value>
+ </param>
+ <param>
+ <key>_enabled</key>
+ <value>True</value>
+ </param>
+ <param>
+ <key>value</key>
+ <value>10</value>
+ </param>
+ <param>
+ <key>_coordinate</key>
+ <value>(268, 189)</value>
+ </param>
+ <param>
+ <key>_rotation</key>
+ <value>0</value>
+ </param>
+ </block>
+ <block>
+ <key>gr_vector_source_x</key>
+ <param>
+ <key>id</key>
+ <value>gr_vector_source_x_0</value>
+ </param>
+ <param>
+ <key>_enabled</key>
+ <value>True</value>
+ </param>
+ <param>
+ <key>type</key>
+ <value>complex</value>
+ </param>
+ <param>
+ <key>vector</key>
+ <value>source_taps</value>
+ </param>
+ <param>
+ <key>repeat</key>
+ <value>True</value>
+ </param>
+ <param>
+ <key>vlen</key>
+ <value>len(source_taps)</value>
+ </param>
+ <param>
+ <key>_coordinate</key>
+ <value>(205, 33)</value>
+ </param>
+ <param>
+ <key>_rotation</key>
+ <value>0</value>
+ </param>
+ </block>
+ <block>
+ <key>note</key>
+ <param>
+ <key>id</key>
+ <value>note_0</value>
+ </param>
+ <param>
+ <key>_enabled</key>
+ <value>True</value>
+ </param>
+ <param>
+ <key>note</key>
+ <value>Pass the FIR taps via a variable sink.</value>
+ </param>
+ <param>
+ <key>_coordinate</key>
+ <value>(14, 141)</value>
+ </param>
+ <param>
+ <key>_rotation</key>
+ <value>0</value>
+ </param>
+ </block>
+ <block>
+ <key>gr_throttle</key>
+ <param>
+ <key>id</key>
+ <value>gr_throttle</value>
+ </param>
+ <param>
+ <key>_enabled</key>
+ <value>True</value>
+ </param>
+ <param>
+ <key>type</key>
+ <value>complex</value>
+ </param>
+ <param>
+ <key>samples_per_second</key>
+ <value>taps_rate</value>
+ </param>
+ <param>
+ <key>vlen</key>
+ <value>len(source_taps)</value>
+ </param>
+ <param>
+ <key>_coordinate</key>
+ <value>(440, 41)</value>
+ </param>
+ <param>
+ <key>_rotation</key>
+ <value>0</value>
+ </param>
+ </block>
+ <block>
+ <key>blks2_variable_sink_x</key>
+ <param>
+ <key>id</key>
+ <value>blks2_variable_sink_x_0</value>
+ </param>
+ <param>
+ <key>_enabled</key>
+ <value>True</value>
+ </param>
+ <param>
+ <key>type</key>
+ <value>complex</value>
+ </param>
+ <param>
+ <key>variable</key>
+ <value>dest_taps</value>
+ </param>
+ <param>
+ <key>decim</key>
+ <value>1</value>
+ </param>
+ <param>
+ <key>vlen</key>
+ <value>len(source_taps)</value>
+ </param>
+ <param>
+ <key>_coordinate</key>
+ <value>(305, 283)</value>
+ </param>
+ <param>
+ <key>_rotation</key>
+ <value>180</value>
+ </param>
+ </block>
+ <connection>
+ <source_block_id>gr_noise_source_x_0</source_block_id>
+ <sink_block_id>gr_fir_filter_xxx_0</sink_block_id>
+ <source_key>0</source_key>
+ <sink_key>0</sink_key>
+ </connection>
+ <connection>
+ <source_block_id>gr_fir_filter_xxx_0</source_block_id>
+ <sink_block_id>gr_throttle_0</sink_block_id>
+ <source_key>0</source_key>
+ <sink_key>0</sink_key>
+ </connection>
+ <connection>
+ <source_block_id>gr_throttle_0</source_block_id>
+ <sink_block_id>wxgui_fftsink2_0</sink_block_id>
+ <source_key>0</source_key>
+ <sink_key>0</sink_key>
+ </connection>
+ <connection>
+ <source_block_id>gr_vector_source_x_0</source_block_id>
+ <sink_block_id>gr_throttle</sink_block_id>
+ <source_key>0</source_key>
+ <sink_key>0</sink_key>
+ </connection>
+ <connection>
+ <source_block_id>gr_throttle</source_block_id>
+ <sink_block_id>blks2_variable_sink_x_0</sink_block_id>
+ <source_key>0</source_key>
+ <sink_key>0</sink_key>
+ </connection>
+</flow_graph>
Modified: gnuradio/branches/releases/3.2/grc/src/grc_gnuradio/blks2/Makefile.am
===================================================================
--- gnuradio/branches/releases/3.2/grc/src/grc_gnuradio/blks2/Makefile.am
2009-05-23 18:25:05 UTC (rev 11094)
+++ gnuradio/branches/releases/3.2/grc/src/grc_gnuradio/blks2/Makefile.am
2009-05-23 18:31:02 UTC (rev 11095)
@@ -1,5 +1,5 @@
#
-# Copyright 2008 Free Software Foundation, Inc.
+# Copyright 2008, 2009 Free Software Foundation, Inc.
#
# This file is part of GNU Radio
#
@@ -28,4 +28,6 @@
error_rate.py \
packet.py \
probe.py \
- selector.py
+ selector.py \
+ tcp.py \
+ variable_sink.py
Modified: gnuradio/branches/releases/3.2/grc/src/grc_gnuradio/blks2/__init__.py
===================================================================
--- gnuradio/branches/releases/3.2/grc/src/grc_gnuradio/blks2/__init__.py
2009-05-23 18:25:05 UTC (rev 11094)
+++ gnuradio/branches/releases/3.2/grc/src/grc_gnuradio/blks2/__init__.py
2009-05-23 18:31:02 UTC (rev 11095)
@@ -24,3 +24,5 @@
packet_demod_b, packet_demod_s, packet_demod_i, packet_demod_f,
packet_demod_c
from error_rate import error_rate
from probe import probe_function, probe_avg_mag_sqrd_c, probe_avg_mag_sqrd_f,
probe_density_b, probe_mpsk_snr_c
+from variable_sink import variable_sink_b, variable_sink_s, variable_sink_i,
variable_sink_f, variable_sink_c
+from tcp import tcp_source, tcp_sink
Copied: gnuradio/branches/releases/3.2/grc/src/grc_gnuradio/blks2/tcp.py (from
rev 11063, gnuradio/trunk/grc/src/grc_gnuradio/blks2/tcp.py)
===================================================================
--- gnuradio/branches/releases/3.2/grc/src/grc_gnuradio/blks2/tcp.py
(rev 0)
+++ gnuradio/branches/releases/3.2/grc/src/grc_gnuradio/blks2/tcp.py
2009-05-23 18:31:02 UTC (rev 11095)
@@ -0,0 +1,66 @@
+#
+# Copyright 2009 Free Software Foundation, Inc.
+#
+# This file is part of GNU Radio
+#
+# GNU Radio is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3, or (at your option)
+# any later version.
+#
+# GNU Radio is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with GNU Radio; see the file COPYING. If not, write to
+# the Free Software Foundation, Inc., 51 Franklin Street,
+# Boston, MA 02110-1301, USA.
+#
+
+from gnuradio import gr
+import socket
+import os
+
+def _get_sock_fd(addr, port, server):
+ """
+ Get the file descriptor for the socket.
+ As a client, block on connect, dup the socket descriptor.
+ As a server, block on accept, dup the client descriptor.
+ @param addr the ip address string
+ @param port the tcp port number
+ @param server true for server mode, false for client mode
+ @return the file descriptor number
+ """
+ sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
+ if server:
+ sock.bind((addr, port))
+ sock.listen(1)
+ clientsock, address = sock.accept()
+ return os.dup(clientsock.fileno())
+ else:
+ sock.connect((addr, port))
+ return os.dup(sock.fileno())
+
+class tcp_source(gr.hier_block2):
+ def __init__(self, itemsize, addr, port, server=True):
+ #init hier block
+ gr.hier_block2.__init__(
+ self, 'tcp_source',
+ gr.io_signature(0, 0, 0),
+ gr.io_signature(1, 1, itemsize),
+ )
+ fd = _get_sock_fd(addr, port, server)
+ self.connect(gr.file_descriptor_source(itemsize, fd), self)
+
+class tcp_sink(gr.hier_block2):
+ def __init__(self, itemsize, addr, port, server=False):
+ #init hier block
+ gr.hier_block2.__init__(
+ self, 'tcp_sink',
+ gr.io_signature(1, 1, itemsize),
+ gr.io_signature(0, 0, 0),
+ )
+ fd = _get_sock_fd(addr, port, server)
+ self.connect(self, gr.file_descriptor_sink(itemsize, fd))
Copied:
gnuradio/branches/releases/3.2/grc/src/grc_gnuradio/blks2/variable_sink.py
(from rev 11063, gnuradio/trunk/grc/src/grc_gnuradio/blks2/variable_sink.py)
===================================================================
--- gnuradio/branches/releases/3.2/grc/src/grc_gnuradio/blks2/variable_sink.py
(rev 0)
+++ gnuradio/branches/releases/3.2/grc/src/grc_gnuradio/blks2/variable_sink.py
2009-05-23 18:31:02 UTC (rev 11095)
@@ -0,0 +1,64 @@
+#
+# Copyright 2009 Free Software Foundation, Inc.
+#
+# This file is part of GNU Radio
+#
+# GNU Radio is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3, or (at your option)
+# any later version.
+#
+# GNU Radio is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with GNU Radio; see the file COPYING. If not, write to
+# the Free Software Foundation, Inc., 51 Franklin Street,
+# Boston, MA 02110-1301, USA.
+#
+
+from gnuradio import gr
+import threading
+import numpy
+
+class _variable_sink_base(gr.hier_block2, threading.Thread):
+ """
+ The thread polls the message queue for values and writes to a callback.
+ """
+
+ def __init__(self, vlen, decim, callback):
+ self._vlen = vlen
+ self._callback = callback
+ self._item_size = self._size*self._vlen
+ #init hier block
+ gr.hier_block2.__init__(
+ self, 'variable_sink',
+ gr.io_signature(1, 1, self._item_size),
+ gr.io_signature(0, 0, 0),
+ )
+ #create blocks
+ self._decimator = gr.keep_one_in_n(self._item_size, decim)
+ self._msgq = gr.msg_queue(2)
+ message_sink = gr.message_sink(self._item_size, self._msgq,
False)
+ #connect
+ self.connect(self, self._decimator, message_sink)
+ #setup thread
+ threading.Thread.__init__(self)
+ self.setDaemon(True)
+ self.start()
+
+ def set_decim(self, decim): self._decimator.set_n(decim)
+
+ def run(self):
+ while True: #truncate to item size, convert to array, callback
+ msg =
self._msgq.delete_head().to_string()[-self._item_size:]
+ arr = map(self._cast, numpy.fromstring(msg,
self._numpy))
+ self._callback(self._vlen > 1 and arr or arr[0])
+
+class variable_sink_b(_variable_sink_base): _numpy, _size, _cast = numpy.int8,
gr.sizeof_char, int
+class variable_sink_s(_variable_sink_base): _numpy, _size, _cast =
numpy.int16, gr.sizeof_short, int
+class variable_sink_i(_variable_sink_base): _numpy, _size, _cast =
numpy.int32, gr.sizeof_int, int
+class variable_sink_f(_variable_sink_base): _numpy, _size, _cast =
numpy.float32, gr.sizeof_float, float
+class variable_sink_c(_variable_sink_base): _numpy, _size, _cast =
numpy.complex64, gr.sizeof_gr_complex, complex
Property changes on:
gnuradio/branches/releases/3.2/grc/src/grc_gnuradio/wxgui/forms/forms.py
___________________________________________________________________
Modified: svn:mergeinfo
-
/gnuradio/branches/developers/eb/t364/grc/src/grc_gnuradio/wxgui/forms/forms.py:11016-11017
/gnuradio/branches/developers/eb/t367/grc/src/grc_gnuradio/wxgui/forms/forms.py:11021-11025
/gnuradio/branches/developers/eb/t371/grc/src/grc_gnuradio/wxgui/forms/forms.py:10958-10971
/gnuradio/branches/developers/jcorgan/deb/grc/src/grc_gnuradio/wxgui/forms/forms.py:10949-10959
/gnuradio/trunk/grc/src/grc_gnuradio/wxgui/forms/forms.py:10942-10944,10946-10947,10958,10969-10970,10972,10974-10975,10978-10981,11000-11001,11014,11018,11027
+
/gnuradio/branches/developers/eb/t364/grc/src/grc_gnuradio/wxgui/forms/forms.py:11016-11017
/gnuradio/branches/developers/eb/t367/grc/src/grc_gnuradio/wxgui/forms/forms.py:11021-11025
/gnuradio/branches/developers/eb/t371/grc/src/grc_gnuradio/wxgui/forms/forms.py:10958-10971
/gnuradio/branches/developers/jcorgan/deb/grc/src/grc_gnuradio/wxgui/forms/forms.py:10949-10959
/gnuradio/trunk/grc/src/grc_gnuradio/wxgui/forms/forms.py:10942-10944,10946-10947,10958,10969-10970,10972,10974-10975,10978-10981,11000-11001,11014,11018,11027,11029-11033,11062-11063,11087
Modified: gnuradio/branches/releases/3.2/grc/src/gui/ActionHandler.py
===================================================================
--- gnuradio/branches/releases/3.2/grc/src/gui/ActionHandler.py 2009-05-23
18:25:05 UTC (rev 11094)
+++ gnuradio/branches/releases/3.2/grc/src/gui/ActionHandler.py 2009-05-23
18:31:02 UTC (rev 11095)
@@ -61,7 +61,7 @@
self.main_window.connect('key-press-event',
self._handle_key_press)
self.get_page = self.main_window.get_page
self.get_flow_graph = self.main_window.get_flow_graph
- self.get_focus_flag =
self.main_window.drawing_area.get_focus_flag
+ self.get_focus_flag = self.main_window.get_focus_flag
#setup the messages
Messages.register_messenger(self.main_window.add_report_line)
Messages.send_init()
@@ -170,8 +170,8 @@
# Cut/Copy/Paste
##################################################
elif state == Actions.BLOCK_CUT:
- self.handle_states(BLOCK_COPY)
- self.handle_states(ELEMENT_DELETE)
+ self.handle_states(Actions.BLOCK_COPY)
+ self.handle_states(Actions.ELEMENT_DELETE)
elif state == Actions.BLOCK_COPY:
self.clipboard =
self.get_flow_graph().copy_to_clipboard()
elif state == Actions.BLOCK_PASTE:
Modified: gnuradio/branches/releases/3.2/grc/src/gui/DrawingArea.py
===================================================================
--- gnuradio/branches/releases/3.2/grc/src/gui/DrawingArea.py 2009-05-23
18:25:05 UTC (rev 11094)
+++ gnuradio/branches/releases/3.2/grc/src/gui/DrawingArea.py 2009-05-23
18:31:02 UTC (rev 11095)
@@ -28,18 +28,17 @@
The drawing area also responds to mouse and key events.
"""
- def __init__(self, main_window):
+ def __init__(self, flow_graph):
"""
DrawingArea contructor.
Connect event handlers.
@param main_window the main_window containing all flow graphs
"""
self.ctrl_mask = False
- self._main_window = main_window
- #inject drawing area into main_window
- self._main_window.drawing_area = self
+ self._flow_graph = flow_graph
gtk.DrawingArea.__init__(self)
self.set_size_request(MIN_WINDOW_WIDTH, MIN_WINDOW_HEIGHT)
+ self.connect('realize', self._handle_window_realize)
self.connect('configure-event', self._handle_window_configure)
self.connect('expose-event', self._handle_window_expose)
self.connect('motion-notify-event', self._handle_mouse_motion)
@@ -58,9 +57,12 @@
#setup the focus flag
self._focus_flag = False
self.get_focus_flag = lambda: self._focus_flag
- self.connect('leave-notify-event', self._handle_focus_event,
False)
- self.connect('enter-notify-event', self._handle_focus_event,
True)
+ def _handle_focus_event(widget, event, focus_flag):
self._focus_flag = focus_flag
+ self.connect('leave-notify-event', _handle_focus_event, False)
+ self.connect('enter-notify-event', _handle_focus_event, True)
+ def new_pixmap(self, width, height): return gtk.gdk.Pixmap(self.window,
width, height, -1)
+
##########################################################################
## Handlers
##########################################################################
@@ -68,18 +70,14 @@
"""
Handle a drag and drop by adding a block at the given
coordinate.
"""
-
self._main_window.get_flow_graph().add_new_block(selection_data.data, (x, y))
+ self._flow_graph.add_new_block(selection_data.data, (x, y))
- def _handle_focus_event(self, widget, event, focus_flag):
- """Record the focus state of the flow graph window."""
- self._focus_flag = focus_flag
-
def _handle_mouse_button_press(self, widget, event):
"""
Forward button click information to the flow graph.
"""
self.ctrl_mask = event.state & gtk.gdk.CONTROL_MASK
- self._main_window.get_flow_graph().handle_mouse_button_press(
+ self._flow_graph.handle_mouse_button_press(
left_click=(event.button == 1),
double_click=(event.type == gtk.gdk._2BUTTON_PRESS),
coordinate=(event.x, event.y),
@@ -90,7 +88,7 @@
Forward button release information to the flow graph.
"""
self.ctrl_mask = event.state & gtk.gdk.CONTROL_MASK
- self._main_window.get_flow_graph().handle_mouse_button_release(
+ self._flow_graph.handle_mouse_button_release(
left_click=(event.button == 1),
coordinate=(event.x, event.y),
)
@@ -100,17 +98,23 @@
Forward mouse motion information to the flow graph.
"""
self.ctrl_mask = event.state & gtk.gdk.CONTROL_MASK
- self._main_window.get_flow_graph().handle_mouse_motion(
+ self._flow_graph.handle_mouse_motion(
coordinate=(event.x, event.y),
)
+ def _handle_window_realize(self, widget):
+ """
+ Called when the window is realized.
+ Update the flowgraph, which calls new pixmap.
+ """
+ self._flow_graph.update()
+
def _handle_window_configure(self, widget, event):
"""
Called when the window is resized.
Create a new pixmap for background buffer.
"""
- width, height = self.get_size_request()
- self.pixmap = gtk.gdk.Pixmap(self.window, width, height, -1)
+ self._pixmap = self.new_pixmap(*self.get_size_request())
def _handle_window_expose(self, widget, event):
"""
@@ -118,5 +122,5 @@
Double buffering: draw to pixmap, then draw pixmap to window.
"""
gc = self.window.new_gc()
- self._main_window.get_flow_graph().draw(gc, self.pixmap)
- self.window.draw_drawable(gc, self.pixmap, 0, 0, 0, 0, -1, -1)
+ self._flow_graph.draw(gc, self._pixmap)
+ self.window.draw_drawable(gc, self._pixmap, 0, 0, 0, 0, -1, -1)
Modified: gnuradio/branches/releases/3.2/grc/src/gui/MainWindow.py
===================================================================
--- gnuradio/branches/releases/3.2/grc/src/gui/MainWindow.py 2009-05-23
18:25:05 UTC (rev 11094)
+++ gnuradio/branches/releases/3.2/grc/src/gui/MainWindow.py 2009-05-23
18:31:02 UTC (rev 11095)
@@ -18,7 +18,6 @@
"""
from Constants import \
- MIN_WINDOW_WIDTH, MIN_WINDOW_HEIGHT, \
NEW_FLOGRAPH_TITLE, DEFAULT_REPORTS_WINDOW_WIDTH
from Actions import \
APPLICATION_QUIT, FLOW_GRAPH_KILL, \
@@ -29,7 +28,6 @@
import Bars
from BlockTreeWindow import BlockTreeWindow
from Dialogs import TextDisplay, MessageDialogHelper
-from DrawingArea import DrawingArea
from NotebookPage import NotebookPage
import Preferences
import Messages
@@ -59,12 +57,6 @@
vbox.pack_start(Bars.MenuBar(), False)
vbox.pack_start(Bars.Toolbar(), False)
vbox.pack_start(self.hpaned)
- #setup scrolled window
- self.scrolled_window = gtk.ScrolledWindow()
- self.scrolled_window.set_size_request(MIN_WINDOW_WIDTH,
MIN_WINDOW_HEIGHT)
- self.scrolled_window.set_policy(gtk.POLICY_AUTOMATIC,
gtk.POLICY_AUTOMATIC)
- self.drawing_area = DrawingArea(self)
- self.scrolled_window.add_with_viewport(self.drawing_area)
#create the notebook
self.notebook = gtk.Notebook()
self.page_to_be_closed = None
@@ -73,11 +65,9 @@
self.notebook.set_scrollable(True) #scroll arrows for page tabs
self.notebook.connect('switch-page', self._handle_page_change)
#setup containers
- flow_graph_box = gtk.VBox(False, 0)
self.flow_graph_vpaned = gtk.VPaned()
- flow_graph_box.pack_start(self.notebook, False, False, 0)
- flow_graph_box.pack_start(self.scrolled_window)
- self.flow_graph_vpaned.pack1(flow_graph_box)
+ #flow_graph_box.pack_start(self.scrolled_window)
+ self.flow_graph_vpaned.pack1(self.notebook)
self.hpaned.pack1(self.flow_graph_vpaned)
self.hpaned.pack2(BlockTreeWindow(platform,
self.get_flow_graph), False) #dont allow resize
#create the reports window
@@ -155,9 +145,6 @@
try: #try to load from file
if file_path: Messages.send_start_load(file_path)
flow_graph = self._platform.get_new_flow_graph()
- #inject drawing area and handle states into flow graph
- flow_graph.drawing_area = self.drawing_area
- flow_graph.handle_states = self.handle_states
page = NotebookPage(
self,
flow_graph=flow_graph,
@@ -252,8 +239,7 @@
)
)
#show/hide notebook tabs
- if len(self._get_pages()) > 1: self.notebook.show()
- else: self.notebook.hide()
+ self.notebook.set_show_tabs(len(self._get_pages()) > 1)
def get_page(self):
"""
@@ -269,6 +255,13 @@
"""
return self.get_page().get_flow_graph()
+ def get_focus_flag(self):
+ """
+ Get the focus flag from the current page.
+ @return the focus flag
+ """
+ return self.get_page().get_drawing_area().get_focus_flag()
+
############################################################
# Helpers
############################################################
Modified: gnuradio/branches/releases/3.2/grc/src/gui/NotebookPage.py
===================================================================
--- gnuradio/branches/releases/3.2/grc/src/gui/NotebookPage.py 2009-05-23
18:25:05 UTC (rev 11094)
+++ gnuradio/branches/releases/3.2/grc/src/gui/NotebookPage.py 2009-05-23
18:31:02 UTC (rev 11095)
@@ -24,6 +24,8 @@
from .. utils import ParseXML
from StateCache import StateCache
from .. platforms.base.Constants import FLOW_GRAPH_DTD
+from Constants import MIN_WINDOW_WIDTH, MIN_WINDOW_HEIGHT
+from DrawingArea import DrawingArea
import os
############################################################
@@ -56,7 +58,6 @@
self.set_saved(True)
#import the data to the flow graph
self.get_flow_graph().import_data(initial_state)
- self.get_flow_graph().update()
#initialize page gui
gtk.HBox.__init__(self, False, 0)
self.show()
@@ -81,7 +82,20 @@
button.set_size_request(w+6, h+6)
self.tab.pack_start(button, False)
self.tab.show_all()
+ #setup scroll window and drawing area
+ self.scrolled_window = gtk.ScrolledWindow()
+ self.scrolled_window.set_size_request(MIN_WINDOW_WIDTH,
MIN_WINDOW_HEIGHT)
+ self.scrolled_window.set_policy(gtk.POLICY_AUTOMATIC,
gtk.POLICY_AUTOMATIC)
+ self.drawing_area = DrawingArea(self.get_flow_graph())
+ self.scrolled_window.add_with_viewport(self.get_drawing_area())
+ self.pack_start(self.scrolled_window)
+ #inject drawing area and handle states into flow graph
+ self.get_flow_graph().drawing_area = self.get_drawing_area()
+ self.get_flow_graph().handle_states = main_window.handle_states
+ self.show_all()
+ def get_drawing_area(self): return self.drawing_area
+
def get_generator(self):
"""
Get the generator object for this flow graph.
Modified: gnuradio/branches/releases/3.2/grc/src/platforms/gui/Block.py
===================================================================
--- gnuradio/branches/releases/3.2/grc/src/platforms/gui/Block.py
2009-05-23 18:25:05 UTC (rev 11094)
+++ gnuradio/branches/releases/3.2/grc/src/platforms/gui/Block.py
2009-05-23 18:31:02 UTC (rev 11095)
@@ -146,7 +146,7 @@
width = self.label_width
height = self.label_height
#setup the pixmap
- pixmap = gtk.gdk.Pixmap(self.get_parent().get_window(), width,
height, -1)
+ pixmap = self.get_parent().new_pixmap(width, height)
gc = pixmap.new_gc()
gc.foreground = self.bg_color
pixmap.draw_rectangle(gc, True, 0, 0, width, height)
Modified: gnuradio/branches/releases/3.2/grc/src/platforms/gui/FlowGraph.py
===================================================================
--- gnuradio/branches/releases/3.2/grc/src/platforms/gui/FlowGraph.py
2009-05-23 18:25:05 UTC (rev 11094)
+++ gnuradio/branches/releases/3.2/grc/src/platforms/gui/FlowGraph.py
2009-05-23 18:31:02 UTC (rev 11095)
@@ -63,10 +63,9 @@
def queue_draw(self): self.get_drawing_area().queue_draw()
def get_size(self): return self.get_drawing_area().get_size_request()
def set_size(self, *args):
self.get_drawing_area().set_size_request(*args)
- def get_window(self): return self.get_drawing_area().window
- def get_pixmap(self): return self.get_drawing_area().pixmap
def get_scroll_pane(self): return self.drawing_area.get_parent()
def get_ctrl_mask(self): return self.drawing_area.ctrl_mask
+ def new_pixmap(self, *args): return
self.get_drawing_area().new_pixmap(*args)
def add_new_block(self, key, coor=None):
"""
Modified: gnuradio/branches/releases/3.2/grc/src/platforms/gui/Port.py
===================================================================
--- gnuradio/branches/releases/3.2/grc/src/platforms/gui/Port.py
2009-05-23 18:25:05 UTC (rev 11094)
+++ gnuradio/branches/releases/3.2/grc/src/platforms/gui/Port.py
2009-05-23 18:31:02 UTC (rev 11095)
@@ -91,7 +91,7 @@
self.w, self.h = layout.get_pixel_size()
self.W, self.H = 2*PORT_LABEL_PADDING+self.w,
2*PORT_LABEL_PADDING+self.h
#create the pixmap
- pixmap =
gtk.gdk.Pixmap(self.get_parent().get_parent().get_window(), self.w, self.h, -1)
+ pixmap = self.get_parent().get_parent().new_pixmap(self.w,
self.h)
gc = pixmap.new_gc()
gc.foreground = self.BG_color
pixmap.draw_rectangle(gc, True, 0, 0, self.w, self.h)
Modified: gnuradio/branches/releases/3.2/grc/src/platforms/python/Param.py
===================================================================
--- gnuradio/branches/releases/3.2/grc/src/platforms/python/Param.py
2009-05-23 18:25:05 UTC (rev 11094)
+++ gnuradio/branches/releases/3.2/grc/src/platforms/python/Param.py
2009-05-23 18:31:02 UTC (rev 11095)
@@ -63,6 +63,9 @@
self._handle_changed()
file_dialog.destroy() #destroy the dialog
+#blacklist certain ids, its not complete, but should help
+import __builtin__
+ID_BLACKLIST = ['options', 'gr', 'blks2', 'wxgui', 'wx', 'math', 'forms',
'firdes'] + dir(__builtin__)
#define types, native python + numpy
VECTOR_TYPES = (tuple, list, set, numpy.ndarray)
COMPLEX_TYPES = [complex, numpy.complex, numpy.complex64, numpy.complex128]
@@ -309,6 +312,10 @@
except:
self._add_error_message('ID "%s" is not
unique.'%v)
raise Exception
+ try: assert v not in ID_BLACKLIST
+ except:
+ self._add_error_message('ID "%s" is
blacklisted.'%v)
+ raise Exception
return v
#########################
# Grid Position Type
Modified:
gnuradio/branches/releases/3.2/grc/src/platforms/python/utils/extract_docs.py
===================================================================
---
gnuradio/branches/releases/3.2/grc/src/platforms/python/utils/extract_docs.py
2009-05-23 18:25:05 UTC (rev 11094)
+++
gnuradio/branches/releases/3.2/grc/src/platforms/python/utils/extract_docs.py
2009-05-23 18:31:02 UTC (rev 11095)
@@ -77,15 +77,17 @@
@param key the block key
@return a string with documentation
"""
- #get potential xml file matches for the key
- if os.path.exists(DOCS_DIR) and os.path.isdir(DOCS_DIR):
- matches = filter(lambda f: is_match(key, f),
os.listdir(DOCS_DIR))
- else: matches = list()
+ UBUNTU_DOCS_DIR = '/usr/share/doc/gnuradio-doc/xml'
+ if os.path.exists(DOCS_DIR): docs_dir = DOCS_DIR
+ elif os.path.exists(UBUNTU_DOCS_DIR): docs_dir = UBUNTU_DOCS_DIR
+ else: return ''
+ #extract matches
+ matches = filter(lambda f: is_match(key, f), os.listdir(docs_dir))
#combine all matches
doc_strs = list()
for match in matches:
try:
- xml_file = DOCS_DIR + '/' + match
+ xml_file = os.path.join(docs_dir, match)
xml = etree.parse(xml_file)
#extract descriptions
comp_name =
extract_txt(xml.xpath(DOXYGEN_NAME_XPATH)[0]).strip('\n')
Property changes on: gnuradio/branches/releases/3.2/grc/src/utils/odict.py
___________________________________________________________________
Modified: svn:mergeinfo
- /gnuradio/branches/developers/eb/t364/grc/src/utils/odict.py:11016-11017
/gnuradio/branches/developers/eb/t367/grc/src/utils/odict.py:11021-11025
/gnuradio/branches/developers/eb/t371/grc/src/utils/odict.py:10958-10971
/gnuradio/branches/developers/jcorgan/deb/grc/src/utils/odict.py:10949-10959
/gnuradio/trunk/grc/src/utils/odict.py:10942-10944,10946-10947,10958,10969-10970,10972,10974-10975,10978-10981,11000-11001,11014,11018,11027
+ /gnuradio/branches/developers/eb/t364/grc/src/utils/odict.py:11016-11017
/gnuradio/branches/developers/eb/t367/grc/src/utils/odict.py:11021-11025
/gnuradio/branches/developers/eb/t371/grc/src/utils/odict.py:10958-10971
/gnuradio/branches/developers/jcorgan/deb/grc/src/utils/odict.py:10949-10959
/gnuradio/trunk/grc/src/utils/odict.py:10942-10944,10946-10947,10958,10969-10970,10972,10974-10975,10978-10981,11000-11001,11014,11018,11027,11029-11033,11062-11063,11087
Modified: gnuradio/branches/releases/3.2/grc/todo.txt
===================================================================
--- gnuradio/branches/releases/3.2/grc/todo.txt 2009-05-23 18:25:05 UTC (rev
11094)
+++ gnuradio/branches/releases/3.2/grc/todo.txt 2009-05-23 18:31:02 UTC (rev
11095)
@@ -25,3 +25,4 @@
-save/restore cwd
-threads dont die on exit in probe and variable sink
-overloaded gui classes for each platform, move param input objects into
overloaded
+-update extract_docs.py for current doxygen setup
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Commit-gnuradio] r11095 - in gnuradio/branches/releases/3.2: . gnuradio-core/src/python/gnuradio/gr gnuradio-examples/python/digital gr-qtgui/src/python gr-wxgui/src/python/plotter grc grc/data/platforms/python grc/data/platforms/python/blocks grc/examples grc/examples/simple grc/src/grc_gnuradio/blks2 grc/src/grc_gnuradio/wxgui/forms grc/src/gui grc/src/platforms/gui grc/src/platforms/python grc/src/platforms/python/utils grc/src/utils,
jcorgan <=