[Commit-gnuradio] [gnuradio] 100/101: grc: gtk minor fixes

[git]

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

jcorgan pushed a commit to branch python3
in repository gnuradio.

commit 69776b6a60a8aa1bcd650e681326141b3c1ec866
Author: Sebastian Koslowski <address@hidden>
Date:   Thu Feb 23 13:21:21 2017 +0100

    grc: gtk minor fixes
---
 grc/core/Block.py      | 5 ++++-
 grc/gui/DrawingArea.py | 3 ++-
 grc/gui/Executor.py    | 2 +-
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/grc/core/Block.py b/grc/core/Block.py
index bca17d4..f707175 100644
--- a/grc/core/Block.py
+++ b/grc/core/Block.py
@@ -137,7 +137,10 @@ class Block(Element):
         for param_n in params_n:
             key = param_n['key']
             if key in self.params:
-                raise Exception('Key "{}" already exists in 
params'.format(key))
+                # raise Exception('Key "{}" already exists in 
params'.format(key))
+                print('Key "{}" already exists in params in block {}'
+                      ''.format(key, self.key))
+                continue
 
             extended_param_n = base_params_n.get(param_n.pop('base_key', 
None), {})
             extended_param_n.update(param_n)
diff --git a/grc/gui/DrawingArea.py b/grc/gui/DrawingArea.py
index 3d001f8..94dfcf1 100644
--- a/grc/gui/DrawingArea.py
+++ b/grc/gui/DrawingArea.py
@@ -91,7 +91,8 @@ class DrawingArea(Gtk.DrawingArea):
         """
         Handle a drag and drop by adding a block at the given coordinate.
         """
-        self._flow_graph.add_new_block(selection_data.get_text(), (x, y))
+        coords = x / self.zoom_factor, y / self.zoom_factor
+        self._flow_graph.add_new_block(selection_data.get_text(), coords)
 
     def _handle_mouse_scroll(self, widget, event):
         if event.get_state() & Gdk.ModifierType.CONTROL_MASK:
diff --git a/grc/gui/Executor.py b/grc/gui/Executor.py
index 7c01d92..552a755 100644
--- a/grc/gui/Executor.py
+++ b/grc/gui/Executor.py
@@ -38,7 +38,7 @@ class ExecFlowGraphThread(threading.Thread):
         threading.Thread.__init__(self)
 
         self.page = flow_graph_page  # store page and dont use main window 
calls in run
-        self.flow_graph = self.page.get_flow_graph()
+        self.flow_graph = self.page.flow_graph
         self.xterm_executable = xterm_executable
         self.update_callback = callback