chiark / gitweb /
Fix resources, imports and indentations.
authorIlya Kulakov <kulakov.ilya@gmail.com>
Wed, 5 Dec 2012 12:14:06 +0000 (19:14 +0700)
committerIlya Kulakov <kulakov.ilya@gmail.com>
Wed, 5 Dec 2012 12:14:06 +0000 (19:14 +0700)
Cura/cura.py
Cura/gui/configWizard.py
Cura/gui/opengl.py
Cura/gui/printWindow.py
Cura/gui/splashScreen.py
Cura/gui/toolbarUtil.py
Cura/gui/webcam.py
Cura/util/resources.py [new file with mode: 0644]

index 35fb8f68fc222f20593074d1c6e9781bec7c922f..65813ae4961eab07b083c3efda649364a186b495 100644 (file)
@@ -9,10 +9,7 @@ The slicing code is the same as Skeinforge. But the UI has been revamped to be..
 
 """
 from __future__ import absolute_import
-import __init__
 
-import sys
-import platform
 from optparse import OptionParser
 
 from util import profile
@@ -36,6 +33,7 @@ Reece.Arnott <http://forums.reprap.org/profile.php?12,152>
 Wade <http://forums.reprap.org/profile.php?12,489>
 Xsainnz <http://forums.reprap.org/profile.php?12,563>
 Zach Hoeken <http://blog.zachhoeken.com/>
+Ilya Kulakov (kulakov.ilya@gmail.com)
 
 Organizations:
 Ultimaker <http://www.ultimaker.com>
@@ -45,12 +43,18 @@ __license__ = 'GNU Affero General Public License http://www.gnu.org/licenses/agp
 
 def main():
        parser = OptionParser(usage="usage: %prog [options] <filename>.stl")
-       parser.add_option("-i", "--ini", action="store", type="string", dest="profileini", help="Load settings from a profile ini file")
-       parser.add_option("-P", "--project", action="store_true", dest="openprojectplanner", help="Open the project planner")
-       parser.add_option("-F", "--flat", action="store_true", dest="openflatslicer", help="Open the 2D SVG slicer (unfinished)")
-       parser.add_option("-r", "--print", action="store", type="string", dest="printfile", help="Open the printing interface, instead of the normal cura interface.")
-       parser.add_option("-p", "--profile", action="store", type="string", dest="profile", help="Internal option, do not use!")
-       parser.add_option("-s", "--slice", action="store_true", dest="slice", help="Slice the given files instead of opening them in Cura")
+       parser.add_option("-i", "--ini", action="store", type="string", dest="profileini",
+               help="Load settings from a profile ini file")
+       parser.add_option("-P", "--project", action="store_true", dest="openprojectplanner",
+               help="Open the project planner")
+       parser.add_option("-F", "--flat", action="store_true", dest="openflatslicer",
+               help="Open the 2D SVG slicer (unfinished)")
+       parser.add_option("-r", "--print", action="store", type="string", dest="printfile",
+               help="Open the printing interface, instead of the normal cura interface.")
+       parser.add_option("-p", "--profile", action="store", type="string", dest="profile",
+               help="Internal option, do not use!")
+       parser.add_option("-s", "--slice", action="store_true", dest="slice",
+               help="Slice the given files instead of opening them in Cura")
        (options, args) = parser.parse_args()
        if options.profile != None:
                profile.loadGlobalProfileFromString(options.profile)
@@ -58,30 +62,36 @@ def main():
                profile.loadGlobalProfile(options.profileini)
        if options.openprojectplanner != None:
                from gui import projectPlanner
+
                projectPlanner.main()
                return
        if options.openflatslicer != None:
                from gui import flatSlicerWindow
+
                flatSlicerWindow.main()
                return
        if options.printfile != None:
                from gui import printWindow
+
                printWindow.startPrintInterface(options.printfile)
                return
 
        if options.slice != None:
                from util import sliceRun
+
                sliceRun.runSlice(args)
        else:
                if len(args) > 0:
                        profile.putPreference('lastFile', ';'.join(args))
                from gui import splashScreen
+
                splashScreen.showSplash(mainWindowRunCallback)
 
+
 def mainWindowRunCallback(splash):
        from gui import mainWindow
+
        mainWindow.main(splash)
 
 if __name__ == '__main__':
        main()
-
index 740832f6006c6b6b5110c172e5e823e814f3224f..daed5adbe486e397a74f8c79b811d709b410d43c 100644 (file)
-from __future__ import absolute_import\r
-import __init__\r
-\r
-import wx, os, platform, types, webbrowser, threading, time, re\r
-import wx.wizard\r
-\r
-from gui import firmwareInstall\r
-from gui import toolbarUtil\r
-from util import machineCom\r
-from util import profile\r
-\r
-class InfoBox(wx.Panel):\r
-       def __init__(self, parent):\r
-               super(InfoBox, self).__init__(parent)\r
-               self.SetBackgroundColour('#FFFF80')\r
-               \r
-               self.sizer = wx.GridBagSizer(5, 5)\r
-               self.SetSizer(self.sizer)\r
-               \r
-               self.attentionBitmap = toolbarUtil.getBitmapImage('attention.png')\r
-               self.errorBitmap = toolbarUtil.getBitmapImage('error.png')\r
-               self.readyBitmap = toolbarUtil.getBitmapImage('ready.png')\r
-               self.busyBitmap = [toolbarUtil.getBitmapImage('busy-0.png'), toolbarUtil.getBitmapImage('busy-1.png'), toolbarUtil.getBitmapImage('busy-2.png'), toolbarUtil.getBitmapImage('busy-3.png')]\r
-               \r
-               self.bitmap = wx.StaticBitmap(self, -1, wx.EmptyBitmapRGBA(24, 24, red=255, green=255, blue=255, alpha=1))\r
-               self.text = wx.StaticText(self, -1, '')\r
-               self.sizer.Add(self.bitmap, pos=(0,0), flag=wx.ALL, border=5)\r
-               self.sizer.Add(self.text, pos=(0,1), flag=wx.TOP|wx.BOTTOM|wx.ALIGN_CENTER_VERTICAL, border=5)\r
-               \r
-               self.busyState = None\r
-               self.timer = wx.Timer(self)\r
-               self.Bind(wx.EVT_TIMER, self.doBusyUpdate, self.timer)\r
-               self.timer.Start(100)\r
-\r
-       def SetInfo(self, info):\r
-               self.SetBackgroundColour('#FFFF80')\r
-               self.text.SetLabel(info)\r
-               self.Refresh()\r
-\r
-       def SetError(self, info):\r
-               self.SetBackgroundColour('#FF8080')\r
-               self.text.SetLabel(info)\r
-               self.SetErrorIndicator()\r
-               self.Refresh()\r
-       \r
-       def SetAttention(self, info):\r
-               self.SetBackgroundColour('#FFFF80')\r
-               self.text.SetLabel(info)\r
-               self.SetAttentionIndicator()\r
-               self.Refresh()\r
-       \r
-       def SetBusyIndicator(self):\r
-               self.busyState = 0\r
-               self.bitmap.SetBitmap(self.busyBitmap[self.busyState])\r
-       \r
-       def doBusyUpdate(self, e):\r
-               if self.busyState == None:\r
-                       return\r
-               self.busyState += 1\r
-               if self.busyState >= len(self.busyBitmap):\r
-                       self.busyState = 0\r
-               self.bitmap.SetBitmap(self.busyBitmap[self.busyState])\r
-       \r
-       def SetReadyIndicator(self):\r
-               self.busyState = None\r
-               self.bitmap.SetBitmap(self.readyBitmap)\r
-       \r
-       def SetErrorIndicator(self):\r
-               self.busyState = None\r
-               self.bitmap.SetBitmap(self.errorBitmap)\r
-       \r
-       def SetAttentionIndicator(self):\r
-               self.busyState = None\r
-               self.bitmap.SetBitmap(self.attentionBitmap)\r
-\r
-class InfoPage(wx.wizard.WizardPageSimple):\r
-       def __init__(self, parent, title):\r
-               wx.wizard.WizardPageSimple.__init__(self, parent)\r
-\r
-               sizer = wx.GridBagSizer(5, 5)\r
-               self.sizer = sizer\r
-               self.SetSizer(sizer)\r
-\r
-               title = wx.StaticText(self, -1, title)\r
-               title.SetFont(wx.Font(18, wx.SWISS, wx.NORMAL, wx.BOLD))\r
-               sizer.Add(title, pos=(0, 0), span=(1,2), flag=wx.ALIGN_CENTRE|wx.ALL)\r
-               sizer.Add(wx.StaticLine(self, -1), pos=(1,0), span=(1,2), flag=wx.EXPAND|wx.ALL)\r
-               sizer.AddGrowableCol(1)\r
-               \r
-               self.rowNr = 2\r
-       \r
-       def AddText(self,info):\r
-               text = wx.StaticText(self, -1, info)\r
-               self.GetSizer().Add(text, pos=(self.rowNr, 0), span=(1,2), flag=wx.LEFT|wx.RIGHT)\r
-               self.rowNr += 1\r
-               return text\r
-       \r
-       def AddSeperator(self):\r
-               self.GetSizer().Add(wx.StaticLine(self, -1), pos=(self.rowNr, 0), span=(1,2), flag=wx.EXPAND|wx.ALL)\r
-               self.rowNr += 1\r
-       \r
-       def AddHiddenSeperator(self):\r
-               self.AddText('')\r
-\r
-       def AddInfoBox(self):\r
-               infoBox = InfoBox(self)\r
-               self.GetSizer().Add(infoBox, pos=(self.rowNr, 0), span=(1,2), flag=wx.LEFT|wx.RIGHT|wx.EXPAND)\r
-               self.rowNr += 1\r
-               return infoBox\r
-       \r
-       def AddRadioButton(self, label, style = 0):\r
-               radio = wx.RadioButton(self, -1, label, style=style)\r
-               self.GetSizer().Add(radio, pos=(self.rowNr, 0), span=(1,2), flag=wx.EXPAND|wx.ALL)\r
-               self.rowNr += 1\r
-               return radio\r
-\r
-       def AddCheckbox(self, label, checked = False):\r
-               check = wx.CheckBox(self, -1)\r
-               text = wx.StaticText(self, -1, label)\r
-               check.SetValue(checked)\r
-               self.GetSizer().Add(text, pos=(self.rowNr, 0), span=(1,1), flag=wx.LEFT|wx.RIGHT)\r
-               self.GetSizer().Add(check, pos=(self.rowNr, 1), span=(1,2), flag=wx.ALL)\r
-               self.rowNr += 1\r
-               return check\r
-       \r
-       def AddButton(self, label):\r
-               button = wx.Button(self, -1, label)\r
-               self.GetSizer().Add(button, pos=(self.rowNr, 0), span=(1,2), flag=wx.LEFT)\r
-               self.rowNr += 1\r
-               return button\r
-       \r
-       def AddDualButton(self, label1, label2):\r
-               button1 = wx.Button(self, -1, label1)\r
-               self.GetSizer().Add(button1, pos=(self.rowNr, 0), flag=wx.RIGHT)\r
-               button2 = wx.Button(self, -1, label2)\r
-               self.GetSizer().Add(button2, pos=(self.rowNr, 1))\r
-               self.rowNr += 1\r
-               return button1, button2\r
-       \r
-       def AddTextCtrl(self, value):\r
-               ret = wx.TextCtrl(self, -1, value)\r
-               self.GetSizer().Add(ret, pos=(self.rowNr, 0), span=(1,2), flag=wx.LEFT)\r
-               self.rowNr += 1\r
-               return ret\r
-\r
-       def AddLabelTextCtrl(self, info, value):\r
-               text = wx.StaticText(self, -1, info)\r
-               ret = wx.TextCtrl(self, -1, value)\r
-               self.GetSizer().Add(text, pos=(self.rowNr, 0), span=(1,1), flag=wx.LEFT)\r
-               self.GetSizer().Add(ret, pos=(self.rowNr, 1), span=(1,1), flag=wx.LEFT)\r
-               self.rowNr += 1\r
-               return ret\r
-       \r
-       def AddTextCtrlButton(self, value, buttonText):\r
-               text = wx.TextCtrl(self, -1, value)\r
-               button = wx.Button(self, -1, buttonText)\r
-               self.GetSizer().Add(text, pos=(self.rowNr, 0), span=(1,1), flag=wx.LEFT)\r
-               self.GetSizer().Add(button, pos=(self.rowNr, 1), span=(1,1), flag=wx.LEFT)\r
-               self.rowNr += 1\r
-               return text, button\r
-\r
-       def AddBitmap(self, bitmap):\r
-               bitmap = wx.StaticBitmap(self, -1, bitmap)\r
-               self.GetSizer().Add(bitmap, pos=(self.rowNr, 0), span=(1,2), flag=wx.LEFT|wx.RIGHT)\r
-               self.rowNr += 1\r
-               return bitmap\r
-\r
-       def AddCheckmark(self, label, bitmap):\r
-               check = wx.StaticBitmap(self, -1, bitmap)\r
-               text = wx.StaticText(self, -1, label)\r
-               self.GetSizer().Add(text, pos=(self.rowNr, 0), span=(1,1), flag=wx.LEFT|wx.RIGHT)\r
-               self.GetSizer().Add(check, pos=(self.rowNr, 1), span=(1,1), flag=wx.ALL)\r
-               self.rowNr += 1\r
-               return check\r
-               \r
-       def AllowNext(self):\r
-               return True\r
-       \r
-       def StoreData(self):\r
-               pass\r
-\r
-class FirstInfoPage(InfoPage):\r
-       def __init__(self, parent):\r
-               super(FirstInfoPage, self).__init__(parent, "First time run wizard")\r
-               self.AddText('Welcome, and thanks for trying Cura!')\r
-               self.AddSeperator()\r
-               self.AddText('This wizard will help you with the following steps:')\r
-               self.AddText('* Configure Cura for your machine')\r
-               self.AddText('* Upgrade your firmware')\r
-               self.AddText('* Check if your machine is working safely')\r
-               #self.AddText('* Calibrate your machine')\r
-               #self.AddText('* Do your first print')\r
-\r
-class RepRapInfoPage(InfoPage):\r
-       def __init__(self, parent):\r
-               super(RepRapInfoPage, self).__init__(parent, "RepRap information")\r
-               self.AddText('RepRap machines are vastly different, and there is no\ndefault configuration in Cura for any of them.')\r
-               self.AddText('If you like a default profile for your machine added,\nthen make an issue on github.')\r
-               self.AddSeperator()\r
-               self.AddText('You will have to manually install Marlin or Sprinter firmware.')\r
-               self.AddSeperator()\r
-               self.machineWidth = self.AddLabelTextCtrl('Machine width (mm)', '80')\r
-               self.machineDepth = self.AddLabelTextCtrl('Machine depth (mm)', '80')\r
-               self.machineHeight = self.AddLabelTextCtrl('Machine height (mm)', '60')\r
-               self.nozzleSize = self.AddLabelTextCtrl('Nozzle size (mm)', '0.5')\r
-               self.heatedBed = self.AddCheckbox('Heated bed')\r
-\r
-       def StoreData(self):\r
-               profile.putPreference('machine_width', self.machineWidth.GetValue())\r
-               profile.putPreference('machine_depth', self.machineDepth.GetValue())\r
-               profile.putPreference('machine_height', self.machineHeight.GetValue())\r
-               profile.putProfileSetting('nozzle_size', self.nozzleSize.GetValue())\r
-               profile.putProfileSetting('machine_center_x', profile.getPreferenceFloat('machine_width') / 2)\r
-               profile.putProfileSetting('machine_center_y', profile.getPreferenceFloat('machine_depth') / 2)\r
-               profile.putProfileSetting('wall_thickness', float(profile.getProfileSettingFloat('nozzle_size')) * 2)\r
-               profile.putPreference('has_heated_bed', str(self.heatedBed.GetValue()))\r
-\r
-class MachineSelectPage(InfoPage):\r
-       def __init__(self, parent):\r
-               super(MachineSelectPage, self).__init__(parent, "Select your machine")\r
-               self.AddText('What kind of machine do you have:')\r
-\r
-               self.UltimakerRadio = self.AddRadioButton("Ultimaker", style=wx.RB_GROUP)\r
-               self.UltimakerRadio.SetValue(True)\r
-               self.UltimakerRadio.Bind(wx.EVT_RADIOBUTTON, self.OnUltimakerSelect)\r
-               self.OtherRadio = self.AddRadioButton("Other (Ex: RepRap)")\r
-               self.OtherRadio.Bind(wx.EVT_RADIOBUTTON, self.OnOtherSelect)\r
-               \r
-       def OnUltimakerSelect(self, e):\r
-               wx.wizard.WizardPageSimple.Chain(self, self.GetParent().ultimakerFirmwareUpgradePage)\r
-               \r
-       def OnOtherSelect(self, e):\r
-               wx.wizard.WizardPageSimple.Chain(self, self.GetParent().repRapInfoPage)\r
-       \r
-       def StoreData(self):\r
-               if self.UltimakerRadio.GetValue():\r
-                       profile.putPreference('machine_width', '205')\r
-                       profile.putPreference('machine_depth', '205')\r
-                       profile.putPreference('machine_height', '200')\r
-                       profile.putPreference('machine_type', 'ultimaker')\r
-                       profile.putProfileSetting('nozzle_size', '0.4')\r
-                       profile.putProfileSetting('machine_center_x', '100')\r
-                       profile.putProfileSetting('machine_center_y', '100')\r
-               else:\r
-                       profile.putPreference('machine_width', '80')\r
-                       profile.putPreference('machine_depth', '80')\r
-                       profile.putPreference('machine_height', '60')\r
-                       profile.putPreference('machine_type', 'reprap')\r
-                       profile.putPreference('startMode', 'Normal')\r
-                       profile.putProfileSetting('nozzle_size', '0.5')\r
-                       profile.putProfileSetting('machine_center_x', '40')\r
-                       profile.putProfileSetting('machine_center_y', '40')\r
-               profile.putProfileSetting('wall_thickness', float(profile.getProfileSetting('nozzle_size')) * 2)\r
-\r
-class FirmwareUpgradePage(InfoPage):\r
-       def __init__(self, parent):\r
-               super(FirmwareUpgradePage, self).__init__(parent, "Upgrade Ultimaker Firmware")\r
-               self.AddText('Firmware is the piece of software running directly on your 3D printer.\nThis firmware controls the step motors, regulates the temperature\nand ultimately makes your printer work.')\r
-               self.AddHiddenSeperator()\r
-               self.AddText('The firmware shipping with new Ultimakers works, but upgrades\nhave been made to make better prints, and make calibration easier.')\r
-               self.AddHiddenSeperator()\r
-               self.AddText('Cura requires these new features and thus\nyour firmware will most likely need to be upgraded.\nYou will get the chance to do so now.')\r
-               upgradeButton, skipUpgradeButton = self.AddDualButton('Upgrade to Marlin firmware', 'Skip upgrade')\r
-               upgradeButton.Bind(wx.EVT_BUTTON, self.OnUpgradeClick)\r
-               skipUpgradeButton.Bind(wx.EVT_BUTTON, self.OnSkipClick)\r
-               self.AddHiddenSeperator()\r
-               self.AddText('Do not upgrade to this firmware if:')\r
-               self.AddText('* You have an older machine based on ATMega1280')\r
-               self.AddText('* Have other changes in the firmware')\r
-               button = self.AddButton('Goto this page for a custom firmware')\r
-               button.Bind(wx.EVT_BUTTON, self.OnUrlClick)\r
-       \r
-       def AllowNext(self):\r
-               return False\r
-       \r
-       def OnUpgradeClick(self, e):\r
-               if firmwareInstall.InstallFirmware():\r
-                       self.GetParent().FindWindowById(wx.ID_FORWARD).Enable()\r
-               \r
-       def OnSkipClick(self, e):\r
-               self.GetParent().FindWindowById(wx.ID_FORWARD).Enable()\r
-       \r
-       def OnUrlClick(self, e):\r
-               webbrowser.open('http://daid.mine.nu/~daid/marlin_build/')\r
-\r
-class UltimakerCheckupPage(InfoPage):\r
-       def __init__(self, parent):\r
-               super(UltimakerCheckupPage, self).__init__(parent, "Ultimaker Checkup")\r
-\r
-               self.checkBitmap = toolbarUtil.getBitmapImage('checkmark.png')\r
-               self.crossBitmap = toolbarUtil.getBitmapImage('cross.png')\r
-               self.unknownBitmap = toolbarUtil.getBitmapImage('question.png')\r
-               self.endStopNoneBitmap = toolbarUtil.getBitmapImage('endstop_none.png')\r
-               self.endStopXMinBitmap = toolbarUtil.getBitmapImage('endstop_xmin.png')\r
-               self.endStopXMaxBitmap = toolbarUtil.getBitmapImage('endstop_xmax.png')\r
-               self.endStopYMinBitmap = toolbarUtil.getBitmapImage('endstop_ymin.png')\r
-               self.endStopYMaxBitmap = toolbarUtil.getBitmapImage('endstop_ymax.png')\r
-               self.endStopZMinBitmap = toolbarUtil.getBitmapImage('endstop_zmin.png')\r
-               self.endStopZMaxBitmap = toolbarUtil.getBitmapImage('endstop_zmax.png')\r
-\r
-               self.AddText('It is a good idea to do a few sanity checks now on your Ultimaker.\nYou can skip these if you know your machine is functional.')\r
-               b1, b2 = self.AddDualButton('Run checks', 'Skip checks')\r
-               b1.Bind(wx.EVT_BUTTON, self.OnCheckClick)\r
-               b2.Bind(wx.EVT_BUTTON, self.OnSkipClick)\r
-               self.AddSeperator()\r
-               self.commState = self.AddCheckmark('Communication:', self.unknownBitmap)\r
-               self.tempState = self.AddCheckmark('Temperature:', self.unknownBitmap)\r
-               self.stopState = self.AddCheckmark('Endstops:', self.unknownBitmap)\r
-               self.AddSeperator()\r
-               self.infoBox = self.AddInfoBox()\r
-               self.machineState = self.AddText('')\r
-               self.temperatureLabel = self.AddText('')\r
-               self.AddSeperator()\r
-               self.endstopBitmap = self.AddBitmap(self.endStopNoneBitmap)\r
-               self.comm = None\r
-               self.xMinStop = False\r
-               self.xMaxStop = False\r
-               self.yMinStop = False\r
-               self.yMaxStop = False\r
-               self.zMinStop = False\r
-               self.zMaxStop = False\r
-\r
-       def __del__(self):\r
-               if self.comm != None:\r
-                       self.comm.close()\r
-       \r
-       def AllowNext(self):\r
-               self.endstopBitmap.Show(False)\r
-               return False\r
-       \r
-       def OnSkipClick(self, e):\r
-               self.GetParent().FindWindowById(wx.ID_FORWARD).Enable()\r
-       \r
-       def OnCheckClick(self, e = None):\r
-               if self.comm != None:\r
-                       self.comm.close()\r
-                       del self.comm\r
-                       self.comm = None\r
-                       wx.CallAfter(self.OnCheckClick)\r
-                       return\r
-               self.infoBox.SetInfo('Connecting to machine.')\r
-               self.infoBox.SetBusyIndicator()\r
-               self.commState.SetBitmap(self.unknownBitmap)\r
-               self.tempState.SetBitmap(self.unknownBitmap)\r
-               self.stopState.SetBitmap(self.unknownBitmap)\r
-               self.checkupState = 0\r
-               self.comm = machineCom.MachineCom(callbackObject=self)\r
-\r
-       def mcLog(self, message):\r
-               pass\r
-\r
-       def mcTempUpdate(self, temp, bedTemp, targetTemp, bedTargetTemp):\r
-               if not self.comm.isOperational():\r
-                       return\r
-               if self.checkupState == 0:\r
-                       self.tempCheckTimeout = 20\r
-                       if temp > 70:\r
-                               self.checkupState = 1\r
-                               wx.CallAfter(self.infoBox.SetInfo, 'Cooldown before temperature check.')\r
-                               self.comm.sendCommand('M104 S0')\r
-                               self.comm.sendCommand('M104 S0')\r
-                       else:\r
-                               self.startTemp = temp\r
-                               self.checkupState = 2\r
-                               wx.CallAfter(self.infoBox.SetInfo, 'Checking the heater and temperature sensor.')\r
-                               self.comm.sendCommand('M104 S200')\r
-                               self.comm.sendCommand('M104 S200')\r
-               elif self.checkupState == 1:\r
-                       if temp < 60:\r
-                               self.startTemp = temp\r
-                               self.checkupState = 2\r
-                               wx.CallAfter(self.infoBox.SetInfo, 'Checking the heater and temperature sensor.')\r
-                               self.comm.sendCommand('M104 S200')\r
-                               self.comm.sendCommand('M104 S200')\r
-               elif self.checkupState == 2:\r
-                       #print "WARNING, TEMPERATURE TEST DISABLED FOR TESTING!"\r
-                       if temp > self.startTemp + 40:\r
-                               self.checkupState = 3\r
-                               wx.CallAfter(self.infoBox.SetAttention, 'Please make sure none of the endstops are pressed.')\r
-                               wx.CallAfter(self.endstopBitmap.Show, True)\r
-                               wx.CallAfter(self.Layout)\r
-                               self.comm.sendCommand('M104 S0')\r
-                               self.comm.sendCommand('M104 S0')\r
-                               self.comm.sendCommand('M119')\r
-                               wx.CallAfter(self.tempState.SetBitmap, self.checkBitmap)\r
-                       else:\r
-                               self.tempCheckTimeout -= 1\r
-                               if self.tempCheckTimeout < 1:\r
-                                       self.checkupState = -1\r
-                                       wx.CallAfter(self.tempState.SetBitmap, self.crossBitmap)\r
-                                       wx.CallAfter(self.infoBox.SetError, 'Temperature measurement FAILED!')\r
-                                       self.comm.sendCommand('M104 S0')\r
-                                       self.comm.sendCommand('M104 S0')\r
-               wx.CallAfter(self.temperatureLabel.SetLabel, 'Head temperature: %d' % (temp))\r
-\r
-       def mcStateChange(self, state):\r
-               if self.comm == None:\r
-                       return\r
-               if self.comm.isOperational():\r
-                       wx.CallAfter(self.commState.SetBitmap, self.checkBitmap)\r
-               elif self.comm.isError():\r
-                       wx.CallAfter(self.commState.SetBitmap, self.crossBitmap)\r
-                       wx.CallAfter(self.infoBox.SetError, 'Failed to establish connection with the printer.')\r
-                       wx.CallAfter(self.endstopBitmap.Show, False)\r
-               wx.CallAfter(self.machineState.SetLabel, 'Communication State: %s' % (self.comm.getStateString()))\r
-       \r
-       def mcMessage(self, message):\r
-               if self.checkupState >= 3 and self.checkupState < 10 and 'x_min' in message:\r
-                       for data in message.split(' '):\r
-                               if ':' in data:\r
-                                       tag, value = data.split(':', 2)\r
-                                       if tag == 'x_min':\r
-                                               self.xMinStop = (value == 'H')\r
-                                       if tag == 'x_max':\r
-                                               self.xMaxStop = (value == 'H')\r
-                                       if tag == 'y_min':\r
-                                               self.yMinStop = (value == 'H')\r
-                                       if tag == 'y_max':\r
-                                               self.yMaxStop = (value == 'H')\r
-                                       if tag == 'z_min':\r
-                                               self.zMinStop = (value == 'H')\r
-                                       if tag == 'z_max':\r
-                                               self.zMaxStop = (value == 'H')\r
-                       self.comm.sendCommand('M119')\r
-                       \r
-                       if self.checkupState == 3:\r
-                               if not self.xMinStop and not self.xMaxStop and not self.yMinStop and not self.yMaxStop and not self.zMinStop and not self.zMaxStop:\r
-                                       self.checkupState = 4\r
-                                       wx.CallAfter(self.infoBox.SetAttention, 'Please press the right X endstop.')\r
-                                       wx.CallAfter(self.endstopBitmap.SetBitmap, self.endStopXMaxBitmap)\r
-                       elif self.checkupState == 4:\r
-                               if not self.xMinStop and self.xMaxStop and not self.yMinStop and not self.yMaxStop and not self.zMinStop and not self.zMaxStop:\r
-                                       self.checkupState = 5\r
-                                       wx.CallAfter(self.infoBox.SetAttention, 'Please press the left X endstop.')\r
-                                       wx.CallAfter(self.endstopBitmap.SetBitmap, self.endStopXMinBitmap)\r
-                       elif self.checkupState == 5:\r
-                               if self.xMinStop and not self.xMaxStop and not self.yMinStop and not self.yMaxStop and not self.zMinStop and not self.zMaxStop:\r
-                                       self.checkupState = 6\r
-                                       wx.CallAfter(self.infoBox.SetAttention, 'Please press the front Y endstop.')\r
-                                       wx.CallAfter(self.endstopBitmap.SetBitmap, self.endStopYMinBitmap)\r
-                       elif self.checkupState == 6:\r
-                               if not self.xMinStop and not self.xMaxStop and self.yMinStop and not self.yMaxStop and not self.zMinStop and not self.zMaxStop:\r
-                                       self.checkupState = 7\r
-                                       wx.CallAfter(self.infoBox.SetAttention, 'Please press the back Y endstop.')\r
-                                       wx.CallAfter(self.endstopBitmap.SetBitmap, self.endStopYMaxBitmap)\r
-                       elif self.checkupState == 7:\r
-                               if not self.xMinStop and not self.xMaxStop and not self.yMinStop and self.yMaxStop and not self.zMinStop and not self.zMaxStop:\r
-                                       self.checkupState = 8\r
-                                       wx.CallAfter(self.infoBox.SetAttention, 'Please press the top Z endstop.')\r
-                                       wx.CallAfter(self.endstopBitmap.SetBitmap, self.endStopZMinBitmap)\r
-                       elif self.checkupState == 8:\r
-                               if not self.xMinStop and not self.xMaxStop and not self.yMinStop and not self.yMaxStop and self.zMinStop and not self.zMaxStop:\r
-                                       self.checkupState = 9\r
-                                       wx.CallAfter(self.infoBox.SetAttention, 'Please press the bottom Z endstop.')\r
-                                       wx.CallAfter(self.endstopBitmap.SetBitmap, self.endStopZMaxBitmap)\r
-                       elif self.checkupState == 9:\r
-                               if not self.xMinStop and not self.xMaxStop and not self.yMinStop and not self.yMaxStop and not self.zMinStop and self.zMaxStop:\r
-                                       self.checkupState = 10\r
-                                       self.comm.close()\r
-                                       wx.CallAfter(self.infoBox.SetInfo, 'Checkup finished')\r
-                                       wx.CallAfter(self.infoBox.SetReadyIndicator)\r
-                                       wx.CallAfter(self.endstopBitmap.Show, False)\r
-                                       wx.CallAfter(self.stopState.SetBitmap, self.checkBitmap)\r
-                                       wx.CallAfter(self.OnSkipClick, None)\r
-\r
-       def mcProgress(self, lineNr):\r
-               pass\r
-       \r
-       def mcZChange(self, newZ):\r
-               pass\r
-\r
-class UltimakerCalibrationPage(InfoPage):\r
-       def __init__(self, parent):\r
-               super(UltimakerCalibrationPage, self).__init__(parent, "Ultimaker Calibration")\r
-               \r
-               self.AddText("Your Ultimaker requires some calibration.")\r
-               self.AddText("This calibration is needed for a proper extrusion amount.")\r
-               self.AddSeperator()\r
-               self.AddText("The following values are needed:")\r
-               self.AddText("* Diameter of filament")\r
-               self.AddText("* Number of steps per mm of filament extrusion")\r
-               self.AddSeperator()\r
-               self.AddText("The better you have calibrated these values, the better your prints\nwill become.")\r
-               self.AddSeperator()\r
-               self.AddText("First we need the diameter of your filament:")\r
-               self.filamentDiameter = self.AddTextCtrl(profile.getProfileSetting('filament_diameter'))\r
-               self.AddText("If you do not own digital Calipers that can measure\nat least 2 digits then use 2.89mm.\nWhich is the average diameter of most filament.")\r
-               self.AddText("Note: This value can be changed later at any time.")\r
-\r
-       def StoreData(self):\r
-               profile.putProfileSetting('filament_diameter', self.filamentDiameter.GetValue())\r
-\r
-class UltimakerCalibrateStepsPerEPage(InfoPage):\r
-       def __init__(self, parent):\r
-               super(UltimakerCalibrateStepsPerEPage, self).__init__(parent, "Ultimaker Calibration")\r
-\r
-               if profile.getPreference('steps_per_e') == '0':\r
-                       profile.putPreference('steps_per_e', '865.888')\r
-               \r
-               self.AddText("Calibrating the Steps Per E requires some manual actions.")\r
-               self.AddText("First remove any filament from your machine.")\r
-               self.AddText("Next put in your filament so the tip is aligned with the\ntop of the extruder drive.")\r
-               self.AddText("We'll push the filament 100mm")\r
-               self.extrudeButton = self.AddButton("Extrude 100mm filament")\r
-               self.AddText("Now measure the amount of extruded filament:\n(this can be more or less then 100mm)")\r
-               self.lengthInput, self.saveLengthButton = self.AddTextCtrlButton('100', 'Save')\r
-               self.AddText("This results in the following steps per E:")\r
-               self.stepsPerEInput = self.AddTextCtrl(profile.getPreference('steps_per_e'))\r
-               self.AddText("You can repeat these steps to get better calibration.")\r
-               self.AddSeperator()\r
-               self.AddText("If you still have filament in your printer which needs\nheat to remove, press the heat up button below:")\r
-               self.heatButton = self.AddButton("Heatup for filament removal")\r
-               \r
-               self.saveLengthButton.Bind(wx.EVT_BUTTON, self.OnSaveLengthClick)\r
-               self.extrudeButton.Bind(wx.EVT_BUTTON, self.OnExtrudeClick)\r
-               self.heatButton.Bind(wx.EVT_BUTTON, self.OnHeatClick)\r
-       \r
-       def OnSaveLengthClick(self, e):\r
-               currentEValue = float(self.stepsPerEInput.GetValue())\r
-               realExtrudeLength = float(self.lengthInput.GetValue())\r
-               newEValue = currentEValue * 100 / realExtrudeLength\r
-               self.stepsPerEInput.SetValue(str(newEValue))\r
-               self.lengthInput.SetValue("100")\r
-       \r
-       def OnExtrudeClick(self, e):\r
-               threading.Thread(target=self.OnExtrudeRun).start()\r
-\r
-       def OnExtrudeRun(self):\r
-               self.heatButton.Enable(False)\r
-               self.extrudeButton.Enable(False)\r
-               currentEValue = float(self.stepsPerEInput.GetValue())\r
-               self.comm = machineCom.MachineCom()\r
-               if not self.comm.isOpen():\r
-                       wx.MessageBox("Error: Failed to open serial port to machine\nIf this keeps happening, try disconnecting and reconnecting the USB cable", 'Printer error', wx.OK | wx.ICON_INFORMATION)\r
-                       self.heatButton.Enable(True)\r
-                       self.extrudeButton.Enable(True)\r
-                       return\r
-               while True:\r
-                       line = self.comm.readline()\r
-                       if line == '':\r
-                               return\r
-                       if 'start' in line:\r
-                               break\r
-               #Wait 3 seconds for the SD card init to timeout if we have SD in our firmware but there is no SD card found.\r
-               time.sleep(3)\r
-               \r
-               self.sendGCommand('M302') #Disable cold extrusion protection\r
-               self.sendGCommand("M92 E%f" % (currentEValue))\r
-               self.sendGCommand("G92 E0")\r
-               self.sendGCommand("G1 E100 F600")\r
-               time.sleep(15)\r
-               self.comm.close()\r
-               self.extrudeButton.Enable()\r
-               self.heatButton.Enable()\r
-\r
-       def OnHeatClick(self, e):\r
-               threading.Thread(target=self.OnHeatRun).start()\r
-       \r
-       def OnHeatRun(self):\r
-               self.heatButton.Enable(False)\r
-               self.extrudeButton.Enable(False)\r
-               self.comm = machineCom.MachineCom()\r
-               if not self.comm.isOpen():\r
-                       wx.MessageBox("Error: Failed to open serial port to machine\nIf this keeps happening, try disconnecting and reconnecting the USB cable", 'Printer error', wx.OK | wx.ICON_INFORMATION)\r
-                       self.heatButton.Enable(True)\r
-                       self.extrudeButton.Enable(True)\r
-                       return\r
-               while True:\r
-                       line = self.comm.readline()\r
-                       if line == '':\r
-                               self.heatButton.Enable(True)\r
-                               self.extrudeButton.Enable(True)\r
-                               return\r
-                       if 'start' in line:\r
-                               break\r
-               #Wait 3 seconds for the SD card init to timeout if we have SD in our firmware but there is no SD card found.\r
-               time.sleep(3)\r
-               \r
-               self.sendGCommand('M104 S200') #Set the temperature to 200C, should be enough to get PLA and ABS out.\r
-               wx.MessageBox('Wait till you can remove the filament from the machine, and press OK.\n(Temperature is set to 200C)', 'Machine heatup', wx.OK | wx.ICON_INFORMATION)\r
-               self.sendGCommand('M104 S0')\r
-               time.sleep(1)\r
-               self.comm.close()\r
-               self.heatButton.Enable(True)\r
-               self.extrudeButton.Enable(True)\r
-       \r
-       def sendGCommand(self, cmd):\r
-               self.comm.sendCommand(cmd) #Disable cold extrusion protection\r
-               while True:\r
-                       line = self.comm.readline()\r
-                       if line == '':\r
-                               return\r
-                       if line.startswith('ok'):\r
-                               break\r
-       \r
-       def StoreData(self):\r
-               profile.putPreference('steps_per_e', self.stepsPerEInput.GetValue())\r
-\r
-class configWizard(wx.wizard.Wizard):\r
-       def __init__(self):\r
-               super(configWizard, self).__init__(None, -1, "Configuration Wizard")\r
-               \r
-               self.Bind(wx.wizard.EVT_WIZARD_PAGE_CHANGED, self.OnPageChanged)\r
-               self.Bind(wx.wizard.EVT_WIZARD_PAGE_CHANGING, self.OnPageChanging)\r
-\r
-               self.firstInfoPage = FirstInfoPage(self)\r
-               self.machineSelectPage = MachineSelectPage(self)\r
-               self.ultimakerFirmwareUpgradePage = FirmwareUpgradePage(self)\r
-               self.ultimakerCheckupPage = UltimakerCheckupPage(self)\r
-               self.ultimakerCalibrationPage = UltimakerCalibrationPage(self)\r
-               self.ultimakerCalibrateStepsPerEPage = UltimakerCalibrateStepsPerEPage(self)\r
-               self.repRapInfoPage = RepRapInfoPage(self)\r
-\r
-               wx.wizard.WizardPageSimple.Chain(self.firstInfoPage, self.machineSelectPage)\r
-               wx.wizard.WizardPageSimple.Chain(self.machineSelectPage, self.ultimakerFirmwareUpgradePage)\r
-               wx.wizard.WizardPageSimple.Chain(self.ultimakerFirmwareUpgradePage, self.ultimakerCheckupPage)\r
-               #wx.wizard.WizardPageSimple.Chain(self.ultimakerCheckupPage, self.ultimakerCalibrationPage)\r
-               #wx.wizard.WizardPageSimple.Chain(self.ultimakerCalibrationPage, self.ultimakerCalibrateStepsPerEPage)\r
-               \r
-               self.FitToPage(self.firstInfoPage)\r
-               self.GetPageAreaSizer().Add(self.firstInfoPage)\r
-               \r
-               self.RunWizard(self.firstInfoPage)\r
-               self.Destroy()\r
-\r
-       def OnPageChanging(self, e):\r
-               e.GetPage().StoreData()\r
-\r
-       def OnPageChanged(self, e):\r
-               if e.GetPage().AllowNext():\r
-                       self.FindWindowById(wx.ID_FORWARD).Enable() \r
-               else:\r
-                       self.FindWindowById(wx.ID_FORWARD).Disable() \r
-               self.FindWindowById(wx.ID_BACKWARD).Disable() \r
+# coding=utf-8
+from __future__ import absolute_import
+
+import webbrowser
+import threading
+import time
+
+import wx
+import wx.wizard
+
+from gui import firmwareInstall
+from gui import toolbarUtil
+from util import machineCom
+from util import profile
+from util.resources import getPathForImage
+
+class InfoBox(wx.Panel):
+       def __init__(self, parent):
+               super(InfoBox, self).__init__(parent)
+               self.SetBackgroundColour('#FFFF80')
+
+               self.sizer = wx.GridBagSizer(5, 5)
+               self.SetSizer(self.sizer)
+
+               self.attentionBitmap = wx.Bitmap(getPathForImage('attention.png'))
+               self.errorBitmap = wx.Bitmap(getPathForImage('error.png'))
+               self.readyBitmap = wx.Bitmap(getPathForImage('ready.png'))
+               self.busyBitmap = [
+                       wx.Bitmap(getPathForImage('busy-0.png')),
+                       wx.Bitmap(getPathForImage('busy-1.png')),
+                       wx.Bitmap(getPathForImage('busy-2.png')),
+                       wx.Bitmap(getPathForImage('busy-3.png'))
+               ]
+
+               self.bitmap = wx.StaticBitmap(self, -1, wx.EmptyBitmapRGBA(24, 24, red=255, green=255, blue=255, alpha=1))
+               self.text = wx.StaticText(self, -1, '')
+               self.sizer.Add(self.bitmap, pos=(0, 0), flag=wx.ALL, border=5)
+               self.sizer.Add(self.text, pos=(0, 1), flag=wx.TOP | wx.BOTTOM | wx.ALIGN_CENTER_VERTICAL, border=5)
+
+               self.busyState = None
+               self.timer = wx.Timer(self)
+               self.Bind(wx.EVT_TIMER, self.doBusyUpdate, self.timer)
+               self.timer.Start(100)
+
+       def SetInfo(self, info):
+               self.SetBackgroundColour('#FFFF80')
+               self.text.SetLabel(info)
+               self.Refresh()
+
+       def SetError(self, info):
+               self.SetBackgroundColour('#FF8080')
+               self.text.SetLabel(info)
+               self.SetErrorIndicator()
+               self.Refresh()
+
+       def SetAttention(self, info):
+               self.SetBackgroundColour('#FFFF80')
+               self.text.SetLabel(info)
+               self.SetAttentionIndicator()
+               self.Refresh()
+
+       def SetBusyIndicator(self):
+               self.busyState = 0
+               self.bitmap.SetBitmap(self.busyBitmap[self.busyState])
+
+       def doBusyUpdate(self, e):
+               if self.busyState == None:
+                       return
+               self.busyState += 1
+               if self.busyState >= len(self.busyBitmap):
+                       self.busyState = 0
+               self.bitmap.SetBitmap(self.busyBitmap[self.busyState])
+
+       def SetReadyIndicator(self):
+               self.busyState = None
+               self.bitmap.SetBitmap(self.readyBitmap)
+
+       def SetErrorIndicator(self):
+               self.busyState = None
+               self.bitmap.SetBitmap(self.errorBitmap)
+
+       def SetAttentionIndicator(self):
+               self.busyState = None
+               self.bitmap.SetBitmap(self.attentionBitmap)
+
+
+class InfoPage(wx.wizard.WizardPageSimple):
+       def __init__(self, parent, title):
+               wx.wizard.WizardPageSimple.__init__(self, parent)
+
+               sizer = wx.GridBagSizer(5, 5)
+               self.sizer = sizer
+               self.SetSizer(sizer)
+
+               title = wx.StaticText(self, -1, title)
+               title.SetFont(wx.Font(18, wx.SWISS, wx.NORMAL, wx.BOLD))
+               sizer.Add(title, pos=(0, 0), span=(1, 2), flag=wx.ALIGN_CENTRE | wx.ALL)
+               sizer.Add(wx.StaticLine(self, -1), pos=(1, 0), span=(1, 2), flag=wx.EXPAND | wx.ALL)
+               sizer.AddGrowableCol(1)
+
+               self.rowNr = 2
+
+       def AddText(self, info):
+               text = wx.StaticText(self, -1, info)
+               self.GetSizer().Add(text, pos=(self.rowNr, 0), span=(1, 2), flag=wx.LEFT | wx.RIGHT)
+               self.rowNr += 1
+               return text
+
+       def AddSeperator(self):
+               self.GetSizer().Add(wx.StaticLine(self, -1), pos=(self.rowNr, 0), span=(1, 2), flag=wx.EXPAND | wx.ALL)
+               self.rowNr += 1
+
+       def AddHiddenSeperator(self):
+               self.AddText('')
+
+       def AddInfoBox(self):
+               infoBox = InfoBox(self)
+               self.GetSizer().Add(infoBox, pos=(self.rowNr, 0), span=(1, 2), flag=wx.LEFT | wx.RIGHT | wx.EXPAND)
+               self.rowNr += 1
+               return infoBox
+
+       def AddRadioButton(self, label, style=0):
+               radio = wx.RadioButton(self, -1, label, style=style)
+               self.GetSizer().Add(radio, pos=(self.rowNr, 0), span=(1, 2), flag=wx.EXPAND | wx.ALL)
+               self.rowNr += 1
+               return radio
+
+       def AddCheckbox(self, label, checked=False):
+               check = wx.CheckBox(self, -1)
+               text = wx.StaticText(self, -1, label)
+               check.SetValue(checked)
+               self.GetSizer().Add(text, pos=(self.rowNr, 0), span=(1, 1), flag=wx.LEFT | wx.RIGHT)
+               self.GetSizer().Add(check, pos=(self.rowNr, 1), span=(1, 2), flag=wx.ALL)
+               self.rowNr += 1
+               return check
+
+       def AddButton(self, label):
+               button = wx.Button(self, -1, label)
+               self.GetSizer().Add(button, pos=(self.rowNr, 0), span=(1, 2), flag=wx.LEFT)
+               self.rowNr += 1
+               return button
+
+       def AddDualButton(self, label1, label2):
+               button1 = wx.Button(self, -1, label1)
+               self.GetSizer().Add(button1, pos=(self.rowNr, 0), flag=wx.RIGHT)
+               button2 = wx.Button(self, -1, label2)
+               self.GetSizer().Add(button2, pos=(self.rowNr, 1))
+               self.rowNr += 1
+               return button1, button2
+
+       def AddTextCtrl(self, value):
+               ret = wx.TextCtrl(self, -1, value)
+               self.GetSizer().Add(ret, pos=(self.rowNr, 0), span=(1, 2), flag=wx.LEFT)
+               self.rowNr += 1
+               return ret
+
+       def AddLabelTextCtrl(self, info, value):
+               text = wx.StaticText(self, -1, info)
+               ret = wx.TextCtrl(self, -1, value)
+               self.GetSizer().Add(text, pos=(self.rowNr, 0), span=(1, 1), flag=wx.LEFT)
+               self.GetSizer().Add(ret, pos=(self.rowNr, 1), span=(1, 1), flag=wx.LEFT)
+               self.rowNr += 1
+               return ret
+
+       def AddTextCtrlButton(self, value, buttonText):
+               text = wx.TextCtrl(self, -1, value)
+               button = wx.Button(self, -1, buttonText)
+               self.GetSizer().Add(text, pos=(self.rowNr, 0), span=(1, 1), flag=wx.LEFT)
+               self.GetSizer().Add(button, pos=(self.rowNr, 1), span=(1, 1), flag=wx.LEFT)
+               self.rowNr += 1
+               return text, button
+
+       def AddBitmap(self, bitmap):
+               bitmap = wx.StaticBitmap(self, -1, bitmap)
+               self.GetSizer().Add(bitmap, pos=(self.rowNr, 0), span=(1, 2), flag=wx.LEFT | wx.RIGHT)
+               self.rowNr += 1
+               return bitmap
+
+       def AddCheckmark(self, label, bitmap):
+               check = wx.StaticBitmap(self, -1, bitmap)
+               text = wx.StaticText(self, -1, label)
+               self.GetSizer().Add(text, pos=(self.rowNr, 0), span=(1, 1), flag=wx.LEFT | wx.RIGHT)
+               self.GetSizer().Add(check, pos=(self.rowNr, 1), span=(1, 1), flag=wx.ALL)
+               self.rowNr += 1
+               return check
+
+       def AllowNext(self):
+               return True
+
+       def StoreData(self):
+               pass
+
+
+class FirstInfoPage(InfoPage):
+       def __init__(self, parent):
+               super(FirstInfoPage, self).__init__(parent, "First time run wizard")
+               self.AddText('Welcome, and thanks for trying Cura!')
+               self.AddSeperator()
+               self.AddText('This wizard will help you with the following steps:')
+               self.AddText('* Configure Cura for your machine')
+               self.AddText('* Upgrade your firmware')
+               self.AddText('* Check if your machine is working safely')
+
+               #self.AddText('* Calibrate your machine')
+               #self.AddText('* Do your first print')
+
+
+class RepRapInfoPage(InfoPage):
+       def __init__(self, parent):
+               super(RepRapInfoPage, self).__init__(parent, "RepRap information")
+               self.AddText(
+                       'RepRap machines are vastly different, and there is no\ndefault configuration in Cura for any of them.')
+               self.AddText('If you like a default profile for your machine added,\nthen make an issue on github.')
+               self.AddSeperator()
+               self.AddText('You will have to manually install Marlin or Sprinter firmware.')
+               self.AddSeperator()
+               self.machineWidth = self.AddLabelTextCtrl('Machine width (mm)', '80')
+               self.machineDepth = self.AddLabelTextCtrl('Machine depth (mm)', '80')
+               self.machineHeight = self.AddLabelTextCtrl('Machine height (mm)', '60')
+               self.nozzleSize = self.AddLabelTextCtrl('Nozzle size (mm)', '0.5')
+               self.heatedBed = self.AddCheckbox('Heated bed')
+
+       def StoreData(self):
+               profile.putPreference('machine_width', self.machineWidth.GetValue())
+               profile.putPreference('machine_depth', self.machineDepth.GetValue())
+               profile.putPreference('machine_height', self.machineHeight.GetValue())
+               profile.putProfileSetting('nozzle_size', self.nozzleSize.GetValue())
+               profile.putProfileSetting('machine_center_x', profile.getPreferenceFloat('machine_width') / 2)
+               profile.putProfileSetting('machine_center_y', profile.getPreferenceFloat('machine_depth') / 2)
+               profile.putProfileSetting('wall_thickness', float(profile.getProfileSettingFloat('nozzle_size')) * 2)
+               profile.putPreference('has_heated_bed', str(self.heatedBed.GetValue()))
+
+
+class MachineSelectPage(InfoPage):
+       def __init__(self, parent):
+               super(MachineSelectPage, self).__init__(parent, "Select your machine")
+               self.AddText('What kind of machine do you have:')
+
+               self.UltimakerRadio = self.AddRadioButton("Ultimaker", style=wx.RB_GROUP)
+               self.UltimakerRadio.SetValue(True)
+               self.UltimakerRadio.Bind(wx.EVT_RADIOBUTTON, self.OnUltimakerSelect)
+               self.OtherRadio = self.AddRadioButton("Other (Ex: RepRap)")
+               self.OtherRadio.Bind(wx.EVT_RADIOBUTTON, self.OnOtherSelect)
+
+       def OnUltimakerSelect(self, e):
+               wx.wizard.WizardPageSimple.Chain(self, self.GetParent().ultimakerFirmwareUpgradePage)
+
+       def OnOtherSelect(self, e):
+               wx.wizard.WizardPageSimple.Chain(self, self.GetParent().repRapInfoPage)
+
+       def StoreData(self):
+               if self.UltimakerRadio.GetValue():
+                       profile.putPreference('machine_width', '205')
+                       profile.putPreference('machine_depth', '205')
+                       profile.putPreference('machine_height', '200')
+                       profile.putPreference('machine_type', 'ultimaker')
+                       profile.putProfileSetting('nozzle_size', '0.4')
+                       profile.putProfileSetting('machine_center_x', '100')
+                       profile.putProfileSetting('machine_center_y', '100')
+               else:
+                       profile.putPreference('machine_width', '80')
+                       profile.putPreference('machine_depth', '80')
+                       profile.putPreference('machine_height', '60')
+                       profile.putPreference('machine_type', 'reprap')
+                       profile.putPreference('startMode', 'Normal')
+                       profile.putProfileSetting('nozzle_size', '0.5')
+                       profile.putProfileSetting('machine_center_x', '40')
+                       profile.putProfileSetting('machine_center_y', '40')
+               profile.putProfileSetting('wall_thickness', float(profile.getProfileSetting('nozzle_size')) * 2)
+
+
+class FirmwareUpgradePage(InfoPage):
+       def __init__(self, parent):
+               super(FirmwareUpgradePage, self).__init__(parent, "Upgrade Ultimaker Firmware")
+               self.AddText(
+                       'Firmware is the piece of software running directly on your 3D printer.\nThis firmware controls the step motors, regulates the temperature\nand ultimately makes your printer work.')
+               self.AddHiddenSeperator()
+               self.AddText(
+                       'The firmware shipping with new Ultimakers works, but upgrades\nhave been made to make better prints, and make calibration easier.')
+               self.AddHiddenSeperator()
+               self.AddText(
+                       'Cura requires these new features and thus\nyour firmware will most likely need to be upgraded.\nYou will get the chance to do so now.')
+               upgradeButton, skipUpgradeButton = self.AddDualButton('Upgrade to Marlin firmware', 'Skip upgrade')
+               upgradeButton.Bind(wx.EVT_BUTTON, self.OnUpgradeClick)
+               skipUpgradeButton.Bind(wx.EVT_BUTTON, self.OnSkipClick)
+               self.AddHiddenSeperator()
+               self.AddText('Do not upgrade to this firmware if:')
+               self.AddText('* You have an older machine based on ATMega1280')
+               self.AddText('* Have other changes in the firmware')
+               button = self.AddButton('Goto this page for a custom firmware')
+               button.Bind(wx.EVT_BUTTON, self.OnUrlClick)
+
+       def AllowNext(self):
+               return False
+
+       def OnUpgradeClick(self, e):
+               if firmwareInstall.InstallFirmware():
+                       self.GetParent().FindWindowById(wx.ID_FORWARD).Enable()
+
+       def OnSkipClick(self, e):
+               self.GetParent().FindWindowById(wx.ID_FORWARD).Enable()
+
+       def OnUrlClick(self, e):
+               webbrowser.open('http://daid.mine.nu/~daid/marlin_build/')
+
+
+class UltimakerCheckupPage(InfoPage):
+       def __init__(self, parent):
+               super(UltimakerCheckupPage, self).__init__(parent, "Ultimaker Checkup")
+
+               self.checkBitmap = wx.Bitmap(getPathForImage('checkmark.png'))
+               self.crossBitmap = wx.Bitmap(getPathForImage('cross.png'))
+               self.unknownBitmap = wx.Bitmap(getPathForImage('question.png'))
+               self.endStopNoneBitmap = wx.Bitmap(getPathForImage('endstop_none.png'))
+               self.endStopXMinBitmap = wx.Bitmap(getPathForImage('endstop_xmin.png'))
+               self.endStopXMaxBitmap = wx.Bitmap(getPathForImage('endstop_xmax.png'))
+               self.endStopYMinBitmap = wx.Bitmap(getPathForImage('endstop_ymin.png'))
+               self.endStopYMaxBitmap = wx.Bitmap(getPathForImage('endstop_ymax.png'))
+               self.endStopZMinBitmap = wx.Bitmap(getPathForImage('endstop_zmin.png'))
+               self.endStopZMaxBitmap = wx.Bitmap(getPathForImage('endstop_zmax.png'))
+
+               self.AddText(
+                       'It is a good idea to do a few sanity checks now on your Ultimaker.\nYou can skip these if you know your machine is functional.')
+               b1, b2 = self.AddDualButton('Run checks', 'Skip checks')
+               b1.Bind(wx.EVT_BUTTON, self.OnCheckClick)
+               b2.Bind(wx.EVT_BUTTON, self.OnSkipClick)
+               self.AddSeperator()
+               self.commState = self.AddCheckmark('Communication:', self.unknownBitmap)
+               self.tempState = self.AddCheckmark('Temperature:', self.unknownBitmap)
+               self.stopState = self.AddCheckmark('Endstops:', self.unknownBitmap)
+               self.AddSeperator()
+               self.infoBox = self.AddInfoBox()
+               self.machineState = self.AddText('')
+               self.temperatureLabel = self.AddText('')
+               self.AddSeperator()
+               self.endstopBitmap = self.AddBitmap(self.endStopNoneBitmap)
+               self.comm = None
+               self.xMinStop = False
+               self.xMaxStop = False
+               self.yMinStop = False
+               self.yMaxStop = False
+               self.zMinStop = False
+               self.zMaxStop = False
+
+       def __del__(self):
+               if self.comm != None:
+                       self.comm.close()
+
+       def AllowNext(self):
+               self.endstopBitmap.Show(False)
+               return False
+
+       def OnSkipClick(self, e):
+               self.GetParent().FindWindowById(wx.ID_FORWARD).Enable()
+
+       def OnCheckClick(self, e=None):
+               if self.comm != None:
+                       self.comm.close()
+                       del self.comm
+                       self.comm = None
+                       wx.CallAfter(self.OnCheckClick)
+                       return
+               self.infoBox.SetInfo('Connecting to machine.')
+               self.infoBox.SetBusyIndicator()
+               self.commState.SetBitmap(self.unknownBitmap)
+               self.tempState.SetBitmap(self.unknownBitmap)
+               self.stopState.SetBitmap(self.unknownBitmap)
+               self.checkupState = 0
+               self.comm = machineCom.MachineCom(callbackObject=self)
+
+       def mcLog(self, message):
+               pass
+
+       def mcTempUpdate(self, temp, bedTemp, targetTemp, bedTargetTemp):
+               if not self.comm.isOperational():
+                       return
+               if self.checkupState == 0:
+                       self.tempCheckTimeout = 20
+                       if temp > 70:
+                               self.checkupState = 1
+                               wx.CallAfter(self.infoBox.SetInfo, 'Cooldown before temperature check.')
+                               self.comm.sendCommand('M104 S0')
+                               self.comm.sendCommand('M104 S0')
+                       else:
+                               self.startTemp = temp
+                               self.checkupState = 2
+                               wx.CallAfter(self.infoBox.SetInfo, 'Checking the heater and temperature sensor.')
+                               self.comm.sendCommand('M104 S200')
+                               self.comm.sendCommand('M104 S200')
+               elif self.checkupState == 1:
+                       if temp < 60:
+                               self.startTemp = temp
+                               self.checkupState = 2
+                               wx.CallAfter(self.infoBox.SetInfo, 'Checking the heater and temperature sensor.')
+                               self.comm.sendCommand('M104 S200')
+                               self.comm.sendCommand('M104 S200')
+               elif self.checkupState == 2:
+                       #print "WARNING, TEMPERATURE TEST DISABLED FOR TESTING!"
+                       if temp > self.startTemp + 40:
+                               self.checkupState = 3
+                               wx.CallAfter(self.infoBox.SetAttention, 'Please make sure none of the endstops are pressed.')
+                               wx.CallAfter(self.endstopBitmap.Show, True)
+                               wx.CallAfter(self.Layout)
+                               self.comm.sendCommand('M104 S0')
+                               self.comm.sendCommand('M104 S0')
+                               self.comm.sendCommand('M119')
+                               wx.CallAfter(self.tempState.SetBitmap, self.checkBitmap)
+                       else:
+                               self.tempCheckTimeout -= 1
+                               if self.tempCheckTimeout < 1:
+                                       self.checkupState = -1
+                                       wx.CallAfter(self.tempState.SetBitmap, self.crossBitmap)
+                                       wx.CallAfter(self.infoBox.SetError, 'Temperature measurement FAILED!')
+                                       self.comm.sendCommand('M104 S0')
+                                       self.comm.sendCommand('M104 S0')
+               wx.CallAfter(self.temperatureLabel.SetLabel, 'Head temperature: %d' % (temp))
+
+       def mcStateChange(self, state):
+               if self.comm == None:
+                       return
+               if self.comm.isOperational():
+                       wx.CallAfter(self.commState.SetBitmap, self.checkBitmap)
+               elif self.comm.isError():
+                       wx.CallAfter(self.commState.SetBitmap, self.crossBitmap)
+                       wx.CallAfter(self.infoBox.SetError, 'Failed to establish connection with the printer.')
+                       wx.CallAfter(self.endstopBitmap.Show, False)
+               wx.CallAfter(self.machineState.SetLabel, 'Communication State: %s' % (self.comm.getStateString()))
+
+       def mcMessage(self, message):
+               if self.checkupState >= 3 and self.checkupState < 10 and 'x_min' in message:
+                       for data in message.split(' '):
+                               if ':' in data:
+                                       tag, value = data.split(':', 2)
+                                       if tag == 'x_min':
+                                               self.xMinStop = (value == 'H')
+                                       if tag == 'x_max':
+                                               self.xMaxStop = (value == 'H')
+                                       if tag == 'y_min':
+                                               self.yMinStop = (value == 'H')
+                                       if tag == 'y_max':
+                                               self.yMaxStop = (value == 'H')
+                                       if tag == 'z_min':
+                                               self.zMinStop = (value == 'H')
+                                       if tag == 'z_max':
+                                               self.zMaxStop = (value == 'H')
+                       self.comm.sendCommand('M119')
+
+                       if self.checkupState == 3:
+                               if not self.xMinStop and not self.xMaxStop and not self.yMinStop and not self.yMaxStop and not self.zMinStop and not self.zMaxStop:
+                                       self.checkupState = 4
+                                       wx.CallAfter(self.infoBox.SetAttention, 'Please press the right X endstop.')
+                                       wx.CallAfter(self.endstopBitmap.SetBitmap, self.endStopXMaxBitmap)
+                       elif self.checkupState == 4:
+                               if not self.xMinStop and self.xMaxStop and not self.yMinStop and not self.yMaxStop and not self.zMinStop and not self.zMaxStop:
+                                       self.checkupState = 5
+                                       wx.CallAfter(self.infoBox.SetAttention, 'Please press the left X endstop.')
+                                       wx.CallAfter(self.endstopBitmap.SetBitmap, self.endStopXMinBitmap)
+                       elif self.checkupState == 5:
+                               if self.xMinStop and not self.xMaxStop and not self.yMinStop and not self.yMaxStop and not self.zMinStop and not self.zMaxStop:
+                                       self.checkupState = 6
+                                       wx.CallAfter(self.infoBox.SetAttention, 'Please press the front Y endstop.')
+                                       wx.CallAfter(self.endstopBitmap.SetBitmap, self.endStopYMinBitmap)
+                       elif self.checkupState == 6:
+                               if not self.xMinStop and not self.xMaxStop and self.yMinStop and not self.yMaxStop and not self.zMinStop and not self.zMaxStop:
+                                       self.checkupState = 7
+                                       wx.CallAfter(self.infoBox.SetAttention, 'Please press the back Y endstop.')
+                                       wx.CallAfter(self.endstopBitmap.SetBitmap, self.endStopYMaxBitmap)
+                       elif self.checkupState == 7:
+                               if not self.xMinStop and not self.xMaxStop and not self.yMinStop and self.yMaxStop and not self.zMinStop and not self.zMaxStop:
+                                       self.checkupState = 8
+                                       wx.CallAfter(self.infoBox.SetAttention, 'Please press the top Z endstop.')
+                                       wx.CallAfter(self.endstopBitmap.SetBitmap, self.endStopZMinBitmap)
+                       elif self.checkupState == 8:
+                               if not self.xMinStop and not self.xMaxStop and not self.yMinStop and not self.yMaxStop and self.zMinStop and not self.zMaxStop:
+                                       self.checkupState = 9
+                                       wx.CallAfter(self.infoBox.SetAttention, 'Please press the bottom Z endstop.')
+                                       wx.CallAfter(self.endstopBitmap.SetBitmap, self.endStopZMaxBitmap)
+                       elif self.checkupState == 9:
+                               if not self.xMinStop and not self.xMaxStop and not self.yMinStop and not self.yMaxStop and not self.zMinStop and self.zMaxStop:
+                                       self.checkupState = 10
+                                       self.comm.close()
+                                       wx.CallAfter(self.infoBox.SetInfo, 'Checkup finished')
+                                       wx.CallAfter(self.infoBox.SetReadyIndicator)
+                                       wx.CallAfter(self.endstopBitmap.Show, False)
+                                       wx.CallAfter(self.stopState.SetBitmap, self.checkBitmap)
+                                       wx.CallAfter(self.OnSkipClick, None)
+
+       def mcProgress(self, lineNr):
+               pass
+
+       def mcZChange(self, newZ):
+               pass
+
+
+class UltimakerCalibrationPage(InfoPage):
+       def __init__(self, parent):
+               super(UltimakerCalibrationPage, self).__init__(parent, "Ultimaker Calibration")
+
+               self.AddText("Your Ultimaker requires some calibration.")
+               self.AddText("This calibration is needed for a proper extrusion amount.")
+               self.AddSeperator()
+               self.AddText("The following values are needed:")
+               self.AddText("* Diameter of filament")
+               self.AddText("* Number of steps per mm of filament extrusion")
+               self.AddSeperator()
+               self.AddText("The better you have calibrated these values, the better your prints\nwill become.")
+               self.AddSeperator()
+               self.AddText("First we need the diameter of your filament:")
+               self.filamentDiameter = self.AddTextCtrl(profile.getProfileSetting('filament_diameter'))
+               self.AddText(
+                       "If you do not own digital Calipers that can measure\nat least 2 digits then use 2.89mm.\nWhich is the average diameter of most filament.")
+               self.AddText("Note: This value can be changed later at any time.")
+
+       def StoreData(self):
+               profile.putProfileSetting('filament_diameter', self.filamentDiameter.GetValue())
+
+
+class UltimakerCalibrateStepsPerEPage(InfoPage):
+       def __init__(self, parent):
+               super(UltimakerCalibrateStepsPerEPage, self).__init__(parent, "Ultimaker Calibration")
+
+               if profile.getPreference('steps_per_e') == '0':
+                       profile.putPreference('steps_per_e', '865.888')
+
+               self.AddText("Calibrating the Steps Per E requires some manual actions.")
+               self.AddText("First remove any filament from your machine.")
+               self.AddText("Next put in your filament so the tip is aligned with the\ntop of the extruder drive.")
+               self.AddText("We'll push the filament 100mm")
+               self.extrudeButton = self.AddButton("Extrude 100mm filament")
+               self.AddText("Now measure the amount of extruded filament:\n(this can be more or less then 100mm)")
+               self.lengthInput, self.saveLengthButton = self.AddTextCtrlButton('100', 'Save')
+               self.AddText("This results in the following steps per E:")
+               self.stepsPerEInput = self.AddTextCtrl(profile.getPreference('steps_per_e'))
+               self.AddText("You can repeat these steps to get better calibration.")
+               self.AddSeperator()
+               self.AddText(
+                       "If you still have filament in your printer which needs\nheat to remove, press the heat up button below:")
+               self.heatButton = self.AddButton("Heatup for filament removal")
+
+               self.saveLengthButton.Bind(wx.EVT_BUTTON, self.OnSaveLengthClick)
+               self.extrudeButton.Bind(wx.EVT_BUTTON, self.OnExtrudeClick)
+               self.heatButton.Bind(wx.EVT_BUTTON, self.OnHeatClick)
+
+       def OnSaveLengthClick(self, e):
+               currentEValue = float(self.stepsPerEInput.GetValue())
+               realExtrudeLength = float(self.lengthInput.GetValue())
+               newEValue = currentEValue * 100 / realExtrudeLength
+               self.stepsPerEInput.SetValue(str(newEValue))
+               self.lengthInput.SetValue("100")
+
+       def OnExtrudeClick(self, e):
+               threading.Thread(target=self.OnExtrudeRun).start()
+
+       def OnExtrudeRun(self):
+               self.heatButton.Enable(False)
+               self.extrudeButton.Enable(False)
+               currentEValue = float(self.stepsPerEInput.GetValue())
+               self.comm = machineCom.MachineCom()
+               if not self.comm.isOpen():
+                       wx.MessageBox(
+                               "Error: Failed to open serial port to machine\nIf this keeps happening, try disconnecting and reconnecting the USB cable",
+                               'Printer error', wx.OK | wx.ICON_INFORMATION)
+                       self.heatButton.Enable(True)
+                       self.extrudeButton.Enable(True)
+                       return
+               while True:
+                       line = self.comm.readline()
+                       if line == '':
+                               return
+                       if 'start' in line:
+                               break
+                       #Wait 3 seconds for the SD card init to timeout if we have SD in our firmware but there is no SD card found.
+               time.sleep(3)
+
+               self.sendGCommand('M302') #Disable cold extrusion protection
+               self.sendGCommand("M92 E%f" % (currentEValue))
+               self.sendGCommand("G92 E0")
+               self.sendGCommand("G1 E100 F600")
+               time.sleep(15)
+               self.comm.close()
+               self.extrudeButton.Enable()
+               self.heatButton.Enable()
+
+       def OnHeatClick(self, e):
+               threading.Thread(target=self.OnHeatRun).start()
+
+       def OnHeatRun(self):
+               self.heatButton.Enable(False)
+               self.extrudeButton.Enable(False)
+               self.comm = machineCom.MachineCom()
+               if not self.comm.isOpen():
+                       wx.MessageBox(
+                               "Error: Failed to open serial port to machine\nIf this keeps happening, try disconnecting and reconnecting the USB cable",
+                               'Printer error', wx.OK | wx.ICON_INFORMATION)
+                       self.heatButton.Enable(True)
+                       self.extrudeButton.Enable(True)
+                       return
+               while True:
+                       line = self.comm.readline()
+                       if line == '':
+                               self.heatButton.Enable(True)
+                               self.extrudeButton.Enable(True)
+                               return
+                       if 'start' in line:
+                               break
+                       #Wait 3 seconds for the SD card init to timeout if we have SD in our firmware but there is no SD card found.
+               time.sleep(3)
+
+               self.sendGCommand('M104 S200') #Set the temperature to 200C, should be enough to get PLA and ABS out.
+               wx.MessageBox(
+                       'Wait till you can remove the filament from the machine, and press OK.\n(Temperature is set to 200C)',
+                       'Machine heatup', wx.OK | wx.ICON_INFORMATION)
+               self.sendGCommand('M104 S0')
+               time.sleep(1)
+               self.comm.close()
+               self.heatButton.Enable(True)
+               self.extrudeButton.Enable(True)
+
+       def sendGCommand(self, cmd):
+               self.comm.sendCommand(cmd) #Disable cold extrusion protection
+               while True:
+                       line = self.comm.readline()
+                       if line == '':
+                               return
+                       if line.startswith('ok'):
+                               break
+
+       def StoreData(self):
+               profile.putPreference('steps_per_e', self.stepsPerEInput.GetValue())
+
+
+class configWizard(wx.wizard.Wizard):
+       def __init__(self):
+               super(configWizard, self).__init__(None, -1, "Configuration Wizard")
+
+               self.Bind(wx.wizard.EVT_WIZARD_PAGE_CHANGED, self.OnPageChanged)
+               self.Bind(wx.wizard.EVT_WIZARD_PAGE_CHANGING, self.OnPageChanging)
+
+               self.firstInfoPage = FirstInfoPage(self)
+               self.machineSelectPage = MachineSelectPage(self)
+               self.ultimakerFirmwareUpgradePage = FirmwareUpgradePage(self)
+               self.ultimakerCheckupPage = UltimakerCheckupPage(self)
+               self.ultimakerCalibrationPage = UltimakerCalibrationPage(self)
+               self.ultimakerCalibrateStepsPerEPage = UltimakerCalibrateStepsPerEPage(self)
+               self.repRapInfoPage = RepRapInfoPage(self)
+
+               wx.wizard.WizardPageSimple.Chain(self.firstInfoPage, self.machineSelectPage)
+               wx.wizard.WizardPageSimple.Chain(self.machineSelectPage, self.ultimakerFirmwareUpgradePage)
+               wx.wizard.WizardPageSimple.Chain(self.ultimakerFirmwareUpgradePage, self.ultimakerCheckupPage)
+               #wx.wizard.WizardPageSimple.Chain(self.ultimakerCheckupPage, self.ultimakerCalibrationPage)
+               #wx.wizard.WizardPageSimple.Chain(self.ultimakerCalibrationPage, self.ultimakerCalibrateStepsPerEPage)
+
+               self.FitToPage(self.firstInfoPage)
+               self.GetPageAreaSizer().Add(self.firstInfoPage)
+
+               self.RunWizard(self.firstInfoPage)
+               self.Destroy()
+
+       def OnPageChanging(self, e):
+               e.GetPage().StoreData()
+
+       def OnPageChanged(self, e):
+               if e.GetPage().AllowNext():
+                       self.FindWindowById(wx.ID_FORWARD).Enable()
+               else:
+                       self.FindWindowById(wx.ID_FORWARD).Disable()
+               self.FindWindowById(wx.ID_BACKWARD).Disable()
index 8a61d16e0ebbde3abfe2e2b68bfbaeda3bb10ff0..79f3328ce1f6fd2903f4d225d4085d87722afe2a 100644 (file)
-import math, time, os\r
-\r
-from util import meshLoader\r
-from util import util3d\r
-from util import profile\r
-\r
-try:\r
-       import OpenGL\r
-       OpenGL.ERROR_CHECKING = False\r
-       from OpenGL.GLU import *\r
-       from OpenGL.GL import *\r
-       hasOpenGLlibs = True\r
-except:\r
-       print "Failed to find PyOpenGL: http://pyopengl.sourceforge.net/"\r
-       hasOpenGLlibs = False\r
-\r
-def InitGL(window, view3D, zoom):\r
-       # set viewing projection\r
-       glMatrixMode(GL_MODELVIEW)\r
-       glLoadIdentity()\r
-       size = window.GetSize()\r
-       glViewport(0,0, size.GetWidth(), size.GetHeight())\r
-       \r
-       glLightfv(GL_LIGHT0, GL_POSITION, [0.2, 0.2, 1.0, 0.0])\r
-       glLightfv(GL_LIGHT1, GL_POSITION, [1.0, 1.0, 1.0, 0.0])\r
-\r
-       glEnable(GL_RESCALE_NORMAL)\r
-       glEnable(GL_LIGHTING)\r
-       glEnable(GL_LIGHT0)\r
-       glEnable(GL_DEPTH_TEST)\r
-       glEnable(GL_CULL_FACE)\r
-       glDisable(GL_BLEND)\r
-\r
-       glClearColor(1.0, 1.0, 1.0, 1.0)\r
-       glClearStencil(0)\r
-       glClearDepth(1.0)\r
-\r
-       glMatrixMode(GL_PROJECTION)\r
-       glLoadIdentity()\r
-       aspect = float(size.GetWidth()) / float(size.GetHeight())\r
-       if view3D:\r
-               gluPerspective(45.0, aspect, 1.0, 1000.0)\r
-       else:\r
-               glOrtho(-aspect * (zoom), aspect * (zoom), -1.0 * (zoom), 1.0 * (zoom), -1000.0, 1000.0)\r
-\r
-       glMatrixMode(GL_MODELVIEW)\r
-       glLoadIdentity()\r
-       glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT | GL_STENCIL_BUFFER_BIT)\r
-\r
-platformMesh = None\r
-\r
-def DrawMachine(machineSize):\r
-       if profile.getPreference('machine_type') == 'ultimaker':\r
-               glPushMatrix()\r
-               glEnable(GL_LIGHTING)\r
-               glTranslate(100,200,-5)\r
-               glLightfv(GL_LIGHT0, GL_DIFFUSE, [0.8,0.8,0.8])\r
-               glLightfv(GL_LIGHT0, GL_AMBIENT, [0.5,0.5,0.5])\r
-               glEnable(GL_BLEND)\r
-               glBlendFunc(GL_SRC_COLOR, GL_ONE_MINUS_SRC_COLOR)\r
-               \r
-               global platformMesh\r
-               if platformMesh == None:\r
-                       platformMesh = meshLoader.loadMesh(os.path.normpath(os.path.join(os.path.split(__file__)[0], "../images", 'ultimaker_platform.stl')))\r
-                       platformMesh.setRotateMirror(0, False, False, False, False, False)\r
-               \r
-               DrawMesh(platformMesh)\r
-               glPopMatrix()\r
-\r
-       glDisable(GL_LIGHTING)\r
-       if False:\r
-               glColor3f(0.7,0.7,0.7)\r
-               glLineWidth(2)\r
-               glBegin(GL_LINES)\r
-               for i in xrange(0, int(machineSize.x), 10):\r
-                       glVertex3f(i, 0, 0)\r
-                       glVertex3f(i, machineSize.y, 0)\r
-               for i in xrange(0, int(machineSize.y), 10):\r
-                       glVertex3f(0, i, 0)\r
-                       glVertex3f(machineSize.x, i, 0)\r
-               glEnd()\r
-               \r
-               glEnable(GL_LINE_SMOOTH)\r
-               glEnable(GL_BLEND)\r
-               glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA)\r
-               glHint(GL_LINE_SMOOTH_HINT, GL_DONT_CARE);\r
-\r
-               glColor3f(0.0,0.0,0.0)\r
-               glLineWidth(4)\r
-               glBegin(GL_LINE_LOOP)\r
-               glVertex3f(0, 0, 0)\r
-               glVertex3f(machineSize.x, 0, 0)\r
-               glVertex3f(machineSize.x, machineSize.y, 0)\r
-               glVertex3f(0, machineSize.y, 0)\r
-               glEnd()\r
-               \r
-               glLineWidth(2)\r
-               glBegin(GL_LINE_LOOP)\r
-               glVertex3f(0, 0, machineSize.z)\r
-               glVertex3f(machineSize.x, 0, machineSize.z)\r
-               glVertex3f(machineSize.x, machineSize.y, machineSize.z)\r
-               glVertex3f(0, machineSize.y, machineSize.z)\r
-               glEnd()\r
-               glBegin(GL_LINES)\r
-               glVertex3f(0, 0, 0)\r
-               glVertex3f(0, 0, machineSize.z)\r
-               glVertex3f(machineSize.x, 0, 0)\r
-               glVertex3f(machineSize.x, 0, machineSize.z)\r
-               glVertex3f(machineSize.x, machineSize.y, 0)\r
-               glVertex3f(machineSize.x, machineSize.y, machineSize.z)\r
-               glVertex3f(0, machineSize.y, 0)\r
-               glVertex3f(0, machineSize.y, machineSize.z)\r
-               glEnd()\r
-       else:\r
-               glDisable(GL_CULL_FACE)\r
-               glEnable(GL_BLEND)\r
-               glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA)\r
-               glColor4ub(5,171,231,127)\r
-               glBegin(GL_QUADS)\r
-               for x in xrange(0, int(machineSize.x), 20):\r
-                       for y in xrange(0, int(machineSize.y), 20):\r
-                               glVertex3f(x, y, -0.01)\r
-                               glVertex3f(min(x+10, machineSize.x), y, -0.01)\r
-                               glVertex3f(min(x+10, machineSize.x), min(y+10, machineSize.y), -0.01)\r
-                               glVertex3f(x, min(y+10, machineSize.y), -0.01)\r
-               for x in xrange(10, int(machineSize.x), 20):\r
-                       for y in xrange(10, int(machineSize.y), 20):\r
-                               glVertex3f(x, y, -0.01)\r
-                               glVertex3f(min(x+10, machineSize.x), y, -0.01)\r
-                               glVertex3f(min(x+10, machineSize.x), min(y+10, machineSize.y), -0.01)\r
-                               glVertex3f(x, min(y+10, machineSize.y), -0.01)\r
-               glEnd()\r
-               glColor4ub(5*8/10,171*8/10,231*8/10,128)\r
-               glBegin(GL_QUADS)\r
-               for x in xrange(10, int(machineSize.x), 20):\r
-                       for y in xrange(0, int(machineSize.y), 20):\r
-                               glVertex3f(x, y, -0.01)\r
-                               glVertex3f(min(x+10, machineSize.x), y, -0.01)\r
-                               glVertex3f(min(x+10, machineSize.x), min(y+10, machineSize.y), -0.01)\r
-                               glVertex3f(x, min(y+10, machineSize.y), -0.01)\r
-               for x in xrange(0, int(machineSize.x), 20):\r
-                       for y in xrange(10, int(machineSize.y), 20):\r
-                               glVertex3f(x, y, -0.01)\r
-                               glVertex3f(min(x+10, machineSize.x), y, -0.01)\r
-                               glVertex3f(min(x+10, machineSize.x), min(y+10, machineSize.y), -0.01)\r
-                               glVertex3f(x, min(y+10, machineSize.y), -0.01)\r
-               glEnd()\r
-               glEnable(GL_CULL_FACE)\r
-\r
-               glColor4ub(5,171,231,64)\r
-               glBegin(GL_QUADS)\r
-               glVertex3f(0, 0, machineSize.z)\r
-               glVertex3f(0, machineSize.y, machineSize.z)\r
-               glVertex3f(machineSize.x, machineSize.y, machineSize.z)\r
-               glVertex3f(machineSize.x, 0, machineSize.z)\r
-               glEnd()\r
-               \r
-               glColor4ub(5,171,231,96)\r
-               glBegin(GL_QUADS)\r
-               glVertex3f(0, 0, 0)\r
-               glVertex3f(0, 0, machineSize.z)\r
-               glVertex3f(machineSize.x, 0, machineSize.z)\r
-               glVertex3f(machineSize.x, 0, 0)\r
-\r
-               glVertex3f(0, machineSize.y, machineSize.z)\r
-               glVertex3f(0, machineSize.y, 0)\r
-               glVertex3f(machineSize.x, machineSize.y, 0)\r
-               glVertex3f(machineSize.x, machineSize.y, machineSize.z)\r
-               glEnd()\r
-\r
-               glColor4ub(5,171,231,128)\r
-               glBegin(GL_QUADS)\r
-               glVertex3f(0, 0, machineSize.z)\r
-               glVertex3f(0, 0, 0)\r
-               glVertex3f(0, machineSize.y, 0)\r
-               glVertex3f(0, machineSize.y, machineSize.z)\r
-\r
-               glVertex3f(machineSize.x, 0, 0)\r
-               glVertex3f(machineSize.x, 0, machineSize.z)\r
-               glVertex3f(machineSize.x, machineSize.y, machineSize.z)\r
-               glVertex3f(machineSize.x, machineSize.y, 0)\r
-               glEnd()\r
-\r
-               glDisable(GL_BLEND)\r
-       \r
-       glPushMatrix()\r
-       glTranslate(5,5,2)\r
-       glLineWidth(2)\r
-       glColor3f(0.5,0,0)\r
-       glBegin(GL_LINES)\r
-       glVertex3f(0,0,0)\r
-       glVertex3f(20,0,0)\r
-       glEnd()\r
-       glColor3f(0,0.5,0)\r
-       glBegin(GL_LINES)\r
-       glVertex3f(0,0,0)\r
-       glVertex3f(0,20,0)\r
-       glEnd()\r
-       glColor3f(0,0,0.5)\r
-       glBegin(GL_LINES)\r
-       glVertex3f(0,0,0)\r
-       glVertex3f(0,0,20)\r
-       glEnd()\r
-\r
-       glDisable(GL_DEPTH_TEST)\r
-       #X\r
-       glColor3f(1,0,0)\r
-       glPushMatrix()\r
-       glTranslate(23,0,0)\r
-       noZ = ResetMatrixRotationAndScale()\r
-       glBegin(GL_LINES)\r
-       glVertex3f(-0.8,1,0)\r
-       glVertex3f(0.8,-1,0)\r
-       glVertex3f(0.8,1,0)\r
-       glVertex3f(-0.8,-1,0)\r
-       glEnd()\r
-       glPopMatrix()\r
-\r
-       #Y\r
-       glColor3f(0,1,0)\r
-       glPushMatrix()\r
-       glTranslate(0,23,0)\r
-       ResetMatrixRotationAndScale()\r
-       glBegin(GL_LINES)\r
-       glVertex3f(-0.8, 1,0)\r
-       glVertex3f( 0.0, 0,0)\r
-       glVertex3f( 0.8, 1,0)\r
-       glVertex3f(-0.8,-1,0)\r
-       glEnd()\r
-       glPopMatrix()\r
-\r
-       #Z\r
-       if not noZ:\r
-               glColor3f(0,0,1)\r
-               glPushMatrix()\r
-               glTranslate(0,0,23)\r
-               ResetMatrixRotationAndScale()\r
-               glBegin(GL_LINES)\r
-               glVertex3f(-0.8, 1,0)\r
-               glVertex3f( 0.8, 1,0)\r
-               glVertex3f( 0.8, 1,0)\r
-               glVertex3f(-0.8,-1,0)\r
-               glVertex3f(-0.8,-1,0)\r
-               glVertex3f( 0.8,-1,0)\r
-               glEnd()\r
-               glPopMatrix()\r
-\r
-       glPopMatrix()\r
-       glEnable(GL_DEPTH_TEST)\r
-       \r
-def ResetMatrixRotationAndScale():\r
-       matrix = glGetFloatv(GL_MODELVIEW_MATRIX)\r
-       noZ = False\r
-       if matrix[3][2] > 0:\r
-               return False\r
-       scale2D = matrix[0][0]\r
-       matrix[0][0] = 1.0\r
-       matrix[1][0] = 0.0\r
-       matrix[2][0] = 0.0\r
-       matrix[0][1] = 0.0\r
-       matrix[1][1] = 1.0\r
-       matrix[2][1] = 0.0\r
-       matrix[0][2] = 0.0\r
-       matrix[1][2] = 0.0\r
-       matrix[2][2] = 1.0\r
-       \r
-       if matrix[3][2] != 0.0:\r
-               matrix[3][0] = matrix[3][0] / (-matrix[3][2] / 100)\r
-               matrix[3][1] = matrix[3][1] / (-matrix[3][2] / 100)\r
-               matrix[3][2] = -100\r
-       else:\r
-               matrix[0][0] = scale2D\r
-               matrix[1][1] = scale2D\r
-               matrix[2][2] = scale2D\r
-               matrix[3][2] = -100\r
-               noZ = True\r
-       \r
-       glLoadMatrixf(matrix)\r
-       return noZ\r
-\r
-def DrawBox(vMin, vMax):\r
-       glBegin(GL_LINE_LOOP)\r
-       glVertex3f(vMin[0], vMin[1], vMin[2])\r
-       glVertex3f(vMax[0], vMin[1], vMin[2])\r
-       glVertex3f(vMax[0], vMax[1], vMin[2])\r
-       glVertex3f(vMin[0], vMax[1], vMin[2])\r
-       glEnd()\r
-\r
-       glBegin(GL_LINE_LOOP)\r
-       glVertex3f(vMin[0], vMin[1], vMax[2])\r
-       glVertex3f(vMax[0], vMin[1], vMax[2])\r
-       glVertex3f(vMax[0], vMax[1], vMax[2])\r
-       glVertex3f(vMin[0], vMax[1], vMax[2])\r
-       glEnd()\r
-       glBegin(GL_LINES)\r
-       glVertex3f(vMin[0], vMin[1], vMin[2])\r
-       glVertex3f(vMin[0], vMin[1], vMax[2])\r
-       glVertex3f(vMax[0], vMin[1], vMin[2])\r
-       glVertex3f(vMax[0], vMin[1], vMax[2])\r
-       glVertex3f(vMax[0], vMax[1], vMin[2])\r
-       glVertex3f(vMax[0], vMax[1], vMax[2])\r
-       glVertex3f(vMin[0], vMax[1], vMin[2])\r
-       glVertex3f(vMin[0], vMax[1], vMax[2])\r
-       glEnd()\r
-\r
-def DrawMeshOutline(mesh):\r
-       glEnable(GL_CULL_FACE)\r
-       glEnableClientState(GL_VERTEX_ARRAY);\r
-       glVertexPointer(3, GL_FLOAT, 0, mesh.vertexes)\r
-\r
-       glCullFace(GL_FRONT)\r
-       glLineWidth(3)\r
-       glPolygonMode(GL_BACK, GL_LINE)\r
-       glDrawArrays(GL_TRIANGLES, 0, mesh.vertexCount)\r
-       glPolygonMode(GL_BACK, GL_FILL)\r
-       glCullFace(GL_BACK)\r
-       \r
-       glDisableClientState(GL_VERTEX_ARRAY)\r
-\r
-def DrawMesh(mesh):\r
-       glEnable(GL_CULL_FACE)\r
-       glEnableClientState(GL_VERTEX_ARRAY);\r
-       glEnableClientState(GL_NORMAL_ARRAY);\r
-       glVertexPointer(3, GL_FLOAT, 0, mesh.vertexes)\r
-       glNormalPointer(GL_FLOAT, 0, mesh.normal)\r
-\r
-       #Odd, drawing in batchs is a LOT faster then drawing it all at once.\r
-       batchSize = 999 #Warning, batchSize needs to be dividable by 3\r
-       extraStartPos = int(mesh.vertexCount / batchSize) * batchSize\r
-       extraCount = mesh.vertexCount - extraStartPos\r
-       \r
-       glCullFace(GL_BACK)\r
-       for i in xrange(0, int(mesh.vertexCount / batchSize)):\r
-               glDrawArrays(GL_TRIANGLES, i*batchSize, batchSize)\r
-       glDrawArrays(GL_TRIANGLES, extraStartPos, extraCount)\r
-       \r
-       glCullFace(GL_FRONT)\r
-       glNormalPointer(GL_FLOAT, 0, mesh.invNormal)\r
-       for i in xrange(0, int(mesh.vertexCount / batchSize)):\r
-               glDrawArrays(GL_TRIANGLES, i*batchSize, batchSize)\r
-       extraStartPos = int(mesh.vertexCount / batchSize) * batchSize\r
-       extraCount = mesh.vertexCount - extraStartPos\r
-       glDrawArrays(GL_TRIANGLES, extraStartPos, extraCount)\r
-       glCullFace(GL_BACK)\r
-       \r
-       glDisableClientState(GL_VERTEX_ARRAY)\r
-       glDisableClientState(GL_NORMAL_ARRAY);\r
-\r
-def DrawGCodeLayer(layer):\r
-       filamentRadius = profile.getProfileSettingFloat('filament_diameter') / 2\r
-       filamentArea = math.pi * filamentRadius * filamentRadius\r
-       lineWidth = profile.getProfileSettingFloat('nozzle_size') / 2 / 10\r
-       \r
-       fillCycle = 0\r
-       fillColorCycle = [[0.5,0.5,0.0],[0.0,0.5,0.5],[0.5,0.0,0.5]]\r
-       moveColor = [0,0,1]\r
-       retractColor = [1,0,0.5]\r
-       supportColor = [0,1,1]\r
-       extrudeColor = [1,0,0]\r
-       innerWallColor = [0,1,0]\r
-       skirtColor = [0,0.5,0.5]\r
-       prevPathWasRetract = False\r
-       \r
-       glDisable(GL_CULL_FACE)\r
-       for path in layer:\r
-               if path.type == 'move':\r
-                       if prevPathWasRetract:\r
-                               c = retractColor\r
-                       else:\r
-                               c = moveColor\r
-               zOffset = 0.01\r
-               if path.type == 'extrude':\r
-                       if path.pathType == 'FILL':\r
-                               c = fillColorCycle[fillCycle]\r
-                               fillCycle = (fillCycle + 1) % len(fillColorCycle)\r
-                       elif path.pathType == 'WALL-INNER':\r
-                               c = innerWallColor\r
-                               zOffset = 0.02\r
-                       elif path.pathType == 'SUPPORT':\r
-                               c = supportColor\r
-                       elif path.pathType == 'SKIRT':\r
-                               c = skirtColor\r
-                       else:\r
-                               c = extrudeColor\r
-               if path.type == 'retract':\r
-                       c = [0,1,1]\r
-               if path.type == 'extrude':\r
-                       drawLength = 0.0\r
-                       prevNormal = None\r
-                       for i in xrange(0, len(path.list)-1):\r
-                               v0 = path.list[i]\r
-                               v1 = path.list[i+1]\r
-\r
-                               # Calculate line width from ePerDistance (needs layer thickness and filament diameter)\r
-                               dist = (v0 - v1).vsize()\r
-                               if dist > 0 and path.layerThickness > 0:\r
-                                       extrusionMMperDist = (v1.e - v0.e) / dist\r
-                                       lineWidth = extrusionMMperDist * filamentArea / path.layerThickness / 2 * v1.extrudeAmountMultiply\r
-\r
-                               drawLength += (v0 - v1).vsize()\r
-                               normal = (v0 - v1).cross(util3d.Vector3(0,0,1))\r
-                               normal.normalize()\r
-\r
-                               vv2 = v0 + normal * lineWidth\r
-                               vv3 = v1 + normal * lineWidth\r
-                               vv0 = v0 - normal * lineWidth\r
-                               vv1 = v1 - normal * lineWidth\r
-\r
-                               glBegin(GL_QUADS)\r
-                               glColor3fv(c)\r
-                               glVertex3f(vv0.x, vv0.y, vv0.z - zOffset)\r
-                               glVertex3f(vv1.x, vv1.y, vv1.z - zOffset)\r
-                               glVertex3f(vv3.x, vv3.y, vv3.z - zOffset)\r
-                               glVertex3f(vv2.x, vv2.y, vv2.z - zOffset)\r
-                               glEnd()\r
-                               if prevNormal != None:\r
-                                       n = (normal + prevNormal)\r
-                                       n.normalize()\r
-                                       vv4 = v0 + n * lineWidth\r
-                                       vv5 = v0 - n * lineWidth\r
-                                       glBegin(GL_QUADS)\r
-                                       glColor3fv(c)\r
-                                       glVertex3f(vv2.x, vv2.y, vv2.z - zOffset)\r
-                                       glVertex3f(vv4.x, vv4.y, vv4.z - zOffset)\r
-                                       glVertex3f(prevVv3.x, prevVv3.y, prevVv3.z - zOffset)\r
-                                       glVertex3f(v0.x, v0.y, v0.z - zOffset)\r
-                                       \r
-                                       glVertex3f(vv0.x, vv0.y, vv0.z - zOffset)\r
-                                       glVertex3f(vv5.x, vv5.y, vv5.z - zOffset)\r
-                                       glVertex3f(prevVv1.x, prevVv1.y, prevVv1.z - zOffset)\r
-                                       glVertex3f(v0.x, v0.y, v0.z - zOffset)\r
-                                       glEnd()\r
-                                       \r
-                               prevNormal = normal\r
-                               prevVv1 = vv1\r
-                               prevVv3 = vv3\r
-               else:\r
-                       glBegin(GL_LINE_STRIP)\r
-                       glColor3fv(c)\r
-                       for v in path.list:\r
-                               glVertex3f(v.x, v.y, v.z)\r
-                       glEnd()\r
-               if not path.type == 'move':\r
-                       prevPathWasRetract = False\r
-               if path.type == 'retract' and path.list[0].almostEqual(path.list[-1]):\r
-                       prevPathWasRetract = True\r
-       glEnable(GL_CULL_FACE)\r
+# coding=utf-8
+from __future__ import absolute_import
+
+import math
+
+from util import meshLoader
+from util import util3d
+from util import profile
+from util.resources import getPathForMesh
+
+try:
+       import OpenGL
+
+       OpenGL.ERROR_CHECKING = False
+       from OpenGL.GLU import *
+       from OpenGL.GL import *
+
+       hasOpenGLlibs = True
+except:
+       print "Failed to find PyOpenGL: http://pyopengl.sourceforge.net/"
+       hasOpenGLlibs = False
+
+def InitGL(window, view3D, zoom):
+       # set viewing projection
+       glMatrixMode(GL_MODELVIEW)
+       glLoadIdentity()
+       size = window.GetSize()
+       glViewport(0, 0, size.GetWidth(), size.GetHeight())
+
+       glLightfv(GL_LIGHT0, GL_POSITION, [0.2, 0.2, 1.0, 0.0])
+       glLightfv(GL_LIGHT1, GL_POSITION, [1.0, 1.0, 1.0, 0.0])
+
+       glEnable(GL_RESCALE_NORMAL)
+       glEnable(GL_LIGHTING)
+       glEnable(GL_LIGHT0)
+       glEnable(GL_DEPTH_TEST)
+       glEnable(GL_CULL_FACE)
+       glDisable(GL_BLEND)
+
+       glClearColor(1.0, 1.0, 1.0, 1.0)
+       glClearStencil(0)
+       glClearDepth(1.0)
+
+       glMatrixMode(GL_PROJECTION)
+       glLoadIdentity()
+       aspect = float(size.GetWidth()) / float(size.GetHeight())
+       if view3D:
+               gluPerspective(45.0, aspect, 1.0, 1000.0)
+       else:
+               glOrtho(-aspect * (zoom), aspect * (zoom), -1.0 * (zoom), 1.0 * (zoom), -1000.0, 1000.0)
+
+       glMatrixMode(GL_MODELVIEW)
+       glLoadIdentity()
+       glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT | GL_STENCIL_BUFFER_BIT)
+
+platformMesh = None
+
+def DrawMachine(machineSize):
+       if profile.getPreference('machine_type') == 'ultimaker':
+               glPushMatrix()
+               glEnable(GL_LIGHTING)
+               glTranslate(100, 200, -5)
+               glLightfv(GL_LIGHT0, GL_DIFFUSE, [0.8, 0.8, 0.8])
+               glLightfv(GL_LIGHT0, GL_AMBIENT, [0.5, 0.5, 0.5])
+               glEnable(GL_BLEND)
+               glBlendFunc(GL_SRC_COLOR, GL_ONE_MINUS_SRC_COLOR)
+
+               global platformMesh
+               if platformMesh == None:
+                       platformMesh = meshLoader.loadMesh(getPathForMesh('ultimaker_platform.stl'))
+                       platformMesh.setRotateMirror(0, False, False, False, False, False)
+
+               DrawMesh(platformMesh)
+               glPopMatrix()
+
+       glDisable(GL_LIGHTING)
+       if False:
+               glColor3f(0.7, 0.7, 0.7)
+               glLineWidth(2)
+               glBegin(GL_LINES)
+               for i in xrange(0, int(machineSize.x), 10):
+                       glVertex3f(i, 0, 0)
+                       glVertex3f(i, machineSize.y, 0)
+               for i in xrange(0, int(machineSize.y), 10):
+                       glVertex3f(0, i, 0)
+                       glVertex3f(machineSize.x, i, 0)
+               glEnd()
+
+               glEnable(GL_LINE_SMOOTH)
+               glEnable(GL_BLEND)
+               glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA)
+               glHint(GL_LINE_SMOOTH_HINT, GL_DONT_CARE);
+
+               glColor3f(0.0, 0.0, 0.0)
+               glLineWidth(4)
+               glBegin(GL_LINE_LOOP)
+               glVertex3f(0, 0, 0)
+               glVertex3f(machineSize.x, 0, 0)
+               glVertex3f(machineSize.x, machineSize.y, 0)
+               glVertex3f(0, machineSize.y, 0)
+               glEnd()
+
+               glLineWidth(2)
+               glBegin(GL_LINE_LOOP)
+               glVertex3f(0, 0, machineSize.z)
+               glVertex3f(machineSize.x, 0, machineSize.z)
+               glVertex3f(machineSize.x, machineSize.y, machineSize.z)
+               glVertex3f(0, machineSize.y, machineSize.z)
+               glEnd()
+               glBegin(GL_LINES)
+               glVertex3f(0, 0, 0)
+               glVertex3f(0, 0, machineSize.z)
+               glVertex3f(machineSize.x, 0, 0)
+               glVertex3f(machineSize.x, 0, machineSize.z)
+               glVertex3f(machineSize.x, machineSize.y, 0)
+               glVertex3f(machineSize.x, machineSize.y, machineSize.z)
+               glVertex3f(0, machineSize.y, 0)
+               glVertex3f(0, machineSize.y, machineSize.z)
+               glEnd()
+       else:
+               glDisable(GL_CULL_FACE)
+               glEnable(GL_BLEND)
+               glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA)
+               glColor4ub(5, 171, 231, 127)
+               glBegin(GL_QUADS)
+               for x in xrange(0, int(machineSize.x), 20):
+                       for y in xrange(0, int(machineSize.y), 20):
+                               glVertex3f(x, y, -0.01)
+                               glVertex3f(min(x + 10, machineSize.x), y, -0.01)
+                               glVertex3f(min(x + 10, machineSize.x), min(y + 10, machineSize.y), -0.01)
+                               glVertex3f(x, min(y + 10, machineSize.y), -0.01)
+               for x in xrange(10, int(machineSize.x), 20):
+                       for y in xrange(10, int(machineSize.y), 20):
+                               glVertex3f(x, y, -0.01)
+                               glVertex3f(min(x + 10, machineSize.x), y, -0.01)
+                               glVertex3f(min(x + 10, machineSize.x), min(y + 10, machineSize.y), -0.01)
+                               glVertex3f(x, min(y + 10, machineSize.y), -0.01)
+               glEnd()
+               glColor4ub(5 * 8 / 10, 171 * 8 / 10, 231 * 8 / 10, 128)
+               glBegin(GL_QUADS)
+               for x in xrange(10, int(machineSize.x), 20):
+                       for y in xrange(0, int(machineSize.y), 20):
+                               glVertex3f(x, y, -0.01)
+                               glVertex3f(min(x + 10, machineSize.x), y, -0.01)
+                               glVertex3f(min(x + 10, machineSize.x), min(y + 10, machineSize.y), -0.01)
+                               glVertex3f(x, min(y + 10, machineSize.y), -0.01)
+               for x in xrange(0, int(machineSize.x), 20):
+                       for y in xrange(10, int(machineSize.y), 20):
+                               glVertex3f(x, y, -0.01)
+                               glVertex3f(min(x + 10, machineSize.x), y, -0.01)
+                               glVertex3f(min(x + 10, machineSize.x), min(y + 10, machineSize.y), -0.01)
+                               glVertex3f(x, min(y + 10, machineSize.y), -0.01)
+               glEnd()
+               glEnable(GL_CULL_FACE)
+
+               glColor4ub(5, 171, 231, 64)
+               glBegin(GL_QUADS)
+               glVertex3f(0, 0, machineSize.z)
+               glVertex3f(0, machineSize.y, machineSize.z)
+               glVertex3f(machineSize.x, machineSize.y, machineSize.z)
+               glVertex3f(machineSize.x, 0, machineSize.z)
+               glEnd()
+
+               glColor4ub(5, 171, 231, 96)
+               glBegin(GL_QUADS)
+               glVertex3f(0, 0, 0)
+               glVertex3f(0, 0, machineSize.z)
+               glVertex3f(machineSize.x, 0, machineSize.z)
+               glVertex3f(machineSize.x, 0, 0)
+
+               glVertex3f(0, machineSize.y, machineSize.z)
+               glVertex3f(0, machineSize.y, 0)
+               glVertex3f(machineSize.x, machineSize.y, 0)
+               glVertex3f(machineSize.x, machineSize.y, machineSize.z)
+               glEnd()
+
+               glColor4ub(5, 171, 231, 128)
+               glBegin(GL_QUADS)
+               glVertex3f(0, 0, machineSize.z)
+               glVertex3f(0, 0, 0)
+               glVertex3f(0, machineSize.y, 0)
+               glVertex3f(0, machineSize.y, machineSize.z)
+
+               glVertex3f(machineSize.x, 0, 0)
+               glVertex3f(machineSize.x, 0, machineSize.z)
+               glVertex3f(machineSize.x, machineSize.y, machineSize.z)
+               glVertex3f(machineSize.x, machineSize.y, 0)
+               glEnd()
+
+               glDisable(GL_BLEND)
+
+       glPushMatrix()
+       glTranslate(5, 5, 2)
+       glLineWidth(2)
+       glColor3f(0.5, 0, 0)
+       glBegin(GL_LINES)
+       glVertex3f(0, 0, 0)
+       glVertex3f(20, 0, 0)
+       glEnd()
+       glColor3f(0, 0.5, 0)
+       glBegin(GL_LINES)
+       glVertex3f(0, 0, 0)
+       glVertex3f(0, 20, 0)
+       glEnd()
+       glColor3f(0, 0, 0.5)
+       glBegin(GL_LINES)
+       glVertex3f(0, 0, 0)
+       glVertex3f(0, 0, 20)
+       glEnd()
+
+       glDisable(GL_DEPTH_TEST)
+       #X
+       glColor3f(1, 0, 0)
+       glPushMatrix()
+       glTranslate(23, 0, 0)
+       noZ = ResetMatrixRotationAndScale()
+       glBegin(GL_LINES)
+       glVertex3f(-0.8, 1, 0)
+       glVertex3f(0.8, -1, 0)
+       glVertex3f(0.8, 1, 0)
+       glVertex3f(-0.8, -1, 0)
+       glEnd()
+       glPopMatrix()
+
+       #Y
+       glColor3f(0, 1, 0)
+       glPushMatrix()
+       glTranslate(0, 23, 0)
+       ResetMatrixRotationAndScale()
+       glBegin(GL_LINES)
+       glVertex3f(-0.8, 1, 0)
+       glVertex3f(0.0, 0, 0)
+       glVertex3f(0.8, 1, 0)
+       glVertex3f(-0.8, -1, 0)
+       glEnd()
+       glPopMatrix()
+
+       #Z
+       if not noZ:
+               glColor3f(0, 0, 1)
+               glPushMatrix()
+               glTranslate(0, 0, 23)
+               ResetMatrixRotationAndScale()
+               glBegin(GL_LINES)
+               glVertex3f(-0.8, 1, 0)
+               glVertex3f(0.8, 1, 0)
+               glVertex3f(0.8, 1, 0)
+               glVertex3f(-0.8, -1, 0)
+               glVertex3f(-0.8, -1, 0)
+               glVertex3f(0.8, -1, 0)
+               glEnd()
+               glPopMatrix()
+
+       glPopMatrix()
+       glEnable(GL_DEPTH_TEST)
+
+
+def ResetMatrixRotationAndScale():
+       matrix = glGetFloatv(GL_MODELVIEW_MATRIX)
+       noZ = False
+       if matrix[3][2] > 0:
+               return False
+       scale2D = matrix[0][0]
+       matrix[0][0] = 1.0
+       matrix[1][0] = 0.0
+       matrix[2][0] = 0.0
+       matrix[0][1] = 0.0
+       matrix[1][1] = 1.0
+       matrix[2][1] = 0.0
+       matrix[0][2] = 0.0
+       matrix[1][2] = 0.0
+       matrix[2][2] = 1.0
+
+       if matrix[3][2] != 0.0:
+               matrix[3][0] = matrix[3][0] / (-matrix[3][2] / 100)
+               matrix[3][1] = matrix[3][1] / (-matrix[3][2] / 100)
+               matrix[3][2] = -100
+       else:
+               matrix[0][0] = scale2D
+               matrix[1][1] = scale2D
+               matrix[2][2] = scale2D
+               matrix[3][2] = -100
+               noZ = True
+
+       glLoadMatrixf(matrix)
+       return noZ
+
+
+def DrawBox(vMin, vMax):
+       glBegin(GL_LINE_LOOP)
+       glVertex3f(vMin[0], vMin[1], vMin[2])
+       glVertex3f(vMax[0], vMin[1], vMin[2])
+       glVertex3f(vMax[0], vMax[1], vMin[2])
+       glVertex3f(vMin[0], vMax[1], vMin[2])
+       glEnd()
+
+       glBegin(GL_LINE_LOOP)
+       glVertex3f(vMin[0], vMin[1], vMax[2])
+       glVertex3f(vMax[0], vMin[1], vMax[2])
+       glVertex3f(vMax[0], vMax[1], vMax[2])
+       glVertex3f(vMin[0], vMax[1], vMax[2])
+       glEnd()
+       glBegin(GL_LINES)
+       glVertex3f(vMin[0], vMin[1], vMin[2])
+       glVertex3f(vMin[0], vMin[1], vMax[2])
+       glVertex3f(vMax[0], vMin[1], vMin[2])
+       glVertex3f(vMax[0], vMin[1], vMax[2])
+       glVertex3f(vMax[0], vMax[1], vMin[2])
+       glVertex3f(vMax[0], vMax[1], vMax[2])
+       glVertex3f(vMin[0], vMax[1], vMin[2])
+       glVertex3f(vMin[0], vMax[1], vMax[2])
+       glEnd()
+
+
+def DrawMeshOutline(mesh):
+       glEnable(GL_CULL_FACE)
+       glEnableClientState(GL_VERTEX_ARRAY);
+       glVertexPointer(3, GL_FLOAT, 0, mesh.vertexes)
+
+       glCullFace(GL_FRONT)
+       glLineWidth(3)
+       glPolygonMode(GL_BACK, GL_LINE)
+       glDrawArrays(GL_TRIANGLES, 0, mesh.vertexCount)
+       glPolygonMode(GL_BACK, GL_FILL)
+       glCullFace(GL_BACK)
+
+       glDisableClientState(GL_VERTEX_ARRAY)
+
+
+def DrawMesh(mesh):
+       glEnable(GL_CULL_FACE)
+       glEnableClientState(GL_VERTEX_ARRAY);
+       glEnableClientState(GL_NORMAL_ARRAY);
+       glVertexPointer(3, GL_FLOAT, 0, mesh.vertexes)
+       glNormalPointer(GL_FLOAT, 0, mesh.normal)
+
+       #Odd, drawing in batchs is a LOT faster then drawing it all at once.
+       batchSize = 999    #Warning, batchSize needs to be dividable by 3
+       extraStartPos = int(mesh.vertexCount / batchSize) * batchSize
+       extraCount = mesh.vertexCount - extraStartPos
+
+       glCullFace(GL_BACK)
+       for i in xrange(0, int(mesh.vertexCount / batchSize)):
+               glDrawArrays(GL_TRIANGLES, i * batchSize, batchSize)
+       glDrawArrays(GL_TRIANGLES, extraStartPos, extraCount)
+
+       glCullFace(GL_FRONT)
+       glNormalPointer(GL_FLOAT, 0, mesh.invNormal)
+       for i in xrange(0, int(mesh.vertexCount / batchSize)):
+               glDrawArrays(GL_TRIANGLES, i * batchSize, batchSize)
+       extraStartPos = int(mesh.vertexCount / batchSize) * batchSize
+       extraCount = mesh.vertexCount - extraStartPos
+       glDrawArrays(GL_TRIANGLES, extraStartPos, extraCount)
+       glCullFace(GL_BACK)
+
+       glDisableClientState(GL_VERTEX_ARRAY)
+       glDisableClientState(GL_NORMAL_ARRAY);
+
+
+def DrawGCodeLayer(layer):
+       filamentRadius = profile.getProfileSettingFloat('filament_diameter') / 2
+       filamentArea = math.pi * filamentRadius * filamentRadius
+       lineWidth = profile.getProfileSettingFloat('nozzle_size') / 2 / 10
+
+       fillCycle = 0
+       fillColorCycle = [[0.5, 0.5, 0.0], [0.0, 0.5, 0.5], [0.5, 0.0, 0.5]]
+       moveColor = [0, 0, 1]
+       retractColor = [1, 0, 0.5]
+       supportColor = [0, 1, 1]
+       extrudeColor = [1, 0, 0]
+       innerWallColor = [0, 1, 0]
+       skirtColor = [0, 0.5, 0.5]
+       prevPathWasRetract = False
+
+       glDisable(GL_CULL_FACE)
+       for path in layer:
+               if path.type == 'move':
+                       if prevPathWasRetract:
+                               c = retractColor
+                       else:
+                               c = moveColor
+               zOffset = 0.01
+               if path.type == 'extrude':
+                       if path.pathType == 'FILL':
+                               c = fillColorCycle[fillCycle]
+                               fillCycle = (fillCycle + 1) % len(fillColorCycle)
+                       elif path.pathType == 'WALL-INNER':
+                               c = innerWallColor
+                               zOffset = 0.02
+                       elif path.pathType == 'SUPPORT':
+                               c = supportColor
+                       elif path.pathType == 'SKIRT':
+                               c = skirtColor
+                       else:
+                               c = extrudeColor
+               if path.type == 'retract':
+                       c = [0, 1, 1]
+               if path.type == 'extrude':
+                       drawLength = 0.0
+                       prevNormal = None
+                       for i in xrange(0, len(path.list) - 1):
+                               v0 = path.list[i]
+                               v1 = path.list[i + 1]
+
+                               # Calculate line width from ePerDistance (needs layer thickness and filament diameter)
+                               dist = (v0 - v1).vsize()
+                               if dist > 0 and path.layerThickness > 0:
+                                       extrusionMMperDist = (v1.e - v0.e) / dist
+                                       lineWidth = extrusionMMperDist * filamentArea / path.layerThickness / 2 * v1.extrudeAmountMultiply
+
+                               drawLength += (v0 - v1).vsize()
+                               normal = (v0 - v1).cross(util3d.Vector3(0, 0, 1))
+                               normal.normalize()
+
+                               vv2 = v0 + normal * lineWidth
+                               vv3 = v1 + normal * lineWidth
+                               vv0 = v0 - normal * lineWidth
+                               vv1 = v1 - normal * lineWidth
+
+                               glBegin(GL_QUADS)
+                               glColor3fv(c)
+                               glVertex3f(vv0.x, vv0.y, vv0.z - zOffset)
+                               glVertex3f(vv1.x, vv1.y, vv1.z - zOffset)
+                               glVertex3f(vv3.x, vv3.y, vv3.z - zOffset)
+                               glVertex3f(vv2.x, vv2.y, vv2.z - zOffset)
+                               glEnd()
+                               if prevNormal != None:
+                                       n = (normal + prevNormal)
+                                       n.normalize()
+                                       vv4 = v0 + n * lineWidth
+                                       vv5 = v0 - n * lineWidth
+                                       glBegin(GL_QUADS)
+                                       glColor3fv(c)
+                                       glVertex3f(vv2.x, vv2.y, vv2.z - zOffset)
+                                       glVertex3f(vv4.x, vv4.y, vv4.z - zOffset)
+                                       glVertex3f(prevVv3.x, prevVv3.y, prevVv3.z - zOffset)
+                                       glVertex3f(v0.x, v0.y, v0.z - zOffset)
+
+                                       glVertex3f(vv0.x, vv0.y, vv0.z - zOffset)
+                                       glVertex3f(vv5.x, vv5.y, vv5.z - zOffset)
+                                       glVertex3f(prevVv1.x, prevVv1.y, prevVv1.z - zOffset)
+                                       glVertex3f(v0.x, v0.y, v0.z - zOffset)
+                                       glEnd()
+
+                               prevNormal = normal
+                               prevVv1 = vv1
+                               prevVv3 = vv3
+               else:
+                       glBegin(GL_LINE_STRIP)
+                       glColor3fv(c)
+                       for v in path.list:
+                               glVertex3f(v.x, v.y, v.z)
+                       glEnd()
+               if not path.type == 'move':
+                       prevPathWasRetract = False
+               if path.type == 'retract' and path.list[0].almostEqual(path.list[-1]):
+                       prevPathWasRetract = True
+       glEnable(GL_CULL_FACE)
index 0b8e2a4ee54960007cbb1eff5cdd8fa287d2f3d9..87d898bed4b72ab04a58c078649c5dfa7397d315 100644 (file)
-from __future__ import absolute_import\r
-import __init__\r
-\r
-import wx, threading, re, subprocess, sys, os, time, platform\r
-from wx.lib import buttons\r
-\r
-from gui import icon\r
-from gui import toolbarUtil\r
-from gui import webcam\r
-from gui import taskbar\r
-from util import machineCom\r
-from util import profile\r
-from util import gcodeInterpreter\r
-from util import power\r
-\r
-printWindowMonitorHandle = None\r
-\r
-def printFile(filename):\r
-       global printWindowMonitorHandle\r
-       if printWindowMonitorHandle == None:\r
-               printWindowMonitorHandle = printProcessMonitor()\r
-       printWindowMonitorHandle.loadFile(filename)\r
-\r
-def startPrintInterface(filename):\r
-       #startPrintInterface is called from the main script when we want the printer interface to run in a seperate process.\r
-       # It needs to run in a seperate process, as any running python code blocks the GCode sender pyton code (http://wiki.python.org/moin/GlobalInterpreterLock).\r
-       app = wx.App(False)\r
-       printWindowHandle = printWindow()\r
-       printWindowHandle.Show(True)\r
-       printWindowHandle.Raise()\r
-       printWindowHandle.OnConnect(None)\r
-       t = threading.Thread(target=printWindowHandle.LoadGCodeFile,args=(filename,))\r
-       t.daemon = True\r
-       t.start()\r
-       app.MainLoop()\r
-\r
-class printProcessMonitor():\r
-       def __init__(self):\r
-               self.handle = None\r
-       \r
-       def loadFile(self, filename):\r
+# coding=utf-8
+from __future__ import absolute_import
+
+import threading
+import re
+import subprocess
+import sys
+import time
+import platform
+
+import wx
+from wx.lib import buttons
+
+from gui import icon
+from gui import toolbarUtil
+from gui import webcam
+from gui import taskbar
+from util import machineCom
+from util import profile
+from util import gcodeInterpreter
+from util import power
+from util.resources import getPathForImage
+
+printWindowMonitorHandle = None
+
+def printFile(filename):
+       global printWindowMonitorHandle
+       if printWindowMonitorHandle == None:
+               printWindowMonitorHandle = printProcessMonitor()
+       printWindowMonitorHandle.loadFile(filename)
+
+
+def startPrintInterface(filename):
+       #startPrintInterface is called from the main script when we want the printer interface to run in a seperate process.
+       # It needs to run in a seperate process, as any running python code blocks the GCode sender pyton code (http://wiki.python.org/moin/GlobalInterpreterLock).
+       app = wx.App(False)
+       printWindowHandle = printWindow()
+       printWindowHandle.Show(True)
+       printWindowHandle.Raise()
+       printWindowHandle.OnConnect(None)
+       t = threading.Thread(target=printWindowHandle.LoadGCodeFile, args=(filename,))
+       t.daemon = True
+       t.start()
+       app.MainLoop()
+
+
+class printProcessMonitor():
+       def __init__(self):
+               self.handle = None
+
+       def loadFile(self, filename):
                if self.handle == None:
                        cmdList = [sys.executable, sys.argv[0], '-r', filename]
                        if platform.system() == "Darwin":
                                if platform.machine() == 'i386':
                                        cmdList.insert(0, 'arch')
                                        cmdList.insert(1, '-i386')
-                       self.handle = subprocess.Popen(cmdList, stdin=subprocess.PIPE, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
-                       self.thread = threading.Thread(target=self.Monitor)\r
-                       self.thread.start()\r
-               else:\r
-                       self.handle.stdin.write(filename + '\n')\r
-       \r
-       def Monitor(self):\r
-               p = self.handle\r
-               line = p.stdout.readline()\r
-               while(len(line) > 0):\r
-                       #print line.rstrip()\r
-                       line = p.stdout.readline()\r
-               p.communicate()\r
-               self.handle = None\r
-               self.thread = None\r
-\r
-class PrintCommandButton(buttons.GenBitmapButton):\r
-       def __init__(self, parent, commandList, bitmapFilename, size=(20,20)):\r
-               self.bitmap = toolbarUtil.getBitmapImage(bitmapFilename)\r
-               super(PrintCommandButton, self).__init__(parent.directControlPanel, -1, self.bitmap, size=size)\r
-\r
-               self.commandList = commandList\r
-               self.parent = parent\r
-\r
-               self.SetBezelWidth(1)\r
-               self.SetUseFocusIndicator(False)\r
-\r
-               self.Bind(wx.EVT_BUTTON, self.OnClick)\r
-\r
-       def OnClick(self, e):\r
-               if self.parent.machineCom == None or self.parent.machineCom.isPrinting():\r
-                       return;\r
-               for cmd in self.commandList:\r
-                       self.parent.machineCom.sendCommand(cmd)\r
-               e.Skip()\r
-\r
-class printWindow(wx.Frame):\r
-       "Main user interface window"\r
-       def __init__(self):\r
-               super(printWindow, self).__init__(None, -1, title='Printing')\r
-               self.machineCom = None\r
-               self.gcode = None\r
-               self.gcodeList = None\r
-               self.sendList = []\r
-               self.temp = None\r
-               self.bedTemp = None\r
-               self.bufferLineCount = 4\r
-               self.sendCnt = 0\r
-               self.feedrateRatioOuterWall = 1.0\r
-               self.feedrateRatioInnerWall = 1.0\r
-               self.feedrateRatioFill = 1.0\r
-               self.feedrateRatioSupport = 1.0\r
-               self.pause = False\r
-               self.termHistory = []\r
-               self.termHistoryIdx = 0\r
-               \r
-               self.cam = None\r
-               if webcam.hasWebcamSupport():\r
-                       self.cam = webcam.webcam()\r
-                       if not self.cam.hasCamera():\r
-                               self.cam = None\r
-\r
-               #self.SetIcon(icon.getMainIcon())\r
-               \r
-               self.SetSizer(wx.BoxSizer())\r
-               self.panel = wx.Panel(self)\r
-               self.GetSizer().Add(self.panel, 1, flag=wx.EXPAND)\r
-               self.sizer = wx.GridBagSizer(2, 2)\r
-               self.panel.SetSizer(self.sizer)\r
-               \r
-               sb = wx.StaticBox(self.panel, label="Statistics")\r
-               boxsizer = wx.StaticBoxSizer(sb, wx.VERTICAL)\r
-\r
-               self.powerWarningText = wx.StaticText(parent=self.panel,\r
-                       id=-1,\r
-                       label="Connect your computer to AC power\nIf it shuts down during printing, the product will be lost.",\r
-                       style=wx.ALIGN_CENTER)\r
-               self.powerWarningText.SetBackgroundColour('red')\r
-               self.powerWarningText.SetForegroundColour('white')\r
-               boxsizer.AddF(self.powerWarningText, flags=wx.SizerFlags().Expand().Border(wx.BOTTOM, 10))\r
-               self.powerManagement = power.PowerManagement()\r
-               self.powerWarningTimer = wx.Timer(self)\r
-               self.Bind(wx.EVT_TIMER, self.OnPowerWarningChange, self.powerWarningTimer)\r
-               self.OnPowerWarningChange(None)\r
-               self.powerWarningTimer.Start(10000)\r
-\r
-               self.statsText = wx.StaticText(self.panel, -1, "Filament: ####.##m #.##g\nEstimated print time: #####:##\nMachine state:\nDetecting baudrateXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX")\r
-               boxsizer.Add(self.statsText, flag=wx.LEFT, border=5)\r
-               \r
-               self.sizer.Add(boxsizer, pos=(0,0), span=(7,1), flag=wx.EXPAND)\r
-               \r
-               self.connectButton = wx.Button(self.panel, -1, 'Connect')\r
-               #self.loadButton = wx.Button(self.panel, -1, 'Load')\r
-               self.printButton = wx.Button(self.panel, -1, 'Print')\r
-               self.pauseButton = wx.Button(self.panel, -1, 'Pause')\r
-               self.cancelButton = wx.Button(self.panel, -1, 'Cancel print')\r
-               self.machineLogButton = wx.Button(self.panel, -1, 'Error log')\r
-               self.progress = wx.Gauge(self.panel, -1)\r
-               \r
-               self.sizer.Add(self.connectButton, pos=(1,1), flag=wx.EXPAND)\r
-               #self.sizer.Add(self.loadButton, pos=(1,1), flag=wx.EXPAND)\r
-               self.sizer.Add(self.printButton, pos=(2,1), flag=wx.EXPAND)\r
-               self.sizer.Add(self.pauseButton, pos=(3,1), flag=wx.EXPAND)\r
-               self.sizer.Add(self.cancelButton, pos=(4,1), flag=wx.EXPAND)\r
-               self.sizer.Add(self.machineLogButton, pos=(5,1), flag=wx.EXPAND)\r
-               self.sizer.Add(self.progress, pos=(7,0), span=(1,7), flag=wx.EXPAND)\r
-\r
-               nb = wx.Notebook(self.panel)\r
-               self.sizer.Add(nb, pos=(0,2), span=(7,4), flag=wx.EXPAND)\r
-               \r
-               self.temperaturePanel = wx.Panel(nb)\r
-               sizer = wx.GridBagSizer(2, 2)\r
-               self.temperaturePanel.SetSizer(sizer)\r
-\r
-               self.temperatureSelect = wx.SpinCtrl(self.temperaturePanel, -1, '0', size=(21*3,21), style=wx.SP_ARROW_KEYS)\r
-               self.temperatureSelect.SetRange(0, 400)\r
-               self.bedTemperatureLabel = wx.StaticText(self.temperaturePanel, -1, "BedTemp:")\r
-               self.bedTemperatureSelect = wx.SpinCtrl(self.temperaturePanel, -1, '0', size=(21*3,21), style=wx.SP_ARROW_KEYS)\r
-               self.bedTemperatureSelect.SetRange(0, 400)\r
-               self.bedTemperatureLabel.Show(False)\r
-               self.bedTemperatureSelect.Show(False)\r
-               \r
-               self.temperatureGraph = temperatureGraph(self.temperaturePanel)\r
-               \r
-               sizer.Add(wx.StaticText(self.temperaturePanel, -1, "Temp:"), pos=(0,0))\r
-               sizer.Add(self.temperatureSelect, pos=(0,1))\r
-               sizer.Add(self.bedTemperatureLabel, pos=(1,0))\r
-               sizer.Add(self.bedTemperatureSelect, pos=(1,1))\r
-               sizer.Add(self.temperatureGraph, pos=(2,0), span=(1,2), flag=wx.EXPAND)\r
-               sizer.AddGrowableRow(2)\r
-               sizer.AddGrowableCol(1)\r
-\r
-               nb.AddPage(self.temperaturePanel, 'Temp')\r
-\r
-               self.directControlPanel = wx.Panel(nb)\r
-               \r
-               sizer = wx.GridBagSizer(2, 2)\r
-               self.directControlPanel.SetSizer(sizer)\r
-               sizer.Add(PrintCommandButton(self, ['G91', 'G1 Y100 F6000', 'G90'], 'print-move-y100.png'), pos=(0,3))\r
-               sizer.Add(PrintCommandButton(self, ['G91', 'G1 Y10 F6000', 'G90'], 'print-move-y10.png'), pos=(1,3))\r
-               sizer.Add(PrintCommandButton(self, ['G91', 'G1 Y1 F6000', 'G90'], 'print-move-y1.png'), pos=(2,3))\r
-\r
-               sizer.Add(PrintCommandButton(self, ['G91', 'G1 Y-1 F6000', 'G90'], 'print-move-y-1.png'), pos=(4,3))\r
-               sizer.Add(PrintCommandButton(self, ['G91', 'G1 Y-10 F6000', 'G90'], 'print-move-y-10.png'), pos=(5,3))\r
-               sizer.Add(PrintCommandButton(self, ['G91', 'G1 Y-100 F6000', 'G90'], 'print-move-y-100.png'), pos=(6,3))\r
-\r
-               sizer.Add(PrintCommandButton(self, ['G91', 'G1 X-100 F6000', 'G90'], 'print-move-x-100.png'), pos=(3,0))\r
-               sizer.Add(PrintCommandButton(self, ['G91', 'G1 X-10 F6000', 'G90'], 'print-move-x-10.png'), pos=(3,1))\r
-               sizer.Add(PrintCommandButton(self, ['G91', 'G1 X-1 F6000', 'G90'], 'print-move-x-1.png'), pos=(3,2))\r
-\r
-               sizer.Add(PrintCommandButton(self, ['G28 X0 Y0'], 'print-move-home.png'), pos=(3,3))\r
-\r
-               sizer.Add(PrintCommandButton(self, ['G91', 'G1 X1 F6000', 'G90'], 'print-move-x1.png'), pos=(3,4))\r
-               sizer.Add(PrintCommandButton(self, ['G91', 'G1 X10 F6000', 'G90'], 'print-move-x10.png'), pos=(3,5))\r
-               sizer.Add(PrintCommandButton(self, ['G91', 'G1 X100 F6000', 'G90'], 'print-move-x100.png'), pos=(3,6))\r
-\r
-               sizer.Add(PrintCommandButton(self, ['G91', 'G1 Z10 F200', 'G90'], 'print-move-z10.png'), pos=(0,8))\r
-               sizer.Add(PrintCommandButton(self, ['G91', 'G1 Z1 F200', 'G90'], 'print-move-z1.png'), pos=(1,8))\r
-               sizer.Add(PrintCommandButton(self, ['G91', 'G1 Z0.1 F200', 'G90'], 'print-move-z0.1.png'), pos=(2,8))\r
-\r
-               sizer.Add(PrintCommandButton(self, ['G28 Z0'], 'print-move-home.png'), pos=(3,8))\r
-\r
-               sizer.Add(PrintCommandButton(self, ['G91', 'G1 Z-0.1 F200', 'G90'], 'print-move-z-0.1.png'), pos=(4,8))\r
-               sizer.Add(PrintCommandButton(self, ['G91', 'G1 Z-1 F200', 'G90'], 'print-move-z-1.png'), pos=(5,8))\r
-               sizer.Add(PrintCommandButton(self, ['G91', 'G1 Z-10 F200', 'G90'], 'print-move-z-10.png'), pos=(6,8))\r
-\r
-               sizer.Add(PrintCommandButton(self, ['G92 E0', 'G1 E2 F120'], 'extrude.png', size=(60,20)), pos=(1,10), span=(1,3), flag=wx.EXPAND)\r
-               sizer.Add(PrintCommandButton(self, ['G92 E0', 'G1 E-2 F120'], 'retract.png', size=(60,20)), pos=(2,10), span=(1,3), flag=wx.EXPAND)\r
-\r
-               nb.AddPage(self.directControlPanel, 'Jog')\r
-\r
-               self.speedPanel = wx.Panel(nb)\r
-               sizer = wx.GridBagSizer(2, 2)\r
-               self.speedPanel.SetSizer(sizer)\r
-\r
-               self.outerWallSpeedSelect = wx.SpinCtrl(self.speedPanel, -1, '100', size=(21*3,21), style=wx.SP_ARROW_KEYS)\r
-               self.outerWallSpeedSelect.SetRange(5, 1000)\r
-               self.innerWallSpeedSelect = wx.SpinCtrl(self.speedPanel, -1, '100', size=(21*3,21), style=wx.SP_ARROW_KEYS)\r
-               self.innerWallSpeedSelect.SetRange(5, 1000)\r
-               self.fillSpeedSelect = wx.SpinCtrl(self.speedPanel, -1, '100', size=(21*3,21), style=wx.SP_ARROW_KEYS)\r
-               self.fillSpeedSelect.SetRange(5, 1000)\r
-               self.supportSpeedSelect = wx.SpinCtrl(self.speedPanel, -1, '100', size=(21*3,21), style=wx.SP_ARROW_KEYS)\r
-               self.supportSpeedSelect.SetRange(5, 1000)\r
-               \r
-               sizer.Add(wx.StaticText(self.speedPanel, -1, "Outer wall:"), pos=(0,0))\r
-               sizer.Add(self.outerWallSpeedSelect, pos=(0,1))\r
-               sizer.Add(wx.StaticText(self.speedPanel, -1, "%"), pos=(0,2))\r
-               sizer.Add(wx.StaticText(self.speedPanel, -1, "Inner wall:"), pos=(1,0))\r
-               sizer.Add(self.innerWallSpeedSelect, pos=(1,1))\r
-               sizer.Add(wx.StaticText(self.speedPanel, -1, "%"), pos=(1,2))\r
-               sizer.Add(wx.StaticText(self.speedPanel, -1, "Fill:"), pos=(2,0))\r
-               sizer.Add(self.fillSpeedSelect, pos=(2,1))\r
-               sizer.Add(wx.StaticText(self.speedPanel, -1, "%"), pos=(2,2))\r
-               sizer.Add(wx.StaticText(self.speedPanel, -1, "Support:"), pos=(3,0))\r
-               sizer.Add(self.supportSpeedSelect, pos=(3,1))\r
-               sizer.Add(wx.StaticText(self.speedPanel, -1, "%"), pos=(3,2))\r
-\r
-               nb.AddPage(self.speedPanel, 'Speed')\r
-               \r
-               self.termPanel = wx.Panel(nb)\r
-               sizer = wx.GridBagSizer(2, 2)\r
-               self.termPanel.SetSizer(sizer)\r
-               \r
-               f = wx.Font(8, wx.FONTFAMILY_MODERN, wx.FONTSTYLE_NORMAL, wx.FONTWEIGHT_NORMAL, False)\r
-               self.termLog = wx.TextCtrl(self.termPanel, style=wx.TE_MULTILINE|wx.TE_DONTWRAP)\r
-               self.termLog.SetFont(f)\r
-               self.termLog.SetEditable(0)\r
-               self.termInput = wx.TextCtrl(self.termPanel, style=wx.TE_PROCESS_ENTER)\r
-               self.termInput.SetFont(f)\r
-\r
-               sizer.Add(self.termLog, pos=(0,0),flag=wx.EXPAND)\r
-               sizer.Add(self.termInput, pos=(1,0),flag=wx.EXPAND)\r
-               sizer.AddGrowableCol(0)\r
-               sizer.AddGrowableRow(0)\r
-\r
-               nb.AddPage(self.termPanel, 'Term')\r
-               \r
-               if self.cam != None:\r
-                       self.camPage = wx.Panel(nb)\r
-                       sizer = wx.GridBagSizer(2, 2)\r
-                       self.camPage.SetSizer(sizer)\r
-                       \r
-                       self.timelapsEnable = wx.CheckBox(self.camPage, -1, 'Enable timelaps movie recording')\r
-                       sizer.Add(self.timelapsEnable, pos=(0,0), span=(1,2), flag=wx.EXPAND)\r
-                       \r
-                       pages = self.cam.propertyPages()\r
-                       self.cam.buttons = [self.timelapsEnable]\r
-                       for page in pages:\r
-                               button = wx.Button(self.camPage, -1, page)\r
-                               button.index = pages.index(page)\r
-                               sizer.Add(button, pos=(1, pages.index(page)))\r
-                               button.Bind(wx.EVT_BUTTON, self.OnPropertyPageButton)\r
-                               self.cam.buttons.append(button)\r
-\r
-                       self.campreviewEnable = wx.CheckBox(self.camPage, -1, 'Show preview')\r
-                       sizer.Add(self.campreviewEnable, pos=(2,0), span=(1,2), flag=wx.EXPAND)\r
-                       \r
-                       self.camPreview = wx.Panel(self.camPage)\r
-                       sizer.Add(self.camPreview, pos=(3,0), span=(1,2), flag=wx.EXPAND)\r
-                       \r
-                       nb.AddPage(self.camPage, 'Camera')\r
-                       self.camPreview.timer = wx.Timer(self)\r
-                       self.Bind(wx.EVT_TIMER, self.OnCameraTimer, self.camPreview.timer)\r
-                       self.camPreview.timer.Start(500)\r
-                       self.camPreview.Bind(wx.EVT_ERASE_BACKGROUND, self.OnCameraEraseBackground)\r
-\r
-               self.sizer.AddGrowableRow(5)\r
-               self.sizer.AddGrowableCol(3)\r
-               \r
-               self.Bind(wx.EVT_CLOSE, self.OnClose)\r
-               self.connectButton.Bind(wx.EVT_BUTTON, self.OnConnect)\r
-               #self.loadButton.Bind(wx.EVT_BUTTON, self.OnLoad)\r
-               self.printButton.Bind(wx.EVT_BUTTON, self.OnPrint)\r
-               self.pauseButton.Bind(wx.EVT_BUTTON, self.OnPause)\r
-               self.cancelButton.Bind(wx.EVT_BUTTON, self.OnCancel)\r
-               self.machineLogButton.Bind(wx.EVT_BUTTON, self.OnMachineLog)\r
-               \r
-               self.Bind(wx.EVT_SPINCTRL, self.OnTempChange, self.temperatureSelect)\r
-               self.Bind(wx.EVT_SPINCTRL, self.OnBedTempChange, self.bedTemperatureSelect)\r
-\r
-               self.Bind(wx.EVT_SPINCTRL, self.OnSpeedChange, self.outerWallSpeedSelect)\r
-               self.Bind(wx.EVT_SPINCTRL, self.OnSpeedChange, self.innerWallSpeedSelect)\r
-               self.Bind(wx.EVT_SPINCTRL, self.OnSpeedChange, self.fillSpeedSelect)\r
-               self.Bind(wx.EVT_SPINCTRL, self.OnSpeedChange, self.supportSpeedSelect)\r
-               self.Bind(wx.EVT_TEXT_ENTER, self.OnTermEnterLine, self.termInput)\r
-               self.termInput.Bind(wx.EVT_CHAR, self.OnTermKey)\r
-               \r
-               self.Layout()\r
-               self.Fit()\r
-               self.Centre()\r
-               \r
-               self.statsText.SetMinSize(self.statsText.GetSize())\r
-
-               self.UpdateButtonStates()\r
-               #self.UpdateProgress()\r
-       \r
-       def OnCameraTimer(self, e):\r
-               if not self.campreviewEnable.GetValue():\r
-                       return\r
-               if self.machineCom != None and self.machineCom.isPrinting():\r
-                       return\r
-               self.cam.takeNewImage()\r
-               self.camPreview.Refresh()\r
-       \r
-       def OnCameraEraseBackground(self, e):\r
-               dc = e.GetDC()\r
-               if not dc:\r
-                       dc = wx.ClientDC(self)\r
-                       rect = self.GetUpdateRegion().GetBox()\r
-                       dc.SetClippingRect(rect)\r
-               dc.SetBackground(wx.Brush(self.camPreview.GetBackgroundColour(), wx.SOLID))\r
-               if self.cam.getLastImage() != None:\r
-                       self.camPreview.SetMinSize((self.cam.getLastImage().GetWidth(), self.cam.getLastImage().GetHeight()))\r
-                       self.camPage.Fit()\r
-                       dc.DrawBitmap(self.cam.getLastImage(), 0, 0)\r
-               else:\r
-                       dc.Clear()\r
-               \r
-       def OnPropertyPageButton(self, e):\r
-               self.cam.openPropertyPage(e.GetEventObject().index)\r
-\r
-       def UpdateButtonStates(self):\r
-               self.connectButton.Enable(self.machineCom == None or self.machineCom.isClosedOrError())\r
-               #self.loadButton.Enable(self.machineCom == None or not (self.machineCom.isPrinting() or self.machineCom.isPaused()))\r
-               self.printButton.Enable(self.machineCom != None and self.machineCom.isOperational() and not (self.machineCom.isPrinting() or self.machineCom.isPaused()))\r
-               self.pauseButton.Enable(self.machineCom != None and (self.machineCom.isPrinting() or self.machineCom.isPaused()))\r
-               if self.machineCom != None and self.machineCom.isPaused():\r
-                       self.pauseButton.SetLabel('Resume')\r
-               else:\r
-                       self.pauseButton.SetLabel('Pause')\r
-               self.cancelButton.Enable(self.machineCom != None and (self.machineCom.isPrinting() or self.machineCom.isPaused()))\r
-               self.temperatureSelect.Enable(self.machineCom != None and self.machineCom.isOperational())\r
-               self.bedTemperatureSelect.Enable(self.machineCom != None and self.machineCom.isOperational())\r
-               self.directControlPanel.Enable(self.machineCom != None and self.machineCom.isOperational() and not self.machineCom.isPrinting())\r
-               self.machineLogButton.Show(self.machineCom != None and self.machineCom.isClosedOrError())\r
-               if self.cam != None:\r
-                       for button in self.cam.buttons:\r
-                               button.Enable(self.machineCom == None or not self.machineCom.isPrinting())\r
-       \r
-       def UpdateProgress(self):\r
-               status = ""\r
-               if self.gcode == None:\r
-                       status += "Loading gcode...\n"\r
-               else:\r
-                       status += "Filament: %.2fm %.2fg\n" % (self.gcode.extrusionAmount / 1000, self.gcode.calculateWeight() * 1000)\r
-                       cost = self.gcode.calculateCost()\r
-                       if cost != False:\r
-                               status += "Filament cost: %s\n" % (cost)\r
-                       status += "Estimated print time: %02d:%02d\n" % (int(self.gcode.totalMoveTimeMinute / 60), int(self.gcode.totalMoveTimeMinute % 60))\r
-               if self.machineCom == None or not self.machineCom.isPrinting():\r
-                       self.progress.SetValue(0)\r
-                       if self.gcodeList != None:\r
-                               status += 'Line: -/%d\n' % (len(self.gcodeList))\r
-               else:\r
-                       printTime = self.machineCom.getPrintTime() / 60\r
-                       printTimeLeft = self.machineCom.getPrintTimeRemainingEstimate()\r
-                       status += 'Line: %d/%d %d%%\n' % (self.machineCom.getPrintPos(), len(self.gcodeList), self.machineCom.getPrintPos() * 100 / len(self.gcodeList))\r
-                       if self.currentZ > 0:\r
-                               status += 'Height: %0.1f\n' % (self.currentZ)\r
-                       status += 'Print time: %02d:%02d\n' % (int(printTime / 60), int(printTime % 60))\r
-                       if printTimeLeft == None:\r
-                               status += 'Print time left: Unknown\n'\r
-                       else:\r
-                               status += 'Print time left: %02d:%02d\n' % (int(printTimeLeft / 60), int(printTimeLeft % 60))\r
-                       self.progress.SetValue(self.machineCom.getPrintPos())\r
-                       taskbar.setProgress(self, self.machineCom.getPrintPos(), len(self.gcodeList))\r
-               if self.machineCom != None:\r
-                       if self.machineCom.getTemp() > 0:\r
-                               status += 'Temp: %d\n' % (self.machineCom.getTemp())\r
-                       if self.machineCom.getBedTemp() > 0:\r
-                               status += 'Bed Temp: %d\n' % (self.machineCom.getBedTemp())\r
-                               self.bedTemperatureLabel.Show(True)\r
-                               self.bedTemperatureSelect.Show(True)\r
-                               self.temperaturePanel.Layout()\r
-                       status += 'Machine state:%s\n' % (self.machineCom.getStateString())\r
-               \r
-               self.statsText.SetLabel(status.strip())\r
-       \r
-       def OnConnect(self, e):\r
-               if self.machineCom != None:\r
-                       self.machineCom.close()\r
-               self.machineCom = machineCom.MachineCom(callbackObject=self)\r
-               self.UpdateButtonStates()\r
-               taskbar.setBusy(self, True)\r
-       \r
-       def OnLoad(self, e):\r
-               pass\r
-       \r
-       def OnPrint(self, e):\r
-               if self.machineCom == None or not self.machineCom.isOperational():\r
-                       return\r
-               if self.gcodeList == None:\r
-                       return\r
-               if self.machineCom.isPrinting():\r
-                       return\r
-               self.currentZ = -1\r
-               if self.cam != None and self.timelapsEnable.GetValue():\r
-                       self.cam.startTimelaps(self.filename[: self.filename.rfind('.')] + ".mpg")\r
-               self.machineCom.printGCode(self.gcodeList)\r
-               self.UpdateButtonStates()\r
-       \r
-       def OnCancel(self, e):\r
-               self.pauseButton.SetLabel('Pause')\r
-               self.machineCom.cancelPrint()\r
-               self.machineCom.sendCommand("M84")\r
-               self.UpdateButtonStates()\r
-       \r
-       def OnPause(self, e):\r
-               if self.machineCom.isPaused():\r
-                       self.machineCom.setPause(False)\r
-               else:\r
-                       self.machineCom.setPause(True)\r
-       \r
-       def OnMachineLog(self, e):\r
-               LogWindow('\n'.join(self.machineCom.getLog()))\r
-       \r
-       def OnClose(self, e):\r
-               global printWindowHandle\r
-               printWindowHandle = None\r
-               if self.machineCom != None:\r
-                       self.machineCom.close()\r
-               self.Destroy()\r
-\r
-       def OnTempChange(self, e):\r
-               self.machineCom.sendCommand("M104 S%d" % (self.temperatureSelect.GetValue()))\r
-\r
-       def OnBedTempChange(self, e):\r
-               self.machineCom.sendCommand("M140 S%d" % (self.bedTemperatureSelect.GetValue()))\r
-       \r
-       def OnSpeedChange(self, e):\r
-               if self.machineCom == None:\r
-                       return\r
-               self.machineCom.setFeedrateModifier('WALL-OUTER', self.outerWallSpeedSelect.GetValue() / 100.0)\r
-               self.machineCom.setFeedrateModifier('WALL-INNER', self.innerWallSpeedSelect.GetValue() / 100.0)\r
-               self.machineCom.setFeedrateModifier('FILL', self.fillSpeedSelect.GetValue() / 100.0)\r
-               self.machineCom.setFeedrateModifier('SUPPORT', self.supportSpeedSelect.GetValue() / 100.0)\r
-       \r
-       def AddTermLog(self, line):\r
-               self.termLog.AppendText(unicode(line, 'utf-8', 'replace'))\r
-               l = len(self.termLog.GetValue())\r
-               self.termLog.SetCaret(wx.Caret(self.termLog, (l, l)))\r
-       \r
-       def OnTermEnterLine(self, e):\r
-               line = self.termInput.GetValue()\r
-               if line == '':\r
-                       return\r
-               self.termLog.AppendText('>%s\n' % (line))\r
-               self.machineCom.sendCommand(line)\r
-               self.termHistory.append(line)\r
-               self.termHistoryIdx = len(self.termHistory)\r
-               self.termInput.SetValue('')\r
-\r
-       def OnTermKey(self, e):\r
-               if len(self.termHistory) > 0:\r
-                       if e.GetKeyCode() == wx.WXK_UP:\r
-                               self.termHistoryIdx = self.termHistoryIdx - 1\r
-                               if self.termHistoryIdx < 0:\r
-                                       self.termHistoryIdx = len(self.termHistory) - 1\r
-                               self.termInput.SetValue(self.termHistory[self.termHistoryIdx])\r
-                       if e.GetKeyCode() == wx.WXK_DOWN:\r
-                               self.termHistoryIdx = self.termHistoryIdx - 1\r
-                               if self.termHistoryIdx >= len(self.termHistory):\r
-                                       self.termHistoryIdx = 0\r
-                               self.termInput.SetValue(self.termHistory[self.termHistoryIdx])\r
-               e.Skip()\r
-\r
-       def OnPowerWarningChange(self, e):\r
-               type = self.powerManagement.get_providing_power_source_type()\r
-               if type == power.POWER_TYPE_AC and self.powerWarningText.IsShown():\r
-                       self.powerWarningText.Hide()\r
-                       self.Layout()\r
-               elif type != power.POWER_TYPE_AC and not self.powerWarningText.IsShown():\r
-                       self.powerWarningText.Show()\r
-                       self.Layout()\r
-\r
-       def LoadGCodeFile(self, filename):\r
-               if self.machineCom != None and self.machineCom.isPrinting():\r
-                       return\r
-               #Send an initial M110 to reset the line counter to zero.\r
-               prevLineType = lineType = 'CUSTOM'\r
-               gcodeList = ["M110"]\r
-               for line in open(filename, 'r'):\r
-                       if line.startswith(';TYPE:'):\r
-                               lineType = line[6:].strip()\r
-                       if ';' in line:\r
-                               line = line[0:line.find(';')]\r
-                       line = line.strip()\r
-                       if len(line) > 0:\r
-                               if prevLineType != lineType:\r
-                                       gcodeList.append((line, lineType, ))\r
-                               else:\r
-                                       gcodeList.append(line)\r
-                               prevLineType = lineType\r
-               gcode = gcodeInterpreter.gcode()\r
-               gcode.loadList(gcodeList)\r
-               #print "Loaded: %s (%d)" % (filename, len(gcodeList))\r
-               self.filename = filename\r
-               self.gcode = gcode\r
-               self.gcodeList = gcodeList\r
-               \r
-               wx.CallAfter(self.progress.SetRange, len(gcodeList))\r
-               wx.CallAfter(self.UpdateButtonStates)\r
-               wx.CallAfter(self.UpdateProgress)\r
-               wx.CallAfter(self.SetTitle, 'Printing: %s' % (filename))\r
-               \r
-       def sendLine(self, lineNr):\r
-               if lineNr >= len(self.gcodeList):\r
-                       return False\r
-               line = self.gcodeList[lineNr]\r
-               try:\r
-                       if ('M104' in line or 'M109' in line) and 'S' in line:\r
-                               n = int(re.search('S([0-9]*)', line).group(1))\r
-                               wx.CallAfter(self.temperatureSelect.SetValue, n)\r
-                       if ('M140' in line or 'M190' in line) and 'S' in line:\r
-                               n = int(re.search('S([0-9]*)', line).group(1))\r
-                               wx.CallAfter(self.bedTemperatureSelect.SetValue, n)\r
-               except:\r
-                       print "Unexpected error:", sys.exc_info()\r
-               checksum = reduce(lambda x,y:x^y, map(ord, "N%d%s" % (lineNr, line)))\r
-               self.machineCom.sendCommand("N%d%s*%d" % (lineNr, line, checksum))\r
-               return True\r
-\r
-       def mcLog(self, message):\r
-               #print message\r
-               pass\r
-       \r
-       def mcTempUpdate(self, temp, bedTemp, targetTemp, bedTargetTemp):\r
-               self.temperatureGraph.addPoint(temp, targetTemp, bedTemp, bedTargetTemp)\r
-               if self.temperatureSelect.GetValue() != targetTemp:\r
-                       wx.CallAfter(self.temperatureSelect.SetValue, targetTemp)\r
-               if self.bedTemperatureSelect.GetValue() != bedTargetTemp:\r
-                       wx.CallAfter(self.bedTemperatureSelect.SetValue, bedTargetTemp)\r
-       \r
-       def mcStateChange(self, state):\r
-               if self.machineCom != None:\r
-                       if state == self.machineCom.STATE_OPERATIONAL and self.cam != None:\r
-                               self.cam.endTimelaps()\r
-                       if state == self.machineCom.STATE_OPERATIONAL:\r
-                               taskbar.setBusy(self, False)\r
-                       if self.machineCom.isClosedOrError():\r
-                               taskbar.setBusy(self, False)\r
-                       if self.machineCom.isPaused():\r
-                               taskbar.setPause(self, True)\r
-               wx.CallAfter(self.UpdateButtonStates)\r
-               wx.CallAfter(self.UpdateProgress)\r
-       \r
-       def mcMessage(self, message):\r
-               wx.CallAfter(self.AddTermLog, message)\r
-       \r
-       def mcProgress(self, lineNr):\r
-               wx.CallAfter(self.UpdateProgress)\r
-       \r
-       def mcZChange(self, newZ):\r
-               self.currentZ = newZ\r
-               if self.cam != None:\r
-                       wx.CallAfter(self.cam.takeNewImage)\r
-                       wx.CallAfter(self.camPreview.Refresh)\r
-\r
-class temperatureGraph(wx.Panel):\r
-       def __init__(self, parent):\r
-               super(temperatureGraph, self).__init__(parent)\r
-               \r
-               self.Bind(wx.EVT_ERASE_BACKGROUND, self.OnEraseBackground)\r
-               self.Bind(wx.EVT_SIZE, self.OnSize)\r
-               self.Bind(wx.EVT_PAINT, self.OnDraw)\r
-               \r
-               self.lastDraw = time.time() - 1.0\r
-               self.points = []\r
-               self.backBuffer = None\r
-               self.addPoint(0,0,0,0)\r
-               self.SetMinSize((320,200))\r
-       \r
-       def OnEraseBackground(self, e):\r
-               pass\r
-       \r
-       def OnSize(self, e):\r
-               if self.backBuffer == None or self.GetSize() != self.backBuffer.GetSize():\r
-                       self.backBuffer = wx.EmptyBitmap(*self.GetSizeTuple())\r
-                       self.UpdateDrawing(True)\r
-       \r
-       def OnDraw(self, e):\r
-               dc = wx.BufferedPaintDC(self, self.backBuffer)\r
-       \r
-       def UpdateDrawing(self, force = False):\r
-               now = time.time()\r
-               if not force and now - self.lastDraw < 1.0:\r
-                       return\r
-               self.lastDraw = now\r
-               dc = wx.MemoryDC()\r
-               dc.SelectObject(self.backBuffer)\r
-               dc.Clear()\r
-               w, h = self.GetSizeTuple()\r
-               bgLinePen = wx.Pen('#A0A0A0')\r
-               tempPen = wx.Pen('#FF4040')\r
-               tempSPPen = wx.Pen('#FFA0A0')\r
-               tempPenBG = wx.Pen('#FFD0D0')\r
-               bedTempPen = wx.Pen('#4040FF')\r
-               bedTempSPPen = wx.Pen('#A0A0FF')\r
-               bedTempPenBG = wx.Pen('#D0D0FF')\r
-\r
-               #Draw the background up to the current temperatures.\r
-               x0 = 0\r
-               t0 = 0\r
-               bt0 = 0\r
-               tSP0 = 0\r
-               btSP0 = 0\r
-               for temp, tempSP, bedTemp, bedTempSP, t in self.points:\r
-                       x1 = int(w - (now - t))\r
-                       for x in xrange(x0, x1 + 1):\r
-                               t = float(x - x0) / float(x1 - x0 + 1) * (temp - t0) + t0\r
-                               bt = float(x - x0) / float(x1 - x0 + 1) * (bedTemp - bt0) + bt0\r
-                               dc.SetPen(tempPenBG)\r
-                               dc.DrawLine(x, h, x, h - (t * h / 300))\r
-                               dc.SetPen(bedTempPenBG)\r
-                               dc.DrawLine(x, h, x, h - (bt * h / 300))\r
-                       t0 = temp\r
-                       bt0 = bedTemp\r
-                       tSP0 = tempSP\r
-                       btSP0 = bedTempSP\r
-                       x0 = x1 + 1\r
-\r
-               #Draw the grid\r
-               for x in xrange(w, 0, -30):\r
-                       dc.SetPen(bgLinePen)\r
-                       dc.DrawLine(x, 0, x, h)\r
-               for y in xrange(h-1, 0, -h * 50 / 300):\r
-                       dc.SetPen(bgLinePen)\r
-                       dc.DrawLine(0, y, w, y)\r
-               dc.DrawLine(0, 0, w, 0)\r
-               dc.DrawLine(0, 0, 0, h)\r
-               \r
-               #Draw the main lines\r
-               x0 = 0\r
-               t0 = 0\r
-               bt0 = 0\r
-               tSP0 = 0\r
-               btSP0 = 0\r
-               for temp, tempSP, bedTemp, bedTempSP, t in self.points:\r
-                       x1 = int(w - (now - t))\r
-                       for x in xrange(x0, x1 + 1):\r
-                               t = float(x - x0) / float(x1 - x0 + 1) * (temp - t0) + t0\r
-                               bt = float(x - x0) / float(x1 - x0 + 1) * (bedTemp - bt0) + bt0\r
-                               tSP = float(x - x0) / float(x1 - x0 + 1) * (tempSP - tSP0) + tSP0\r
-                               btSP = float(x - x0) / float(x1 - x0 + 1) * (bedTempSP - btSP0) + btSP0\r
-                               dc.SetPen(tempSPPen)\r
-                               dc.DrawPoint(x, h - (tSP * h / 300))\r
-                               dc.SetPen(bedTempSPPen)\r
-                               dc.DrawPoint(x, h - (btSP * h / 300))\r
-                               dc.SetPen(tempPen)\r
-                               dc.DrawPoint(x, h - (t * h / 300))\r
-                               dc.SetPen(bedTempPen)\r
-                               dc.DrawPoint(x, h - (bt * h / 300))\r
-                       t0 = temp\r
-                       bt0 = bedTemp\r
-                       tSP0 = tempSP\r
-                       btSP0 = bedTempSP\r
-                       x0 = x1 + 1\r
-               \r
-               del dc\r
-               self.Refresh(eraseBackground=False)\r
-               self.Update()\r
-               \r
-               if len(self.points) > 0 and (time.time() - self.points[0][4]) > w + 20:\r
-                       self.points.pop(0)\r
-\r
-       def addPoint(self, temp, tempSP, bedTemp, bedTempSP):\r
-               if bedTemp == None:\r
-                       bedTemp = 0\r
-               if bedTempSP == None:\r
-                       bedTempSP = 0\r
-               self.points.append((temp, tempSP, bedTemp, bedTempSP, time.time()))\r
-               wx.CallAfter(self.UpdateDrawing)\r
-\r
-class LogWindow(wx.Frame):\r
-       def __init__(self, logText):\r
-               super(LogWindow, self).__init__(None, title="Machine log")\r
-               self.textBox = wx.TextCtrl(self, -1, logText, style=wx.TE_MULTILINE|wx.TE_DONTWRAP|wx.TE_READONLY)\r
-               self.SetSize((500,400))\r
-               self.Centre()\r
-               self.Show(True)\r
+                       self.handle = subprocess.Popen(cmdList, stdin=subprocess.PIPE, stdout=subprocess.PIPE,
+                               stderr=subprocess.PIPE)
+                       self.thread = threading.Thread(target=self.Monitor)
+                       self.thread.start()
+               else:
+                       self.handle.stdin.write(filename + '\n')
+
+       def Monitor(self):
+               p = self.handle
+               line = p.stdout.readline()
+               while(len(line) > 0):
+                       #print line.rstrip()
+                       line = p.stdout.readline()
+               p.communicate()
+               self.handle = None
+               self.thread = None
+
+
+class PrintCommandButton(buttons.GenBitmapButton):
+       def __init__(self, parent, commandList, bitmapFilename, size=(20, 20)):
+               self.bitmap = wx.Bitmap(getPathForImage(bitmapFilename))
+               super(PrintCommandButton, self).__init__(parent.directControlPanel, -1, self.bitmap, size=size)
+
+               self.commandList = commandList
+               self.parent = parent
+
+               self.SetBezelWidth(1)
+               self.SetUseFocusIndicator(False)
+
+               self.Bind(wx.EVT_BUTTON, self.OnClick)
+
+       def OnClick(self, e):
+               if self.parent.machineCom == None or self.parent.machineCom.isPrinting():
+                       return;
+               for cmd in self.commandList:
+                       self.parent.machineCom.sendCommand(cmd)
+               e.Skip()
+
+
+class printWindow(wx.Frame):
+       "Main user interface window"
+
+       def __init__(self):
+               super(printWindow, self).__init__(None, -1, title='Printing')
+               self.machineCom = None
+               self.gcode = None
+               self.gcodeList = None
+               self.sendList = []
+               self.temp = None
+               self.bedTemp = None
+               self.bufferLineCount = 4
+               self.sendCnt = 0
+               self.feedrateRatioOuterWall = 1.0
+               self.feedrateRatioInnerWall = 1.0
+               self.feedrateRatioFill = 1.0
+               self.feedrateRatioSupport = 1.0
+               self.pause = False
+               self.termHistory = []
+               self.termHistoryIdx = 0
+
+               self.cam = None
+               if webcam.hasWebcamSupport():
+                       self.cam = webcam.webcam()
+                       if not self.cam.hasCamera():
+                               self.cam = None
+
+               #self.SetIcon(icon.getMainIcon())
+
+               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)
+
+               sb = wx.StaticBox(self.panel, label="Statistics")
+               boxsizer = wx.StaticBoxSizer(sb, wx.VERTICAL)
+
+               self.powerWarningText = wx.StaticText(parent=self.panel,
+                       id=-1,
+                       label="Connect your computer to AC power\nIf it shuts down during printing, the product will be lost.",
+                       style=wx.ALIGN_CENTER)
+               self.powerWarningText.SetBackgroundColour('red')
+               self.powerWarningText.SetForegroundColour('white')
+               boxsizer.AddF(self.powerWarningText, flags=wx.SizerFlags().Expand().Border(wx.BOTTOM, 10))
+               self.powerManagement = power.PowerManagement()
+               self.powerWarningTimer = wx.Timer(self)
+               self.Bind(wx.EVT_TIMER, self.OnPowerWarningChange, self.powerWarningTimer)
+               self.OnPowerWarningChange(None)
+               self.powerWarningTimer.Start(10000)
+
+               self.statsText = wx.StaticText(self.panel, -1,
+                       "Filament: ####.##m #.##g\nEstimated print time: #####:##\nMachine state:\nDetecting baudrateXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX")
+               boxsizer.Add(self.statsText, flag=wx.LEFT, border=5)
+
+               self.sizer.Add(boxsizer, pos=(0, 0), span=(7, 1), flag=wx.EXPAND)
+
+               self.connectButton = wx.Button(self.panel, -1, 'Connect')
+               #self.loadButton = wx.Button(self.panel, -1, 'Load')
+               self.printButton = wx.Button(self.panel, -1, 'Print')
+               self.pauseButton = wx.Button(self.panel, -1, 'Pause')
+               self.cancelButton = wx.Button(self.panel, -1, 'Cancel print')
+               self.machineLogButton = wx.Button(self.panel, -1, 'Error log')
+               self.progress = wx.Gauge(self.panel, -1)
+
+               self.sizer.Add(self.connectButton, pos=(1, 1), flag=wx.EXPAND)
+               #self.sizer.Add(self.loadButton, pos=(1,1), flag=wx.EXPAND)
+               self.sizer.Add(self.printButton, pos=(2, 1), flag=wx.EXPAND)
+               self.sizer.Add(self.pauseButton, pos=(3, 1), flag=wx.EXPAND)
+               self.sizer.Add(self.cancelButton, pos=(4, 1), flag=wx.EXPAND)
+               self.sizer.Add(self.machineLogButton, pos=(5, 1), flag=wx.EXPAND)
+               self.sizer.Add(self.progress, pos=(7, 0), span=(1, 7), flag=wx.EXPAND)
+
+               nb = wx.Notebook(self.panel)
+               self.sizer.Add(nb, pos=(0, 2), span=(7, 4), flag=wx.EXPAND)
+
+               self.temperaturePanel = wx.Panel(nb)
+               sizer = wx.GridBagSizer(2, 2)
+               self.temperaturePanel.SetSizer(sizer)
+
+               self.temperatureSelect = wx.SpinCtrl(self.temperaturePanel, -1, '0', size=(21 * 3, 21), style=wx.SP_ARROW_KEYS)
+               self.temperatureSelect.SetRange(0, 400)
+               self.bedTemperatureLabel = wx.StaticText(self.temperaturePanel, -1, "BedTemp:")
+               self.bedTemperatureSelect = wx.SpinCtrl(self.temperaturePanel, -1, '0', size=(21 * 3, 21),
+                       style=wx.SP_ARROW_KEYS)
+               self.bedTemperatureSelect.SetRange(0, 400)
+               self.bedTemperatureLabel.Show(False)
+               self.bedTemperatureSelect.Show(False)
+
+               self.temperatureGraph = temperatureGraph(self.temperaturePanel)
+
+               sizer.Add(wx.StaticText(self.temperaturePanel, -1, "Temp:"), pos=(0, 0))
+               sizer.Add(self.temperatureSelect, pos=(0, 1))
+               sizer.Add(self.bedTemperatureLabel, pos=(1, 0))
+               sizer.Add(self.bedTemperatureSelect, pos=(1, 1))
+               sizer.Add(self.temperatureGraph, pos=(2, 0), span=(1, 2), flag=wx.EXPAND)
+               sizer.AddGrowableRow(2)
+               sizer.AddGrowableCol(1)
+
+               nb.AddPage(self.temperaturePanel, 'Temp')
+
+               self.directControlPanel = wx.Panel(nb)
+
+               sizer = wx.GridBagSizer(2, 2)
+               self.directControlPanel.SetSizer(sizer)
+               sizer.Add(PrintCommandButton(self, ['G91', 'G1 Y100 F6000', 'G90'], 'print-move-y100.png'), pos=(0, 3))
+               sizer.Add(PrintCommandButton(self, ['G91', 'G1 Y10 F6000', 'G90'], 'print-move-y10.png'), pos=(1, 3))
+               sizer.Add(PrintCommandButton(self, ['G91', 'G1 Y1 F6000', 'G90'], 'print-move-y1.png'), pos=(2, 3))
+
+               sizer.Add(PrintCommandButton(self, ['G91', 'G1 Y-1 F6000', 'G90'], 'print-move-y-1.png'), pos=(4, 3))
+               sizer.Add(PrintCommandButton(self, ['G91', 'G1 Y-10 F6000', 'G90'], 'print-move-y-10.png'), pos=(5, 3))
+               sizer.Add(PrintCommandButton(self, ['G91', 'G1 Y-100 F6000', 'G90'], 'print-move-y-100.png'), pos=(6, 3))
+
+               sizer.Add(PrintCommandButton(self, ['G91', 'G1 X-100 F6000', 'G90'], 'print-move-x-100.png'), pos=(3, 0))
+               sizer.Add(PrintCommandButton(self, ['G91', 'G1 X-10 F6000', 'G90'], 'print-move-x-10.png'), pos=(3, 1))
+               sizer.Add(PrintCommandButton(self, ['G91', 'G1 X-1 F6000', 'G90'], 'print-move-x-1.png'), pos=(3, 2))
+
+               sizer.Add(PrintCommandButton(self, ['G28 X0 Y0'], 'print-move-home.png'), pos=(3, 3))
+
+               sizer.Add(PrintCommandButton(self, ['G91', 'G1 X1 F6000', 'G90'], 'print-move-x1.png'), pos=(3, 4))
+               sizer.Add(PrintCommandButton(self, ['G91', 'G1 X10 F6000', 'G90'], 'print-move-x10.png'), pos=(3, 5))
+               sizer.Add(PrintCommandButton(self, ['G91', 'G1 X100 F6000', 'G90'], 'print-move-x100.png'), pos=(3, 6))
+
+               sizer.Add(PrintCommandButton(self, ['G91', 'G1 Z10 F200', 'G90'], 'print-move-z10.png'), pos=(0, 8))
+               sizer.Add(PrintCommandButton(self, ['G91', 'G1 Z1 F200', 'G90'], 'print-move-z1.png'), pos=(1, 8))
+               sizer.Add(PrintCommandButton(self, ['G91', 'G1 Z0.1 F200', 'G90'], 'print-move-z0.1.png'), pos=(2, 8))
+
+               sizer.Add(PrintCommandButton(self, ['G28 Z0'], 'print-move-home.png'), pos=(3, 8))
+
+               sizer.Add(PrintCommandButton(self, ['G91', 'G1 Z-0.1 F200', 'G90'], 'print-move-z-0.1.png'), pos=(4, 8))
+               sizer.Add(PrintCommandButton(self, ['G91', 'G1 Z-1 F200', 'G90'], 'print-move-z-1.png'), pos=(5, 8))
+               sizer.Add(PrintCommandButton(self, ['G91', 'G1 Z-10 F200', 'G90'], 'print-move-z-10.png'), pos=(6, 8))
+
+               sizer.Add(PrintCommandButton(self, ['G92 E0', 'G1 E2 F120'], 'extrude.png', size=(60, 20)), pos=(1, 10),
+                       span=(1, 3), flag=wx.EXPAND)
+               sizer.Add(PrintCommandButton(self, ['G92 E0', 'G1 E-2 F120'], 'retract.png', size=(60, 20)), pos=(2, 10),
+                       span=(1, 3), flag=wx.EXPAND)
+
+               nb.AddPage(self.directControlPanel, 'Jog')
+
+               self.speedPanel = wx.Panel(nb)
+               sizer = wx.GridBagSizer(2, 2)
+               self.speedPanel.SetSizer(sizer)
+
+               self.outerWallSpeedSelect = wx.SpinCtrl(self.speedPanel, -1, '100', size=(21 * 3, 21), style=wx.SP_ARROW_KEYS)
+               self.outerWallSpeedSelect.SetRange(5, 1000)
+               self.innerWallSpeedSelect = wx.SpinCtrl(self.speedPanel, -1, '100', size=(21 * 3, 21), style=wx.SP_ARROW_KEYS)
+               self.innerWallSpeedSelect.SetRange(5, 1000)
+               self.fillSpeedSelect = wx.SpinCtrl(self.speedPanel, -1, '100', size=(21 * 3, 21), style=wx.SP_ARROW_KEYS)
+               self.fillSpeedSelect.SetRange(5, 1000)
+               self.supportSpeedSelect = wx.SpinCtrl(self.speedPanel, -1, '100', size=(21 * 3, 21), style=wx.SP_ARROW_KEYS)
+               self.supportSpeedSelect.SetRange(5, 1000)
+
+               sizer.Add(wx.StaticText(self.speedPanel, -1, "Outer wall:"), pos=(0, 0))
+               sizer.Add(self.outerWallSpeedSelect, pos=(0, 1))
+               sizer.Add(wx.StaticText(self.speedPanel, -1, "%"), pos=(0, 2))
+               sizer.Add(wx.StaticText(self.speedPanel, -1, "Inner wall:"), pos=(1, 0))
+               sizer.Add(self.innerWallSpeedSelect, pos=(1, 1))
+               sizer.Add(wx.StaticText(self.speedPanel, -1, "%"), pos=(1, 2))
+               sizer.Add(wx.StaticText(self.speedPanel, -1, "Fill:"), pos=(2, 0))
+               sizer.Add(self.fillSpeedSelect, pos=(2, 1))
+               sizer.Add(wx.StaticText(self.speedPanel, -1, "%"), pos=(2, 2))
+               sizer.Add(wx.StaticText(self.speedPanel, -1, "Support:"), pos=(3, 0))
+               sizer.Add(self.supportSpeedSelect, pos=(3, 1))
+               sizer.Add(wx.StaticText(self.speedPanel, -1, "%"), pos=(3, 2))
+
+               nb.AddPage(self.speedPanel, 'Speed')
+
+               self.termPanel = wx.Panel(nb)
+               sizer = wx.GridBagSizer(2, 2)
+               self.termPanel.SetSizer(sizer)
+
+               f = wx.Font(8, wx.FONTFAMILY_MODERN, wx.FONTSTYLE_NORMAL, wx.FONTWEIGHT_NORMAL, False)
+               self.termLog = wx.TextCtrl(self.termPanel, style=wx.TE_MULTILINE | wx.TE_DONTWRAP)
+               self.termLog.SetFont(f)
+               self.termLog.SetEditable(0)
+               self.termInput = wx.TextCtrl(self.termPanel, style=wx.TE_PROCESS_ENTER)
+               self.termInput.SetFont(f)
+
+               sizer.Add(self.termLog, pos=(0, 0), flag=wx.EXPAND)
+               sizer.Add(self.termInput, pos=(1, 0), flag=wx.EXPAND)
+               sizer.AddGrowableCol(0)
+               sizer.AddGrowableRow(0)
+
+               nb.AddPage(self.termPanel, 'Term')
+
+               if self.cam != None:
+                       self.camPage = wx.Panel(nb)
+                       sizer = wx.GridBagSizer(2, 2)
+                       self.camPage.SetSizer(sizer)
+
+                       self.timelapsEnable = wx.CheckBox(self.camPage, -1, 'Enable timelaps movie recording')
+                       sizer.Add(self.timelapsEnable, pos=(0, 0), span=(1, 2), flag=wx.EXPAND)
+
+                       pages = self.cam.propertyPages()
+                       self.cam.buttons = [self.timelapsEnable]
+                       for page in pages:
+                               button = wx.Button(self.camPage, -1, page)
+                               button.index = pages.index(page)
+                               sizer.Add(button, pos=(1, pages.index(page)))
+                               button.Bind(wx.EVT_BUTTON, self.OnPropertyPageButton)
+                               self.cam.buttons.append(button)
+
+                       self.campreviewEnable = wx.CheckBox(self.camPage, -1, 'Show preview')
+                       sizer.Add(self.campreviewEnable, pos=(2, 0), span=(1, 2), flag=wx.EXPAND)
+
+                       self.camPreview = wx.Panel(self.camPage)
+                       sizer.Add(self.camPreview, pos=(3, 0), span=(1, 2), flag=wx.EXPAND)
+
+                       nb.AddPage(self.camPage, 'Camera')
+                       self.camPreview.timer = wx.Timer(self)
+                       self.Bind(wx.EVT_TIMER, self.OnCameraTimer, self.camPreview.timer)
+                       self.camPreview.timer.Start(500)
+                       self.camPreview.Bind(wx.EVT_ERASE_BACKGROUND, self.OnCameraEraseBackground)
+
+               self.sizer.AddGrowableRow(5)
+               self.sizer.AddGrowableCol(3)
+
+               self.Bind(wx.EVT_CLOSE, self.OnClose)
+               self.connectButton.Bind(wx.EVT_BUTTON, self.OnConnect)
+               #self.loadButton.Bind(wx.EVT_BUTTON, self.OnLoad)
+               self.printButton.Bind(wx.EVT_BUTTON, self.OnPrint)
+               self.pauseButton.Bind(wx.EVT_BUTTON, self.OnPause)
+               self.cancelButton.Bind(wx.EVT_BUTTON, self.OnCancel)
+               self.machineLogButton.Bind(wx.EVT_BUTTON, self.OnMachineLog)
+
+               self.Bind(wx.EVT_SPINCTRL, self.OnTempChange, self.temperatureSelect)
+               self.Bind(wx.EVT_SPINCTRL, self.OnBedTempChange, self.bedTemperatureSelect)
+
+               self.Bind(wx.EVT_SPINCTRL, self.OnSpeedChange, self.outerWallSpeedSelect)
+               self.Bind(wx.EVT_SPINCTRL, self.OnSpeedChange, self.innerWallSpeedSelect)
+               self.Bind(wx.EVT_SPINCTRL, self.OnSpeedChange, self.fillSpeedSelect)
+               self.Bind(wx.EVT_SPINCTRL, self.OnSpeedChange, self.supportSpeedSelect)
+               self.Bind(wx.EVT_TEXT_ENTER, self.OnTermEnterLine, self.termInput)
+               self.termInput.Bind(wx.EVT_CHAR, self.OnTermKey)
+
+               self.Layout()
+               self.Fit()
+               self.Centre()
+
+               self.statsText.SetMinSize(self.statsText.GetSize())
+
+               self.UpdateButtonStates()
+
+       #self.UpdateProgress()
+
+       def OnCameraTimer(self, e):
+               if not self.campreviewEnable.GetValue():
+                       return
+               if self.machineCom != None and self.machineCom.isPrinting():
+                       return
+               self.cam.takeNewImage()
+               self.camPreview.Refresh()
+
+       def OnCameraEraseBackground(self, e):
+               dc = e.GetDC()
+               if not dc:
+                       dc = wx.ClientDC(self)
+                       rect = self.GetUpdateRegion().GetBox()
+                       dc.SetClippingRect(rect)
+               dc.SetBackground(wx.Brush(self.camPreview.GetBackgroundColour(), wx.SOLID))
+               if self.cam.getLastImage() != None:
+                       self.camPreview.SetMinSize((self.cam.getLastImage().GetWidth(), self.cam.getLastImage().GetHeight()))
+                       self.camPage.Fit()
+                       dc.DrawBitmap(self.cam.getLastImage(), 0, 0)
+               else:
+                       dc.Clear()
+
+       def OnPropertyPageButton(self, e):
+               self.cam.openPropertyPage(e.GetEventObject().index)
+
+       def UpdateButtonStates(self):
+               self.connectButton.Enable(self.machineCom == None or self.machineCom.isClosedOrError())
+               #self.loadButton.Enable(self.machineCom == None or not (self.machineCom.isPrinting() or self.machineCom.isPaused()))
+               self.printButton.Enable(self.machineCom != None and self.machineCom.isOperational() and not (
+               self.machineCom.isPrinting() or self.machineCom.isPaused()))
+               self.pauseButton.Enable(
+                       self.machineCom != None and (self.machineCom.isPrinting() or self.machineCom.isPaused()))
+               if self.machineCom != None and self.machineCom.isPaused():
+                       self.pauseButton.SetLabel('Resume')
+               else:
+                       self.pauseButton.SetLabel('Pause')
+               self.cancelButton.Enable(
+                       self.machineCom != None and (self.machineCom.isPrinting() or self.machineCom.isPaused()))
+               self.temperatureSelect.Enable(self.machineCom != None and self.machineCom.isOperational())
+               self.bedTemperatureSelect.Enable(self.machineCom != None and self.machineCom.isOperational())
+               self.directControlPanel.Enable(
+                       self.machineCom != None and self.machineCom.isOperational() and not self.machineCom.isPrinting())
+               self.machineLogButton.Show(self.machineCom != None and self.machineCom.isClosedOrError())
+               if self.cam != None:
+                       for button in self.cam.buttons:
+                               button.Enable(self.machineCom == None or not self.machineCom.isPrinting())
+
+       def UpdateProgress(self):
+               status = ""
+               if self.gcode == None:
+                       status += "Loading gcode...\n"
+               else:
+                       status += "Filament: %.2fm %.2fg\n" % (
+                       self.gcode.extrusionAmount / 1000, self.gcode.calculateWeight() * 1000)
+                       cost = self.gcode.calculateCost()
+                       if cost != False:
+                               status += "Filament cost: %s\n" % (cost)
+                       status += "Estimated print time: %02d:%02d\n" % (
+                       int(self.gcode.totalMoveTimeMinute / 60), int(self.gcode.totalMoveTimeMinute % 60))
+               if self.machineCom == None or not self.machineCom.isPrinting():
+                       self.progress.SetValue(0)
+                       if self.gcodeList != None:
+                               status += 'Line: -/%d\n' % (len(self.gcodeList))
+               else:
+                       printTime = self.machineCom.getPrintTime() / 60
+                       printTimeLeft = self.machineCom.getPrintTimeRemainingEstimate()
+                       status += 'Line: %d/%d %d%%\n' % (self.machineCom.getPrintPos(), len(self.gcodeList),
+                                                         self.machineCom.getPrintPos() * 100 / len(self.gcodeList))
+                       if self.currentZ > 0:
+                               status += 'Height: %0.1f\n' % (self.currentZ)
+                       status += 'Print time: %02d:%02d\n' % (int(printTime / 60), int(printTime % 60))
+                       if printTimeLeft == None:
+                               status += 'Print time left: Unknown\n'
+                       else:
+                               status += 'Print time left: %02d:%02d\n' % (int(printTimeLeft / 60), int(printTimeLeft % 60))
+                       self.progress.SetValue(self.machineCom.getPrintPos())
+                       taskbar.setProgress(self, self.machineCom.getPrintPos(), len(self.gcodeList))
+               if self.machineCom != None:
+                       if self.machineCom.getTemp() > 0:
+                               status += 'Temp: %d\n' % (self.machineCom.getTemp())
+                       if self.machineCom.getBedTemp() > 0:
+                               status += 'Bed Temp: %d\n' % (self.machineCom.getBedTemp())
+                               self.bedTemperatureLabel.Show(True)
+                               self.bedTemperatureSelect.Show(True)
+                               self.temperaturePanel.Layout()
+                       status += 'Machine state:%s\n' % (self.machineCom.getStateString())
+
+               self.statsText.SetLabel(status.strip())
+
+       def OnConnect(self, e):
+               if self.machineCom != None:
+                       self.machineCom.close()
+               self.machineCom = machineCom.MachineCom(callbackObject=self)
+               self.UpdateButtonStates()
+               taskbar.setBusy(self, True)
+
+       def OnLoad(self, e):
+               pass
+
+       def OnPrint(self, e):
+               if self.machineCom == None or not self.machineCom.isOperational():
+                       return
+               if self.gcodeList == None:
+                       return
+               if self.machineCom.isPrinting():
+                       return
+               self.currentZ = -1
+               if self.cam != None and self.timelapsEnable.GetValue():
+                       self.cam.startTimelaps(self.filename[: self.filename.rfind('.')] + ".mpg")
+               self.machineCom.printGCode(self.gcodeList)
+               self.UpdateButtonStates()
+
+       def OnCancel(self, e):
+               self.pauseButton.SetLabel('Pause')
+               self.machineCom.cancelPrint()
+               self.machineCom.sendCommand("M84")
+               self.UpdateButtonStates()
+
+       def OnPause(self, e):
+               if self.machineCom.isPaused():
+                       self.machineCom.setPause(False)
+               else:
+                       self.machineCom.setPause(True)
+
+       def OnMachineLog(self, e):
+               LogWindow('\n'.join(self.machineCom.getLog()))
+
+       def OnClose(self, e):
+               global printWindowHandle
+               printWindowHandle = None
+               if self.machineCom != None:
+                       self.machineCom.close()
+               self.Destroy()
+
+       def OnTempChange(self, e):
+               self.machineCom.sendCommand("M104 S%d" % (self.temperatureSelect.GetValue()))
+
+       def OnBedTempChange(self, e):
+               self.machineCom.sendCommand("M140 S%d" % (self.bedTemperatureSelect.GetValue()))
+
+       def OnSpeedChange(self, e):
+               if self.machineCom == None:
+                       return
+               self.machineCom.setFeedrateModifier('WALL-OUTER', self.outerWallSpeedSelect.GetValue() / 100.0)
+               self.machineCom.setFeedrateModifier('WALL-INNER', self.innerWallSpeedSelect.GetValue() / 100.0)
+               self.machineCom.setFeedrateModifier('FILL', self.fillSpeedSelect.GetValue() / 100.0)
+               self.machineCom.setFeedrateModifier('SUPPORT', self.supportSpeedSelect.GetValue() / 100.0)
+
+       def AddTermLog(self, line):
+               self.termLog.AppendText(unicode(line, 'utf-8', 'replace'))
+               l = len(self.termLog.GetValue())
+               self.termLog.SetCaret(wx.Caret(self.termLog, (l, l)))
+
+       def OnTermEnterLine(self, e):
+               line = self.termInput.GetValue()
+               if line == '':
+                       return
+               self.termLog.AppendText('>%s\n' % (line))
+               self.machineCom.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 = 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 = self.termHistoryIdx - 1
+                               if self.termHistoryIdx >= len(self.termHistory):
+                                       self.termHistoryIdx = 0
+                               self.termInput.SetValue(self.termHistory[self.termHistoryIdx])
+               e.Skip()
+
+       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.Layout()
+               elif type != power.POWER_TYPE_AC and not self.powerWarningText.IsShown():
+                       self.powerWarningText.Show()
+                       self.Layout()
+
+       def LoadGCodeFile(self, filename):
+               if self.machineCom != None and self.machineCom.isPrinting():
+                       return
+               #Send an initial M110 to reset the line counter to zero.
+               prevLineType = lineType = 'CUSTOM'
+               gcodeList = ["M110"]
+               for line in open(filename, 'r'):
+                       if line.startswith(';TYPE:'):
+                               lineType = line[6:].strip()
+                       if ';' in line:
+                               line = line[0:line.find(';')]
+                       line = line.strip()
+                       if len(line) > 0:
+                               if prevLineType != lineType:
+                                       gcodeList.append((line, lineType, ))
+                               else:
+                                       gcodeList.append(line)
+                               prevLineType = lineType
+               gcode = gcodeInterpreter.gcode()
+               gcode.loadList(gcodeList)
+               #print "Loaded: %s (%d)" % (filename, len(gcodeList))
+               self.filename = filename
+               self.gcode = gcode
+               self.gcodeList = gcodeList
+
+               wx.CallAfter(self.progress.SetRange, len(gcodeList))
+               wx.CallAfter(self.UpdateButtonStates)
+               wx.CallAfter(self.UpdateProgress)
+               wx.CallAfter(self.SetTitle, 'Printing: %s' % (filename))
+
+       def sendLine(self, lineNr):
+               if lineNr >= len(self.gcodeList):
+                       return False
+               line = self.gcodeList[lineNr]
+               try:
+                       if ('M104' in line or 'M109' in line) and 'S' in line:
+                               n = int(re.search('S([0-9]*)', line).group(1))
+                               wx.CallAfter(self.temperatureSelect.SetValue, n)
+                       if ('M140' in line or 'M190' in line) and 'S' in line:
+                               n = int(re.search('S([0-9]*)', line).group(1))
+                               wx.CallAfter(self.bedTemperatureSelect.SetValue, n)
+               except:
+                       print "Unexpected error:", sys.exc_info()
+               checksum = reduce(lambda x, y: x ^ y, map(ord, "N%d%s" % (lineNr, line)))
+               self.machineCom.sendCommand("N%d%s*%d" % (lineNr, line, checksum))
+               return True
+
+       def mcLog(self, message):
+               #print message
+               pass
+
+       def mcTempUpdate(self, temp, bedTemp, targetTemp, bedTargetTemp):
+               self.temperatureGraph.addPoint(temp, targetTemp, bedTemp, bedTargetTemp)
+               if self.temperatureSelect.GetValue() != targetTemp:
+                       wx.CallAfter(self.temperatureSelect.SetValue, targetTemp)
+               if self.bedTemperatureSelect.GetValue() != bedTargetTemp:
+                       wx.CallAfter(self.bedTemperatureSelect.SetValue, bedTargetTemp)
+
+       def mcStateChange(self, state):
+               if self.machineCom != None:
+                       if state == self.machineCom.STATE_OPERATIONAL and self.cam != None:
+                               self.cam.endTimelaps()
+                       if state == self.machineCom.STATE_OPERATIONAL:
+                               taskbar.setBusy(self, False)
+                       if self.machineCom.isClosedOrError():
+                               taskbar.setBusy(self, False)
+                       if self.machineCom.isPaused():
+                               taskbar.setPause(self, True)
+               wx.CallAfter(self.UpdateButtonStates)
+               wx.CallAfter(self.UpdateProgress)
+
+       def mcMessage(self, message):
+               wx.CallAfter(self.AddTermLog, message)
+
+       def mcProgress(self, lineNr):
+               wx.CallAfter(self.UpdateProgress)
+
+       def mcZChange(self, newZ):
+               self.currentZ = newZ
+               if self.cam != None:
+                       wx.CallAfter(self.cam.takeNewImage)
+                       wx.CallAfter(self.camPreview.Refresh)
+
+
+class temperatureGraph(wx.Panel):
+       def __init__(self, parent):
+               super(temperatureGraph, self).__init__(parent)
+
+               self.Bind(wx.EVT_ERASE_BACKGROUND, self.OnEraseBackground)
+               self.Bind(wx.EVT_SIZE, self.OnSize)
+               self.Bind(wx.EVT_PAINT, self.OnDraw)
+
+               self.lastDraw = time.time() - 1.0
+               self.points = []
+               self.backBuffer = None
+               self.addPoint(0, 0, 0, 0)
+               self.SetMinSize((320, 200))
+
+       def OnEraseBackground(self, e):
+               pass
+
+       def OnSize(self, e):
+               if self.backBuffer == None or self.GetSize() != self.backBuffer.GetSize():
+                       self.backBuffer = wx.EmptyBitmap(*self.GetSizeTuple())
+                       self.UpdateDrawing(True)
+
+       def OnDraw(self, e):
+               dc = wx.BufferedPaintDC(self, self.backBuffer)
+
+       def UpdateDrawing(self, force=False):
+               now = time.time()
+               if not force and now - self.lastDraw < 1.0:
+                       return
+               self.lastDraw = now
+               dc = wx.MemoryDC()
+               dc.SelectObject(self.backBuffer)
+               dc.Clear()
+               w, h = self.GetSizeTuple()
+               bgLinePen = wx.Pen('#A0A0A0')
+               tempPen = wx.Pen('#FF4040')
+               tempSPPen = wx.Pen('#FFA0A0')
+               tempPenBG = wx.Pen('#FFD0D0')
+               bedTempPen = wx.Pen('#4040FF')
+               bedTempSPPen = wx.Pen('#A0A0FF')
+               bedTempPenBG = wx.Pen('#D0D0FF')
+
+               #Draw the background up to the current temperatures.
+               x0 = 0
+               t0 = 0
+               bt0 = 0
+               tSP0 = 0
+               btSP0 = 0
+               for temp, tempSP, bedTemp, bedTempSP, t in self.points:
+                       x1 = int(w - (now - t))
+                       for x in xrange(x0, x1 + 1):
+                               t = float(x - x0) / float(x1 - x0 + 1) * (temp - t0) + t0
+                               bt = float(x - x0) / float(x1 - x0 + 1) * (bedTemp - bt0) + bt0
+                               dc.SetPen(tempPenBG)
+                               dc.DrawLine(x, h, x, h - (t * h / 300))
+                               dc.SetPen(bedTempPenBG)
+                               dc.DrawLine(x, h, x, h - (bt * h / 300))
+                       t0 = temp
+                       bt0 = bedTemp
+                       tSP0 = tempSP
+                       btSP0 = bedTempSP
+                       x0 = x1 + 1
+
+               #Draw the grid
+               for x in xrange(w, 0, -30):
+                       dc.SetPen(bgLinePen)
+                       dc.DrawLine(x, 0, x, h)
+               for y in xrange(h - 1, 0, -h * 50 / 300):
+                       dc.SetPen(bgLinePen)
+                       dc.DrawLine(0, y, w, y)
+               dc.DrawLine(0, 0, w, 0)
+               dc.DrawLine(0, 0, 0, h)
+
+               #Draw the main lines
+               x0 = 0
+               t0 = 0
+               bt0 = 0
+               tSP0 = 0
+               btSP0 = 0
+               for temp, tempSP, bedTemp, bedTempSP, t in self.points:
+                       x1 = int(w - (now - t))
+                       for x in xrange(x0, x1 + 1):
+                               t = float(x - x0) / float(x1 - x0 + 1) * (temp - t0) + t0
+                               bt = float(x - x0) / float(x1 - x0 + 1) * (bedTemp - bt0) + bt0
+                               tSP = float(x - x0) / float(x1 - x0 + 1) * (tempSP - tSP0) + tSP0
+                               btSP = float(x - x0) / float(x1 - x0 + 1) * (bedTempSP - btSP0) + btSP0
+                               dc.SetPen(tempSPPen)
+                               dc.DrawPoint(x, h - (tSP * h / 300))
+                               dc.SetPen(bedTempSPPen)
+                               dc.DrawPoint(x, h - (btSP * h / 300))
+                               dc.SetPen(tempPen)
+                               dc.DrawPoint(x, h - (t * h / 300))
+                               dc.SetPen(bedTempPen)
+                               dc.DrawPoint(x, h - (bt * h / 300))
+                       t0 = temp
+                       bt0 = bedTemp
+                       tSP0 = tempSP
+                       btSP0 = bedTempSP
+                       x0 = x1 + 1
+
+               del dc
+               self.Refresh(eraseBackground=False)
+               self.Update()
+
+               if len(self.points) > 0 and (time.time() - self.points[0][4]) > w + 20:
+                       self.points.pop(0)
+
+       def addPoint(self, temp, tempSP, bedTemp, bedTempSP):
+               if bedTemp == None:
+                       bedTemp = 0
+               if bedTempSP == None:
+                       bedTempSP = 0
+               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="Machine log")
+               self.textBox = wx.TextCtrl(self, -1, logText, style=wx.TE_MULTILINE | wx.TE_DONTWRAP | wx.TE_READONLY)
+               self.SetSize((500, 400))
+               self.Centre()
+               self.Show(True)
index cfa4792b8a0fcb27a8781e82226c508ecfcfed96..c0ddee86ad68eec0fe41b4bb8725fc6413d5e03f 100644 (file)
@@ -1,39 +1,39 @@
-import sys, os
-#We only need the core here, which speeds up the import. As we want to show the splashscreen ASAP.
-import wx._core
+# coding=utf-8
+from __future__ import absolute_import
+
+import wx._core #We only need the core here, which speeds up the import. As we want to show the splashscreen ASAP.
+
+from util.resources import getPathForImage
 
-def getBitmapImage(filename):
-       #The frozen executable has the script files in a zip, so we need to exit another level to get to our images.
-       if hasattr(sys, 'frozen'):
-               return wx.Bitmap(os.path.normpath(os.path.join(os.path.split(__file__)[0], "../../images", filename)))
-       else:
-               return wx.Bitmap(os.path.normpath(os.path.join(os.path.split(__file__)[0], "../images", filename)))
 
 class splashScreen(wx.SplashScreen):
        def __init__(self, callback):
                self.callback = callback
-               bitmap = getBitmapImage("splash.png")
+               bitmap = wx.Bitmap(getPathForImage('splash.png'))
                super(splashScreen, self).__init__(bitmap, wx.SPLASH_CENTRE_ON_SCREEN, 0, None)
                wx.CallAfter(self.DoCallback)
-       
+
        def DoCallback(self):
                self.callback(self)
                self.Destroy()
 
+
 def showSplash(callback):
        app = wx.App(False)
        splashScreen(callback)
        app.MainLoop()
 
+
 def testCallback(splashscreen):
        print "Callback!"
        import time
+
        time.sleep(2)
        print "!Callback"
 
+
 def main():
        showSplash(testCallback)
 
 if __name__ == u'__main__':
        main()
-
index ad7770a20c49dccfe574eb6827d945f296ca7da9..62f4d6d85ff452edef14bfe474df005ffe9bdef3 100644 (file)
@@ -1,28 +1,23 @@
+# coding=utf-8
+from __future__ import absolute_import
 from __future__ import division
 
-import os, sys
-
 import wx
 from wx.lib import buttons
 
 from util import profile
+from util.resources import getPathForImage
+
 
 #######################################################
 # toolbarUtil contains help classes and functions for
 # toolbar buttons.
 #######################################################
 
-def getBitmapImage(filename):
-       #The frozen executable has the script files in a zip, so we need to exit another level to get to our images.
-       if hasattr(sys, 'frozen'):
-               return wx.Bitmap(os.path.normpath(os.path.join(os.path.split(__file__)[0], "../../images", filename)))
-       else:
-               return wx.Bitmap(os.path.normpath(os.path.join(os.path.split(__file__)[0], "../images", filename)))
-
 class Toolbar(wx.ToolBar):
        def __init__(self, parent):
                super(Toolbar, self).__init__(parent, -1, style=wx.TB_HORIZONTAL | wx.NO_BORDER)
-               self.SetToolBitmapSize( ( 21, 21 ) )
+               self.SetToolBitmapSize(( 21, 21 ))
 
                if not hasattr(parent, 'popup'):
                        # Create popup window
@@ -30,14 +25,14 @@ class Toolbar(wx.ToolBar):
                        parent.popup.SetBackgroundColour(wx.SystemSettings.GetColour(wx.SYS_COLOUR_INFOBK))
                        parent.popup.text = wx.StaticText(parent.popup, -1, '')
                        parent.popup.sizer = wx.BoxSizer()
-                       parent.popup.sizer.Add(parent.popup.text, flag=wx.EXPAND|wx.ALL, border=1)
+                       parent.popup.sizer.Add(parent.popup.text, flag=wx.EXPAND | wx.ALL, border=1)
                        parent.popup.SetSizer(parent.popup.sizer)
                        parent.popup.owner = None
 
        def OnPopupDisplay(self, e):
                self.UpdatePopup(e.GetEventObject())
                self.GetParent().popup.Show(True)
-       
+
        def OnPopupHide(self, e):
                if self.GetParent().popup.owner == e.GetEventObject():
                        self.GetParent().popup.Show(False)
@@ -50,13 +45,14 @@ class Toolbar(wx.ToolBar):
                popup.Fit();
                x, y = control.ClientToScreenXY(0, 0)
                sx, sy = control.GetSizeTuple()
-               popup.SetPosition((x, y+sy))
+               popup.SetPosition((x, y + sy))
+
 
 class ToggleButton(buttons.GenBitmapToggleButton):
        def __init__(self, parent, profileSetting, bitmapFilenameOn, bitmapFilenameOff,
-                                helpText='', id=-1, callback=None, size=(20,20)):
-               self.bitmapOn = getBitmapImage(bitmapFilenameOn)
-               self.bitmapOff = getBitmapImage(bitmapFilenameOff)
+                    helpText='', id=-1, callback=None, size=(20, 20)):
+               self.bitmapOn = wx.Bitmap(getPathForImage(bitmapFilenameOn))
+               self.bitmapOff = wx.Bitmap(getPathForImage(bitmapFilenameOff))
 
                super(ToggleButton, self).__init__(parent, id, self.bitmapOff, size=size)
 
@@ -75,7 +71,7 @@ class ToggleButton(buttons.GenBitmapToggleButton):
 
                self.Bind(wx.EVT_ENTER_WINDOW, self.OnMouseEnter)
                self.Bind(wx.EVT_LEAVE_WINDOW, self.OnMouseLeave)
-               
+
                parent.AddControl(self)
 
        def SetBitmap(self, boolValue):
@@ -117,11 +113,12 @@ class ToggleButton(buttons.GenBitmapToggleButton):
                self.Refresh()
                event.Skip()
 
+
 class RadioButton(buttons.GenBitmapButton):
        def __init__(self, parent, group, bitmapFilenameOn, bitmapFilenameOff,
-                                helpText='', id=-1, callback=None, size=(20,20)):
-               self.bitmapOn = getBitmapImage(bitmapFilenameOn)
-               self.bitmapOff = getBitmapImage(bitmapFilenameOff)
+                    helpText='', id=-1, callback=None, size=(20, 20)):
+               self.bitmapOn = wx.Bitmap(getPathForImage(bitmapFilenameOn))
+               self.bitmapOff = wx.Bitmap(getPathForImage(bitmapFilenameOff))
 
                super(RadioButton, self).__init__(parent, id, self.bitmapOff, size=size)
 
@@ -138,10 +135,10 @@ class RadioButton(buttons.GenBitmapButton):
 
                self.Bind(wx.EVT_ENTER_WINDOW, self.OnMouseEnter)
                self.Bind(wx.EVT_LEAVE_WINDOW, self.OnMouseLeave)
-               
+
                if len(group) == 1:
                        self.SetValue(True)
-               
+
                parent.AddControl(self)
 
        def SetBitmap(self, boolValue):
@@ -158,7 +155,7 @@ class RadioButton(buttons.GenBitmapButton):
                        for other in self.group:
                                if other != self:
                                        other.SetValue(False)
-       
+
        def GetValue(self):
                return self._value
 
@@ -179,10 +176,11 @@ class RadioButton(buttons.GenBitmapButton):
                self.Refresh()
                event.Skip()
 
+
 class NormalButton(buttons.GenBitmapButton):
        def __init__(self, parent, callback, bitmapFilename,
-                                helpText='', id=-1, size=(20,20)):
-               self.bitmap = getBitmapImage(bitmapFilename)
+                    helpText='', id=-1, size=(20, 20)):
+               self.bitmap = wx.Bitmap(getPathForImage(bitmapFilename))
                super(NormalButton, self).__init__(parent, id, self.bitmap, size=size)
 
                self.helpText = helpText
@@ -193,9 +191,9 @@ class NormalButton(buttons.GenBitmapButton):
 
                self.Bind(wx.EVT_ENTER_WINDOW, self.OnMouseEnter)
                self.Bind(wx.EVT_LEAVE_WINDOW, self.OnMouseLeave)
-               
+
                self.Bind(wx.EVT_BUTTON, self.OnButton)
-               
+
                parent.AddControl(self)
 
        def OnButton(self, event):
index a7043729b5e05c34250267c4cc62e8e87cde0e71..56d28260c200eb9bcd11bdedb3f9adfda2170149 100644 (file)
-import os, glob, subprocess, platform\r
-import wx\r
-\r
-from util import profile\r
-from gui import toolbarUtil\r
-\r
-try:\r
-       #Try to find the OpenCV library for video capture.\r
-       from opencv import cv\r
-       from opencv import highgui\r
-except:\r
-       cv = None\r
-\r
-try:\r
-       #Use the vidcap library directly from the VideoCapture package. (Windows only)\r
-       #       http://videocapture.sourceforge.net/\r
-       # We're using the binary interface, not the python interface, so we don't depend on PIL\r
-       import vidcap as win32vidcap\r
-except:\r
-       win32vidcap = None\r
-\r
-def hasWebcamSupport():\r
-       if cv == None and win32vidcap == None:\r
-               return False\r
-       if not os.path.exists(getFFMPEGpath()):\r
-               return False\r
-       return True\r
-\r
-def getFFMPEGpath():\r
-       if platform.system() == "Windows":\r
-               return os.path.normpath(os.path.join(os.path.split(__file__)[0], "../ffmpeg.exe"))\r
-       elif os.path.exists('/usr/bin/ffmpeg'):\r
-               return '/usr/bin/ffmpeg'\r
-       return os.path.normpath(os.path.join(os.path.split(__file__)[0], "../ffmpeg"))\r
-\r
-class webcam(object):\r
-       def __init__(self):\r
-               self._cam = None\r
-               self._overlayImage = toolbarUtil.getBitmapImage("cura-overlay.png")\r
-               self._overlayUltimaker = toolbarUtil.getBitmapImage("ultimaker-overlay.png")\r
-               if cv != None:\r
-                       self._cam = highgui.cvCreateCameraCapture(-1)\r
-               elif win32vidcap != None:\r
-                       try:\r
-                               self._cam = win32vidcap.new_Dev(0, False)\r
-                       except:\r
-                               pass\r
-               \r
-               self._doTimelaps = False\r
-               self._bitmap = None\r
-       \r
-       def hasCamera(self):\r
-               return self._cam != None\r
-       \r
-       def propertyPages(self):\r
-               if self._cam == None:\r
-                       return []\r
-               if cv != None:\r
-                       #TODO Make an OpenCV property page\r
-                       return []\r
-               elif win32vidcap != None:\r
-                       return ['Image properties', 'Format properties']\r
-\r
-       def openPropertyPage(self, pageType = 0):\r
-               if self._cam == None:\r
-                       return\r
-               if cv != None:\r
-                       pass\r
-               elif win32vidcap != None:\r
-                       if pageType == 0:\r
-                               self._cam.displaycapturefilterproperties()\r
-                       else:\r
-                               del self._cam\r
-                               self._cam = None\r
-                               tmp = win32vidcap.new_Dev(0, False)\r
-                               tmp.displaycapturepinproperties()\r
-                               self._cam = tmp\r
-       \r
-       def takeNewImage(self):\r
-               if self._cam == None:\r
-                       return\r
-               if cv != None:\r
-                       frame = cv.QueryFrame(self._cam)\r
-                       cv.CvtColor(frame, frame, cv.CV_BGR2RGB)\r
-                       bitmap = wx.BitmapFromBuffer(frame.width, frame.height, frame.imageData)\r
-               elif win32vidcap != None:\r
-                       buffer, width, height = self._cam.getbuffer()\r
-                       try:\r
-                               wxImage = wx.EmptyImage(width, height)\r
-                               wxImage.SetData(buffer[::-1])\r
-                               if self._bitmap != None:\r
-                                       del self._bitmap\r
-                               bitmap = wxImage.ConvertToBitmap()\r
-                               del wxImage\r
-                               del buffer\r
-                       except:\r
-                               pass\r
-\r
-               dc = wx.MemoryDC()\r
-               dc.SelectObject(bitmap)\r
-               dc.DrawBitmap(self._overlayImage, bitmap.GetWidth() - self._overlayImage.GetWidth() - 5, 5, True)\r
-               if profile.getPreference('machine_type') == 'ultimaker':\r
-                       dc.DrawBitmap(self._overlayUltimaker, (bitmap.GetWidth() - self._overlayUltimaker.GetWidth()) / 2, bitmap.GetHeight() - self._overlayUltimaker.GetHeight() - 5, True)\r
-               dc.SelectObject(wx.NullBitmap)\r
-\r
-               self._bitmap = bitmap\r
-\r
-               if self._doTimelaps:\r
-                       filename = os.path.normpath(os.path.join(os.path.split(__file__)[0], "../__tmp_snap", "__tmp_snap_%04d.jpg" % (self._snapshotCount)))\r
-                       self._snapshotCount += 1\r
-                       bitmap.SaveFile(filename, wx.BITMAP_TYPE_JPEG)\r
-\r
-               return self._bitmap\r
-       \r
-       def getLastImage(self):\r
-               return self._bitmap\r
-       \r
-       def startTimelaps(self, filename):\r
-               if self._cam == None:\r
-                       return\r
-               self._cleanTempDir()\r
-               self._timelapsFilename = filename\r
-               self._snapshotCount = 0\r
-               self._doTimelaps = True\r
-               print "startTimelaps"\r
-       \r
-       def endTimelaps(self):\r
-               if self._doTimelaps:\r
-                       ffmpeg = getFFMPEGpath()\r
-                       basePath = os.path.normpath(os.path.join(os.path.split(__file__)[0], "../__tmp_snap", "__tmp_snap_%04d.jpg"))\r
-                       subprocess.call([ffmpeg, '-r', '12.5', '-i', basePath, '-vcodec', 'mpeg2video', '-pix_fmt', 'yuv420p', '-r', '25', '-y', '-b:v', '1500k', '-f', 'vob', self._timelapsFilename])\r
-               self._doTimelaps = False\r
-       \r
-       def _cleanTempDir(self):\r
-               basePath = os.path.normpath(os.path.join(os.path.split(__file__)[0], "../__tmp_snap"))\r
-               try:\r
-                       os.makedirs(basePath)\r
-               except:\r
-                       pass\r
-               for filename in glob.iglob(basePath + "/*.jpg"):\r
-                       os.remove(filename)\r
+# coding=utf-8
+from __future__ import absolute_import
+
+import os
+import glob
+import subprocess
+import platform
+
+import wx
+
+from util import profile
+from util.resources import getPathForImage
+from gui import toolbarUtil
+
+try:
+       #Try to find the OpenCV library for video capture.
+       from opencv import cv
+       from opencv import highgui
+except:
+       cv = None
+
+try:
+       #Use the vidcap library directly from the VideoCapture package. (Windows only)
+       #       http://videocapture.sourceforge.net/
+       # We're using the binary interface, not the python interface, so we don't depend on PIL
+       import vidcap as win32vidcap
+except:
+       win32vidcap = None
+
+def hasWebcamSupport():
+       if cv == None and win32vidcap == None:
+               return False
+       if not os.path.exists(getFFMPEGpath()):
+               return False
+       return True
+
+
+def getFFMPEGpath():
+       if platform.system() == "Windows":
+               return os.path.normpath(os.path.join(os.path.split(__file__)[0], "../ffmpeg.exe"))
+       elif os.path.exists('/usr/bin/ffmpeg'):
+               return '/usr/bin/ffmpeg'
+       return os.path.normpath(os.path.join(os.path.split(__file__)[0], "../ffmpeg"))
+
+
+class webcam(object):
+       def __init__(self):
+               self._cam = None
+               self._overlayImage = wx.Bitmap(getPathForImage('cura-overlay.png'))
+               self._overlayUltimaker = wx.Bitmap(getPathForImage('ultimaker-overlay.png'))
+               if cv != None:
+                       self._cam = highgui.cvCreateCameraCapture(-1)
+               elif win32vidcap != None:
+                       try:
+                               self._cam = win32vidcap.new_Dev(0, False)
+                       except:
+                               pass
+
+               self._doTimelaps = False
+               self._bitmap = None
+
+       def hasCamera(self):
+               return self._cam != None
+
+       def propertyPages(self):
+               if self._cam == None:
+                       return []
+               if cv != None:
+                       #TODO Make an OpenCV property page
+                       return []
+               elif win32vidcap != None:
+                       return ['Image properties', 'Format properties']
+
+       def openPropertyPage(self, pageType=0):
+               if self._cam == None:
+                       return
+               if cv != None:
+                       pass
+               elif win32vidcap != None:
+                       if pageType == 0:
+                               self._cam.displaycapturefilterproperties()
+                       else:
+                               del self._cam
+                               self._cam = None
+                               tmp = win32vidcap.new_Dev(0, False)
+                               tmp.displaycapturepinproperties()
+                               self._cam = tmp
+
+       def takeNewImage(self):
+               if self._cam == None:
+                       return
+               if cv != None:
+                       frame = cv.QueryFrame(self._cam)
+                       cv.CvtColor(frame, frame, cv.CV_BGR2RGB)
+                       bitmap = wx.BitmapFromBuffer(frame.width, frame.height, frame.imageData)
+               elif win32vidcap != None:
+                       buffer, width, height = self._cam.getbuffer()
+                       try:
+                               wxImage = wx.EmptyImage(width, height)
+                               wxImage.SetData(buffer[::-1])
+                               if self._bitmap != None:
+                                       del self._bitmap
+                               bitmap = wxImage.ConvertToBitmap()
+                               del wxImage
+                               del buffer
+                       except:
+                               pass
+
+               dc = wx.MemoryDC()
+               dc.SelectObject(bitmap)
+               dc.DrawBitmap(self._overlayImage, bitmap.GetWidth() - self._overlayImage.GetWidth() - 5, 5, True)
+               if profile.getPreference('machine_type') == 'ultimaker':
+                       dc.DrawBitmap(self._overlayUltimaker, (bitmap.GetWidth() - self._overlayUltimaker.GetWidth()) / 2,
+                               bitmap.GetHeight() - self._overlayUltimaker.GetHeight() - 5, True)
+               dc.SelectObject(wx.NullBitmap)
+
+               self._bitmap = bitmap
+
+               if self._doTimelaps:
+                       filename = os.path.normpath(os.path.join(os.path.split(__file__)[0], "../__tmp_snap",
+                               "__tmp_snap_%04d.jpg" % (self._snapshotCount)))
+                       self._snapshotCount += 1
+                       bitmap.SaveFile(filename, wx.BITMAP_TYPE_JPEG)
+
+               return self._bitmap
+
+       def getLastImage(self):
+               return self._bitmap
+
+       def startTimelaps(self, filename):
+               if self._cam == None:
+                       return
+               self._cleanTempDir()
+               self._timelapsFilename = filename
+               self._snapshotCount = 0
+               self._doTimelaps = True
+               print "startTimelaps"
+
+       def endTimelaps(self):
+               if self._doTimelaps:
+                       ffmpeg = getFFMPEGpath()
+                       basePath = os.path.normpath(
+                               os.path.join(os.path.split(__file__)[0], "../__tmp_snap", "__tmp_snap_%04d.jpg"))
+                       subprocess.call(
+                               [ffmpeg, '-r', '12.5', '-i', basePath, '-vcodec', 'mpeg2video', '-pix_fmt', 'yuv420p', '-r', '25', '-y',
+                                '-b:v', '1500k', '-f', 'vob', self._timelapsFilename])
+               self._doTimelaps = False
+
+       def _cleanTempDir(self):
+               basePath = os.path.normpath(os.path.join(os.path.split(__file__)[0], "../__tmp_snap"))
+               try:
+                       os.makedirs(basePath)
+               except:
+                       pass
+               for filename in glob.iglob(basePath + "/*.jpg"):
+                       os.remove(filename)
diff --git a/Cura/util/resources.py b/Cura/util/resources.py
new file mode 100644 (file)
index 0000000..0db52c1
--- /dev/null
@@ -0,0 +1,36 @@
+# coding=utf-8
+from __future__ import absolute_import
+import os
+import sys
+
+__all__ = ['getPathForResource', 'getPathForImage', 'getPathForMesh']
+
+
+if sys.platform.startswith('darwin'):
+       if hasattr(sys, 'frozen'):
+               from Foundation import *
+               imagesPath = os.path.join(NSBundle.mainBundle().resourcePath(), 'images')
+               meshesPath = os.path.join(NSBundle.mainBundle().resourcePath(), 'images')
+       else:
+               imagesPath = os.path.join(os.path.dirname(__file__), "../images")
+               meshesPath = os.path.join(os.path.dirname(__file__), "../images")
+else:
+       if hasattr(sys, 'frozen'):
+               imagesPath = os.path.join(os.path.dirname(__file__), "../../images")
+               meshesPath = os.path.join(os.path.dirname(__file__), "../../images")
+       else:
+               imagesPath = os.path.join(os.path.dirname(__file__), "../images")
+               meshesPath = os.path.join(os.path.dirname(__file__), "../images")
+
+
+def getPathForResource(dir, resource_name):
+       assert os.path.isdir(dir), "{p} is not a directory".format(p=dir)
+       path = os.path.normpath(os.path.join(dir, resource_name))
+       assert os.path.isfile(path), "{p} is not a file.".format(p=path)
+       return path
+
+def getPathForImage(name):
+       return getPathForResource(imagesPath, name)
+
+def getPathForMesh(name):
+       return getPathForResource(meshesPath, name)