X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=Cura%2Fgui%2FconfigWizard.py;h=d0273bc474637844f65c5310dc29405dea286129;hb=6208201bafdeaf82883181471c6da3a41283cfe7;hp=bde370f14478a67c34a2ad2f37635b09cea1f222;hpb=a04e5664e0b1e0e3448f668ad96afb668349b031;p=cura.git

diff --git a/Cura/gui/configWizard.py b/Cura/gui/configWizard.py
index bde370f1..d0273bc4 100644
--- a/Cura/gui/configWizard.py
+++ b/Cura/gui/configWizard.py
@@ -282,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)"))
@@ -311,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)
@@ -350,14 +350,16 @@ class MachineSelectPage(InfoPage):
 			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')
+			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)')
@@ -366,7 +368,7 @@ 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')
@@ -724,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)
@@ -757,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)