diff options
| -rw-r--r-- | gnuradio-runtime/lib/scheduler.h | 2 | ||||
| -rw-r--r-- | gr-utils/python/modtool/grc_xml_generator.py | 2 | ||||
| -rw-r--r-- | gr-utils/python/modtool/templates.py | 2 | ||||
| -rw-r--r-- | grc/gui/FlowGraph.py | 7 |
4 files changed, 8 insertions, 5 deletions
diff --git a/gnuradio-runtime/lib/scheduler.h b/gnuradio-runtime/lib/scheduler.h index 575862b27d..0924808965 100644 --- a/gnuradio-runtime/lib/scheduler.h +++ b/gnuradio-runtime/lib/scheduler.h @@ -45,7 +45,7 @@ namespace gr { /*! * \brief Construct a scheduler and begin evaluating the graph. * - * The scheduler will continue running until all blocks until they + * The scheduler will continue running until all blocks * report that they are done or the stop method is called. */ scheduler(flat_flowgraph_sptr ffg, int max_noutput_items); diff --git a/gr-utils/python/modtool/grc_xml_generator.py b/gr-utils/python/modtool/grc_xml_generator.py index 7ccd443196..af17ca1822 100644 --- a/gr-utils/python/modtool/grc_xml_generator.py +++ b/gr-utils/python/modtool/grc_xml_generator.py @@ -35,7 +35,7 @@ class GRCXMLGenerator(object): # Can't make a dict 'cause order matters self._header = (('name', blockname.replace('_', ' ').capitalize()), ('key', '%s_%s' % (modname, blockname)), - ('category', modname.upper()), + ('category', '[%s]' % modname.upper()), ('import', 'import %s' % modname), ('make', '%s.%s(%s)' % (modname, blockname, ', '.join(params_list))) ) diff --git a/gr-utils/python/modtool/templates.py b/gr-utils/python/modtool/templates.py index 1d03d9f24d..07534e5673 100644 --- a/gr-utils/python/modtool/templates.py +++ b/gr-utils/python/modtool/templates.py @@ -531,7 +531,7 @@ Templates['grc_xml'] = '''<?xml version="1.0"?> <block> <name>${blockname}</name> <key>${modname}_${blockname}</key> - <category>${modname}</category> + <category>[${modname}]</category> <import>import ${modname}</import> <make>${modname}.${blockname}(${strip_arg_types_grc(arglist)})</make> <!-- Make one 'param' node for every Parameter you want settable from the GUI. diff --git a/grc/gui/FlowGraph.py b/grc/gui/FlowGraph.py index 6eb05f9ac9..f98aec41d5 100644 --- a/grc/gui/FlowGraph.py +++ b/grc/gui/FlowGraph.py @@ -143,11 +143,14 @@ class FlowGraph(Element, _Flowgraph): """ id = self._get_unique_id(key) #calculate the position coordinate + W, H = self.get_size() h_adj = self.get_scroll_pane().get_hadjustment() v_adj = self.get_scroll_pane().get_vadjustment() if coor is None: coor = ( - int(random.uniform(.25, .75)*h_adj.page_size + h_adj.get_value()), - int(random.uniform(.25, .75)*v_adj.page_size + v_adj.get_value()), + int(random.uniform(.25, .75) * min(h_adj.page_size, W) + + h_adj.get_value()), + int(random.uniform(.25, .75) * min(v_adj.page_size, H) + + v_adj.get_value()), ) #get the new block block = self.new_block(key) |