summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjblum2008-10-11 02:12:45 +0000
committerjblum2008-10-11 02:12:45 +0000
commitfabc12473261de8f1cbff837df52c2659474ad6e (patch)
tree530714af8f397da9242b6579a9421a4974323077
parentb419135854207311cd467a987a75884dbae75afd (diff)
downloadgnuradio-fabc12473261de8f1cbff837df52c2659474ad6e.tar.gz
gnuradio-fabc12473261de8f1cbff837df52c2659474ad6e.tar.bz2
gnuradio-fabc12473261de8f1cbff837df52c2659474ad6e.zip
some fix
git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@9772 221aa14e-8319-0410-a670-987f0aec2ac5
-rw-r--r--grc/data/platforms/python/blocks/variable_sink.xml2
-rw-r--r--grc/data/platforms/python/blocks/wxgui_numbersink2.xml2
-rw-r--r--grc/src/platforms/gui/FlowGraph.py2
-rw-r--r--grc/todo.txt2
4 files changed, 6 insertions, 2 deletions
diff --git a/grc/data/platforms/python/blocks/variable_sink.xml b/grc/data/platforms/python/blocks/variable_sink.xml
index 13737b2cf..a4adb5c00 100644
--- 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 c3a8c52bd..d5fc064e7 100644
--- 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 c547a4e78..e130a05fe 100644
--- 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 97c59f1e8..6c0629f9a 100644
--- 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