equal
deleted
inserted
replaced
304 |
304 |
305 wnd = wx.GetApp() |
305 wnd = wx.GetApp() |
306 InspectionTool().Show(wnd, True) |
306 InspectionTool().Show(wnd, True) |
307 |
307 |
308 def OnTaskBarQuit(self, evt): |
308 def OnTaskBarQuit(self, evt): |
|
309 if wx.Platform == '__WXMSW__': |
|
310 Thread(target=self.pyroserver.Quit).start() |
309 self.RemoveIcon() |
311 self.RemoveIcon() |
310 wx.CallAfter(wx.GetApp().Exit) |
312 wx.CallAfter(wx.GetApp().ExitMainLoop) |
311 |
313 |
312 def UpdateIcon(self, plcstatus): |
314 def UpdateIcon(self, plcstatus): |
313 if plcstatus is "Started" : |
315 if plcstatus is "Started" : |
314 currenticon = self.MakeIcon(starticon) |
316 currenticon = self.MakeIcon(starticon) |
315 elif plcstatus is "Stopped": |
317 elif plcstatus is "Stopped": |
379 print "Publishing service on local network" |
381 print "Publishing service on local network" |
380 self.servicepublisher = ServicePublisher.ServicePublisher() |
382 self.servicepublisher = ServicePublisher.ServicePublisher() |
381 self.servicepublisher.RegisterService(self.servicename, self.ip_addr, self.port) |
383 self.servicepublisher.RegisterService(self.servicename, self.ip_addr, self.port) |
382 |
384 |
383 if self.autostart and self.plcobj.GetPLCstatus()[0] != "Empty": |
385 if self.autostart and self.plcobj.GetPLCstatus()[0] != "Empty": |
384 self.plcobj.LoadPLC() |
|
385 self.plcobj.StartPLC() |
386 self.plcobj.StartPLC() |
386 |
387 |
387 sys.stdout.flush() |
388 sys.stdout.flush() |
388 |
389 |
389 self.daemon.requestLoop() |
390 self.daemon.requestLoop() |