chiark / gitweb /
Change how the engine is interfaced from the python code. Put the GCode viewer in...
[cura.git] / Cura / gui / configWizard.py
index c26c8460162dbd13725dc46b0e87681fb86289ab..d0273bc474637844f65c5310dc29405dea286129 100644 (file)
@@ -223,11 +223,12 @@ class FirstInfoPage(InfoPage):
                        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(_("* Optionally upgrade your firmware"))
-               self.AddText(_("* Optionally check if your machine is working safely"))
-               self.AddText(_("* Optionally level your printer bed"))
+               self.AddText(_("This wizard will help you in setting up Cura for your machine."))
+               # self.AddText(_("This wizard will help you with the following steps:"))
+               # self.AddText(_("* Configure Cura for your machine"))
+               # self.AddText(_("* Optionally upgrade your firmware"))
+               # self.AddText(_("* Optionally check if your machine is working safely"))
+               # self.AddText(_("* Optionally level your printer bed"))
 
                #self.AddText('* Calibrate your machine')
                #self.AddText('* Do your first print')
@@ -237,7 +238,7 @@ class OtherMachineSelectPage(InfoPage):
        def __init__(self, parent):
                super(OtherMachineSelectPage, self).__init__(parent, "Other machine information")
                self.AddText(_("The following pre-defined machine profiles are available"))
-               self.AddText(_("Note that these profiles are not guaranteed to give good results,\nor work at all. Extra tweaks might be required."))
+               self.AddText(_("Note that these profiles are not guaranteed to give good results,\nor work at all. Extra tweaks might be required.\nIf you find issues with the predefined profiles,\nor want an extra profile.\nPlease report it at the github issue tracker."))
                self.options = []
                machines = resources.getDefaultMachineProfiles()
                machines.sort()
@@ -281,7 +282,7 @@ class CustomRepRapInfoPage(InfoPage):
                self.machineName = self.AddLabelTextCtrl(_("Machine name"), "RepRap")
                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.machineHeight = self.AddLabelTextCtrl(_("Machine height (mm)"), "55")
                self.nozzleSize = self.AddLabelTextCtrl(_("Nozzle size (mm)"), "0.5")
                self.heatedBed = self.AddCheckbox(_("Heated bed"))
                self.HomeAtCenter = self.AddCheckbox(_("Bed center is 0,0,0 (RoStock)"))
@@ -310,7 +311,7 @@ class MachineSelectPage(InfoPage):
                self.Ultimaker2Radio = self.AddRadioButton("Ultimaker2", style=wx.RB_GROUP)
                self.Ultimaker2Radio.SetValue(True)
                self.Ultimaker2Radio.Bind(wx.EVT_RADIOBUTTON, self.OnUltimaker2Select)
-               self.UltimakerRadio = self.AddRadioButton("Ultimaker")
+               self.UltimakerRadio = self.AddRadioButton("Ultimaker Original")
                self.UltimakerRadio.Bind(wx.EVT_RADIOBUTTON, self.OnUltimakerSelect)
                self.OtherRadio = self.AddRadioButton(_("Other (Ex: RepRap, MakerBot)"))
                self.OtherRadio.Bind(wx.EVT_RADIOBUTTON, self.OnOtherSelect)
@@ -335,24 +336,30 @@ class MachineSelectPage(InfoPage):
                return True
 
        def StoreData(self):
+               profile.putProfileSetting('retraction_enable', 'True')
                if self.Ultimaker2Radio.GetValue():
                        profile.putMachineSetting('machine_width', '230')
                        profile.putMachineSetting('machine_depth', '225')
                        profile.putMachineSetting('machine_height', '205')
+                       profile.putMachineSetting('machine_name', 'ultimaker2')
                        profile.putMachineSetting('machine_type', 'ultimaker2')
                        profile.putMachineSetting('machine_center_is_zero', 'False')
                        profile.putMachineSetting('has_heated_bed', 'True')
                        profile.putMachineSetting('gcode_flavor', 'UltiGCode')
-                       profile.putProfileSetting('nozzle_size', '0.4')
                        profile.putMachineSetting('extruder_head_size_min_x', '40.0')
                        profile.putMachineSetting('extruder_head_size_min_y', '10.0')
                        profile.putMachineSetting('extruder_head_size_max_x', '60.0')
                        profile.putMachineSetting('extruder_head_size_max_y', '30.0')
-                       profile.putMachineSetting('extruder_head_size_height', '60.0')
+                       profile.putMachineSetting('extruder_head_size_height', '55.0')
+                       profile.putProfileSetting('nozzle_size', '0.4')
+                       profile.putProfileSetting('fan_full_height', '5.0')
+                       profile.putMachineSetting('extruder_offset_x1', '18.0')
+                       profile.putMachineSetting('extruder_offset_y1', '0.0')
                elif self.UltimakerRadio.GetValue():
                        profile.putMachineSetting('machine_width', '205')
                        profile.putMachineSetting('machine_depth', '205')
                        profile.putMachineSetting('machine_height', '200')
+                       profile.putMachineSetting('machine_name', 'ultimaker original')
                        profile.putMachineSetting('machine_type', 'ultimaker')
                        profile.putMachineSetting('machine_center_is_zero', 'False')
                        profile.putMachineSetting('gcode_flavor', 'RepRap (Marlin/Sprinter)')
@@ -361,11 +368,12 @@ class MachineSelectPage(InfoPage):
                        profile.putMachineSetting('extruder_head_size_min_y', '18.0')
                        profile.putMachineSetting('extruder_head_size_max_x', '18.0')
                        profile.putMachineSetting('extruder_head_size_max_y', '35.0')
-                       profile.putMachineSetting('extruder_head_size_height', '60.0')
+                       profile.putMachineSetting('extruder_head_size_height', '55.0')
                else:
                        profile.putMachineSetting('machine_width', '80')
                        profile.putMachineSetting('machine_depth', '80')
                        profile.putMachineSetting('machine_height', '60')
+                       profile.putMachineSetting('machine_name', 'reprap')
                        profile.putMachineSetting('machine_type', 'reprap')
                        profile.putMachineSetting('gcode_flavor', 'RepRap (Marlin/Sprinter)')
                        profile.putPreference('startMode', 'Normal')
@@ -418,7 +426,7 @@ class UltimakerFirmwareUpgradePage(InfoPage):
                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(_("* You have an older machine based on ATMega1280 (Rev 1 machine)"))
                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)
@@ -718,7 +726,9 @@ class UltimakerCalibrateStepsPerEPage(InfoPage):
                self.lengthInput.SetValue("100")
 
        def OnExtrudeClick(self, e):
-               threading.Thread(target=self.OnExtrudeRun).start()
+               t = threading.Thread(target=self.OnExtrudeRun)
+               t.daemon = True
+               t.start()
 
        def OnExtrudeRun(self):
                self.heatButton.Enable(False)
@@ -751,7 +761,9 @@ class UltimakerCalibrateStepsPerEPage(InfoPage):
                self.heatButton.Enable()
 
        def OnHeatClick(self, e):
-               threading.Thread(target=self.OnHeatRun).start()
+               t = threading.Thread(target=self.OnHeatRun)
+               t.daemon = True
+               t.start()
 
        def OnHeatRun(self):
                self.heatButton.Enable(False)