X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=Cura%2Fgui%2FconfigWizard.py;h=b5d8fa92f5f3d1300186eb7df39162fd53b49e09;hb=730e8f2c1c8dfc9498a1b416cc398606f60940c3;hp=039b419115acd394c41335147eabcee3c8db8500;hpb=79300af31ab141dbf160772c9250f58df5cf56fa;p=cura.git

diff --git a/Cura/gui/configWizard.py b/Cura/gui/configWizard.py
index 039b4191..b5d8fa92 100644
--- a/Cura/gui/configWizard.py
+++ b/Cura/gui/configWizard.py
@@ -1112,10 +1112,16 @@ class LulzbotMachineSelectPage(InfoPage):
 		self.LulzbotMini = self.AddImageButton(self.panel, 0, 0, _("LulzBot Mini"),
 											   'Lulzbot_mini.jpg', image_size, style=ImageButton.IB_GROUP)
 		self.LulzbotMini.OnSelected(self.OnLulzbotMiniSelected)
-		self.LulzbotTaz = self.AddImageButton(self.panel, 0, 1, _("LulzBot TAZ 4 or 5"),
+		
+		self.LulzbotTaz6 = self.AddImageButton(self.panel, 0, 1, _("LulzBot TAZ 6"),
+											   'Lulzbot_TAZ6.jpg', image_size)
+		self.LulzbotTaz6.OnSelected(self.OnLulzbotTaz6Selected)
+		
+		self.LulzbotTaz = self.AddImageButton(self.panel, 1, 0, _("LulzBot TAZ 4 or 5"),
 											   'Lulzbot_TAZ5.jpg', image_size)
 		self.LulzbotTaz.OnSelected(self.OnLulzbotTazSelected)
-		self.OtherPrinters = self.AddImageButton(self.panel, 1, 0, _("Other Printers"),
+		
+		self.OtherPrinters = self.AddImageButton(self.panel, 1, 1, _("Other Printers"),
 												 'Generic-3D-Printer.png', image_size)
 		self.OtherPrinters.OnSelected(self.OnOthersSelected)
 		self.LulzbotMini.SetValue(True)
@@ -1131,6 +1137,9 @@ class LulzbotMachineSelectPage(InfoPage):
 		wx.wizard.WizardPageSimple.Chain(self.GetParent().lulzbotMiniToolheadPage,
 										 self.GetParent().lulzbotReadyPage)
 
+	def OnLulzbotTaz6Selected(self):
+		wx.wizard.WizardPageSimple.Chain(self, self.GetParent().lulzbotTaz6SelectPage)
+
 	def OnLulzbotTazSelected(self):
 		wx.wizard.WizardPageSimple.Chain(self, self.GetParent().lulzbotTazSelectPage)
 
@@ -1213,18 +1222,43 @@ class LulzbotMiniToolheadSelectPage(InfoPage):
 			profile.putMachineSetting('toolhead_shortname', 'Flexystruder')
 			profile.putMachineSetting('machine_type', 'lulzbot_mini_flexystruder')
 
+class LulzbotTaz6SelectPage(InfoPage):
+	def __init__(self, parent):
+		super(LulzbotTaz6SelectPage, self).__init__(parent, _("LulzBot TAZ 6 Selection"))
+
+		self.panel = self.AddPanel()
+		image_size=(LulzbotMachineSelectPage.IMAGE_WIDTH, LulzbotMachineSelectPage.IMAGE_HEIGHT)
+		self.taz6 = self.AddImageButton(self.panel, 0, 0, _('Tilapia'),
+										'Lulzbot_Toolhead_TAZ_Tilapia.jpg', image_size,
+										style=ImageButton.IB_GROUP)
+		self.taz6.OnSelected(self.OnTilapiaSelected)
+		self.taz6.SetValue(True)
+
+	def OnPageShown(self):
+		self.taz6.TriggerGroupCallbacks()
+
+	def OnTilapiaSelected(self):
+		wx.wizard.WizardPageSimple.Chain(self, self.GetParent().lulzbotReadyPage)
+
+	def StoreData(self):
+		profile.putProfileSetting('nozzle_size',  '0.5')
+		profile.putMachineSetting('extruder_amount', '1')
+		profile.putMachineSetting('toolhead', 'Single Extruder Tilapia')
+		profile.putMachineSetting('toolhead_shortname', 'Tilapia')
+		profile.putMachineSetting('machine_type', 'lulzbot_TAZ_6_Single_Tilapia')
+		profile.putMachineSetting('machine_name', 'LulzBot TAZ 6')
 
 class LulzbotTazSelectPage(InfoPage):
 	def __init__(self, parent):
-		super(LulzbotTazSelectPage, self).__init__(parent, _("LulzBot TAZ Selection"))
+		super(LulzbotTazSelectPage, self).__init__(parent, _("LulzBot TAZ 4-5 Selection"))
 
 		self.panel = self.AddPanel()
 		image_size=(LulzbotMachineSelectPage.IMAGE_WIDTH, LulzbotMachineSelectPage.IMAGE_HEIGHT)
-		self.taz5 = self.AddImageButton(self.panel, 0, 0, _('Stock TAZ 5 (PEI and v2)'),
+		self.taz5 = self.AddImageButton(self.panel, 0, 0, _('Stock TAZ 5 (PEI && v2)'),
 										'Lulzbot_TAZ_5_Hex_and_PEI.jpg', image_size,
 										style=ImageButton.IB_GROUP)
 		self.taz5.OnSelected(self.OnTaz5Selected)
-		self.taz4 = self.AddImageButton(self.panel, 0, 1, _('Stock TAZ 4 (PET and v1)'),
+		self.taz4 = self.AddImageButton(self.panel, 0, 1, _('Stock TAZ 4 (PET && v1)'),
 										'Lulzbot_TAZ_4_Buda_and_PET.jpg', image_size)
 		self.taz4.OnSelected(self.OnTaz4Selected)
 		self.modified = self.AddImageButton(self.panel, 1, 0, _('Modified LulzBot TAZ 4 or 5'),
@@ -1494,6 +1528,7 @@ class LulzbotChangeToolheadWizard(wx.wizard.Wizard):
 		self.lulzbotTaz5NozzleSelectPage = LulzbotTaz5NozzleSelectPage(self)
 		self.lulzbotTazBedSelectPage = LulzbotTazBedSelectPage(self)
 		self.lulzbotTazSelectPage = LulzbotTazSelectPage(self)
+		self.lulzbotTaz6SelectPage = LulzbotTaz6SelectPage(self)
 
 		wx.wizard.WizardPageSimple.Chain(self.lulzbotMiniToolheadPage, self.lulzbotReadyPage)
 		wx.wizard.WizardPageSimple.Chain(self.lulzbotTazHotendPage, self.lulzbotTazToolheadPage)
@@ -1516,6 +1551,8 @@ class LulzbotChangeToolheadWizard(wx.wizard.Wizard):
 			self.FindWindowById(wx.ID_BACKWARD).Enable()
 		else:
 			self.FindWindowById(wx.ID_BACKWARD).Disable()
+		if hasattr(e.GetPage(), 'OnPageShown'):
+			e.GetPage().OnPageShown()
 
 	def OnCancel(self, e):
 		profile.putProfileSetting('nozzle_size', self._nozzle_size)
@@ -1533,7 +1570,6 @@ class ConfigWizard(wx.wizard.Wizard):
 
 		self.Bind(wx.wizard.EVT_WIZARD_PAGE_CHANGED, self.OnPageChanged)
 		self.Bind(wx.wizard.EVT_WIZARD_PAGE_CHANGING, self.OnPageChanging)
-		self.Bind(wx.wizard.EVT_WIZARD_PAGE_SHOWN, self.OnPageShown)
 		self.Bind(wx.wizard.EVT_WIZARD_CANCEL, self.OnCancel)
 
 		self.machineSelectPage = MachineSelectPage(self)
@@ -1573,11 +1609,6 @@ class ConfigWizard(wx.wizard.Wizard):
 		self.RunWizard(self.lulzbotMachineSelectPage)
 		self.Destroy()
 
-	def OnPageShown(self, e):
-		page = e.GetPage()
-		if hasattr(page, 'OnPageShown'):
-			page.OnPageShown()
-
 	def OnPageChanging(self, e):
 		e.GetPage().StoreData()
 
@@ -1590,6 +1621,8 @@ class ConfigWizard(wx.wizard.Wizard):
 			self.FindWindowById(wx.ID_BACKWARD).Enable()
 		else:
 			self.FindWindowById(wx.ID_BACKWARD).Disable()
+		if hasattr(e.GetPage(), 'OnPageShown'):
+			e.GetPage().OnPageShown()
 
 	def OnCancel(self, e):
 		new_machine_index = int(profile.getPreferenceFloat('active_machine'))