Add temperature and extruder control to pronterface UI.

diff --git a/Cura/gui/printWindow.py b/Cura/gui/printWindow.py
index 089bfd8eca1897eb1a0a6794e60f1623b0a07ab3..9997dc64cfbfe9253a687e2f3440baed46da2475 100644 (file)
--- a/Cura/gui/printWindow.py
+++ b/Cura/gui/printWindow.py
@@ -52,6 +52,7 @@ class printWindowPlugin(wx.Frame):
                        'addTemperatureGraph': self.script_addTemperatureGraph,
                        'addProgressbar': self.script_addProgressbar,
                        'addButton': self.script_addButton,
+                       'addSpinner': self.script_addSpinner,
 
                        'sendGCode': self.script_sendGCode,
                        'connect': self.script_connect,
@@ -131,6 +132,19 @@ class printWindowPlugin(wx.Frame):
                self._buttonList.append(button)
                self.Bind(wx.EVT_BUTTON, lambda e: command(data), button)
 
+       def script_addSpinner(self, r, g, b, command, data):
+               x, y, w, h = self._getColoredRect(r, g, b)
+               if x < 0:
+                       return
+               spinner = wx.SpinCtrl(self, -1, style=wx.TE_PROCESS_ENTER)
+               spinner.SetRange(0, 300)
+               spinner.SetPosition((x, y))
+               spinner.SetSize((w, h))
+               spinner.command = command
+               spinner.data = data
+               self._buttonList.append(spinner)
+               self.Bind(wx.EVT_SPINCTRL, lambda e: command(data % (spinner.GetValue())), spinner)
+
        def _getColoredRect(self, r, g, b):
                for x in xrange(0, self._mapImage.GetWidth()):
                        for y in xrange(0, self._mapImage.GetHeight()):

diff --git a/plugins/PronterfaceUI/image.png b/plugins/PronterfaceUI/image.png
index fc2c9980aa8364f5f01775ac74226f3296860473..2b896bdbe29761c442ca34d205ebb1c3f3ff5ab1 100644 (file)
Binary files a/plugins/PronterfaceUI/image.png and b/plugins/PronterfaceUI/image.png differ

diff --git a/plugins/PronterfaceUI/map.png b/plugins/PronterfaceUI/map.png
index ae414e0602836be1e27c5f1aa142bb4ce6b86b85..664f570175e590629e366d97106ff5c70d690825 100644 (file)
Binary files a/plugins/PronterfaceUI/map.png and b/plugins/PronterfaceUI/map.png differ

diff --git a/plugins/PronterfaceUI/script.py b/plugins/PronterfaceUI/script.py
index c950f0c581705b5a64f8ec7765b59f43ba631020..4503f596a0896723e88e2207d84b1e4e8fbfcb65 100644 (file)
--- a/plugins/PronterfaceUI/script.py
+++ b/plugins/PronterfaceUI/script.py
@@ -33,11 +33,21 @@ 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")
 
+addColorCommand(255, 180, 0, sendGCode, "G91; G1 E10 F120; G90")
+addColorCommand(255, 160, 0, sendGCode, "G91; G1 E1 F120; G90")
+addColorCommand(255, 140, 0, sendGCode, "G91; G1 E0.1 F120; G90")
+addColorCommand(255, 120, 0, sendGCode, "G91; G1 E-0.1 F120; G90")
+addColorCommand(255, 100, 0, sendGCode, "G91; G1 E-1 F120; G90")
+addColorCommand(255,  80, 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")
 
+addSpinner(180, 0, 160, sendGCode, "M104 S%d")
+addSpinner(180, 0, 180, sendGCode, "M140 S%d")
+
 addTerminal(255, 0, 255)
 addTemperatureGraph(180, 0, 255)
 addProgressbar(255, 200, 200)