diff options
| author | Sebastian Koslowski <koslowski@kit.edu> | 2017-02-23 13:21:21 +0100 |
|---|---|---|
| committer | Sebastian Koslowski <koslowski@kit.edu> | 2017-03-09 20:17:06 +0100 |
| commit | 69776b6a60a8aa1bcd650e681326141b3c1ec866 (patch) | |
| tree | fe094136ac6162504178318b1794ac2df8a151a4 | |
| parent | 395bd4415cc92217886d0f2a4f026a6070e1748b (diff) | |
grc: gtk minor fixes
| -rw-r--r-- | grc/core/Block.py | 5 | ||||
| -rw-r--r-- | grc/gui/DrawingArea.py | 3 | ||||
| -rw-r--r-- | 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 bca17d458a..f707175551 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 3d001f8c1e..94dfcf1370 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 7c01d921bc..552a7554dc 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 |