Add an enable/disable preview box for the camera, so people do not get freaked out that their camera starts up when printing.

master
daid303 2012-10-05 16:25:15 +02:00
parent b46aeca961
commit a2486a537a
1 changed files with 6 additions and 1 deletions

View File

@ -255,9 +255,12 @@ class printWindow(wx.Frame):
sizer.Add(button, pos=(1, pages.index(page))) sizer.Add(button, pos=(1, pages.index(page)))
button.Bind(wx.EVT_BUTTON, self.OnPropertyPageButton) button.Bind(wx.EVT_BUTTON, self.OnPropertyPageButton)
self.cam.buttons.append(button) 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) self.camPreview = wx.Panel(self.camPage)
sizer.Add(self.camPreview, pos=(2,0), span=(1,2), flag=wx.EXPAND) sizer.Add(self.camPreview, pos=(3,0), span=(1,2), flag=wx.EXPAND)
nb.AddPage(self.camPage, 'Camera') nb.AddPage(self.camPage, 'Camera')
self.camPreview.timer = wx.Timer(self) self.camPreview.timer = wx.Timer(self)
@ -296,6 +299,8 @@ class printWindow(wx.Frame):
#self.UpdateProgress() #self.UpdateProgress()
def OnCameraTimer(self, e): def OnCameraTimer(self, e):
if not self.campreviewEnable.GetValue():
return
if self.machineCom != None and self.machineCom.isPrinting(): if self.machineCom != None and self.machineCom.isPrinting():
return return
self.cam.takeNewImage() self.cam.takeNewImage()