some fix

git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@9772 221aa14e-8319-0410-a670-987f0aec2ac5

diff --git a/grc/data/platforms/python/blocks/variable_sink.xml b/grc/data/platforms/python/blocks/variable_sink.xml
index 13737b2cf1daf214709a939c97ffda61a5b69396..a4adb5c00cd477ab69dbd1ab2d2919ae2c05b153 100644 (file)
--- a/grc/data/platforms/python/blocks/variable_sink.xml
+++ b/grc/data/platforms/python/blocks/variable_sink.xml
@@ -9,7 +9,7 @@
        <key>variable_sink</key>
        <import>from grc_gnuradio import blks2 as grc_blks2</import>
        <make>grc_blks2.queue_sink_$(type.fcn)($vlen)
-grc_blks2.queue_sink_thread(self.$id, set_$(variable))</make>
+grc_blks2.queue_sink_thread(self.$id, self.set_$(variable))</make>
        <param>
                <name>Type</name>
                <key>type</key>

diff --git a/grc/data/platforms/python/blocks/wxgui_numbersink2.xml b/grc/data/platforms/python/blocks/wxgui_numbersink2.xml
index c3a8c52bd9506be7a75fc3f4aeba15548cef6002..d5fc064e7cf2f695a3f34ed1ccb6082c11eff784 100644 (file)
--- a/grc/data/platforms/python/blocks/wxgui_numbersink2.xml
+++ b/grc/data/platforms/python/blocks/wxgui_numbersink2.xml
@@ -27,8 +27,8 @@
 #end if
        label=$title,
        peak_hold=$options.peak_hold,
+       show_gauge=$show_gauge,
 )
-self.$(id).set_show_gauge($show_gauge)
 #set $grid_pos = $grid_pos.eval
 #if not grid_pos
 self.Add(self.$(id).win)

diff --git a/grc/src/platforms/gui/FlowGraph.py b/grc/src/platforms/gui/FlowGraph.py
index c547a4e78d7693d05219423fb34859b9f76ae457..e130a05fe5e1dd7e5c04f43bf3dcf4a1996bf0ac 100644 (file)
--- a/grc/src/platforms/gui/FlowGraph.py
+++ b/grc/src/platforms/gui/FlowGraph.py
@@ -155,6 +155,8 @@ class FlowGraph(Element):
                                block.get_param(param_key).set_value(param_value)
                        #move block to offset coordinate
                        block.move((x_off, y_off))
+               #update before creating connections
+               self.update()
                #create connections
                for connection_n in connections_n:
                        source = old_id2block[connection_n['source_block_id']].get_source(connection_n['source_key'])

diff --git a/grc/todo.txt b/grc/todo.txt
index 97c59f1e8af484ffa61640e8cc3cff90fb9b7975..6c0629f9adb19d224f6c2fc50c534ca6b4549faf 100644 (file)
--- a/grc/todo.txt
+++ b/grc/todo.txt
@@ -32,6 +32,8 @@
 -dont hide vlen controller when vlen > 1
 -dont generate py files in .grc file dir
 -save/restore cwd
+-special connection validation rules for disabled blocks
+-threads dont die on exit in probe and queue module
 
 ##################################################
 # External