[Commit-gnuradio] [gnuradio] 03/05: Merge branch 'maint'

[git]

This is an automated email from the git hooks/post-receive script.

jcorgan pushed a commit to branch master
in repository gnuradio.

commit c62b9f70627f6ed516159451b9e7a0c735126d1f
Merge: a7285ea 7ffc414
Author: Johnathan Corgan <address@hidden>
Date:   Mon Jun 6 09:29:25 2016 -0700

    Merge branch 'maint'

 gnuradio-runtime/lib/scheduler.h | 2 +-
 grc/gui/FlowGraph.py             | 7 +++++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --cc grc/gui/FlowGraph.py
index 6eb05f9,cfaa6a0..f98aec4
--- a/grc/gui/FlowGraph.py
+++ b/grc/gui/FlowGraph.py
@@@ -146,11 -128,13 +147,13 @@@ class FlowGraph(Element, _Flowgraph)
          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.get_new_block(key)
 +        block = self.new_block(key)
          block.set_coordinate(coor)
          block.set_rotation(0)
          block.get_param('id').set_value(id)