beremiz: comparison Beremiz

equal deleted inserted replaced

-:22e65b8e20f4
+:fdf81615ed04
 import os, sys, getopt
 def usage():
 print """
 Usage of Beremiz PLC execution service :\n
-%s {[-n name] [-i ip] [-p port] [-x enabletaskbar]|-h|--help} working_dir
+%s {[-n name] [-i ip] [-p port] [-x enabletaskbar] [-a autostart]|-h|--help} working_dir
 -n        - zeroconf service name
 -i        - ip of interface to bind to (x.x.x.x)
 -p        - port number
 -h        - print this help text and quit
+-a        - autostart PLC (0:disable 1:enable)
 -x        - enable/disable wxTaskbarIcon (0:disable 1:enable)
 working_dir - directory where are stored PLC files
 """%sys.argv[0]
 try:
-opts, argv = getopt.getopt(sys.argv[1:], "i:p:n:x:h")
+opts, argv = getopt.getopt(sys.argv[1:], "i:p:n:x:a:h")
 except getopt.GetoptError, err:
 # print help information and exit:
 print str(err) # will print something like "option -a not recognized"
 usage()
 sys.exit(2)
 port = 3000
 name = os.environ[{
 "linux2":"USER",
 "win32":"USERNAME",
 }.get(sys.platform, "USER")]
+autostart = False
 enablewx = True
 havewx = False
 for o, a in opts:
 if o == "-h":
 port = int(a)
 elif o == "-n":
 name = a
 elif o == "-x":
 enablewx = int(a)
+elif o == "-a":
+autostart = int(a)
 else:
 usage()
 sys.exit()
 if len(argv) > 1:
 argv=[WorkingDir]
 if enablewx:
 try:
 import wx, re
-from threading import Thread
+from threading import Thread, currentThread
 from types import *
 havewx = True
 except:
 havewx = False
 def SetTests(self, tests):
 self.Tests = tests
 class BeremizTaskBarIcon(wx.TaskBarIcon):
+TBMENU_START = wx.NewId()
+TBMENU_STOP = wx.NewId()
 TBMENU_CHANGE_NAME = wx.NewId()
 TBMENU_CHANGE_PORT = wx.NewId()
 TBMENU_CHANGE_INTERFACE = wx.NewId()
 TBMENU_LIVE_SHELL = wx.NewId()
 TBMENU_WXINSPECTOR = wx.NewId()
 self.pyroserver = pyroserver
 # Set the image
 self.UpdateIcon(None)
 # bind some events
+self.Bind(wx.EVT_MENU, self.OnTaskBarStartPLC, id=self.TBMENU_START)
+self.Bind(wx.EVT_MENU, self.OnTaskBarStopPLC, id=self.TBMENU_STOP)
 self.Bind(wx.EVT_MENU, self.OnTaskBarChangeName, id=self.TBMENU_CHANGE_NAME)
 self.Bind(wx.EVT_MENU, self.OnTaskBarChangeInterface, id=self.TBMENU_CHANGE_INTERFACE)
 self.Bind(wx.EVT_MENU, self.OnTaskBarLiveShell, id=self.TBMENU_LIVE_SHELL)
 self.Bind(wx.EVT_MENU, self.OnTaskBarWXInspector, id=self.TBMENU_WXINSPECTOR)
 self.Bind(wx.EVT_MENU, self.OnTaskBarChangePort, id=self.TBMENU_CHANGE_PORT)
 the menu for the default EVT_RIGHT_DOWN event.  Just create
 the menu how you want it and return it from this function,
 the base class takes care of the rest.
 """
 menu = wx.Menu()
+menu.Append(self.TBMENU_START, "Start PLC")
+menu.Append(self.TBMENU_STOP, "Stop PLC")
 menu.Append(self.TBMENU_CHANGE_NAME, "Change Name")
 menu.Append(self.TBMENU_CHANGE_INTERFACE, "Change IP of interface to bind")
 menu.Append(self.TBMENU_LIVE_SHELL, "Launch a live Python shell")
 menu.Append(self.TBMENU_WXINSPECTOR, "Launch WX GUI inspector")
 menu.Append(self.TBMENU_CHANGE_PORT, "Change Port Number")
 img = img.Scale(22, 22)
 # wxMac can be any size upto 128x128, so leave the source img alone....
 icon = wx.IconFromBitmap(img.ConvertToBitmap() )
 return icon
-def OnTaskBarChangeInterface(self,evt):
+def OnTaskBarStartPLC(self, evt):
-dlg = ParamsEntryDialog(None, "Enter the ip of the interface to bind", defaultValue=pyroserver.ip)
+if self.pyroserver.plcobj is not None:
+self.pyroserver.plcobj.StartPLC()
+evt.Skip()
+def OnTaskBarStopPLC(self, evt):
+if self.pyroserver.plcobj is not None:
+self.pyroserver.plcobj.StopPLC()
+evt.Skip()
+def OnTaskBarChangeInterface(self, evt):
+dlg = ParamsEntryDialog(None, "Enter the ip of the interface to bind", defaultValue=self.pyroserver.ip)
 dlg.SetTests([(re.compile('\d{1,3}(?:\.\d{1,3}){3}$').match, "Ip is not valid!"),
 ( lambda ip :len([x for x in ip.split(".") if 0 <= int(x) <= 255]) == 4, "Ip is not valid!")
 ])
 if dlg.ShowModal() == wx.ID_OK:
 self.pyroserver.ip = dlg.GetValue()
 self.pyroserver.Stop()
 evt.Skip()
-def OnTaskBarChangePort(self,evt):
+def OnTaskBarChangePort(self, evt):
-dlg = ParamsEntryDialog(None, "Enter a port number ", defaultValue=str(pyroserver.port))
+dlg = ParamsEntryDialog(None, "Enter a port number ", defaultValue=str(self.pyroserver.port))
 dlg.SetTests([(UnicodeType.isdigit, "Port number must be an integer!"), (lambda port : 0 <= int(port) <= 65535 , "Port number must be 0 <= port <= 65535!")])
 if dlg.ShowModal() == wx.ID_OK:
 self.pyroserver.port = int(dlg.GetValue())
 self.pyroserver.Stop()
 evt.Skip()
-def OnTaskBarChangeWorkingDir(self,evt):
+def OnTaskBarChangeWorkingDir(self, evt):
-dlg = wx.DirDialog(None, "Choose a working directory ", pyroserver.workdir, wx.DD_NEW_DIR_BUTTON)
+dlg = wx.DirDialog(None, "Choose a working directory ", self.pyroserver.workdir, wx.DD_NEW_DIR_BUTTON)
 if dlg.ShowModal() == wx.ID_OK:
 self.pyroserver.workdir = dlg.GetPath()
 self.pyroserver.Stop()
 evt.Skip()
-def OnTaskBarChangeName(self,evt):
+def OnTaskBarChangeName(self, evt):
-dlg = ParamsEntryDialog(None, "Enter a name ", defaultValue=pyroserver.name)
+dlg = ParamsEntryDialog(None, "Enter a name ", defaultValue=self.pyroserver.name)
 dlg.SetTests([(lambda name : len(name) is not 0 , "Name must not be null!")])
 if dlg.ShowModal() == wx.ID_OK:
 self.pyroserver.name = dlg.GetValue()
 self.pyroserver.Restart()
 evt.Skip()
-def OnTaskBarLiveShell(self,evt):
+def OnTaskBarLiveShell(self, evt):
 if self.pyroserver.plcobj is not None and self.pyroserver.plcobj.python_threads_vars is not None:
 from wx import py
 #frame = py.shell.ShellFrame(locals=self.pyroserver.plcobj.python_threads_vars)
 frame = py.crust.CrustFrame(locals=self.pyroserver.plcobj.python_threads_vars)
 frame.Show()
 if not wnd:
 wnd = wx.GetApp()
 InspectionTool().Show(wnd, True)
 evt.Skip()
-def OnTaskBarQuit(self,evt):
+def OnTaskBarQuit(self, evt):
-pyroserver.Quit()
+self.pyroserver.Quit()
 self.RemoveIcon()
-wx.GetApp().ExitMainLoop()
+wx.CallAfter(wx.GetApp().Exit)
 evt.Skip()
 def UpdateIcon(self, plcstatus):
 if plcstatus is "Started" :
 currenticon = self.MakeIcon(starticon.GetImage())
 def default_evaluator(callable, *args, **kwargs):
 return callable(*args,**kwargs)
 class Server():
-def __init__(self, name, ip, port, workdir, argv, statuschange=None, evaluator=default_evaluator):
+def __init__(self, name, ip, port, workdir, argv, autostart=False, statuschange=None, evaluator=default_evaluator):
 self.continueloop = True
 self.daemon = None
 self.name = name
 self.ip = ip
 self.port = port
 self.workdir = workdir
 self.argv = argv
 self.plcobj = None
 self.servicepublisher = None
+self.autostart = autostart
 self.statuschange = statuschange
 self.evaluator = evaluator
 def Loop(self):
 while self.continueloop:
 # Configure and publish service
 # Not publish service if localhost in address params
 if self.ip != "localhost" and self.ip != "127.0.0.1":
 print "Publish service on local network"
 self.servicepublisher = ServicePublisher.ServicePublisher()
 self.servicepublisher.RegisterService(self.name, self.ip, self.port)
+if self.autostart:
+self.plcobj.StartPLC()
 sys.stdout.flush()
 self.daemon.requestLoop()
 def Stop(self):
+self.plcobj.StopPLC()
 if self.servicepublisher is not None:
 self.servicepublisher.UnRegisterService()
 del self.servicepublisher
 self.daemon.shutdown(True)
 if havewx:
 from threading import Semaphore
 wx_eval_lock = Semaphore(0)
 app=wx.App(redirect=False)
+mythread = currentThread()
 def statuschange(status):
 wx.CallAfter(taskbar_instance.UpdateIcon,status)
 eval_res = None
 def wx_evaluator(callable, *args, **kwargs):
 eval_res=callable(*args,**kwargs)
 #print eval_res
 wx_eval_lock.release()
 def evaluator(callable, *args, **kwargs):
-wx.CallAfter(wx_evaluator,callable,*args,**kwargs)
+# call directly the callable function if call from the wx mainloop (avoid dead lock)
-wx_eval_lock.acquire()
+if(mythread == currentThread()):
+callable(*args,**kwargs)
+else:
+wx.CallAfter(wx_evaluator,callable,*args,**kwargs)
+wx_eval_lock.acquire()
 return eval_res
-pyroserver = Server(name, ip, port, WorkingDir, argv, statuschange, evaluator)
+pyroserver = Server(name, ip, port, WorkingDir, argv, autostart, statuschange, evaluator)
 taskbar_instance = BeremizTaskBarIcon(pyroserver)
 pyro_thread=Thread(target=pyroserver.Loop)
 pyro_thread.start()
 app.MainLoop()
 else:
-pyroserver = Server(name, ip, port, WorkingDir, argv)
+pyroserver = Server(name, ip, port, WorkingDir, argv, autostart)
 pyroserver.Loop()

changeset 330	fdf81615ed04
parent 319	bdd82ac65f5d
child 343	fe2d1936b546