Commit f50cc72a authored by Gary Hodgson's avatar Gary Hodgson Committed by Guillaume Seguin

stop end fullscreen at end of present; added 3mm rise and drop sequence.

parent bf589632
...@@ -112,15 +112,16 @@ class dispframe(wx.Frame): ...@@ -112,15 +112,16 @@ class dispframe(wx.Frame):
print "Rising" print "Rising"
if self.p != None and self.p.online: if self.p != None and self.p.online:
self.p.send_now("G91") self.p.send_now("G91")
self.p.send_now("G1 Z%f F250" % (self.thickness,)) self.p.send_now("G1 Z%f F200" % (3,))
self.p.send_now("G1 Z-%f F200" % (3-self.thickness,))
self.p.send_now("G90") self.p.send_now("G90")
def hidePic(self): def hidePic(self):
print "Hiding" print "Hiding"
self.pic.Hide() self.pic.Hide()
def hidePicAndRise(self): def hidePicAndRise(self):
self.hidePic() wx.CallAfter(self.hidePic)
self.rise() wx.FutureCall(250, self.rise)
def nextimg(self, event): def nextimg(self, event):
if self.index < len(self.layers): if self.index < len(self.layers):
...@@ -133,7 +134,6 @@ class dispframe(wx.Frame): ...@@ -133,7 +134,6 @@ class dispframe(wx.Frame):
print "end" print "end"
wx.CallAfter(self.pic.Hide) wx.CallAfter(self.pic.Hide)
wx.CallAfter(self.Refresh) wx.CallAfter(self.Refresh)
wx.CallAfter(self.ShowFullScreen, 0)
wx.CallAfter(self.timer.Stop) wx.CallAfter(self.timer.Stop)
def present(self, layers, interval=0.5, pause=0.2, thickness=0.4, scale=20, size=(1024, 768), offset=(0, 0)): def present(self, layers, interval=0.5, pause=0.2, thickness=0.4, scale=20, size=(1024, 768), offset=(0, 0)):
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment