Merge https://bitbucket.org/jpcgt/flatcam/src/master into Port_to_Python3k

# Conflicts: # ObjectCollection.py
2018-05-30 20:38:43 +03:00
parent 4cf06b71e8 6f53d38338
commit a6a26de0d3
4 changed files with 21 additions and 8 deletions
--- a/FlatCAMApp.py
+++ b/FlatCAMApp.py
@@ -1641,8 +1641,9 @@ class App(QtCore.QObject):
        try:
            App.log.debug('button=%d, x=%d, y=%d, xdata=%f, ydata=%f' % (
                event.button, event.x, event.y, event.xdata, event.ydata))
-
-            self.clipboard.setText(self.defaults["point_clipboard_format"] % (event.xdata, event.ydata))
+            modifiers = QtGui.QApplication.keyboardModifiers()
+            if modifiers == QtCore.Qt.ControlModifier:
+                self.clipboard.setText(self.defaults["point_clipboard_format"] % (event.xdata, event.ydata))

        except Exception as e:
            App.log.debug("Outside plot?")