chiark / gitweb /
Add experimental new advanced print window
authorYouness Alaoui <kakaroto@kakaroto.homelinux.net>
Wed, 15 Jul 2015 17:35:49 +0000 (13:35 -0400)
committerYouness Alaoui <kakaroto@kakaroto.homelinux.net>
Wed, 15 Jul 2015 20:31:01 +0000 (16:31 -0400)
Cura/gui/printWindow.py
Cura/gui/sceneView.py
Cura/util/profile.py

index 920367f3f8192b963b6c5830717e0400afec09f3..020f385474e00c088cb427f32d931d93eb87f22b 100644 (file)
@@ -7,6 +7,7 @@ import sys
 import os
 import ctypes
 import subprocess
+from Cura.util import resources
 
 #TODO: This does not belong here!
 if sys.platform.startswith('win'):
@@ -567,6 +568,377 @@ class printWindowBasic(wx.Frame):
                        self.cancelButton.Enable(False)
                self.errorLogButton.Show(self._printerConnection.isInErrorState())
 
+class printWindowAdvanced(wx.Frame):
+       def __init__(self, parent, printerConnection):
+               super(printWindowAdvanced, self).__init__(parent, -1, style=wx.CLOSE_BOX|wx.CLIP_CHILDREN|wx.CAPTION|wx.SYSTEM_MENU|wx.FRAME_FLOAT_ON_PARENT|wx.MINIMIZE_BOX, title=_("Printing on %s") % (printerConnection.getName()))
+               self._printerConnection = printerConnection
+               self._lastUpdateTime = time.time()
+               self._isPrinting = False
+
+               self.SetSizer(wx.BoxSizer())
+               self.panel = wx.Panel(self)
+               self.GetSizer().Add(self.panel, 1, flag=wx.EXPAND)
+               self.sizer = wx.GridBagSizer(2, 2)
+               self.panel.SetSizer(self.sizer)
+               self.panel.SetBackgroundColour(wx.WHITE)
+               self._termHistory = []
+               self._termHistoryIdx = 0
+
+               self._mapImage = wx.Image(resources.getPathForImage('print-window-map.png'))
+               self._colorCommandMap = {}
+
+               # Move X
+               self._addMovementCommand(0, 0, 255, self._moveX, 100)
+               self._addMovementCommand(0, 0, 240, self._moveX, 10)
+               self._addMovementCommand(0, 0, 220, self._moveX, 1)
+               self._addMovementCommand(0, 0, 200, self._moveX, 0.1)
+               self._addMovementCommand(0, 0, 180, self._moveX, -0.1)
+               self._addMovementCommand(0, 0, 160, self._moveX, -1)
+               self._addMovementCommand(0, 0, 140, self._moveX, -10)
+               self._addMovementCommand(0, 0, 120, self._moveX, -100)
+
+               # Move Y
+               self._addMovementCommand(0, 255, 0, self._moveY, -100)
+               self._addMovementCommand(0, 240, 0, self._moveY, -10)
+               self._addMovementCommand(0, 220, 0, self._moveY, -1)
+               self._addMovementCommand(0, 200, 0, self._moveY, -0.1)
+               self._addMovementCommand(0, 180, 0, self._moveY, 0.1)
+               self._addMovementCommand(0, 160, 0, self._moveY, 1)
+               self._addMovementCommand(0, 140, 0, self._moveY, 10)
+               self._addMovementCommand(0, 120, 0, self._moveY, 100)
+
+               # Move Z
+               self._addMovementCommand(255, 0, 0, self._moveZ, -10)
+               self._addMovementCommand(220, 0, 0, self._moveZ, -1)
+               self._addMovementCommand(200, 0, 0, self._moveZ, -0.1)
+               self._addMovementCommand(180, 0, 0, self._moveZ, 0.1)
+               self._addMovementCommand(160, 0, 0, self._moveZ, 1)
+               self._addMovementCommand(140, 0, 0, self._moveZ, 10)
+
+               # Extrude/Retract
+               self._addMovementCommand(255, 80, 0, self._moveE, 10)
+               self._addMovementCommand(255, 180, 0, self._moveE, -10)
+
+               # Home
+               self._addMovementCommand(255, 255, 0, self._homeXYZ, None)
+               self._addMovementCommand(240, 255, 0, self._homeXYZ, "X")
+               self._addMovementCommand(220, 255, 0, self._homeXYZ, "Y")
+               self._addMovementCommand(200, 255, 0, self._homeXYZ, "Z")
+
+               self.powerWarningText = wx.StaticText(parent=self.panel,
+                       id=-1,
+                       label=_("Your computer is running on battery power.\nConnect your computer to AC power or your print might not finish."),
+                       style=wx.ALIGN_CENTER)
+               self.powerWarningText.SetBackgroundColour('red')
+               self.powerWarningText.SetForegroundColour('white')
+               self.powerManagement = power.PowerManagement()
+               self.powerWarningTimer = wx.Timer(self)
+               self.Bind(wx.EVT_TIMER, self.OnPowerWarningChange, self.powerWarningTimer)
+               self.OnPowerWarningChange(None)
+               self.powerWarningTimer.Start(1000)
+
+               self.connectButton = wx.Button(self.panel, -1, _("Connect"), size=(125, 30))
+               self.printButton = wx.Button(self.panel, -1, _("Print"), size=(125, 30))
+               self.cancelButton = wx.Button(self.panel, -1, _("Cancel"), size=(125, 30))
+               self.errorLogButton = wx.Button(self.panel, -1, _("Error log"), size=(125, 30))
+               self.motorsOffButton = wx.Button(self.panel, -1, _("Motors off"), size=(125, 30))
+               self.movementBitmap = wx.StaticBitmap(self.panel, -1, wx.BitmapFromImage(wx.Image(
+                               resources.getPathForImage('print-window.png'))), (0, 0))
+               self.temperatureBitmap = wx.StaticBitmap(self.panel, -1, wx.BitmapFromImage(wx.Image(
+                               resources.getPathForImage('print-window-temperature.png'))), (0, 0))
+               self.temperatureField = TemperatureField(self.panel)
+               self.temperatureBedBitmap = wx.StaticBitmap(self.panel, -1, wx.BitmapFromImage(wx.Image(
+                               resources.getPathForImage('print-window-temperature-bed.png'))), (0, 0))
+               self.temperatureBedField = TemperatureField(self.panel)
+               self.temperatureGraph = TemperatureGraph(self.panel)
+               self.progress = wx.Gauge(self.panel, -1, range=1000)
+
+               f = wx.Font(8, wx.FONTFAMILY_MODERN, wx.FONTSTYLE_NORMAL, wx.FONTWEIGHT_NORMAL, False)
+               self._termLog = wx.TextCtrl(self.panel, style=wx.TE_MULTILINE | wx.TE_DONTWRAP)
+               self._termLog.SetFont(f)
+               self._termLog.SetEditable(0)
+               self._termInput = wx.TextCtrl(self.panel, style=wx.TE_PROCESS_ENTER)
+               self._termInput.SetFont(f)
+
+               self.Bind(wx.EVT_TEXT_ENTER, self.OnTermEnterLine, self._termInput)
+               self._termInput.Bind(wx.EVT_CHAR, self.OnTermKey)
+
+               self.sizer.Add(self.powerWarningText, pos=(0, 0), span=(1, 6), flag=wx.EXPAND|wx.BOTTOM, border=5)
+               self.sizer.Add(self.connectButton, pos=(1, 0), flag=wx.LEFT, border=2)
+               self.sizer.Add(self.printButton, pos=(1, 1), flag=wx.LEFT, border=2)
+               self.sizer.Add(self.cancelButton, pos=(1, 2), flag=wx.LEFT, border=2)
+               self.sizer.Add(self.errorLogButton, pos=(1, 4), flag=wx.LEFT, border=2)
+               self.sizer.Add(self.motorsOffButton, pos=(1, 5), flag=wx.LEFT|wx.RIGHT, border=2)
+               self.sizer.Add(self.movementBitmap, pos=(2, 0), span=(2, 3))
+               self.sizer.Add(self.temperatureGraph, pos=(4, 0), span=(4, 2), flag=wx.EXPAND)
+               self.sizer.Add(self.temperatureBitmap, pos=(4, 2), span=(1, 1), flag=wx.EXPAND)
+               self.sizer.Add(self.temperatureField, pos=(5, 2), span=(1, 1), flag=wx.EXPAND)
+               self.sizer.Add(self.temperatureBedBitmap, pos=(6, 2), span=(1, 1), flag=wx.EXPAND)
+               self.sizer.Add(self.temperatureBedField, pos=(7, 2), span=(1, 1), flag=wx.EXPAND)
+               self.sizer.Add(self._termLog, pos=(2, 3), span=(5, 3), flag=wx.EXPAND)
+               self.sizer.Add(self._termInput, pos=(7, 3), span=(1, 3), flag=wx.EXPAND)
+               self.sizer.Add(self.progress, pos=(8, 0), span=(1, 6), flag=wx.EXPAND|wx.BOTTOM)
+
+               self.Bind(wx.EVT_SIZE, self.OnSize)
+               self.Bind(wx.EVT_CLOSE, self.OnClose)
+               self.movementBitmap.Bind(wx.EVT_LEFT_DOWN, self.OnLeftClick)
+               self.connectButton.Bind(wx.EVT_BUTTON, self.OnConnect)
+               self.printButton.Bind(wx.EVT_BUTTON, self.OnPrint)
+               self.cancelButton.Bind(wx.EVT_BUTTON, self.OnCancel)
+               self.errorLogButton.Bind(wx.EVT_BUTTON, self.OnErrorLog)
+               self.motorsOffButton.Bind(wx.EVT_BUTTON, self.OnMotorsOff)
+
+               self.Layout()
+               self.Fit()
+               self.Refresh()
+               self.progress.SetMinSize(self.progress.GetSize())
+               self._updateButtonStates()
+
+               self._printerConnection.addCallback(self._doPrinterConnectionUpdate)
+
+               if self._printerConnection.hasActiveConnection() and \
+                  not self._printerConnection.isActiveConnectionOpen():
+                       self._printerConnection.openActiveConnection()
+
+       def OnSize(self, e):
+               # HACK ALERT: This is needed for some reason otherwise the window
+               # will be bigger than it should be until a power warning change
+               self.Layout()
+               self.Fit()
+
+       def OnClose(self, e):
+               if self._printerConnection.hasActiveConnection():
+                       if self._printerConnection.isPrinting() or self._printerConnection.isPaused():
+                               pass #TODO: Give warning that the close will kill the print.
+                       self._printerConnection.closeActiveConnection()
+               self._printerConnection.removeCallback(self._doPrinterConnectionUpdate)
+               #TODO: When multiple printer windows are open, closing one will enable sleeping again.
+               preventComputerFromSleeping(self, False)
+               self._printerConnection.cancelPrint()
+               self.Destroy()
+
+       def OnPowerWarningChange(self, e):
+               type = self.powerManagement.get_providing_power_source_type()
+               if type == power.POWER_TYPE_AC and self.powerWarningText.IsShown():
+                       self.powerWarningText.Hide()
+                       self.panel.Layout()
+                       self.Layout()
+                       self.Fit()
+                       self.Refresh()
+               elif type != power.POWER_TYPE_AC and not self.powerWarningText.IsShown():
+                       self.powerWarningText.Show()
+                       self.panel.Layout()
+                       self.Layout()
+                       self.Fit()
+                       self.Refresh()
+
+       def script_addTextButton(self, r_text, g_text, b_text, r_button, g_button, b_button, button_text, command, data):
+               x_text, y_text, w_text, h_text = self._getColoredRect(r_text, g_text, b_text)
+               if x_text < 0:
+                       return
+               x_button, y_button, w_button, h_button = self._getColoredRect(r_button, g_button, b_button)
+               if x_button < 0:
+                       return
+               from wx.lib.intctrl import IntCtrl
+               text = IntCtrl(self, -1)
+               text.SetBounds(0, 300)
+               text.SetPosition((x_text, y_text))
+               text.SetSize((w_text, h_text))
+
+               button = wx.Button(self, -1, _(button_text))
+               button.SetPosition((x_button, y_button))
+               button.SetSize((w_button, h_button))
+               button.command = command
+               button.data = data
+               self._buttonList.append(button)
+               self.Bind(wx.EVT_BUTTON, lambda e: command(data % text.GetValue()), button)
+
+       def OnConnect(self, e):
+               self._printerConnection.openActiveConnection()
+
+       def OnPrint(self, e):
+               if self._printerConnection.isPrinting() or self._printerConnection.isPaused():
+                       self._printerConnection.pause(not self._printerConnection.isPaused())
+               else:
+                       self._printerConnection.startPrint()
+
+       def OnCancel(self, e):
+               self._printerConnection.cancelPrint()
+
+       def OnErrorLog(self, e):
+               LogWindow(self._printerConnection.getErrorLog())
+
+       def OnMotorsOff(self, e):
+               self._printerConnection.sendCommand("M18")
+
+       def GetMapRGB(self, x, y):
+               r = self._mapImage.GetRed(x, y)
+               g = self._mapImage.GetGreen(x, y)
+               b = self._mapImage.GetBlue(x, y)
+               return (r, g, b)
+
+       def OnLeftClick(self, e):
+               (r, g, b) = self.GetMapRGB(e.GetX(), e.GetY())
+               if (r, g, b) in self._colorCommandMap:
+                       command = self._colorCommandMap[(r, g, b)]
+                       command[0](command[1])
+
+       def _addMovementCommand(self, r, g, b, command, step):
+               self._colorCommandMap[(r, g, b)] = (command, step)
+
+       def _moveXYZE(self, step, feedrate):
+               if (not self._printerConnection.hasActiveConnection() or \
+                       self._printerConnection.isActiveConnectionOpen()) and \
+                       (not self._printerConnection.isPaused() and \
+                        not self._printerConnection.isPrinting()):
+                       self._printerConnection.sendCommand("G91")
+                       self._printerConnection.sendCommand("G1 X%d F%d" % (step, feedrate))
+                       self._printerConnection.sendCommand("G90")
+
+       def _moveX(self, step):
+               self._moveXYZE(step, 2000)
+
+       def _moveY(self, step):
+               self._moveXYZE(step, 2000)
+
+       def _moveZ(self, step):
+               self._moveXYZE(step, 200)
+
+       def _moveE(self, step):
+               self._moveXYZE(step, 120)
+
+       def _homeXYZ(self, direction):
+               if not self._printerConnection.isPaused() and not self._printerConnection.isPrinting():
+                       if direction is None:
+                               self._printerConnection.sendCommand("G28")
+                       else:
+                               self._printerConnection.sendCommand("G28 %s0" % direction)
+
+       def OnTermEnterLine(self, e):
+               if not self._printerConnection.isAbleToSendDirectCommand():
+                       return
+               line = self._termInput.GetValue()
+               if line == '':
+                       return
+               self._addTermLog('> %s\n' % (line))
+               self._printerConnection.sendCommand(line)
+               self._termHistory.append(line)
+               self._termHistoryIdx = len(self._termHistory)
+               self._termInput.SetValue('')
+
+       def OnTermKey(self, e):
+               if len(self._termHistory) > 0:
+                       if e.GetKeyCode() == wx.WXK_UP:
+                               self._termHistoryIdx -= 1
+                               if self._termHistoryIdx < 0:
+                                       self._termHistoryIdx = len(self._termHistory) - 1
+                               self._termInput.SetValue(self._termHistory[self._termHistoryIdx])
+                       if e.GetKeyCode() == wx.WXK_DOWN:
+                               self._termHistoryIdx -= 1
+                               if self._termHistoryIdx >= len(self._termHistory):
+                                       self._termHistoryIdx = 0
+                               self._termInput.SetValue(self._termHistory[self._termHistoryIdx])
+               e.Skip()
+
+       def _addTermLog(self, line):
+               if self._termLog is not None:
+                       if len(self._termLog.GetValue()) > 10000:
+                               self._termLog.SetValue(self._termLog.GetValue()[-10000:])
+                       self._termLog.SetInsertionPointEnd()
+                       if type(line) != unicode:
+                               line = unicode(line, 'utf-8', 'replace')
+                       self._termLog.AppendText(line.encode('utf-8', 'replace'))
+
+       def _updateButtonStates(self):
+               self.connectButton.Show(self._printerConnection.hasActiveConnection())
+               self.connectButton.Enable(not self._printerConnection.isActiveConnectionOpen() and \
+                                                                 not self._printerConnection.isActiveConnectionOpening())
+               if not self._printerConnection.hasPause():
+                       if not self._printerConnection.hasActiveConnection() or \
+                          self._printerConnection.isActiveConnectionOpen():
+                               self.printButton.Enable(not self._printerConnection.isPrinting() and \
+                                                                               not self._printerConnection.isPaused())
+                       else:
+                               self.printButton.Enable(False)
+               else:
+                       if not self._printerConnection.hasActiveConnection() or \
+                          self._printerConnection.isActiveConnectionOpen():
+                               if self._printerConnection.isPrinting():
+                                       self.printButton.SetLabel(_("Pause"))
+                               else:
+                                       if self._printerConnection.isPaused():
+                                               self.printButton.SetLabel(_("Resume"))
+                                       else:
+                                               self.printButton.SetLabel(_("Print"))
+                               self.printButton.Enable(True)
+                       else:
+                               self.printButton.Enable(False)
+               if not self._printerConnection.hasActiveConnection() or \
+                  self._printerConnection.isActiveConnectionOpen():
+                       self.cancelButton.Enable(self._printerConnection.isPrinting() or \
+                                                                        self._printerConnection.isPaused())
+               else:
+                       self.cancelButton.Enable(False)
+               self.errorLogButton.Show(self._printerConnection.isInErrorState())
+               self._termInput.Enable(self._printerConnection.isAbleToSendDirectCommand())
+
+       def _doPrinterConnectionUpdate(self, connection, extraInfo = None):
+               wx.CallAfter(self.__doPrinterConnectionUpdate, connection, extraInfo)
+               if self.temperatureGraph is not None:
+                       temp = []
+                       for n in xrange(0, 4):
+                               t = connection.getTemperature(0)
+                               if t is not None:
+                                       temp.append(t)
+                               else:
+                                       break
+                       self.temperatureGraph.addPoint(temp, [0] * len(temp), connection.getBedTemperature(), 0)
+
+       def __doPrinterConnectionUpdate(self, connection, extraInfo):
+               t = time.time()
+               if self._lastUpdateTime + 0.5 > t and extraInfo is None:
+                       return
+               self._lastUpdateTime = t
+
+               if extraInfo is not None and len(extraInfo) > 0:
+                       self._addTermLog('< %s\n' % (extraInfo))
+
+               self._updateButtonStates()
+               isPrinting = connection.isPrinting() or connection.isPaused()
+               if isPrinting:
+                       self.progress.SetValue(connection.getPrintProgress() * 1000)
+               else:
+                       self.progress.SetValue(0)
+               info = connection.getStatusString()
+               info += '\n'
+               if self._printerConnection.getTemperature(0) is not None:
+                       info += 'Temperature: %d' % (self._printerConnection.getTemperature(0))
+               if self._printerConnection.getBedTemperature() > 0:
+                       info += ' Bed: %d' % (self._printerConnection.getBedTemperature())
+               self.SetTitle(info.replace('\n', ', '))
+               if isPrinting != self._isPrinting:
+                       self._isPrinting = isPrinting
+                       preventComputerFromSleeping(self, self._isPrinting)
+
+class TemperatureField(wx.Panel):
+       def __init__(self, parent, callback):
+               super(TemperatureField, self).__init__(parent)
+               self.callback = callback
+               
+               self.SetBackgroundColour(wx.WHITE)
+               self.sizer = wx.BoxSizer()
+               self.SetSizer(self.sizer)
+               self.sizer.SetOrientation(wx.HORIZONTAL)
+
+               self.text = IntCtrl(self, -1)
+               self.text.SetBounds(0, 300)
+               self.sizer.Add(self.text, 1, flag=wx.EXPAND)
+
+               self.button = wx.Button(self, -1, _("Set"))
+               self.sizer.Add(self.button, 0)
+               self.Bind(wx.EVT_BUTTON, lambda e: self.callback(self.text.GetValue()), self.button)
+
+
 class TemperatureGraph(wx.Panel):
        def __init__(self, parent):
                super(TemperatureGraph, self).__init__(parent)
@@ -695,7 +1067,6 @@ class TemperatureGraph(wx.Panel):
                self._points.append((temp[:], tempSP[:], bedTemp, bedTempSP, time.time()))
                wx.CallAfter(self.UpdateDrawing)
 
-
 class LogWindow(wx.Frame):
        def __init__(self, logText):
                super(LogWindow, self).__init__(None, title=_("Error log"))
index 9c6af21ca3228a40fe27d8525583657a498ce695..e7143defb3f28b4a0d1f24334cb99e57d741c2d1 100644 (file)
@@ -356,7 +356,11 @@ class SceneView(openglGui.glGuiPanel):
                                        connection.window = printWindow.printWindowPlugin(self, connection, p.getFullFilename())
                                        break
                        if connection.window is None:
-                               connection.window = printWindow.printWindowBasic(self, connection)
+                               if windowType == "Basic":
+                                       connection.window = printWindow.printWindowBasic(self, connection)
+                               else:
+                                       connection.window = printWindow.printWindowAdvanced(self, connection)
+
                connection.window.Show()
                connection.window.Raise()
                if not connection.loadGCodeData(self._engine.getResult().getGCode()):
index 693607068c41bf3f2c496a99ed31c26b4c771cf4..82a0db564b8fa7bef2154f386b93b7d198680f1c 100644 (file)
@@ -1359,6 +1359,7 @@ def getAlterationFileContents(filename, extruderCount = 1):
        return unicode(prefix + re.sub("(.)\{([^\}]*)\}", replaceTagMatch, alterationContents).rstrip() + '\n' + postfix).strip().encode('utf-8') + '\n'
 
 def performVersionUpgrade():
+       putPreference("printing_window", "Advanced")
        for n in xrange(0, getMachineCount()):
                # This is a hack around an issue where the machine type in the wizard
                # changed and causes some people to have it set to lulzbot_TAZ and some