[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Commit-gnuradio] r11219 - in gnuradio/branches/releases/3.2: . gnuradio
|
From: |
jcorgan |
|
Subject: |
[Commit-gnuradio] r11219 - in gnuradio/branches/releases/3.2: . gnuradio-core/src/python/gnuradio/gr gnuradio-examples/python/digital gr-qtgui/src/python gr-wxgui/src/python gr-wxgui/src/python/plotter grc grc/data/platforms/base grc/data/platforms/python grc/data/platforms/python/blocks grc/examples/audio grc/examples/simple grc/examples/trellis grc/examples/usrp grc/examples/xmlrpc grc/freedesktop grc/scripts grc/src/grc_gnuradio/wxgui/forms grc/src/gui grc/src/platforms/base grc/src/platforms/gui grc/src/platforms/python grc/src/platforms/python/utils grc/src/utils usrp2/host/include/usrp2 |
|
Date: |
Wed, 17 Jun 2009 12:51:19 -0600 (MDT) |
Author: jcorgan
Date: 2009-06-17 12:51:18 -0600 (Wed, 17 Jun 2009)
New Revision: 11219
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/numbersink2.py
gnuradio/branches/releases/3.2/gr-wxgui/src/python/plotter/grid_plotter_base.py
gnuradio/branches/releases/3.2/grc/Makefile.inc
gnuradio/branches/releases/3.2/grc/data/platforms/base/Makefile.am
gnuradio/branches/releases/3.2/grc/data/platforms/python/Makefile.am
gnuradio/branches/releases/3.2/grc/data/platforms/python/blocks/Makefile.am
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/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/wxgui_numbersink2.xml
gnuradio/branches/releases/3.2/grc/examples/audio/
gnuradio/branches/releases/3.2/grc/examples/simple/
gnuradio/branches/releases/3.2/grc/examples/trellis/
gnuradio/branches/releases/3.2/grc/examples/usrp/
gnuradio/branches/releases/3.2/grc/examples/xmlrpc/
gnuradio/branches/releases/3.2/grc/freedesktop/Makefile.am
gnuradio/branches/releases/3.2/grc/scripts/grc
gnuradio/branches/releases/3.2/grc/scripts/usrp2_probe
gnuradio/branches/releases/3.2/grc/scripts/usrp_probe
gnuradio/branches/releases/3.2/grc/src/grc_gnuradio/wxgui/forms/forms.py
gnuradio/branches/releases/3.2/grc/src/gui/BlockTreeWindow.py
gnuradio/branches/releases/3.2/grc/src/platforms/base/Constants.py.in
gnuradio/branches/releases/3.2/grc/src/platforms/base/Makefile.am
gnuradio/branches/releases/3.2/grc/src/platforms/base/Platform.py
gnuradio/branches/releases/3.2/grc/src/platforms/gui/Block.py
gnuradio/branches/releases/3.2/grc/src/platforms/gui/Colors.py
gnuradio/branches/releases/3.2/grc/src/platforms/gui/Connection.py
gnuradio/branches/releases/3.2/grc/src/platforms/gui/Element.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/Constants.py.in
gnuradio/branches/releases/3.2/grc/src/platforms/python/FlowGraph.py
gnuradio/branches/releases/3.2/grc/src/platforms/python/Makefile.am
gnuradio/branches/releases/3.2/grc/src/platforms/python/Param.py
gnuradio/branches/releases/3.2/grc/src/platforms/python/Platform.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
gnuradio/branches/releases/3.2/usrp2/host/include/usrp2/mimo_config.h
Log:
Applied changesets r11114:11116, r11130, r11160:11166, r11167:11173 to release
3.2 branch. Branch passes distcheck.
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,11013-11022,11046-11059,11075-11077
/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,11043,11047,11050,11062-11063,11072,11078,11080-11082,11084-11091,11099,11101,11106,11109,11111-11112
+ /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,11013-11022,11046-11059,11075-11077
/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,11043,11047,11050,11062-11063,11072,11078,11080-11082,11084-11091,11099,11101,11106,11109,11111-11112,11115-11116,11130,11161-11163,11165-11166,11168-11173
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,11013-11022,11046-11059,11075-11077
/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,11043,11047,11050,11062-11063,11072,11078,11080-11082,11084-11091,11099,11101,11106,11109,11111-11112
+
/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,11013-11022,11046-11059,11075-11077
/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,11043,11047,11050,11062-11063,11072,11078,11080-11082,11084-11091,11099,11101,11106,11109,11111-11112,11115-11116,11130,11161-11163,11165-11166,11168-11173
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,11013-11022,11046-11059,11075-11077
/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,11043,11047,11050,11062-11063,11072,11078,11080-11082,11084-11091,11099,11101,11106,11109,11111-11112
+
/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,11013-11022,11046-11059,11075-11077
/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,11043,11047,11050,11062-11063,11072,11078,11080-11082,11084-11091,11099,11101,11106,11109,11111-11112,11115-11116,11130,11161-11163,11165-11166,11168-11173
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,11013-11022,11046-11059,11075-11077
/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,11043,11047,11050,11062-11063,11072,11078,11080-11082,11084-11091,11099,11101,11106,11109,11111-11112
+
/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,11013-11022,11046-11059,11075-11077
/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,11043,11047,11050,11062-11063,11072,11078,11080-11082,11084-11091,11099,11101,11106,11109,11111-11112,11115-11116,11130,11161-11163,11165-11166,11168-11173
Modified: gnuradio/branches/releases/3.2/gr-wxgui/src/python/numbersink2.py
===================================================================
--- gnuradio/branches/releases/3.2/gr-wxgui/src/python/numbersink2.py
2009-06-17 04:35:14 UTC (rev 11218)
+++ gnuradio/branches/releases/3.2/gr-wxgui/src/python/numbersink2.py
2009-06-17 18:51:18 UTC (rev 11219)
@@ -40,7 +40,6 @@
self,
parent,
unit='units',
- base_value=None, #ignore (old wrapper)
minval=0,
maxval=1,
factor=1,
@@ -54,6 +53,7 @@
size=number_window.DEFAULT_WIN_SIZE,
peak_hold=False,
show_gauge=True,
+ **kwargs #catchall for backwards compatibility
):
#ensure avg alpha
if avg_alpha is None: avg_alpha = 2.0/number_rate
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,11013-11022,11046-11059,11075-11077
/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,11043,11047,11050,11062-11063,11072,11078,11080-11082,11084-11091,11099,11101,11106,11109,11111-11112
+
/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,11013-11022,11046-11059,11075-11077
/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,11043,11047,11050,11062-11063,11072,11078,11080-11082,11084-11091,11099,11101,11106,11109,11111-11112,11115-11116,11130,11161-11163,11165-11166,11168-11173
Modified: gnuradio/branches/releases/3.2/grc/Makefile.inc
===================================================================
--- gnuradio/branches/releases/3.2/grc/Makefile.inc 2009-06-17 04:35:14 UTC
(rev 11218)
+++ gnuradio/branches/releases/3.2/grc/Makefile.inc 2009-06-17 18:51:18 UTC
(rev 11219)
@@ -22,7 +22,6 @@
include $(top_srcdir)/Makefile.common
grc_gnuradio_prefix = $(pythondir)/grc_gnuradio
grc_src_prefix = $(pythondir)/gnuradio/grc
-grc_data_prefix = $(datadir)/$(PACKAGE)/grc
-grc_base_data_dir = $(grc_data_prefix)/platforms/base
-grc_python_data_dir = $(grc_data_prefix)/platforms/python
-grc_python_blocks_dir = $(grc_data_prefix)/platforms/python/blocks
+grc_base_data_reldir = grc/base
+grc_python_data_reldir = grc/python
+grc_blocks_data_reldir = grc/blocks
Modified: gnuradio/branches/releases/3.2/grc/data/platforms/base/Makefile.am
===================================================================
--- gnuradio/branches/releases/3.2/grc/data/platforms/base/Makefile.am
2009-06-17 04:35:14 UTC (rev 11218)
+++ gnuradio/branches/releases/3.2/grc/data/platforms/base/Makefile.am
2009-06-17 18:51:18 UTC (rev 11219)
@@ -21,7 +21,7 @@
include $(top_srcdir)/grc/Makefile.inc
-ourdatadir = $(grc_base_data_dir)
+ourdatadir = $(pkgdatadir)/$(grc_base_data_reldir)
dist_ourdata_DATA = \
block_tree.dtd \
Modified: gnuradio/branches/releases/3.2/grc/data/platforms/python/Makefile.am
===================================================================
--- gnuradio/branches/releases/3.2/grc/data/platforms/python/Makefile.am
2009-06-17 04:35:14 UTC (rev 11218)
+++ gnuradio/branches/releases/3.2/grc/data/platforms/python/Makefile.am
2009-06-17 18:51:18 UTC (rev 11219)
@@ -23,7 +23,7 @@
SUBDIRS = blocks
-ourdatadir = $(grc_python_data_dir)
+ourdatadir = $(pkgdatadir)/$(grc_python_data_reldir)
dist_ourdata_DATA = \
block.dtd \
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-06-17 04:35:14 UTC (rev 11218)
+++ gnuradio/branches/releases/3.2/grc/data/platforms/python/blocks/Makefile.am
2009-06-17 18:51:18 UTC (rev 11219)
@@ -21,7 +21,7 @@
include $(top_srcdir)/grc/Makefile.inc
-ourdatadir = $(grc_python_blocks_dir)
+ourdatadir = $(pkgdatadir)/$(grc_blocks_data_reldir)
dist_ourdata_DATA = \
audio_sink.xml \
Property changes on:
gnuradio/branches/releases/3.2/grc/data/platforms/python/blocks/blks2_tcp_sink.xml
___________________________________________________________________
Modified: 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/blks2_tcp_sink.xml:11075-11077
/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:11043,11047,11050,11072,11078,11080-11082,11084-11091,11099,11101,11106,11109,11111-11112
+
/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/blks2_tcp_sink.xml:11075-11077
/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:11043,11047,11050,11072,11078,11080-11082,11084-11091,11099,11101,11106,11109,11111-11112,11115-11116,11130,11161-11163,11165-11166,11168-11173
Property changes on:
gnuradio/branches/releases/3.2/grc/data/platforms/python/blocks/blks2_tcp_source.xml
___________________________________________________________________
Modified: 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/blks2_tcp_source.xml:11075-11077
/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:11043,11047,11050,11072,11078,11080-11082,11084-11091,11099,11101,11106,11109,11111-11112
+
/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/blks2_tcp_source.xml:11075-11077
/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:11043,11047,11050,11072,11078,11080-11082,11084-11091,11099,11101,11106,11109,11111-11112,11115-11116,11130,11161-11163,11165-11166,11168-11173
Property changes on:
gnuradio/branches/releases/3.2/grc/data/platforms/python/blocks/blks2_variable_sink_x.xml
___________________________________________________________________
Modified: 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/blks2_variable_sink_x.xml:11075-11077
/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:11043,11047,11050,11072,11078,11080-11082,11084-11091,11099,11101,11106,11109,11111-11112
+
/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/blks2_variable_sink_x.xml:11075-11077
/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:11043,11047,11050,11072,11078,11080-11082,11084-11091,11099,11101,11106,11109,11111-11112,11115-11116,11130,11161-11163,11165-11166,11168-11173
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,11013-11022,11046-11059,11075-11077
/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,11043,11047,11050,11062-11063,11072,11078,11080-11082,11084-11091,11099,11101,11106,11109,11111-11112
+
/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,11013-11022,11046-11059,11075-11077
/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,11043,11047,11050,11062-11063,11072,11078,11080-11082,11084-11091,11099,11101,11106,11109,11111-11112,11115-11116,11130,11161-11163,11165-11166,11168-11173
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,11013-11022,11046-11059,11075-11077
/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,11043,11047,11050,11062-11063,11072,11078,11080-11082,11084-11091,11099,11101,11106,11109,11111-11112
+
/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,11013-11022,11046-11059,11075-11077
/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,11043,11047,11050,11062-11063,11072,11078,11080-11082,11084-11091,11099,11101,11106,11109,11111-11112,11115-11116,11130,11161-11163,11165-11166,11168-11173
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,11013-11022,11046-11059,11075-11077
/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,11043,11047,11050,11062-11063,11072,11078,11080-11082,11084-11091,11099,11101,11106,11109,11111-11112
+
/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,11013-11022,11046-11059,11075-11077
/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,11043,11047,11050,11062-11063,11072,11078,11080-11082,11084-11091,11099,11101,11106,11109,11111-11112,11115-11116,11130,11161-11163,11165-11166,11168-11173
Modified:
gnuradio/branches/releases/3.2/grc/data/platforms/python/blocks/wxgui_numbersink2.xml
===================================================================
---
gnuradio/branches/releases/3.2/grc/data/platforms/python/blocks/wxgui_numbersink2.xml
2009-06-17 04:35:14 UTC (rev 11218)
+++
gnuradio/branches/releases/3.2/grc/data/platforms/python/blocks/wxgui_numbersink2.xml
2009-06-17 18:51:18 UTC (rev 11219)
@@ -11,7 +11,6 @@
<make>numbersink2.$(type.fcn)(
self.GetWin(),
unit=$units,
- base_value=$base_value,
minval=$min_value,
maxval=$max_value,
factor=$factor,
@@ -66,12 +65,6 @@
<type>real</type>
</param>
<param>
- <name>Base Value</name>
- <key>base_value</key>
- <value>0.0</value>
- <type>real</type>
- </param>
- <param>
<name>Min Value</name>
<key>min_value</key>
<value>-100</value>
@@ -172,5 +165,7 @@
Set Average Alpha to 0 for automatic setting.
Use the Grid Position (row, column, row span, column span) to position the
graphical element in the window.
+
+Incoming numbers are multiplied by the factor, and then added-to by the
reference level.
</doc>
</block>
Property changes on: gnuradio/branches/releases/3.2/grc/examples/audio
___________________________________________________________________
Modified: svn:ignore
-
+ Makefile
Makefile.in
Property changes on: gnuradio/branches/releases/3.2/grc/examples/simple
___________________________________________________________________
Modified: svn:ignore
-
+ Makefile
Makefile.in
Property changes on: gnuradio/branches/releases/3.2/grc/examples/trellis
___________________________________________________________________
Modified: svn:ignore
-
+ Makefile
Makefile.in
Property changes on: gnuradio/branches/releases/3.2/grc/examples/usrp
___________________________________________________________________
Modified: svn:ignore
-
+ Makefile
Makefile.in
Property changes on: gnuradio/branches/releases/3.2/grc/examples/xmlrpc
___________________________________________________________________
Modified: svn:ignore
-
+ Makefile
Makefile.in
Modified: gnuradio/branches/releases/3.2/grc/freedesktop/Makefile.am
===================================================================
--- gnuradio/branches/releases/3.2/grc/freedesktop/Makefile.am 2009-06-17
04:35:14 UTC (rev 11218)
+++ gnuradio/branches/releases/3.2/grc/freedesktop/Makefile.am 2009-06-17
18:51:18 UTC (rev 11219)
@@ -21,7 +21,7 @@
include $(top_srcdir)/grc/Makefile.inc
-ourdatadir = $(grc_data_prefix)/freedesktop
+ourdatadir = $(pkgdatadir)/grc/freedesktop
dist_ourdata_DATA = \
grc-icon-256.png \
@@ -36,8 +36,8 @@
dist_bin_SCRIPTS = grc_setup_freedesktop
-grc_setup_freedesktop: Makefile grc_setup_freedesktop.in
- sed -e 's|@address@hidden|$(ourdatadir)|g' $(srcdir)/address@hidden > $@
+grc_setup_freedesktop: $(srcdir)/grc_setup_freedesktop.in Makefile
+ sed -e 's|@address@hidden|$(ourdatadir)|g' $< > $@
EXTRA_DIST = $(srcdir)/grc_setup_freedesktop.in
BUILT_SOURCES = grc_setup_freedesktop
Modified: gnuradio/branches/releases/3.2/grc/scripts/grc
===================================================================
--- gnuradio/branches/releases/3.2/grc/scripts/grc 2009-06-17 04:35:14 UTC
(rev 11218)
+++ gnuradio/branches/releases/3.2/grc/scripts/grc 2009-06-17 18:51:18 UTC
(rev 11219)
@@ -18,14 +18,16 @@
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
"""
+import os
+
import pygtk
pygtk.require('2.0')
import gtk
-try: import gnuradio
+try: from gnuradio import gr
except ImportError, e:
d = gtk.MessageDialog(type=gtk.MESSAGE_ERROR,
buttons=gtk.BUTTONS_CLOSE, message_format="""
-Cannot find module gnuradio. Is your PYTHONPATH set correctly?""")
+Cannot import gnuradio. Are your PYTHONPATH and LD_LIBRARY_PATH set
correctly?""")
d.set_title(str(e))
d.run()
exit(-1)
@@ -50,5 +52,8 @@
#setup icon using icon theme
try:
gtk.window_set_default_icon(gtk.IconTheme().load_icon('gnuradio-grc', 256, 0))
except: pass
- ActionHandler(args, Platform())
+ #extract extra block paths from environment variable, separated by
semicolon
+ try: extra_blocks = os.environ['GRC_BLOCKS_PATH'].split(';')
+ except: extra_blocks = list()
+ ActionHandler(args, Platform(extra_blocks=extra_blocks))
Modified: gnuradio/branches/releases/3.2/grc/scripts/usrp2_probe
===================================================================
--- gnuradio/branches/releases/3.2/grc/scripts/usrp2_probe 2009-06-17
04:35:14 UTC (rev 11218)
+++ gnuradio/branches/releases/3.2/grc/scripts/usrp2_probe 2009-06-17
18:51:18 UTC (rev 11219)
@@ -30,7 +30,7 @@
from gnuradio.grc.gui.Dialogs import TextDisplay
from gnuradio.grc.platforms.python.Platform import Platform
-platform = Platform(block_paths_internal_only=['usrp2_probe.xml'])
+platform = Platform(critical_only=True)
from gnuradio.grc.platforms.gui.Platform import Platform
platform = Platform(platform)
Modified: gnuradio/branches/releases/3.2/grc/scripts/usrp_probe
===================================================================
--- gnuradio/branches/releases/3.2/grc/scripts/usrp_probe 2009-06-17
04:35:14 UTC (rev 11218)
+++ gnuradio/branches/releases/3.2/grc/scripts/usrp_probe 2009-06-17
18:51:18 UTC (rev 11219)
@@ -28,7 +28,7 @@
from gnuradio.grc.gui.Dialogs import TextDisplay
from gnuradio.grc.platforms.python.Platform import Platform
-platform = Platform(block_paths_internal_only=['usrp_probe.xml'])
+platform = Platform(critical_only=True)
from gnuradio.grc.platforms.gui.Platform import Platform
platform = Platform(platform)
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,11013-11022,11046-11059,11075-11077
/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,11043,11047,11050,11062-11063,11072,11078,11080-11082,11084-11091,11099,11101,11106,11109,11111-11112
+
/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,11013-11022,11046-11059,11075-11077
/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,11043,11047,11050,11062-11063,11072,11078,11080-11082,11084-11091,11099,11101,11106,11109,11111-11112,11115-11116,11130,11161-11163,11165-11166,11168-11173
Modified: gnuradio/branches/releases/3.2/grc/src/gui/BlockTreeWindow.py
===================================================================
--- gnuradio/branches/releases/3.2/grc/src/gui/BlockTreeWindow.py
2009-06-17 04:35:14 UTC (rev 11218)
+++ gnuradio/branches/releases/3.2/grc/src/gui/BlockTreeWindow.py
2009-06-17 18:51:18 UTC (rev 11219)
@@ -18,6 +18,7 @@
"""
from Constants import DEFAULT_BLOCKS_WINDOW_WIDTH, DND_TARGETS
+from .. platforms.gui import Utils
import pygtk
pygtk.require('2.0')
import gtk
@@ -25,6 +26,7 @@
NAME_INDEX = 0
KEY_INDEX = 1
+DOC_INDEX = 2
class BlockTreeWindow(gtk.VBox):
"""The block selection panel."""
@@ -42,7 +44,7 @@
self.platform = platform
self.get_flow_graph = get_flow_graph
#make the tree model for holding blocks
- self.treestore = gtk.TreeStore(gobject.TYPE_STRING,
gobject.TYPE_STRING)
+ self.treestore = gtk.TreeStore(gobject.TYPE_STRING,
gobject.TYPE_STRING, gobject.TYPE_STRING)
self.treeview = gtk.TreeView(self.treestore)
self.treeview.set_enable_search(False) #disable pop up search
box
self.treeview.add_events(gtk.gdk.BUTTON_PRESS_MASK)
@@ -53,6 +55,9 @@
renderer = gtk.CellRendererText()
column = gtk.TreeViewColumn('Blocks', renderer, text=NAME_INDEX)
self.treeview.append_column(column)
+ #try to enable the tooltips (available in pygtk 2.12 and above)
+ try: self.treeview.set_tooltip_column(DOC_INDEX)
+ except: pass
#setup drag and drop
self.treeview.enable_model_drag_source(gtk.gdk.BUTTON1_MASK,
DND_TARGETS, gtk.gdk.ACTION_COPY)
self.treeview.connect('drag-data-get',
self._handle_drag_get_data)
@@ -92,12 +97,14 @@
iter =
self.treestore.insert_before(self._categories[sub_category[:-1]], None)
self.treestore.set_value(iter, NAME_INDEX, '[
%s ]'%cat_name)
self.treestore.set_value(iter, KEY_INDEX, '')
+ self.treestore.set_value(iter, DOC_INDEX,
Utils.xml_encode('Category: %s'%cat_name))
self._categories[sub_category] = iter
#add block
if block is None: return
iter = self.treestore.insert_before(self._categories[category],
None)
self.treestore.set_value(iter, NAME_INDEX, block.get_name())
self.treestore.set_value(iter, KEY_INDEX, block.get_key())
+ self.treestore.set_value(iter, DOC_INDEX,
Utils.xml_encode(block.get_doc() or 'undocumented'))
############################################################
## Helper Methods
Modified: gnuradio/branches/releases/3.2/grc/src/platforms/base/Constants.py.in
===================================================================
--- gnuradio/branches/releases/3.2/grc/src/platforms/base/Constants.py.in
2009-06-17 04:35:14 UTC (rev 11218)
+++ gnuradio/branches/releases/3.2/grc/src/platforms/base/Constants.py.in
2009-06-17 18:51:18 UTC (rev 11219)
@@ -24,6 +24,7 @@
VERSION = '@VERSION@'
#setup paths
-DATA_DIR = '@datadir@'
+PKG_DIR = os.environ.get('GR_DATADIR', '@pkgdatadir@')
+DATA_DIR = os.path.join(PKG_DIR, '@reldatadir@')
FLOW_GRAPH_DTD = os.path.join(DATA_DIR, 'flow_graph.dtd')
BLOCK_TREE_DTD = os.path.join(DATA_DIR, 'block_tree.dtd')
Modified: gnuradio/branches/releases/3.2/grc/src/platforms/base/Makefile.am
===================================================================
--- gnuradio/branches/releases/3.2/grc/src/platforms/base/Makefile.am
2009-06-17 04:35:14 UTC (rev 11218)
+++ gnuradio/branches/releases/3.2/grc/src/platforms/base/Makefile.am
2009-06-17 18:51:18 UTC (rev 11219)
@@ -34,12 +34,13 @@
Port.py \
__init__.py
-Constants.py: Makefile Constants.py.in
+Constants.py: $(srcdir)/Constants.py.in Makefile
sed \
-e 's|@address@hidden|$(PACKAGE)|g' \
-e 's|@address@hidden|$(VERSION)|g' \
- -e 's|@address@hidden|$(grc_base_data_dir)|g' \
- $(srcdir)/address@hidden > $@
+ -e 's|@address@hidden|$(pkgdatadir)|g' \
+ -e 's|@address@hidden|$(grc_base_data_reldir)|g' \
+ $< > $@
EXTRA_DIST = $(srcdir)/Constants.py.in
BUILT_SOURCES = Constants.py
Modified: gnuradio/branches/releases/3.2/grc/src/platforms/base/Platform.py
===================================================================
--- gnuradio/branches/releases/3.2/grc/src/platforms/base/Platform.py
2009-06-17 04:35:14 UTC (rev 11218)
+++ gnuradio/branches/releases/3.2/grc/src/platforms/base/Platform.py
2009-06-17 18:51:18 UTC (rev 11219)
@@ -61,8 +61,6 @@
for filename in filter(lambda f:
f.endswith('.xml'), filenames):
self._load_blocks(os.path.join(dirpath, filename))
- def get_prefs_block(self): return
self.get_new_flow_graph().get_new_block('preferences')
-
def _load_blocks(self, f):
"""
Load the block wrappers from the file path.
Modified: gnuradio/branches/releases/3.2/grc/src/platforms/gui/Block.py
===================================================================
--- gnuradio/branches/releases/3.2/grc/src/platforms/gui/Block.py
2009-06-17 04:35:14 UTC (rev 11218)
+++ gnuradio/branches/releases/3.2/grc/src/platforms/gui/Block.py
2009-06-17 18:51:18 UTC (rev 11219)
@@ -115,7 +115,7 @@
def update(self):
"""Update the block, parameters, and ports when a change
occurs."""
- self.bg_color = self.get_enabled() and Colors.BG_COLOR or
Colors.DISABLED_BG_COLOR
+ self._bg_color = self.get_enabled() and
Colors.BLOCK_ENABLED_COLOR or Colors.BLOCK_DISABLED_COLOR
self.clear()
self._create_labels()
self.W = self.label_width + 2*BLOCK_LABEL_PADDING
@@ -148,9 +148,8 @@
#setup the pixmap
pixmap = self.get_parent().new_pixmap(width, height)
gc = pixmap.new_gc()
- gc.foreground = self.bg_color
+ gc.set_foreground(self._bg_color)
pixmap.draw_rectangle(gc, True, 0, 0, width, height)
- gc.foreground = Colors.TXT_COLOR
#draw the layouts
h_off = 0
for i,layout in enumerate(layouts):
@@ -175,7 +174,10 @@
"""
x, y = self.get_coordinate()
#draw main block
- Element.draw(self, gc, window, BG_color=self.bg_color)
+ Element.draw(
+ self, gc, window, bg_color=self._bg_color,
+ border_color=self.is_highlighted() and
Colors.HIGHLIGHT_COLOR or Colors.BORDER_COLOR,
+ )
#draw label image
if self.is_horizontal():
window.draw_image(gc, self.horizontal_label, 0, 0,
x+BLOCK_LABEL_PADDING, y+(self.H-self.label_height)/2, -1, -1)
Modified: gnuradio/branches/releases/3.2/grc/src/platforms/gui/Colors.py
===================================================================
--- gnuradio/branches/releases/3.2/grc/src/platforms/gui/Colors.py
2009-06-17 04:35:14 UTC (rev 11218)
+++ gnuradio/branches/releases/3.2/grc/src/platforms/gui/Colors.py
2009-06-17 18:51:18 UTC (rev 11219)
@@ -21,14 +21,17 @@
pygtk.require('2.0')
import gtk
-COLORMAP = gtk.gdk.colormap_get_system() #create all of the colors
-def get_color(color_code): return COLORMAP.alloc_color(color_code, True, True)
+_COLORMAP = gtk.gdk.colormap_get_system() #create all of the colors
+def get_color(color_code): return _COLORMAP.alloc_color(color_code, True, True)
-BACKGROUND_COLOR = get_color('#FFF9FF') #main window background
-FG_COLOR = get_color('black') #normal border color
-BG_COLOR = get_color('#F1ECFF') #default background
-DISABLED_BG_COLOR = get_color('#CCCCCC') #disabled background
-DISABLED_FG_COLOR = get_color('#999999') #disabled foreground
-H_COLOR = get_color('#00FFFF') #Highlight border color
-TXT_COLOR = get_color('black') #text color
-ERROR_COLOR = get_color('red') #error color
+HIGHLIGHT_COLOR = get_color('#00FFFF')
+BORDER_COLOR = get_color('black')
+#flow graph color constants
+FLOWGRAPH_BACKGROUND_COLOR = get_color('#FFF9FF')
+#block color constants
+BLOCK_ENABLED_COLOR = get_color('#F1ECFF')
+BLOCK_DISABLED_COLOR = get_color('#CCCCCC')
+#connection color constants
+CONNECTION_ENABLED_COLOR = get_color('black')
+CONNECTION_DISABLED_COLOR = get_color('#999999')
+CONNECTION_ERROR_COLOR = get_color('red')
Modified: gnuradio/branches/releases/3.2/grc/src/platforms/gui/Connection.py
===================================================================
--- gnuradio/branches/releases/3.2/grc/src/platforms/gui/Connection.py
2009-06-17 04:35:14 UTC (rev 11218)
+++ gnuradio/branches/releases/3.2/grc/src/platforms/gui/Connection.py
2009-06-17 18:51:18 UTC (rev 11219)
@@ -23,7 +23,14 @@
from Constants import CONNECTOR_ARROW_BASE, CONNECTOR_ARROW_HEIGHT
class Connection(Element):
- """A graphical connection for ports."""
+ """
+ A graphical connection for ports.
+ The connection has 2 parts, the arrow and the wire.
+ The coloring of the arrow and wire exposes the status of 3 states:
+ enabled/disabled, valid/invalid, highlighted/non-highlighted.
+ The wire coloring exposes the enabled and highlighted states.
+ The arrow coloring exposes the enabled and valid states.
+ """
def get_coordinate(self):
"""
@@ -59,8 +66,9 @@
Utils.get_rotated_coordinate((-CONNECTOR_ARROW_HEIGHT,
CONNECTOR_ARROW_BASE/2), self.get_sink().get_rotation()),
]
self._update_after_move()
- if self.is_valid(): self._foreground = Colors.FG_COLOR
- else: self._foreground = Colors.ERROR_COLOR
+ if not self.get_enabled(): self._arrow_color =
Colors.CONNECTION_DISABLED_COLOR
+ elif not self.is_valid(): self._arrow_color =
Colors.CONNECTION_ERROR_COLOR
+ else: self._arrow_color = Colors.CONNECTION_ENABLED_COLOR
def _update_after_move(self):
"""Calculate coordinates."""
@@ -123,8 +131,10 @@
self._sink_coor = sink.get_coordinate()
self._source_coor = source.get_coordinate()
#draw
- fg_color = self.get_enabled() and Colors.FG_COLOR or
Colors.DISABLED_FG_COLOR
- Element.draw(self, gc, window, FG_color=fg_color)
- gc.foreground = self._foreground
+ if self.is_highlighted(): border_color = Colors.HIGHLIGHT_COLOR
+ elif self.get_enabled(): border_color =
Colors.CONNECTION_ENABLED_COLOR
+ else: border_color = Colors.CONNECTION_DISABLED_COLOR
+ Element.draw(self, gc, window, bg_color=None,
border_color=border_color)
#draw arrow on sink port
+ gc.set_foreground(self._arrow_color)
window.draw_polygon(gc, True, self._arrow)
Modified: gnuradio/branches/releases/3.2/grc/src/platforms/gui/Element.py
===================================================================
--- gnuradio/branches/releases/3.2/grc/src/platforms/gui/Element.py
2009-06-17 04:35:14 UTC (rev 11218)
+++ gnuradio/branches/releases/3.2/grc/src/platforms/gui/Element.py
2009-06-17 18:51:18 UTC (rev 11219)
@@ -61,24 +61,24 @@
rotation = rotation or self.get_rotation()
return rotation in (90, 270)
- def draw(self, gc, window, BG_color=Colors.BG_COLOR,
FG_color=Colors.FG_COLOR):
+ def draw(self, gc, window, border_color, bg_color):
"""
Draw in the given window.
@param gc the graphics context
@param window the gtk window to draw on
- @param BG_color the background color
- @param FG_color the foreground color
+ @param border_color the color for lines and rectangle borders
+ @param bg_color the color for the inside of the rectangle
"""
X,Y = self.get_coordinate()
for (rX,rY),(W,H) in self.areas_dict[self.get_rotation()]:
aX = X + rX
aY = Y + rY
- gc.foreground = BG_color
+ gc.set_foreground(bg_color)
window.draw_rectangle(gc, True, aX, aY, W, H)
- gc.foreground = self.is_highlighted() and
Colors.H_COLOR or FG_color
+ gc.set_foreground(border_color)
window.draw_rectangle(gc, False, aX, aY, W, H)
for (x1, y1),(x2, y2) in self.lines_dict[self.get_rotation()]:
- gc.foreground = self.is_highlighted() and
Colors.H_COLOR or FG_color
+ gc.set_foreground(border_color)
window.draw_line(gc, X+x1, Y+y1, X+x2, Y+y2)
def rotate(self, rotation):
Modified: gnuradio/branches/releases/3.2/grc/src/platforms/gui/FlowGraph.py
===================================================================
--- gnuradio/branches/releases/3.2/grc/src/platforms/gui/FlowGraph.py
2009-06-17 04:35:14 UTC (rev 11218)
+++ gnuradio/branches/releases/3.2/grc/src/platforms/gui/FlowGraph.py
2009-06-17 18:51:18 UTC (rev 11219)
@@ -248,7 +248,7 @@
"""
W,H = self.get_size()
#draw the background
- gc.foreground = Colors.BACKGROUND_COLOR
+ gc.set_foreground(Colors.FLOWGRAPH_BACKGROUND_COLOR)
window.draw_rectangle(gc, True, 0, 0, W, H)
#draw multi select rectangle
if self.mouse_pressed and (not self.get_selected_elements() or
self.get_ctrl_mask()):
@@ -259,9 +259,9 @@
x, y = int(min(x1, x2)), int(min(y1, y2))
w, h = int(abs(x1 - x2)), int(abs(y1 - y2))
#draw
- gc.foreground = Colors.H_COLOR
+ gc.set_foreground(Colors.HIGHLIGHT_COLOR)
window.draw_rectangle(gc, True, x, y, w, h)
- gc.foreground = Colors.TXT_COLOR
+ gc.set_foreground(Colors.BORDER_COLOR)
window.draw_rectangle(gc, False, x, y, w, h)
#draw blocks on top of connections
for element in self.get_connections() + self.get_blocks():
Modified: gnuradio/branches/releases/3.2/grc/src/platforms/gui/Port.py
===================================================================
--- gnuradio/branches/releases/3.2/grc/src/platforms/gui/Port.py
2009-06-17 04:35:14 UTC (rev 11218)
+++ gnuradio/branches/releases/3.2/grc/src/platforms/gui/Port.py
2009-06-17 18:51:18 UTC (rev 11219)
@@ -84,7 +84,7 @@
def _create_labels(self):
"""Create the labels for the socket."""
- self.BG_color = Colors.get_color(self.get_color())
+ self._bg_color = Colors.get_color(self.get_color())
#create the layout
layout = gtk.DrawingArea().create_pango_layout('')
layout.set_markup(Utils.parse_template(PORT_MARKUP_TMPL,
port=self))
@@ -93,9 +93,8 @@
#create the pixmap
pixmap = self.get_parent().get_parent().new_pixmap(self.w,
self.h)
gc = pixmap.new_gc()
- gc.foreground = self.BG_color
+ gc.set_foreground(self._bg_color)
pixmap.draw_rectangle(gc, True, 0, 0, self.w, self.h)
- gc.foreground = Colors.TXT_COLOR
pixmap.draw_layout(gc, 0, 0, layout)
#create the images
self.horizontal_label = image = pixmap.get_image(0, 0, self.w,
self.h)
@@ -110,8 +109,10 @@
@param gc the graphics context
@param window the gtk window to draw on
"""
- Element.draw(self, gc, window, BG_color=self.BG_color)
- gc.foreground = Colors.TXT_COLOR
+ Element.draw(
+ self, gc, window, bg_color=self._bg_color,
+ border_color=self.is_highlighted() and
Colors.HIGHLIGHT_COLOR or Colors.BORDER_COLOR,
+ )
X,Y = self.get_coordinate()
(x,y),(w,h) = self.areas_dict[self.get_rotation()][0] #use the
first area's sizes to place the labels
if self.is_horizontal():
Modified:
gnuradio/branches/releases/3.2/grc/src/platforms/python/Constants.py.in
===================================================================
--- gnuradio/branches/releases/3.2/grc/src/platforms/python/Constants.py.in
2009-06-17 04:35:14 UTC (rev 11218)
+++ gnuradio/branches/releases/3.2/grc/src/platforms/python/Constants.py.in
2009-06-17 18:51:18 UTC (rev 11219)
@@ -20,13 +20,14 @@
import os
import sys
import stat
+from .. base.Constants import PKG_DIR
PYEXEC = '@PYTHONW@'
#setup paths
-DOCS_DIR = os.path.join('@docdir@', 'xml')
-DATA_DIR = '@datadir@'
-BLOCKS_DIR = '@blocksdir@'
+DOCS_DIR = os.path.join(os.environ.get('GR_DOCDIR', '@docdir@'), 'xml')
+DATA_DIR = os.path.join(PKG_DIR, '@reldatadir@')
+BLOCKS_DIR = os.path.join(PKG_DIR, '@relblocksdir@')
HIER_BLOCKS_LIB_DIR = os.path.join(os.path.expanduser('~'), '.grc_gnuradio')
#file creation modes
Modified: gnuradio/branches/releases/3.2/grc/src/platforms/python/FlowGraph.py
===================================================================
--- gnuradio/branches/releases/3.2/grc/src/platforms/python/FlowGraph.py
2009-06-17 04:35:14 UTC (rev 11218)
+++ gnuradio/branches/releases/3.2/grc/src/platforms/python/FlowGraph.py
2009-06-17 18:51:18 UTC (rev 11219)
@@ -25,11 +25,12 @@
def _get_value_expr(variable_block):
"""
Get the expression to evaluate from the value param.
+ Parameter blocks need to be evaluated so the stringify flag can be
determined.
@param variable_block the variable or parameter block
@return the expression string
"""
value_param = variable_block.get_param('value')
- value_param.evaluate() #evaluate prior to code
+ if variable_block.get_key() == 'parameter': value_param.evaluate()
return value_param.to_code()
class FlowGraph(_FlowGraph):
@@ -42,13 +43,12 @@
@param namespace a dict representing the namespace
@return the resultant object
"""
- #check cache
- if self._eval_cache.has_key(code) and self._eval_cache[code][0]
== namespace:
- return self._eval_cache[code][1]
- #evaluate
- result = eval(code, namespace, namespace)
- self._eval_cache[code] = (namespace.copy(), result)
- return result
+ my_hash = hash(code + str(namespace))
+ #cache if does not exist
+ if not self._eval_cache.has_key(my_hash):
+ self._eval_cache[my_hash] = eval(code, namespace,
namespace)
+ #return from cache
+ return self._eval_cache[my_hash]
def _get_io_signature(self, pad_key):
"""
Modified: gnuradio/branches/releases/3.2/grc/src/platforms/python/Makefile.am
===================================================================
--- gnuradio/branches/releases/3.2/grc/src/platforms/python/Makefile.am
2009-06-17 04:35:14 UTC (rev 11218)
+++ gnuradio/branches/releases/3.2/grc/src/platforms/python/Makefile.am
2009-06-17 18:51:18 UTC (rev 11219)
@@ -36,13 +36,13 @@
Port.py \
__init__.py
-Constants.py: Makefile Constants.py.in
+Constants.py: $(srcdir)/Constants.py.in Makefile
sed \
-e 's|@address@hidden|$(PYTHONW)|g' \
- -e 's|@address@hidden|$(grc_python_data_dir)|g' \
- -e 's|@address@hidden|$(grc_python_blocks_dir)|g' \
+ -e 's|@address@hidden|$(grc_python_data_reldir)|g' \
+ -e 's|@address@hidden|$(grc_blocks_data_reldir)|g' \
-e 's|@address@hidden|$(gr_docdir)|g' \
- $(srcdir)/address@hidden > $@
+ $< > $@
EXTRA_DIST = $(srcdir)/Constants.py.in
BUILT_SOURCES = Constants.py
Modified: gnuradio/branches/releases/3.2/grc/src/platforms/python/Param.py
===================================================================
--- gnuradio/branches/releases/3.2/grc/src/platforms/python/Param.py
2009-06-17 04:35:14 UTC (rev 11218)
+++ gnuradio/branches/releases/3.2/grc/src/platforms/python/Param.py
2009-06-17 18:51:18 UTC (rev 11219)
@@ -225,8 +225,8 @@
elif t in ('raw', 'complex', 'real', 'int', 'complex_vector',
'real_vector', 'int_vector', 'hex'):
#raise exception if python cannot evaluate this value
try: e = self.get_parent().get_parent().evaluate(v)
- except:
- self._add_error_message('Value "%s" cannot be
evaluated.'%v)
+ except Exception, e:
+ self._add_error_message('Value "%s" cannot be
evaluated: %s'%(v, e))
raise Exception
#raise an exception if the data is invalid
if t == 'raw': return e
Modified: gnuradio/branches/releases/3.2/grc/src/platforms/python/Platform.py
===================================================================
--- gnuradio/branches/releases/3.2/grc/src/platforms/python/Platform.py
2009-06-17 04:35:14 UTC (rev 11218)
+++ gnuradio/branches/releases/3.2/grc/src/platforms/python/Platform.py
2009-06-17 18:51:18 UTC (rev 11219)
@@ -30,25 +30,22 @@
BLOCK_TREE, DEFAULT_FLOW_GRAPH, \
BLOCKS_DIR
+_critical_blocks_only = map(lambda b: os.path.join(BLOCKS_DIR, b),
['options.xml', 'usrp_probe.xml', 'usrp2_probe.xml'])
+
class Platform(_Platform):
- def __init__(self, block_paths_internal_only=[],
block_paths_external=[]):
+ def __init__(self, extra_blocks=[], critical_only=False):
"""
Make a platform for gnuradio.
- The internal only list will replace the current block path.
- @param block_paths_internal_only a list of blocks internal to
this platform
- @param block_paths_external a list of blocks to load in
addition to the above blocks
+ @param extra_blocks a list of block paths to load in addition
to main block library
+ @param critical_only only load critical blocks (used only for
usrp probe scripts to speed up load time)
"""
#ensure hier dir
if not os.path.exists(HIER_BLOCKS_LIB_DIR):
os.mkdir(HIER_BLOCKS_LIB_DIR)
- #handle internal/only
- if block_paths_internal_only:
- block_paths = map(lambda b: os.path.join(BLOCKS_DIR,
b), ['options.xml'] + block_paths_internal_only)
- else: block_paths = [BLOCKS_DIR]
- #handle external
- block_paths.extend(block_paths_external)
- #append custom hiers
- block_paths.append(HIER_BLOCKS_LIB_DIR)
+ if critical_only: block_paths = _critical_blocks_only
+ else: block_paths = extra_blocks + [HIER_BLOCKS_LIB_DIR,
BLOCKS_DIR]
+ #convert block paths to absolute paths, ensure uniqueness
+ block_paths = set(map(os.path.abspath, block_paths))
#init
_Platform.__init__(
self,
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-06-17 04:35:14 UTC (rev 11218)
+++
gnuradio/branches/releases/3.2/grc/src/platforms/python/utils/extract_docs.py
2009-06-17 18:51:18 UTC (rev 11219)
@@ -1,5 +1,5 @@
"""
-Copyright 2008 Free Software Foundation, Inc.
+Copyright 2008, 2009 Free Software Foundation, Inc.
This file is part of GNU Radio
GNU Radio Companion is free software; you can redistribute it and/or
@@ -26,17 +26,19 @@
DOXYGEN_BRIEFDESC_GR_XPATH = '/doxygen/compounddef/briefdescription'
DOXYGEN_DETAILDESC_GR_XPATH = '/doxygen/compounddef/detaileddescription'
-def extract_txt(xml, parent_text=None):
+def extract_txt(xml):
"""
Recursivly pull the text out of an xml tree.
@param xml the xml tree
- @param parent_text the text of the parent element
@return a string
"""
- text = xml.text or ''
- tail = parent_text and xml.tail or ''
+ text = (xml.text or '').replace('\n', '')
+ tail = (xml.tail or '').replace('\n', '')
+ if xml.tag == 'para': tail += '\n\n'
+ if xml.tag == 'linebreak': text += '\n'
+ if xml.tag == 'parametername': text += ': '
return text + ''.join(
- map(lambda x: extract_txt(x, text), xml)
+ map(lambda x: extract_txt(x), xml)
) + tail
def _extract(key):
@@ -61,16 +63,16 @@
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')
+ comp_name =
extract_txt(xml.xpath(DOXYGEN_NAME_XPATH)[0]).strip()
comp_name = ' --- ' + comp_name + ' --- '
- if key.startswith('gr_') or key.startswith('trellis_'):
- brief_desc =
extract_txt(xml.xpath(DOXYGEN_BRIEFDESC_GR_XPATH)[0]).strip('\n')
- detailed_desc =
extract_txt(xml.xpath(DOXYGEN_DETAILDESC_GR_XPATH)[0]).strip('\n')
+ if re.match('(gr|usrp2|trellis)_.*', key):
+ brief_desc =
extract_txt(xml.xpath(DOXYGEN_BRIEFDESC_GR_XPATH)[0]).strip()
+ detailed_desc =
extract_txt(xml.xpath(DOXYGEN_DETAILDESC_GR_XPATH)[0]).strip()
else:
brief_desc = ''
detailed_desc = ''
#combine
- doc_strs.append('\n'.join([comp_name, brief_desc,
detailed_desc]).strip('\n'))
+ doc_strs.append('\n\n'.join([comp_name, brief_desc,
detailed_desc]).strip())
except IndexError: pass #bad format
return '\n\n'.join(doc_strs)
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,11013-11022,11046-11059,11075-11077
/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,11043,11047,11050,11062-11063,11072,11078,11080-11082,11084-11091,11099,11101,11106,11109,11111-11112
+ /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,11013-11022,11046-11059,11075-11077
/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,11043,11047,11050,11062-11063,11072,11078,11080-11082,11084-11091,11099,11101,11106,11109,11111-11112,11115-11116,11130,11161-11163,11165-11166,11168-11173
Modified: gnuradio/branches/releases/3.2/grc/todo.txt
===================================================================
--- gnuradio/branches/releases/3.2/grc/todo.txt 2009-06-17 04:35:14 UTC (rev
11218)
+++ gnuradio/branches/releases/3.2/grc/todo.txt 2009-06-17 18:51:18 UTC (rev
11219)
@@ -1,27 +1,45 @@
##################################################
# Blocks
##################################################
--probe: also non-float outputs
--log slider gui control
+* probe: also non-float outputs
+* log slider gui control
+* generic usrp (when its ready)
+* packet mod: whitening offset
##################################################
# Features
##################################################
--param editor, expand entry boxes in focus
--change param dialog to panel within main window
--command line option for additional block wrappers
--zoom in/out (cairo vector graphics) (use scroll wheel as control)
--search for blocks
--click and drag on whitespace to scroll
--gui grid editor for configuring grid params/placing wxgui plots and controls
+* param editor, expand entry boxes in focus
+* change param dialog to panel within main window
+* search for blocks in category window
+* gui grid editor for configuring grid params/placing wxgui plots and controls
+* drag from one port to another to connect
+* per parameter docs
+ * extract individual param docs from doxygen
+ * doc tag in param for handwritten notes
+* separate generated code into top block and gui class
+ * use gui.py in gr-wxgui and remove custom top_block_gui
+* configuration option for adding block paths
+* data types guide/colors for the help menu
##################################################
# Problems
##################################################
--auto generate hier library
--auto clean hier library
--add hier blocks to tree without restart?
--dont generate py files in .grc file dir
--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
+* hier block generation
+ * auto generate hier library on changes
+ * auto clean hier library when block removed
+ * add hier blocks to tree without restart
+* dont generate py files in saved flowgraph dir
+* 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
+* align param titles in paramsdialog
+
+##################################################
+# Future
+##################################################
+* require pygtk 2.12 for treeview tooltips
+ * remove try/except in BlockTreeWindow.py
+* remove support for saved flow graphs ending in .xml
+* remove converter script for previous format
+* reorganize module structure
Property changes on:
gnuradio/branches/releases/3.2/usrp2/host/include/usrp2/mimo_config.h
___________________________________________________________________
Modified: svn:mergeinfo
-
/gnuradio/branches/developers/eb/t348/usrp2/firmware/include/usrp2_mimo_config.h:10638-10648
/gnuradio/branches/developers/eb/t364/usrp2/firmware/include/usrp2_mimo_config.h:11016-11017
/gnuradio/branches/developers/eb/t367/usrp2/firmware/include/usrp2_mimo_config.h:11021-11025
/gnuradio/branches/developers/eb/t371/usrp2/firmware/include/usrp2_mimo_config.h:10958-10971
/gnuradio/branches/developers/eb/t378/usrp2/firmware/include/usrp2_mimo_config.h:10683-10688
/gnuradio/branches/developers/jblum/grc/usrp2/firmware/include/usrp2_mimo_config.h:10680-10938
/gnuradio/branches/developers/jblum/gui_guts/usrp2/firmware/include/usrp2_mimo_config.h:10464-10658
/gnuradio/branches/developers/jblum/vlen/usrp2/firmware/include/usrp2_mimo_config.h:10667-10677
/gnuradio/branches/developers/jcorgan/cpphier/usrp2/firmware/include/usrp2_mimo_config.h:10818-10858
/gnuradio/branches/developers/jcorgan/deb/usrp2/firmware/include/usrp2_mimo_config.h:10949-10959,11013-11022
/gnuradio/branches/developers/jcorgan/fw-optimize/usrp2/firmware/include/usrp2_mimo_config.h:10428-10429
/gnuradio/branches/developers/jcorgan/gpio2/usrp2/firmware/include/usrp2_mimo_config.h:10713-10765
/gnuradio/branches/developers/jcorgan/iad2/usrp2/firmware/include/usrp2_mimo_config.h:10771-10887
/gnuradio/branches/developers/jcorgan/t161/usrp2/firmware/include/usrp2_mimo_config.h:10876-10880
/gnuradio/branches/developers/michaelld/am_swig_4/usrp2/firmware/include/usrp2_mimo_config.h:10555-10595
/gnuradio/branches/developers/michaelld/two_mods/usrp2/firmware/include/usrp2_mimo_config.h:10540-10546
/gnuradio/trunk/usrp2/host/include/usrp2/mimo_config.h:11084-11085,11088-11090,11099,11101,11106,11109,11111-11112
+
/gnuradio/branches/developers/eb/t348/usrp2/firmware/include/usrp2_mimo_config.h:10638-10648
/gnuradio/branches/developers/eb/t364/usrp2/firmware/include/usrp2_mimo_config.h:11016-11017
/gnuradio/branches/developers/eb/t367/usrp2/firmware/include/usrp2_mimo_config.h:11021-11025
/gnuradio/branches/developers/eb/t371/usrp2/firmware/include/usrp2_mimo_config.h:10958-10971
/gnuradio/branches/developers/eb/t378/usrp2/firmware/include/usrp2_mimo_config.h:10683-10688
/gnuradio/branches/developers/jblum/grc/usrp2/firmware/include/usrp2_mimo_config.h:10680-10938
/gnuradio/branches/developers/jblum/gui_guts/usrp2/firmware/include/usrp2_mimo_config.h:10464-10658
/gnuradio/branches/developers/jblum/vlen/usrp2/firmware/include/usrp2_mimo_config.h:10667-10677
/gnuradio/branches/developers/jcorgan/cpphier/usrp2/firmware/include/usrp2_mimo_config.h:10818-10858
/gnuradio/branches/developers/jcorgan/deb/usrp2/firmware/include/usrp2_mimo_config.h:10949-10959,11013-11022
/gnuradio/branches/developers/jcorgan/fw-optimize/usrp2/firmware/include/usrp2_mimo_config.h:10428-10429
/gnuradio/branches/developers/jcorgan/gpio2/usrp2/firmware/include/usrp2_mimo_config.h:10713-10765
/gnuradio/branches/developers/jcorgan/iad2/usrp2/firmware/include/usrp2_mimo_config.h:10771-10887
/gnuradio/branches/developers/jcorgan/t161/usrp2/firmware/include/usrp2_mimo_config.h:10876-10880
/gnuradio/branches/developers/michaelld/am_swig_4/usrp2/firmware/include/usrp2_mimo_config.h:10555-10595
/gnuradio/branches/developers/michaelld/two_mods/usrp2/firmware/include/usrp2_mimo_config.h:10540-10546
/gnuradio/trunk/usrp2/host/include/usrp2/mimo_config.h:11084-11085,11088-11090,11099,11101,11106,11109,11111-11112,11115-11116,11130,11161-11163,11165-11166,11168-11173
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Commit-gnuradio] r11219 - in gnuradio/branches/releases/3.2: . gnuradio-core/src/python/gnuradio/gr gnuradio-examples/python/digital gr-qtgui/src/python gr-wxgui/src/python gr-wxgui/src/python/plotter grc grc/data/platforms/base grc/data/platforms/python grc/data/platforms/python/blocks grc/examples/audio grc/examples/simple grc/examples/trellis grc/examples/usrp grc/examples/xmlrpc grc/freedesktop grc/scripts grc/src/grc_gnuradio/wxgui/forms grc/src/gui grc/src/platforms/base grc/src/platforms/gui grc/src/platforms/python grc/src/platforms/python/utils grc/src/utils usrp2/host/include/usrp2,
jcorgan <=