Disable UI movement when printing or when the print job is paused

diff --git a/Cura/gui/printWindow.py b/Cura/gui/printWindow.py
index 397badbe08680d39fd90deb5502a20e104eb73c8..b92150df7622f63dc09fc380ab4a7f9473bef490 100644 (file)
--- a/Cura/gui/printWindow.py
+++ b/Cura/gui/printWindow.py
@@ -82,6 +82,7 @@ class printWindowPlugin(wx.Frame):
                        'addTextButton': self.script_addTextButton,
 
                        'sendGCode': self.script_sendGCode,
+                       'sendMovementGCode': self.script_sendMovementGCode,
                        'connect': self.script_connect,
                        'startPrint': self.script_startPrint,
                        'pausePrint': self.script_pausePrint,
@@ -222,6 +223,10 @@ class printWindowPlugin(wx.Frame):
                        if len(line) > 0:
                                self._printerConnection.sendCommand(line)
 
+       def script_sendMovementGCode(self, data = None):
+               if not self._printerConnection.isPaused() and not self._printerConnection.isPrinting():
+                       self.script_sendGCode(data)
+
        def script_connect(self, data = None):
                self._printerConnection.openActiveConnection()
 

diff --git a/plugins/PronterfaceUI/script.py b/plugins/PronterfaceUI/script.py
index eb3175052240c1ec772fae61585f2c538ab7de67..6ee7f8d0665e863f7df3b07214d4922f4b31cfe5 100644 (file)
--- a/plugins/PronterfaceUI/script.py
+++ b/plugins/PronterfaceUI/script.py
@@ -8,39 +8,45 @@
 
 setImage('image.png', 'map.png')
 
-addColorCommand(0, 0, 255, sendGCode, "G91; G1 X100 F2000; G90")
-addColorCommand(0, 0, 240, sendGCode, "G91; G1 X10 F2000; G90")
-addColorCommand(0, 0, 220, sendGCode, "G91; G1 X1 F2000; G90")
-addColorCommand(0, 0, 200, sendGCode, "G91; G1 X0.1 F2000; G90")
-addColorCommand(0, 0, 180, sendGCode, "G91; G1 X-0.1 F2000; G90")
-addColorCommand(0, 0, 160, sendGCode, "G91; G1 X-1 F2000; G90")
-addColorCommand(0, 0, 140, sendGCode, "G91; G1 X-10 F2000; G90")
-addColorCommand(0, 0, 120, sendGCode, "G91; G1 X-100 F2000; G90")
-
-addColorCommand(0, 255, 0, sendGCode, "G91; G1 Y-100 F2000; G90")
-addColorCommand(0, 240, 0, sendGCode, "G91; G1 Y-10 F2000; G90")
-addColorCommand(0, 220, 0, sendGCode, "G91; G1 Y-1 F2000; G90")
-addColorCommand(0, 200, 0, sendGCode, "G91; G1 Y-0.1 F2000; G90")
-addColorCommand(0, 180, 0, sendGCode, "G91; G1 Y0.1 F2000; G90")
-addColorCommand(0, 160, 0, sendGCode, "G91; G1 Y1 F2000; G90")
-addColorCommand(0, 140, 0, sendGCode, "G91; G1 Y10 F2000; G90")
-addColorCommand(0, 120, 0, sendGCode, "G91; G1 Y100 F2000; G90")
-
-addColorCommand(255, 0, 0, sendGCode, "G91; G1 Z10 F200; G90")
-addColorCommand(220, 0, 0, sendGCode, "G91; G1 Z1 F200; G90")
-addColorCommand(200, 0, 0, sendGCode, "G91; G1 Z0.1 F200; G90")
-addColorCommand(180, 0, 0, sendGCode, "G91; G1 Z-0.1 F200; G90")
-addColorCommand(160, 0, 0, sendGCode, "G91; G1 Z-1 F200; G90")
-addColorCommand(140, 0, 0, sendGCode, "G91; G1 Z-10 F200; G90")
-
+# Move X
+addColorCommand(0, 0, 255, sendMovementGCode, "G91; G1 X100 F2000; G90")
+addColorCommand(0, 0, 240, sendMovementGCode, "G91; G1 X10 F2000; G90")
+addColorCommand(0, 0, 220, sendMovementGCode, "G91; G1 X1 F2000; G90")
+addColorCommand(0, 0, 200, sendMovementGCode, "G91; G1 X0.1 F2000; G90")
+addColorCommand(0, 0, 180, sendMovementGCode, "G91; G1 X-0.1 F2000; G90")
+addColorCommand(0, 0, 160, sendMovementGCode, "G91; G1 X-1 F2000; G90")
+addColorCommand(0, 0, 140, sendMovementGCode, "G91; G1 X-10 F2000; G90")
+addColorCommand(0, 0, 120, sendMovementGCode, "G91; G1 X-100 F2000; G90")
+
+# Move Y
+addColorCommand(0, 255, 0, sendMovementGCode, "G91; G1 Y-100 F2000; G90")
+addColorCommand(0, 240, 0, sendMovementGCode, "G91; G1 Y-10 F2000; G90")
+addColorCommand(0, 220, 0, sendMovementGCode, "G91; G1 Y-1 F2000; G90")
+addColorCommand(0, 200, 0, sendMovementGCode, "G91; G1 Y-0.1 F2000; G90")
+addColorCommand(0, 180, 0, sendMovementGCode, "G91; G1 Y0.1 F2000; G90")
+addColorCommand(0, 160, 0, sendMovementGCode, "G91; G1 Y1 F2000; G90")
+addColorCommand(0, 140, 0, sendMovementGCode, "G91; G1 Y10 F2000; G90")
+addColorCommand(0, 120, 0, sendMovementGCode, "G91; G1 Y100 F2000; G90")
+
+# Move Z
+addColorCommand(255, 0, 0, sendMovementGCode, "G91; G1 Z10 F200; G90")
+addColorCommand(220, 0, 0, sendMovementGCode, "G91; G1 Z1 F200; G90")
+addColorCommand(200, 0, 0, sendMovementGCode, "G91; G1 Z0.1 F200; G90")
+addColorCommand(180, 0, 0, sendMovementGCode, "G91; G1 Z-0.1 F200; G90")
+addColorCommand(160, 0, 0, sendMovementGCode, "G91; G1 Z-1 F200; G90")
+addColorCommand(140, 0, 0, sendMovementGCode, "G91; G1 Z-10 F200; G90")
+
+# Extrude/Retract
 addColorCommand(255, 80, 0, sendGCode, "G91; G1 E10 F120; G90")
 addColorCommand(255, 180, 0, sendGCode, "G91; G1 E-10 F120; G90")
 
-addColorCommand(255, 255, 0, sendGCode, "G28")
-addColorCommand(240, 255, 0, sendGCode, "G28 X0")
-addColorCommand(220, 255, 0, sendGCode, "G28 Y0")
-addColorCommand(200, 255, 0, sendGCode, "G28 Z0")
+# Home
+addColorCommand(255, 255, 0, sendMovementGCode, "G28")
+addColorCommand(240, 255, 0, sendMovementGCode, "G28 X0")
+addColorCommand(220, 255, 0, sendMovementGCode, "G28 Y0")
+addColorCommand(200, 255, 0, sendMovementGCode, "G28 Z0")
 
+# Set temperatures
 addTextButton(180, 0, 160, 180, 0, 140, 'set', sendGCode, "M104 S%d")
 addTextButton(180, 0, 180, 180, 0, 150, 'set', sendGCode, "M140 S%d")