# HG changeset patch
# User edouard
# Date 1250156935 -7200
# Node ID 46d7d2ce84d2a54fdb763be19db5f9bf2b21ba10
# Parent 71c441104cac214097d83abe7c88b9cac06fbb4b# Parent 35cc4c6a29363d0a89f3e1096832cf14bb79f3de
Merge with 35cc4c6a29363d0a89f3e1096832cf14bb79f3de
diff -r 35cc4c6a2936 -r 46d7d2ce84d2 Beremiz_service.py
--- a/Beremiz_service.py Mon Aug 10 11:35:14 2009 +0200
+++ b/Beremiz_service.py Thu Aug 13 11:48:55 2009 +0200
@@ -34,12 +34,13 @@
-h - print this help text and quit
-a - autostart PLC (0:disable 1:enable)
-x - enable/disable wxTaskbarIcon (0:disable 1:enable)
+ -t - enable/disable Twisted web interface (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:a:h")
+ opts, argv = getopt.getopt(sys.argv[1:], "i:p:n:x:t:a:h")
except getopt.GetoptError, err:
# print help information and exit:
print str(err) # will print something like "option -a not recognized"
@@ -56,6 +57,8 @@
autostart = False
enablewx = True
havewx = False
+enabletwisted = True
+havetwisted = False
for o, a in opts:
if o == "-h":
@@ -71,6 +74,8 @@
name = a
elif o == "-x":
enablewx = int(a)
+ elif o == "-t":
+ enabletwisted = int(a)
elif o == "-a":
autostart = int(a)
else:
@@ -426,7 +431,7 @@
return callable(*args,**kwargs)
class Server():
- def __init__(self, name, ip, port, workdir, argv, autostart=False, statuschange=None, evaluator=default_evaluator):
+ def __init__(self, name, ip, port, workdir, argv, autostart=False, statuschange=None, evaluator=default_evaluator, website=None):
self.continueloop = True
self.daemon = None
self.name = name
@@ -439,6 +444,7 @@
self.autostart = autostart
self.statuschange = statuschange
self.evaluator = evaluator
+ self.website = website
def Loop(self):
while self.continueloop:
@@ -454,7 +460,7 @@
def Start(self):
pyro.initServer()
self.daemon=pyro.Daemon(host=self.ip, port=self.port)
- self.plcobj = PLCObject(self.workdir, self.daemon, self.argv, self.statuschange, self.evaluator)
+ self.plcobj = PLCObject(self.workdir, self.daemon, self.argv, self.statuschange, self.evaluator, self.website)
uri = self.daemon.connect(self.plcobj,"PLCObject")
print "The daemon runs on port :",self.port
@@ -481,7 +487,161 @@
self.servicepublisher.UnRegisterService()
del self.servicepublisher
self.daemon.shutdown(True)
-
+
+if enabletwisted:
+ try:
+ if havewx:
+ from twisted.internet import wxreactor
+ wxreactor.install()
+ from twisted.internet import reactor, task
+ from twisted.python import log, util
+ from nevow import rend, appserver, inevow, tags, loaders, athena
+ from nevow.page import renderer
+
+ havetwisted = True
+ except:
+ havetwisted = False
+
+if havetwisted:
+
+ xhtml_header = '''
+
+'''
+
+
+ class DefaultPLCStartedHMI(athena.LiveElement):
+ docFactory = loaders.stan(tags.div(render=tags.directive('liveElement'))[
+ tags.h1["PLC IS NOW STARTED"],
+ ])
+ class PLCStoppedHMI(athena.LiveElement):
+ docFactory = loaders.stan(tags.div(render=tags.directive('liveElement'))[
+ tags.h1["PLC IS STOPPED"]
+ ])
+
+ class MainPage(athena.LiveElement):
+ jsClass = u"WebInterface.PLC"
+ docFactory = loaders.stan(tags.div(render=tags.directive('liveElement'))[
+ tags.div(id='content')[
+ tags.div(render = tags.directive('PLCElement')),
+ ]])
+
+ def __init__(self, *a, **kw):
+ athena.LiveElement.__init__(self, *a, **kw)
+ self.pcl_state = False
+ self.HMI = None
+ self.resetPLCStartedHMI()
+
+ def setPLCState(self, state):
+ self.pcl_state = state
+ if self.HMI is not None:
+ self.callRemote('updateHMI')
+
+ def setPLCStartedHMI(self, hmi):
+ self.PLCStartedHMIClass = hmi
+
+ def resetPLCStartedHMI(self):
+ self.PLCStartedHMIClass = DefaultPLCStartedHMI
+
+ def getHMI(self):
+ return self.HMI
+
+ def HMIexec(self, function, *args, **kwargs):
+ if self.HMI is not None:
+ getattr(self.HMI, function, lambda:None)(*args, **kwargs)
+ athena.expose(HMIexec)
+
+ def resetHMI(self):
+ self.HMI = None
+
+ def PLCElement(self, ctx, data):
+ return self.getPLCElement()
+ renderer(PLCElement)
+
+ def getPLCElement(self):
+ self.detachFragmentChildren()
+ if self.pcl_state:
+ f = self.PLCStartedHMIClass()
+ else:
+ f = PLCStoppedHMI()
+ f.setFragmentParent(self)
+ self.HMI = f
+ return f
+ athena.expose(getPLCElement)
+
+ def detachFragmentChildren(self):
+ for child in self.liveFragmentChildren[:]:
+ child.detach()
+
+ class WebInterface(athena.LivePage):
+
+ docFactory = loaders.stan([tags.raw(xhtml_header),
+ tags.html(xmlns="http://www.w3.org/1999/xhtml")[
+ tags.head(render=tags.directive('liveglue')),
+ tags.body[
+ tags.div[
+ tags.div( render = tags.directive( "MainPage" ))
+ ]]]])
+ MainPage = MainPage()
+
+ def __init__(self, plcState=False, *a, **kw):
+ super(WebInterface, self).__init__(*a, **kw)
+ self.jsModules.mapping[u'WebInterface'] = util.sibpath(__file__, 'webinterface.js')
+ self.plcState = plcState
+ self.MainPage.setPLCState(plcState)
+
+ def getHMI(self):
+ return self.MainPage.getHMI()
+
+ def LoadHMI(self, hmi, jsmodules):
+ for name, path in jsmodules.iteritems():
+ self.jsModules.mapping[name] = os.path.join(WorkingDir, path)
+ self.MainPage.setPLCStartedHMI(hmi)
+
+ def UnLoadHMI(self):
+ self.MainPage.resetPLCStartedHMI()
+
+ def PLCStarted(self):
+ self.plcState = True
+ self.MainPage.setPLCState(True)
+
+ def PLCStopped(self):
+ self.plcState = False
+ self.MainPage.setPLCState(False)
+
+ def renderHTTP(self, ctx):
+ """
+ Force content type to fit with SVG
+ """
+ req = inevow.IRequest(ctx)
+ req.setHeader('Content-type', 'application/xhtml+xml')
+ return super(WebInterface, self).renderHTTP(ctx)
+
+ def render_MainPage(self, ctx, data):
+ f = self.MainPage
+ f.setFragmentParent(self)
+ return ctx.tag[f]
+
+ def child_(self, ctx):
+ self.MainPage.detachFragmentChildren()
+ return WebInterface(plcState=self.plcState)
+
+ def beforeRender(self, ctx):
+ d = self.notifyOnDisconnect()
+ d.addErrback(self.disconnected)
+
+ def disconnected(self, reason):
+ self.MainPage.resetHMI()
+ #print reason
+ #print "We will be called back when the client disconnects"
+
+ if havewx:
+ reactor.registerWxApp(app)
+ res = WebInterface()
+ site = appserver.NevowSite(res)
+ reactor.listenTCP(8009, site)
+else:
+ res = None
if havewx:
from threading import Semaphore
@@ -510,12 +670,17 @@
wx_eval_lock.acquire()
return eval_res
- pyroserver = Server(name, ip, port, WorkingDir, argv, autostart, statuschange, evaluator)
+ pyroserver = Server(name, ip, port, WorkingDir, argv, autostart, statuschange, evaluator, res)
taskbar_instance = BeremizTaskBarIcon(pyroserver)
pyro_thread=Thread(target=pyroserver.Loop)
pyro_thread.start()
+else:
+ pyroserver = Server(name, ip, port, WorkingDir, argv, autostart, website=res)
+
+if havetwisted:
+ reactor.run()
+elif havewx:
app.MainLoop()
else:
- pyroserver = Server(name, ip, port, WorkingDir, argv, autostart)
pyroserver.Loop()
diff -r 35cc4c6a2936 -r 46d7d2ce84d2 Zeroconf.py
--- a/Zeroconf.py Mon Aug 10 11:35:14 2009 +0200
+++ b/Zeroconf.py Thu Aug 13 11:48:55 2009 +0200
@@ -1154,7 +1154,7 @@
"""Updates service information from a DNS record"""
if record is not None and not record.isExpired(now):
if record.type == _TYPE_A:
- if record.name == self.name:
+ if record.name == self.server:
self.address = record.address
elif record.type == _TYPE_SRV:
if record.name == self.name:
@@ -1162,7 +1162,6 @@
self.port = record.port
self.weight = record.weight
self.priority = record.priority
- self.address = None
self.updateRecord(zeroconf, now, zeroconf.cache.getByDetails(self.server, _TYPE_A, _CLASS_IN))
elif record.type == _TYPE_TXT:
if record.name == self.name:
diff -r 35cc4c6a2936 -r 46d7d2ce84d2 discovery.py
--- a/discovery.py Mon Aug 10 11:35:14 2009 +0200
+++ b/discovery.py Thu Aug 13 11:48:55 2009 +0200
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
# -*- coding: utf-8 -*-
#This file is part of Beremiz, a Integrated Development Environment for
@@ -27,7 +26,7 @@
import socket
import wx.lib.mixins.listctrl as listmix
-class TestListCtrl(wx.ListCtrl, listmix.ListCtrlAutoWidthMixin):
+class AutoWidthListCtrl(wx.ListCtrl, listmix.ListCtrlAutoWidthMixin):
def __init__(self, parent, ID, pos=wx.DefaultPosition,
size=wx.DefaultSize, style=0):
wx.ListCtrl.__init__(self, parent, ID, pos, size, style)
@@ -38,17 +37,22 @@
self.my_result=None
wx.Dialog.__init__(self, parent, id, title, size=(600,600), style=wx.DEFAULT_DIALOG_STYLE)
+ # set up dialog sizer
+
sizer = wx.FlexGridSizer(2, 1, 2, 2) # rows, cols, vgap, hgap
sizer.AddGrowableRow(0)
sizer.AddGrowableCol(0)
- self.list = TestListCtrl(self, -1,
- #pos=(50,20),
- #size=(500,300),
- style=wx.LC_REPORT
- | wx.LC_EDIT_LABELS
- | wx.LC_SORT_ASCENDING
- )
+ # set up list control
+
+ self.list = AutoWidthListCtrl(self, -1,
+ #pos=(50,20),
+ #size=(500,300),
+ style=wx.LC_REPORT
+ | wx.LC_EDIT_LABELS
+ | wx.LC_SORT_ASCENDING
+ | wx.LC_SINGLE_SEL
+ )
sizer.Add(self.list, 1, wx.EXPAND)
btsizer = wx.FlexGridSizer(1, 6, 2, 2) # rows, cols, vgap, hgap
@@ -60,6 +64,8 @@
self.Bind(wx.EVT_LIST_ITEM_SELECTED, self.OnItemSelected, self.list)
self.Bind(wx.EVT_LIST_ITEM_ACTIVATED, self.OnItemActivated, self.list)
+ # set up buttons
+
local_id = wx.NewId()
b = wx.Button(self, local_id, _("Refresh"))
self.Bind(wx.EVT_BUTTON, self.OnRefreshButton, b)
@@ -89,7 +95,12 @@
listmix.ColumnSorterMixin.__init__(self, 4)
- #type = "_http._tcp.local."
+ # Used by the ColumnSorterMixin, see wx/lib/mixins/listctrl.py
+ self.itemDataMap = {}
+
+ # a counter used to assign a unique id to each listctrl item
+ self.nextItemId = 0
+
self.browser = None
self.zConfInstance = Zeroconf()
self.RefreshList()
@@ -158,16 +169,55 @@
return self.my_result
def removeService(self, zeroconf, type, name):
- pass
+ '''
+ called when a service with the desired type goes offline.
+ '''
+
+ # loop through the list items looking for the service that went offline
+ for idx in xrange(self.list.GetItemCount()):
+ # this is the unique identifier assigned to the item
+ item_id = self.list.GetItemData(idx)
+
+ # this is the full typename that was received by addService
+ item_name = self.itemDataMap[item_id][4]
+
+ if item_name == name:
+ self.list.DeleteItem(idx)
+ break
def addService(self, zeroconf, type, name):
+ '''
+ called when a service with the desired type is discovered.
+ '''
+
info = self.zConfInstance.getServiceInfo(type, name)
+
+ svcname = name.split(".")[0]
typename = type.split(".")[0][1:]
+ ip = str(socket.inet_ntoa(info.getAddress()))
+ port = info.getPort()
+
num_items = self.list.GetItemCount()
- self.list.InsertStringItem(num_items, name.split(".")[0])
- self.list.SetStringItem(num_items, 1, "%s"%typename)
- self.list.SetStringItem(num_items, 2, "%s"%str(socket.inet_ntoa(info.getAddress())))
- self.list.SetStringItem(num_items, 3, "%s"%info.getPort())
+
+ # display the new data in the list
+ new_item = self.list.InsertStringItem(num_items, svcname)
+ self.list.SetStringItem(new_item, 1, "%s" % typename)
+ self.list.SetStringItem(new_item, 2, "%s" % ip)
+ self.list.SetStringItem(new_item, 3, "%s" % port)
+
+ # record the new data for the ColumnSorterMixin
+ # we assign every list item a unique id (that won't change when items
+ # are added or removed)
+ self.list.SetItemData(new_item, self.nextItemId)
+
+ # the value of each column has to be stored in the itemDataMap
+ # so that ColumnSorterMixin knows how to sort the column.
+
+ # "name" is included at the end so that self.removeService
+ # can access it.
+ self.itemDataMap[self.nextItemId] = [ svcname, typename, ip, port, name ]
+
+ self.nextItemId += 1
def CreateURI(self, connect_type, connect_address, connect_port):
uri = "%s://%s:%s"%(connect_type, connect_address, connect_port)
diff -r 35cc4c6a2936 -r 46d7d2ce84d2 plugins/python/modules/svgui/README
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/plugins/python/modules/svgui/README Thu Aug 13 11:48:55 2009 +0200
@@ -0,0 +1,1 @@
+SVGUI HMI
\ No newline at end of file
diff -r 35cc4c6a2936 -r 46d7d2ce84d2 plugins/python/modules/svgui/__init__.py
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/plugins/python/modules/svgui/__init__.py Thu Aug 13 11:48:55 2009 +0200
@@ -0,0 +1,1 @@
+from svgui import *
diff -r 35cc4c6a2936 -r 46d7d2ce84d2 plugins/python/modules/svgui/livesvg.js
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/plugins/python/modules/svgui/livesvg.js Thu Aug 13 11:48:55 2009 +0200
@@ -0,0 +1,71 @@
+// import Nevow.Athena
+// import Divmod.Base
+function init() {
+ Nevow.Athena.Widget.fromAthenaID(1).callRemote('HMIexec', 'initClient');
+}
+
+function updateAttr(id, param, value) {
+ Nevow.Athena.Widget.fromAthenaID(1).callRemote('HMIexec', 'setattr', id, param, value);
+}
+
+var svguiWidgets={};
+
+var currentObject = null;
+function setCurrentObject(obj) {
+ currentObject = obj;
+}
+function isCurrentObject(obj) {
+ return currentObject == obj;
+}
+
+function getSVGElementById(id) {
+ return document.getElementById(id);
+}
+
+function blockSVGElementDrag(element) {
+ element.addEventListener("draggesture", function(event){event.stopPropagation()}, true);
+}
+
+LiveSVGPage.LiveSVGWidget = Nevow.Athena.Widget.subclass('LiveSVGPage.LiveSVGWidget');
+LiveSVGPage.LiveSVGWidget.methods(
+ function handleEvent(self, evt) {
+ if (currentObject != null) {
+ currentObject.handleEvent(evt);
+ }
+ },
+
+ function receiveData(self, data){
+ dataReceived = json_parse(data);
+ newState = json_parse(dataReceived.kwargs).state
+ svguiWidgets[dataReceived.back_id].updateState(newState);
+ //console.log("OBJET : " + dataReceived.back_id + " STATE : " + newState);
+ },
+
+ function SvguiButton(self,elt_back, args){
+ var btn = new svguilib.button(self, elt_back, args.sele_id, args.toggle, args.state, args.active);
+ return btn;
+ },
+
+ function SvguiTextCtrl(self, elt_back, args){
+ var txtCtrl = new svguilib.textControl(self, elt_back, args.state);
+ return txtCtrl;
+ },
+
+ function init(self, arg1){
+ //console.log("Object received : " + arg1);
+ for (ind in arg1) {
+ gad = json_parse(arg1[ind]);
+ args = json_parse(gad.kwargs);
+ gadget = self[gad.__class__](gad.back_id, args);
+ svguiWidgets[gadget.back_elt.id]=gadget;
+ //console.log('GADGET :' + gadget);
+ }
+ var elements = document.getElementsByTagName("svg");
+ for (var i = 0; i < elements.length; i++) {
+ elements[i].addEventListener("mouseup", self, false);
+ }
+ //console.log("SVGUIWIDGETS : " + svguiWidgets);
+ }
+);
+
+Divmod.Base.addLoadEvent(init);
\ No newline at end of file
diff -r 35cc4c6a2936 -r 46d7d2ce84d2 plugins/python/modules/svgui/pous.xml
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/plugins/python/modules/svgui/pous.xml Thu Aug 13 11:48:55 2009 +0200
@@ -0,0 +1,1061 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 'int(SVGUI("SvguiButton","'
+
+
+
+
+
+
+ '",sele_id="'
+
+
+
+
+
+
+ '",state='
+
+
+
+
+
+
+ ',toggle=True,active=True))'
+
+
+
+
+
+
+ BOOL#1
+
+
+
+
+
+
+ back_id
+
+
+
+
+
+
+ sele_id
+
+
+
+
+
+
+ set_state
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ current_state
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 'SVGUI("SvguiTextCtrl","'
+
+
+
+
+
+
+ back_id
+
+
+
+
+
+
+ state
+
+
+
+
+
+
+ '",state="'
+
+
+
+
+
+
+ '")'
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ code
+
+
+
+
+
+
+ BOOL#1
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 'int(SVGUI("SvguiButton","'
+
+
+
+
+
+
+ '",sele_id="'
+
+
+
+
+
+
+ '",state='
+
+
+
+
+
+
+ ',active=True))'
+
+
+
+
+
+
+ BOOL#1
+
+
+
+
+
+
+ back_id
+
+
+
+
+
+
+ sele_id
+
+
+
+
+
+
+ set_state
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ current_state
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 'SVGUI("SvguiButton","'
+
+
+
+
+
+
+ '",sele_id="'
+
+
+
+
+
+
+ back_id
+
+
+
+
+
+
+ sele_id
+
+
+
+
+
+
+ ',toggle=True)'
+
+
+
+
+
+
+ '", state='
+
+
+
+
+
+
+ state
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ BOOL#1
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff -r 35cc4c6a2936 -r 46d7d2ce84d2 plugins/python/modules/svgui/pyjs/__init__.py
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/plugins/python/modules/svgui/pyjs/__init__.py Thu Aug 13 11:48:55 2009 +0200
@@ -0,0 +1,2 @@
+from pyjs import *
+
diff -r 35cc4c6a2936 -r 46d7d2ce84d2 plugins/python/modules/svgui/pyjs/build.py
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/plugins/python/modules/svgui/pyjs/build.py Thu Aug 13 11:48:55 2009 +0200
@@ -0,0 +1,724 @@
+#!/usr/bin/env python
+
+import sys
+import os
+import shutil
+from copy import copy
+from os.path import join, dirname, basename, abspath, split, isfile, isdir
+from optparse import OptionParser
+import pyjs
+from cStringIO import StringIO
+try:
+ # Python 2.5 and above
+ from hashlib import md5
+except:
+ import md5
+import re
+
+usage = """
+ usage: %prog [options]
+
+This is the command line builder for the pyjamas project, which can
+be used to build Ajax applications from Python.
+For more information, see the website at http://pyjs.org/
+"""
+
+# GWT1.2 Impl | GWT1.2 Output | Pyjamas 0.2 Platform | Pyjamas 0.2 Output
+# -------------+-----------------------+----------------------+----------------------
+# IE6 | ie6 | IE6 | ie6
+# Opera | opera | Opera | opera
+# Safari | safari | Safari | safari
+# -- | gecko1_8 | Mozilla | mozilla
+# -- | gecko | OldMoz | oldmoz
+# Standard | all | (default code) | all
+# Mozilla | gecko1_8, gecko | -- | --
+# Old | safari, gecko, opera | -- | --
+
+version = "%prog pyjamas version 2006-08-19"
+
+# these names in lowercase need match the strings
+# returned by "provider$user.agent" in order to be selected corretly
+app_platforms = ['IE6', 'Opera', 'OldMoz', 'Safari', 'Mozilla']
+
+# usually defaults to e.g. /usr/share/pyjamas
+_data_dir = os.path.join(pyjs.prefix, "share/pyjamas")
+
+
+# .cache.html files produces look like this
+CACHE_HTML_PAT=re.compile('^[a-z]*.[0-9a-f]{32}\.cache\.html$')
+
+# ok these are the three "default" library directories, containing
+# the builtins (str, List, Dict, ord, round, len, range etc.)
+# the main pyjamas libraries (pyjamas.ui, pyjamas.Window etc.)
+# and the contributed addons
+
+for p in ["library/builtins",
+ "library",
+ "addons"]:
+ p = os.path.join(_data_dir, p)
+ if os.path.isdir(p):
+ pyjs.path.append(p)
+
+
+def read_boilerplate(data_dir, filename):
+ return open(join(data_dir, "builder/boilerplate", filename)).read()
+
+def copy_boilerplate(data_dir, filename, output_dir):
+ filename = join(data_dir, "builder/boilerplate", filename)
+ shutil.copy(filename, output_dir)
+
+
+# taken and modified from python2.4
+def copytree_exists(src, dst, symlinks=False):
+ if not os.path.exists(src):
+ return
+
+ names = os.listdir(src)
+ try:
+ os.mkdir(dst)
+ except:
+ pass
+
+ errors = []
+ for name in names:
+ if name.startswith('CVS'):
+ continue
+ if name.startswith('.git'):
+ continue
+ if name.startswith('.svn'):
+ continue
+
+ srcname = os.path.join(src, name)
+ dstname = os.path.join(dst, name)
+ try:
+ if symlinks and os.path.islink(srcname):
+ linkto = os.readlink(srcname)
+ os.symlink(linkto, dstname)
+ elif isdir(srcname):
+ copytree_exists(srcname, dstname, symlinks)
+ else:
+ shutil.copy2(srcname, dstname)
+ except (IOError, os.error), why:
+ errors.append((srcname, dstname, why))
+ if errors:
+ print errors
+
+def check_html_file(source_file, dest_path):
+ """ Checks if a base HTML-file is available in the PyJamas
+ output directory.
+ If the HTML-file isn't available, it will be created.
+
+ If a CSS-file with the same name is available
+ in the output directory, a reference to this CSS-file
+ is included.
+
+ If no CSS-file is found, this function will look for a special
+ CSS-file in the output directory, with the name
+ "pyjamas_default.css", and if found it will be referenced
+ in the generated HTML-file.
+
+ [thank you to stef mientki for contributing this function]
+ """
+
+ base_html = """\
+
+
+
+
+ %(css)s
+ %(title)s
+
+
+
+
+
+"""
+
+ filename = os.path.split ( source_file )[1]
+ mod_name = os.path.splitext ( filename )[0]
+ file_name = os.path.join ( dest_path, mod_name + '.html' )
+
+ # if html file in output directory exists, leave it alone.
+ if os.path.exists ( file_name ):
+ return 0
+
+ if os.path.exists (
+ os.path.join ( dest_path, mod_name + '.css' ) ) :
+ css = ""
+ elif os.path.exists (
+ os.path.join ( dest_path, 'pyjamas_default.css' ) ) :
+ css = ""
+
+ else:
+ css = ''
+
+ title = 'PyJamas Auto-Generated HTML file ' + mod_name
+
+ base_html = base_html % {'modulename': mod_name, 'title': title, 'css': css}
+
+ fh = open (file_name, 'w')
+ fh.write (base_html)
+ fh.close ()
+
+ return 1
+
+
+def build(app_name, output, js_includes=(), debug=False, dynamic=0,
+ data_dir=None, cache_buster=False, optimize=False):
+
+ # make sure the output directory is always created in the current working
+ # directory or at the place given if it is an absolute path.
+ output = os.path.abspath(output)
+ msg = "Building '%(app_name)s' to output directory '%(output)s'" % locals()
+ if debug:
+ msg += " with debugging statements"
+ print msg
+
+ # check the output directory
+ if os.path.exists(output) and not os.path.isdir(output):
+ print >>sys.stderr, "Output destination %s exists and is not a directory" % output
+ return
+ if not os.path.isdir(output):
+ try:
+ print "Creating output directory"
+ os.mkdir(output)
+ except StandardError, e:
+ print >>sys.stderr, "Exception creating output directory %s: %s" % (output, e)
+
+ ## public dir
+ for p in pyjs.path:
+ pub_dir = join(p, 'public')
+ if isdir(pub_dir):
+ print "Copying: public directory of library %r" % p
+ copytree_exists(pub_dir, output)
+
+ ## AppName.html - can be in current or public directory
+ html_input_filename = app_name + ".html"
+ html_output_filename = join(output, basename(html_input_filename))
+ if os.path.isfile(html_input_filename):
+ if not os.path.isfile(html_output_filename) or \
+ os.path.getmtime(html_input_filename) > \
+ os.path.getmtime(html_output_filename):
+ try:
+ shutil.copy(html_input_filename, html_output_filename)
+ except:
+ print >>sys.stderr, "Warning: Missing module HTML file %s" % html_input_filename
+
+ print "Copying: %(html_input_filename)s" % locals()
+
+ if check_html_file(html_input_filename, output):
+ print >>sys.stderr, "Warning: Module HTML file %s has been auto-generated" % html_input_filename
+
+ ## pygwt.js
+
+ print "Copying: pygwt.js"
+
+ pygwt_js_template = read_boilerplate(data_dir, "pygwt.js")
+ pygwt_js_output = open(join(output, "pygwt.js"), "w")
+
+ print >>pygwt_js_output, pygwt_js_template
+
+ pygwt_js_output.close()
+
+ ## Images
+
+ print "Copying: Images and History"
+ copy_boilerplate(data_dir, "corner_dialog_topleft_black.png", output)
+ copy_boilerplate(data_dir, "corner_dialog_topright_black.png", output)
+ copy_boilerplate(data_dir, "corner_dialog_bottomright_black.png", output)
+ copy_boilerplate(data_dir, "corner_dialog_bottomleft_black.png", output)
+ copy_boilerplate(data_dir, "corner_dialog_edge_black.png", output)
+ copy_boilerplate(data_dir, "corner_dialog_topleft.png", output)
+ copy_boilerplate(data_dir, "corner_dialog_topright.png", output)
+ copy_boilerplate(data_dir, "corner_dialog_bottomright.png", output)
+ copy_boilerplate(data_dir, "corner_dialog_bottomleft.png", output)
+ copy_boilerplate(data_dir, "corner_dialog_edge.png", output)
+ copy_boilerplate(data_dir, "tree_closed.gif", output)
+ copy_boilerplate(data_dir, "tree_open.gif", output)
+ copy_boilerplate(data_dir, "tree_white.gif", output)
+ copy_boilerplate(data_dir, "history.html", output)
+
+
+ ## all.cache.html
+ app_files = generateAppFiles(data_dir, js_includes, app_name, debug,
+ output, dynamic, cache_buster, optimize)
+
+ ## AppName.nocache.html
+
+ print "Creating: %(app_name)s.nocache.html" % locals()
+
+ home_nocache_html_template = read_boilerplate(data_dir, "home.nocache.html")
+ home_nocache_html_output = open(join(output, app_name + ".nocache.html"),
+ "w")
+
+ # the selector templ is added to the selectScript function
+ select_tmpl = """O(["true","%s"],"%s");"""
+ script_selectors = StringIO()
+
+ for platform, file_prefix in app_files:
+ print >> script_selectors, select_tmpl % (platform, file_prefix)
+
+ print >>home_nocache_html_output, home_nocache_html_template % dict(
+ app_name = app_name,
+ script_selectors = script_selectors.getvalue(),
+ )
+
+ home_nocache_html_output.close()
+
+ print "Done. You can run your app by opening '%(html_output_filename)s' in a browser" % locals()
+
+
+def generateAppFiles(data_dir, js_includes, app_name, debug, output, dynamic,
+ cache_buster, optimize):
+
+ all_cache_html_template = read_boilerplate(data_dir, "all.cache.html")
+ mod_cache_html_template = read_boilerplate(data_dir, "mod.cache.html")
+
+ # clean out the old ones first
+ for name in os.listdir(output):
+ if CACHE_HTML_PAT.match(name):
+ p = join(output, name)
+ print "Deleting existing app file %s" % p
+ os.unlink(p)
+
+ app_files = []
+ tmpl = read_boilerplate(data_dir, "all.cache.html")
+ parser = pyjs.PlatformParser("platform")
+ app_headers = ''
+ scripts = [''%script \
+ for script in js_includes]
+ app_body = '\n'.join(scripts)
+
+ mod_code = {}
+ mod_libs = {}
+ modules = {}
+ app_libs = {}
+ early_app_libs = {}
+ app_code = {}
+ overrides = {}
+ pover = {}
+ app_modnames = {}
+ mod_levels = {}
+
+ # First, generate all the code.
+ # Second, (dynamic only), post-analyse the places where modules
+ # haven't changed
+ # Third, write everything out.
+
+ for platform in app_platforms:
+
+ mod_code[platform] = {}
+ mod_libs[platform] = {}
+ modules[platform] = []
+ pover[platform] = {}
+ app_libs[platform] = ''
+ early_app_libs[platform] = ''
+ app_code[platform] = {}
+ app_modnames[platform] = {}
+
+ # Application.Platform.cache.html
+
+ parser.setPlatform(platform)
+ app_translator = pyjs.AppTranslator(
+ parser=parser, dynamic=dynamic, optimize=optimize)
+ early_app_libs[platform], appcode = \
+ app_translator.translate(None, is_app=False,
+ debug=debug,
+ library_modules=['dynamicajax.js',
+ '_pyjs.js', 'sys',
+ 'pyjslib'])
+ pover[platform].update(app_translator.overrides.items())
+ for mname, name in app_translator.overrides.items():
+ pd = overrides.setdefault(mname, {})
+ pd[platform] = name
+
+ print appcode
+ #mod_code[platform][app_name] = appcode
+
+ # platform.Module.cache.js
+
+ modules_done = ['pyjslib', 'sys', '_pyjs.js']
+ #modules_to_do = [app_name] + app_translator.library_modules
+ modules_to_do = [app_name] + app_translator.library_modules
+
+ dependencies = {}
+
+ deps = map(pyjs.strip_py, modules_to_do)
+ for d in deps:
+ sublist = add_subdeps(dependencies, d)
+ modules_to_do += sublist
+ deps = uniquify(deps)
+ #dependencies[app_name] = deps
+
+ modules[platform] = modules_done + modules_to_do
+
+ while modules_to_do:
+
+ #print "modules to do", modules_to_do
+
+ mn = modules_to_do.pop()
+ mod_name = pyjs.strip_py(mn)
+
+ if mod_name in modules_done:
+ continue
+
+ modules_done.append(mod_name)
+
+ mod_cache_name = "%s.%s.cache.js" % (platform.lower(), mod_name)
+
+ parser.setPlatform(platform)
+ mod_translator = pyjs.AppTranslator(parser=parser, optimize=optimize)
+ mod_libs[platform][mod_name], mod_code[platform][mod_name] = \
+ mod_translator.translate(mod_name,
+ is_app=False,
+ debug=debug)
+ pover[platform].update(mod_translator.overrides.items())
+ for mname, name in mod_translator.overrides.items():
+ pd = overrides.setdefault(mname, {})
+ pd[platform] = name
+
+ mods = mod_translator.library_modules
+ modules_to_do += mods
+ modules[platform] += mods
+
+ deps = map(pyjs.strip_py, mods)
+ sd = subdeps(mod_name)
+ if len(sd) > 1:
+ deps += sd[:-1]
+ while mod_name in deps:
+ deps.remove(mod_name)
+
+ #print
+ #print
+ #print "modname preadd:", mod_name, deps
+ #print
+ #print
+ for d in deps:
+ sublist = add_subdeps(dependencies, d)
+ modules_to_do += sublist
+ modules_to_do += add_subdeps(dependencies, mod_name)
+ #print "modname:", mod_name, deps
+ deps = uniquify(deps)
+ #print "modname:", mod_name, deps
+ dependencies[mod_name] = deps
+
+ # work out the dependency ordering of the modules
+
+ mod_levels[platform] = make_deps(None, dependencies, modules_done)
+
+ # now write everything out
+
+ for platform in app_platforms:
+
+ early_app_libs_ = early_app_libs[platform]
+ app_libs_ = app_libs[platform]
+ app_code_ = app_code[platform]
+ #modules_ = filter_mods(app_name, modules[platform])
+ mods = flattenlist(mod_levels[platform])
+ mods.reverse()
+ modules_ = filter_mods(None, mods)
+
+ for mod_name in modules_:
+
+ mod_code_ = mod_code[platform][mod_name]
+
+ mod_name = pyjs.strip_py(mod_name)
+
+ override_name = "%s.%s" % (platform.lower(), mod_name)
+ if pover[platform].has_key(override_name):
+ mod_cache_name = "%s.cache.js" % (override_name)
+ else:
+ mod_cache_name = "%s.cache.js" % (mod_name)
+
+ print "Creating: " + mod_cache_name
+
+ modlevels = make_deps(None, dependencies, dependencies[mod_name])
+
+ modnames = []
+
+ for md in modlevels:
+ mnames = map(lambda x: "'%s'" % x, md)
+ mnames = "new pyjslib.List([\n\t\t\t%s])" % ',\n\t\t\t'.join(mnames)
+ modnames.append(mnames)
+
+ modnames.reverse()
+ modnames = "new pyjslib.List([\n\t\t%s\n\t])" % ',\n\t\t'.join(modnames)
+
+ # convert the overrides
+
+ overnames = map(lambda x: "'%s': '%s'" % x, pover[platform].items())
+ overnames = "new pyjslib.Dict({\n\t\t%s\n\t})" % ',\n\t\t'.join(overnames)
+
+ if dynamic:
+ mod_cache_html_output = open(join(output, mod_cache_name), "w")
+ else:
+ mod_cache_html_output = StringIO()
+
+ print >>mod_cache_html_output, mod_cache_html_template % dict(
+ mod_name = mod_name,
+ app_name = app_name,
+ modnames = modnames,
+ overrides = overnames,
+ mod_libs = mod_libs[platform][mod_name],
+ dynamic = dynamic,
+ mod_code = mod_code_,
+ )
+
+ if dynamic:
+ mod_cache_html_output.close()
+ else:
+ mod_cache_html_output.seek(0)
+ app_libs_ += mod_cache_html_output.read()
+
+ # write out the dependency ordering of the modules
+
+ app_modnames = []
+
+ for md in mod_levels[platform]:
+ mnames = map(lambda x: "'%s'" % x, md)
+ mnames = "new pyjslib.List([\n\t\t\t%s])" % ',\n\t\t\t'.join(mnames)
+ app_modnames.append(mnames)
+
+ app_modnames.reverse()
+ app_modnames = "new pyjslib.List([\n\t\t%s\n\t])" % ',\n\t\t'.join(app_modnames)
+
+ # convert the overrides
+
+ overnames = map(lambda x: "'%s': '%s'" % x, pover[platform].items())
+ overnames = "new pyjslib.Dict({\n\t\t%s\n\t})" % ',\n\t\t'.join(overnames)
+
+ #print "platform names", platform, overnames
+ #print pover
+
+ # now write app.allcache including dependency-ordered list of
+ # library modules
+
+ file_contents = all_cache_html_template % dict(
+ app_name = app_name,
+ early_app_libs = early_app_libs_,
+ app_libs = app_libs_,
+ app_code = app_code_,
+ app_body = app_body,
+ overrides = overnames,
+ platform = platform.lower(),
+ dynamic = dynamic,
+ app_modnames = app_modnames,
+ app_headers = app_headers
+ )
+ if cache_buster:
+ digest = md5.new(file_contents).hexdigest()
+ file_name = "%s.%s.%s" % (platform.lower(), app_name, digest)
+ else:
+ file_name = "%s.%s" % (platform.lower(), app_name)
+ file_name += ".cache.html"
+ out_path = join(output, file_name)
+ out_file = open(out_path, 'w')
+ out_file.write(file_contents)
+ out_file.close()
+ app_files.append((platform.lower(), file_name))
+ print "Created app file %s:%s: %s" % (
+ app_name, platform, out_path)
+
+ return app_files
+
+def flattenlist(ll):
+ res = []
+ for l in ll:
+ res += l
+ return res
+
+# creates sub-dependencies e.g. pyjamas.ui.Widget
+# creates pyjamas.ui.Widget, pyjamas.ui and pyjamas.
+def subdeps(m):
+ d = []
+ m = m.split(".")
+ for i in range(0, len(m)):
+ d.append('.'.join(m[:i+1]))
+ return d
+
+import time
+
+def add_subdeps(deps, mod_name):
+ sd = subdeps(mod_name)
+ if len(sd) == 1:
+ return []
+ #print "subdeps", mod_name, sd
+ #print "deps", deps
+ res = []
+ for i in range(0, len(sd)-1):
+ parent = sd[i]
+ child = sd[i+1]
+ l = deps.get(child, [])
+ l.append(parent)
+ deps[child] = l
+ if parent not in res:
+ res.append(parent)
+ #print deps
+ return res
+
+# makes unique and preserves list order
+def uniquify(md):
+ res = []
+ for m in md:
+ if m not in res:
+ res.append(m)
+ return res
+
+def filter_mods(app_name, md):
+ while 'sys' in md:
+ md.remove('sys')
+ while 'pyjslib' in md:
+ md.remove('pyjslib')
+ while app_name in md:
+ md.remove(app_name)
+ md = filter(lambda x: not x.endswith('.js'), md)
+ md = map(pyjs.strip_py, md)
+
+ return uniquify(md)
+
+def filter_deps(app_name, deps):
+
+ res = {}
+ for (k, l) in deps.items():
+ mods = filter_mods(k, l)
+ while k in mods:
+ mods.remove(k)
+ res[k] = mods
+ return res
+
+def has_nodeps(mod, deps):
+ if not deps.has_key(mod) or not deps[mod]:
+ return True
+ return False
+
+def nodeps_list(mod_list, deps):
+ res = []
+ for mod in mod_list:
+ if has_nodeps(mod, deps):
+ res.append(mod)
+ return res
+
+# this function takes a dictionary of dependent modules and
+# creates a list of lists. the first list will be modules
+# that have no dependencies; the second list will be those
+# modules that have the first list as dependencies; the
+# third will be those modules that have the first and second...
+# etc.
+
+
+def make_deps(app_name, deps, mod_list):
+ print "Calculating Dependencies ..."
+ mod_list = filter_mods(app_name, mod_list)
+ deps = filter_deps(app_name, deps)
+
+ if not mod_list:
+ return []
+
+ #print mod_list
+ #print deps
+
+ ordered_deps = []
+ last_len = -1
+ while deps:
+ l_deps = len(deps)
+ #print l_deps
+ if l_deps==last_len:
+ for m, dl in deps.items():
+ for d in dl:
+ if m in deps.get(d, []):
+ raise Exception('Circular Imports found: \n%s %s -> %s %s'
+ % (m, dl, d, deps[d]))
+ #raise Exception('Could not calculate dependencies: \n%s' % deps)
+ break
+ last_len = l_deps
+ #print "modlist", mod_list
+ nodeps = nodeps_list(mod_list, deps)
+ #print "nodeps", nodeps
+ mod_list = filter(lambda x: x not in nodeps, mod_list)
+ newdeps = {}
+ for k in deps.keys():
+ depslist = deps[k]
+ depslist = filter(lambda x: x not in nodeps, depslist)
+ if depslist:
+ newdeps[k] = depslist
+ #print "newdeps", newdeps
+ deps = newdeps
+ ordered_deps.append(nodeps)
+ #time.sleep(0)
+
+ if mod_list:
+ ordered_deps.append(mod_list) # last dependencies - usually the app(s)
+
+ ordered_deps.reverse()
+
+ return ordered_deps
+
+def main():
+ global app_platforms
+
+ parser = OptionParser(usage = usage, version = version)
+ parser.add_option("-o", "--output", dest="output",
+ help="directory to which the webapp should be written")
+ parser.add_option("-j", "--include-js", dest="js_includes", action="append",
+ help="javascripts to load into the same frame as the rest of the script")
+ parser.add_option("-I", "--library_dir", dest="library_dirs",
+ action="append", help="additional paths appended to PYJSPATH")
+ parser.add_option("-D", "--data_dir", dest="data_dir",
+ help="path for data directory")
+ parser.add_option("-m", "--dynamic-modules", action="store_true",
+ dest="dynamic", default=False,
+ help="Split output into separate dynamically-loaded modules (experimental)")
+ parser.add_option("-P", "--platforms", dest="platforms",
+ help="platforms to build for, comma-separated")
+ parser.add_option("-d", "--debug", action="store_true", dest="debug")
+ parser.add_option("-O", "--optimize", action="store_true",
+ dest="optimize", default=False,
+ help="Optimize generated code (removes all print statements)",
+ )
+ parser.add_option("-c", "--cache_buster", action="store_true",
+ dest="cache_buster",
+ help="Enable browser cache-busting (MD5 hash added to output filenames)")
+
+ parser.set_defaults(output = "output", js_includes=[], library_dirs=[],
+ platforms=(','.join(app_platforms)),
+ data_dir=os.path.join(sys.prefix, "share/pyjamas"),
+ dynamic=False,
+ cache_buster=False,
+ debug=False)
+ (options, args) = parser.parse_args()
+ if len(args) != 1:
+ parser.error("incorrect number of arguments")
+
+ data_dir = abspath(options.data_dir)
+
+ app_path = args[0]
+ if app_path.endswith('.py'):
+ app_path = abspath(app_path)
+ if not isfile(app_path):
+ parser.error("Application file not found %r" % app_path)
+ app_path, app_name = split(app_path)
+ app_name = app_name[:-3]
+ pyjs.path.append(app_path)
+ elif os.path.sep in app_path:
+ parser.error("Not a valid module declaration %r" % app_path)
+ else:
+ app_name = app_path
+
+ for d in options.library_dirs:
+ pyjs.path.append(abspath(d))
+
+ if options.platforms:
+ app_platforms = options.platforms.split(',')
+
+ # this is mostly for getting boilerplate stuff
+ data_dir = os.path.abspath(options.data_dir)
+
+ build(app_name, options.output, options.js_includes,
+ options.debug, options.dynamic and 1 or 0, data_dir,
+ options.cache_buster, options.optimize)
+
+if __name__ == "__main__":
+ main()
+
diff -r 35cc4c6a2936 -r 46d7d2ce84d2 plugins/python/modules/svgui/pyjs/jsonrpc/README.txt
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/plugins/python/modules/svgui/pyjs/jsonrpc/README.txt Thu Aug 13 11:48:55 2009 +0200
@@ -0,0 +1,12 @@
+These classes are intended for use server-side.
+
+e.g. in a django view.py :
+
+ from pyjs.jsonrpc.django import JSONService, jsonremote
+
+ jsonservice = JSONRPCService()
+
+ @jsonremote(jsonservice)
+ def test(request, echo_param):
+ return "echoing the param back: %s" % echo_param
+
diff -r 35cc4c6a2936 -r 46d7d2ce84d2 plugins/python/modules/svgui/pyjs/jsonrpc/django/jsonrpc.py
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/plugins/python/modules/svgui/pyjs/jsonrpc/django/jsonrpc.py Thu Aug 13 11:48:55 2009 +0200
@@ -0,0 +1,226 @@
+# jsonrpc.py
+# original code: http://trac.pyworks.org/pyjamas/wiki/DjangoWithPyJamas
+# also from: http://www.pimentech.fr/technologies/outils
+from django.utils import simplejson
+from django.http import HttpResponse
+import sys
+
+from pyjs.jsonrpc import JSONRPCServiceBase
+# JSONRPCService and jsonremote are used in combination to drastically
+# simplify the provision of JSONRPC services. use as follows:
+#
+# jsonservice = JSONRPCService()
+#
+# @jsonremote(jsonservice)
+# def test(request, echo_param):
+# return "echoing the param back: %s" % echo_param
+#
+# dump jsonservice into urlpatterns:
+# (r'^service1/$', 'djangoapp.views.jsonservice'),
+
+class JSONRPCService(JSONRPCServiceBase):
+
+ def __call__(self, request, extra=None):
+ return self.process(request.raw_post_data)
+
+def jsonremote(service):
+ """Make JSONRPCService a decorator so that you can write :
+
+ from jsonrpc import JSONRPCService
+ chatservice = JSONRPCService()
+
+ @jsonremote(chatservice)
+ def login(request, user_name):
+ (...)
+ """
+ def remotify(func):
+ if isinstance(service, JSONRPCService):
+ service.add_method(func.__name__, func)
+ else:
+ emsg = 'Service "%s" not found' % str(service.__name__)
+ raise NotImplementedError, emsg
+ return func
+ return remotify
+
+
+# FormProcessor provides a mechanism for turning Django Forms into JSONRPC
+# Services. If you have an existing Django app which makes prevalent
+# use of Django Forms it will save you rewriting the app.
+# use as follows. in djangoapp/views.py :
+#
+# class SimpleForm(forms.Form):
+# testfield = forms.CharField(max_length=100)
+#
+# class SimpleForm2(forms.Form):
+# testfield = forms.CharField(max_length=20)
+#
+# processor = FormProcessor({'processsimpleform': SimpleForm,
+# 'processsimpleform2': SimpleForm2})
+#
+# this will result in a JSONRPC service being created with two
+# RPC functions. dump "processor" into urlpatterns to make it
+# part of the app:
+# (r'^formsservice/$', 'djangoapp.views.processor'),
+
+from django import forms
+
+def builderrors(form):
+ d = {}
+ for error in form.errors.keys():
+ if error not in d:
+ d[error] = []
+ for errorval in form.errors[error]:
+ d[error].append(unicode(errorval))
+ return d
+
+
+# contains the list of arguments in each field
+field_names = {
+ 'CharField': ['max_length', 'min_length'],
+ 'IntegerField': ['max_value', 'min_value'],
+ 'FloatField': ['max_value', 'min_value'],
+ 'DecimalField': ['max_value', 'min_value', 'max_digits', 'decimal_places'],
+ 'DateField': ['input_formats'],
+ 'DateTimeField': ['input_formats'],
+ 'TimeField': ['input_formats'],
+ 'RegexField': ['max_length', 'min_length'], # sadly we can't get the expr
+ 'EmailField': ['max_length', 'min_length'],
+ 'URLField': ['max_length', 'min_length', 'verify_exists', 'user_agent'],
+ 'ChoiceField': ['choices'],
+ 'FilePathField': ['path', 'match', 'recursive', 'choices'],
+ 'IPAddressField': ['max_length', 'min_length'],
+ }
+
+def describe_field_errors(field):
+ res = {}
+ field_type = field.__class__.__name__
+ msgs = {}
+ for n, m in field.error_messages.items():
+ msgs[n] = unicode(m)
+ res['error_messages'] = msgs
+ if field_type in ['ComboField', 'MultiValueField', 'SplitDateTimeField']:
+ res['fields'] = map(describe_field, field.fields)
+ return res
+
+def describe_fields_errors(fields, field_names):
+ res = {}
+ if not field_names:
+ field_names = fields.keys()
+ for name in field_names:
+ field = fields[name]
+ res[name] = describe_field_errors(field)
+ return res
+
+def describe_field(field):
+ res = {}
+ field_type = field.__class__.__name__
+ for fname in field_names.get(field_type, []) + \
+ ['help_text', 'label', 'initial', 'required']:
+ res[fname] = getattr(field, fname)
+ if field_type in ['ComboField', 'MultiValueField', 'SplitDateTimeField']:
+ res['fields'] = map(describe_field, field.fields)
+ return res
+
+def describe_fields(fields, field_names):
+ res = {}
+ if not field_names:
+ field_names = fields.keys()
+ for name in field_names:
+ field = fields[name]
+ res[name] = describe_field(field)
+ return res
+
+class FormProcessor(JSONRPCService):
+ def __init__(self, forms, _formcls=None):
+
+ if _formcls is None:
+ JSONRPCService.__init__(self)
+ for k in forms.keys():
+ s = FormProcessor({}, forms[k])
+ self.add_method(k, s.__process)
+ else:
+ JSONRPCService.__init__(self, forms)
+ self.formcls = _formcls
+
+ def __process(self, request, params, command=None):
+
+ f = self.formcls(params)
+
+ if command is None: # just validate
+ if not f.is_valid():
+ return {'success':False, 'errors': builderrors(f)}
+ return {'success':True}
+
+ elif command.has_key('describe_errors'):
+ field_names = command['describe_errors']
+ return describe_fields_errors(f.fields, field_names)
+
+ elif command.has_key('describe'):
+ field_names = command['describe']
+ return describe_fields(f.fields, field_names)
+
+ elif command.has_key('save'):
+ if not f.is_valid():
+ return {'success':False, 'errors': builderrors(f)}
+ instance = f.save() # XXX: if you want more, over-ride save.
+ return {'success': True, 'instance': json_convert(instance) }
+
+ elif command.has_key('html'):
+ return {'success': True, 'html': f.as_table()}
+
+ return "unrecognised command"
+
+
+
+
+# The following is incredibly convenient for saving vast amounts of
+# coding, avoiding doing silly things like this:
+# jsonresult = {'field1': djangoobject.field1,
+# 'field2': djangoobject.date.strftime('%Y.%M'),
+# ..... }
+#
+# The date/time flatten function is there because JSONRPC doesn't
+# support date/time objects or formats, so conversion to a string
+# is the most logical choice. pyjamas, being python, can easily
+# be used to parse the string result at the other end.
+#
+# use as follows:
+#
+# jsonservice = JSONRPCService()
+#
+# @jsonremote(jsonservice)
+# def list_some_model(request, start=0, count=10):
+# l = SomeDjangoModelClass.objects.filter()
+# res = json_convert(l[start:end])
+#
+# @jsonremote(jsonservice)
+# def list_another_model(request, start=0, count=10):
+# l = AnotherDjangoModelClass.objects.filter()
+# res = json_convert(l[start:end])
+#
+# dump jsonservice into urlpatterns to make the two RPC functions,
+# list_some_model and list_another_model part of the django app:
+# (r'^service1/$', 'djangoapp.views.jsonservice'),
+
+from django.core.serializers import serialize
+import datetime
+from datetime import date
+
+def dict_datetimeflatten(item):
+ d = {}
+ for k, v in item.items():
+ k = str(k)
+ if isinstance(v, datetime.date):
+ d[k] = str(v)
+ elif isinstance(v, dict):
+ d[k] = dict_datetimeflatten(v)
+ else:
+ d[k] = v
+ return d
+
+def json_convert(l, fields=None):
+ res = []
+ for item in serialize('python', l, fields=fields):
+ res.append(dict_datetimeflatten(item))
+ return res
+
diff -r 35cc4c6a2936 -r 46d7d2ce84d2 plugins/python/modules/svgui/pyjs/jsonrpc/jsonrpc.py
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/plugins/python/modules/svgui/pyjs/jsonrpc/jsonrpc.py Thu Aug 13 11:48:55 2009 +0200
@@ -0,0 +1,43 @@
+import gluon.contrib.simplejson as simplejson
+import types
+import sys
+
+class JSONRPCServiceBase:
+
+ def __init__(self):
+ self.methods={}
+
+ def response(self, id, result):
+ return simplejson.dumps({'version': '1.1', 'id':id,
+ 'result':result, 'error':None})
+ def error(self, id, code, message):
+ return simplejson.dumps({'id': id,
+ 'version': '1.1',
+ 'error': {'name': 'JSONRPCError',
+ 'code': code,
+ 'message': message
+ }
+ })
+
+ def add_method(self, name, method):
+ self.methods[name] = method
+
+ def process(self, data):
+ data = simplejson.loads(data)
+ id, method, params = data["id"], data["method"], data["params"]
+ if method in self.methods:
+ try:
+ result =self.methods[method](*params)
+ return self.response(id, result)
+ except BaseException:
+ etype, eval, etb = sys.exc_info()
+ return self.error(id, 100, '%s: %s' %(etype.__name__, eval))
+ except:
+ etype, eval, etb = sys.exc_info()
+ return self.error(id, 100, 'Exception %s: %s' %(etype, eval))
+ else:
+ return self.error(id, 100, 'method "%s" does not exist' % method)
+
+ def listmethods(self):
+ return self.methods.keys()
+
diff -r 35cc4c6a2936 -r 46d7d2ce84d2 plugins/python/modules/svgui/pyjs/jsonrpc/web2py/jsonrpc.py
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/plugins/python/modules/svgui/pyjs/jsonrpc/web2py/jsonrpc.py Thu Aug 13 11:48:55 2009 +0200
@@ -0,0 +1,11 @@
+from pyjs.jsonrpc import JSONRPCServiceBase
+
+class JSONRPCService(JSONRPCServiceBase):
+
+ def serve(self):
+ return self.process(request.body.read())
+
+ def __call__(self,func):
+ self.methods[func.__name__]=func
+ return func
+
diff -r 35cc4c6a2936 -r 46d7d2ce84d2 plugins/python/modules/svgui/pyjs/lib/_pyjs.js
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/plugins/python/modules/svgui/pyjs/lib/_pyjs.js Thu Aug 13 11:48:55 2009 +0200
@@ -0,0 +1,160 @@
+function pyjs_extend(klass, base) {
+ function klass_object_inherit() {}
+ klass_object_inherit.prototype = base.prototype;
+ klass_object = new klass_object_inherit();
+ for (var i in base.prototype.__class__) {
+ v = base.prototype.__class__[i];
+ if (typeof v == "function" && (v.class_method || v.static_method || v.unbound_method))
+ {
+ klass_object[i] = v;
+ }
+ }
+
+ function klass_inherit() {}
+ klass_inherit.prototype = klass_object;
+ klass.prototype = new klass_inherit();
+ klass_object.constructor = klass;
+ klass.prototype.__class__ = klass_object;
+
+ for (var i in base.prototype) {
+ v = base.prototype[i];
+ if (typeof v == "function" && v.instance_method)
+ {
+ klass.prototype[i] = v;
+ }
+ }
+}
+
+/* creates a class, derived from bases, with methods and variables */
+function pyjs_type(clsname, bases, methods)
+{
+ var fn_cls = function() {};
+ fn_cls.__name__ = clsname;
+ var fn = function() {
+ var instance = new fn_cls();
+ if(instance.__init__) instance.__init__.apply(instance, arguments);
+ return instance;
+ }
+ fn_cls.__initialize__ = function() {
+ if (fn_cls.__was_initialized__) return;
+ fn_cls.__was_initialized__ = true;
+ fn_cls.__extend_baseclasses();
+ fn_cls.prototype.__class__.__new__ = fn;
+ fn_cls.prototype.__class__.__name__ = clsname;
+ }
+ fn_cls.__extend_baseclasses = function() {
+ var bi;
+ for (bi in fn_cls.__baseclasses)
+ {
+ var b = fn_cls.__baseclasses[bi];
+ if (b.__was_initialized__)
+ {
+ continue;
+ }
+ b.__initialize__();
+ }
+ for (bi in fn_cls.__baseclasses)
+ {
+ var b = fn_cls.__baseclasses[bi];
+ pyjs_extend(fn_cls, b);
+ }
+ }
+ if (!bases) {
+ bases = [pyjslib.__Object];
+ }
+ fn_cls.__baseclasses = bases;
+
+ fn_cls.__initialize__();
+
+ for (k in methods) {
+ var mth = methods[k];
+ var mtype = typeof mth;
+ if (mtype == "function" ) {
+ fn_cls.prototype[k] = mth;
+ fn_cls.prototype.__class__[k] = function () {
+ return fn_cls.prototype[k].call.apply(
+ fn_cls.prototype[k], arguments);
+ };
+ fn_cls.prototype.__class__[k].unbound_method = true;
+ fn_cls.prototype.instance_method = true;
+ fn_cls.prototype.__class__[k].__name__ = k;
+ fn_cls.prototype[k].__name__ = k;
+ } else {
+ fn_cls.prototype.__class__[k] = mth;
+ }
+ }
+ return fn;
+}
+function pyjs_kwargs_call(obj, func, star_args, args)
+{
+ var call_args;
+
+ if (star_args)
+ {
+ if (!pyjslib.isIteratable(star_args))
+ {
+ throw (pyjslib.TypeError(func.__name__ + "() arguments after * must be a sequence" + pyjslib.repr(star_args)));
+ }
+ call_args = Array();
+ var __i = star_args.__iter__();
+ var i = 0;
+ try {
+ while (true) {
+ call_args[i]=__i.next();
+ i++;
+ }
+ } catch (e) {
+ if (e != pyjslib.StopIteration) {
+ throw e;
+ }
+ }
+
+ if (args)
+ {
+ var n = star_args.length;
+ for (var i=0; i < args.length; i++) {
+ call_args[n+i]=args[i];
+ }
+ }
+ }
+ else
+ {
+ call_args = args;
+ }
+ return func.apply(obj, call_args);
+}
+
+function pyjs_kwargs_function_call(func, star_args, args)
+{
+ return pyjs_kwargs_call(null, func, star_args, args);
+}
+
+function pyjs_kwargs_method_call(obj, method_name, star_args, args)
+{
+ var method = obj[method_name];
+ if (method.parse_kwargs)
+ {
+ args = method.parse_kwargs.apply(null, args);
+ }
+ return pyjs_kwargs_call(obj, method, star_args, args);
+}
+
+//String.prototype.__getitem__ = String.prototype.charAt;
+//String.prototype.upper = String.prototype.toUpperCase;
+//String.prototype.lower = String.prototype.toLowerCase;
+//String.prototype.find=pyjslib.String_find;
+//String.prototype.join=pyjslib.String_join;
+//String.prototype.isdigit=pyjslib.String_isdigit;
+//String.prototype.__iter__=pyjslib.String___iter__;
+//
+//String.prototype.__replace=String.prototype.replace;
+//String.prototype.replace=pyjslib.String_replace;
+//
+//String.prototype.split=pyjslib.String_split;
+//String.prototype.strip=pyjslib.String_strip;
+//String.prototype.lstrip=pyjslib.String_lstrip;
+//String.prototype.rstrip=pyjslib.String_rstrip;
+//String.prototype.startswith=pyjslib.String_startswith;
+
+var str = String;
+
diff -r 35cc4c6a2936 -r 46d7d2ce84d2 plugins/python/modules/svgui/pyjs/lib/json.js
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/plugins/python/modules/svgui/pyjs/lib/json.js Thu Aug 13 11:48:55 2009 +0200
@@ -0,0 +1,293 @@
+json_parse = (function () {
+
+// This is a function that can parse a JSON text, producing a JavaScript
+// data structure. It is a simple, recursive descent parser. It does not use
+// eval or regular expressions, so it can be used as a model for implementing
+// a JSON parser in other languages.
+
+// We are defining the function inside of another function to avoid creating
+// global variables.
+
+ var at, // The index of the current character
+ ch, // The current character
+ escapee = {
+ '"': '"',
+ '\\': '\\',
+ '/': '/',
+ b: '\b',
+ f: '\f',
+ n: '\n',
+ r: '\r',
+ t: '\t'
+ },
+ text,
+
+ error = function (m) {
+
+// Call error when something is wrong.
+
+ throw {
+ name: 'SyntaxError',
+ message: m,
+ at: at,
+ text: text
+ };
+ },
+
+ next = function (c) {
+
+// If a c parameter is provided, verify that it matches the current character.
+
+ if (c && c !== ch) {
+ error("Expected '" + c + "' instead of '" + ch + "'");
+ }
+
+// Get the next character. When there are no more characters,
+// return the empty string.
+
+ ch = text.charAt(at);
+ at += 1;
+ return ch;
+ },
+
+ number = function () {
+
+// Parse a number value.
+
+ var number,
+ string = '';
+
+ if (ch === '-') {
+ string = '-';
+ next('-');
+ }
+ while (ch >= '0' && ch <= '9') {
+ string += ch;
+ next();
+ }
+ if (ch === '.') {
+ string += '.';
+ while (next() && ch >= '0' && ch <= '9') {
+ string += ch;
+ }
+ }
+ if (ch === 'e' || ch === 'E') {
+ string += ch;
+ next();
+ if (ch === '-' || ch === '+') {
+ string += ch;
+ next();
+ }
+ while (ch >= '0' && ch <= '9') {
+ string += ch;
+ next();
+ }
+ }
+ number = +string;
+ if (isNaN(number)) {
+ error("Bad number");
+ } else {
+ return number;
+ }
+ },
+
+ string = function () {
+
+// Parse a string value.
+
+ var hex,
+ i,
+ string = '',
+ uffff;
+
+// When parsing for string values, we must look for " and \ characters.
+
+ if (ch === '"') {
+ while (next()) {
+ if (ch === '"') {
+ next();
+ return string;
+ } else if (ch === '\\') {
+ next();
+ if (ch === 'u') {
+ uffff = 0;
+ for (i = 0; i < 4; i += 1) {
+ hex = parseInt(next(), 16);
+ if (!isFinite(hex)) {
+ break;
+ }
+ uffff = uffff * 16 + hex;
+ }
+ string += String.fromCharCode(uffff);
+ } else if (typeof escapee[ch] === 'string') {
+ string += escapee[ch];
+ } else {
+ break;
+ }
+ } else {
+ string += ch;
+ }
+ }
+ }
+ error("Bad string");
+ },
+
+ white = function () {
+
+// Skip whitespace.
+
+ while (ch && ch <= ' ') {
+ next();
+ }
+ },
+
+ word = function () {
+
+// true, false, or null.
+
+ switch (ch) {
+ case 't':
+ next('t');
+ next('r');
+ next('u');
+ next('e');
+ return true;
+ case 'f':
+ next('f');
+ next('a');
+ next('l');
+ next('s');
+ next('e');
+ return false;
+ case 'n':
+ next('n');
+ next('u');
+ next('l');
+ next('l');
+ return null;
+ }
+ error("Unexpected '" + ch + "'");
+ },
+
+ value, // Place holder for the value function.
+
+ array = function () {
+
+// Parse an array value.
+
+ var array = [];
+
+ if (ch === '[') {
+ next('[');
+ white();
+ if (ch === ']') {
+ next(']');
+ return array; // empty array
+ }
+ while (ch) {
+ array.push(value());
+ white();
+ if (ch === ']') {
+ next(']');
+ return array;
+ }
+ next(',');
+ white();
+ }
+ }
+ error("Bad array");
+ },
+
+ object = function () {
+
+// Parse an object value.
+
+ var key,
+ object = {};
+
+ if (ch === '{') {
+ next('{');
+ white();
+ if (ch === '}') {
+ next('}');
+ return object; // empty object
+ }
+ while (ch) {
+ key = string();
+ white();
+ next(':');
+ if (Object.hasOwnProperty.call(object, key)) {
+ error('Duplicate key "' + key + '"');
+ }
+ object[key] = value();
+ white();
+ if (ch === '}') {
+ next('}');
+ return object;
+ }
+ next(',');
+ white();
+ }
+ }
+ error("Bad object");
+ };
+
+ value = function () {
+
+// Parse a JSON value. It could be an object, an array, a string, a number,
+// or a word.
+
+ white();
+ switch (ch) {
+ case '{':
+ return object();
+ case '[':
+ return array();
+ case '"':
+ return string();
+ case '-':
+ return number();
+ default:
+ return ch >= '0' && ch <= '9' ? number() : word();
+ }
+ };
+
+// Return the json_parse function. It will have access to all of the above
+// functions and variables.
+
+ return function (source, reviver) {
+ var result;
+
+ text = source;
+ at = 0;
+ ch = ' ';
+ result = value();
+ white();
+ if (ch) {
+ error("Syntax error");
+ }
+
+// If there is a reviver function, we recursively walk the new structure,
+// passing each name/value pair to the reviver function for possible
+// transformation, starting with a temporary root object that holds the result
+// in an empty key. If there is not a reviver function, we simply return the
+// result.
+
+ return typeof reviver === 'function' ? (function walk(holder, key) {
+ var k, v, value = holder[key];
+ if (value && typeof value === 'object') {
+ for (k in value) {
+ if (Object.hasOwnProperty.call(value, k)) {
+ v = walk(value, k);
+ if (v !== undefined) {
+ value[k] = v;
+ } else {
+ delete value[k];
+ }
+ }
+ }
+ }
+ return reviver.call(holder, key, value);
+ }({'': result}, '')) : result;
+ };
+}());
diff -r 35cc4c6a2936 -r 46d7d2ce84d2 plugins/python/modules/svgui/pyjs/lib/pyjslib.py
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/plugins/python/modules/svgui/pyjs/lib/pyjslib.py Thu Aug 13 11:48:55 2009 +0200
@@ -0,0 +1,1365 @@
+# Copyright 2006 James Tauber and contributors
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+
+# iteration from Bob Ippolito's Iteration in JavaScript
+
+from __pyjamas__ import JS
+
+# must declare import _before_ importing sys
+
+def import_module(path, parent_module, module_name, dynamic=1, async=False):
+ """
+ """
+
+ JS("""
+ var cache_file;
+
+ if (module_name == "sys" || module_name == 'pyjslib')
+ {
+ /*module_load_request[module_name] = 1;*/
+ return;
+ }
+
+ if (path == null)
+ {
+ path = './';
+ }
+
+ var override_name = sys.platform + "." + module_name;
+ if (((sys.overrides != null) &&
+ (sys.overrides.has_key(override_name))))
+ {
+ cache_file = sys.overrides.__getitem__(override_name) ;
+ }
+ else
+ {
+ cache_file = module_name ;
+ }
+
+ cache_file = (path + cache_file + '.cache.js' ) ;
+
+ //alert("cache " + cache_file + " " + module_name + " " + parent_module);
+
+ /* already loaded? */
+ if (module_load_request[module_name])
+ {
+ if (module_load_request[module_name] >= 3 && parent_module != null)
+ {
+ //onload_fn = parent_module + '.' + module_name + ' = ' + module_name + ';';
+ //pyjs_eval(onload_fn); /* set up the parent-module namespace */
+ }
+ return;
+ }
+ if (typeof (module_load_request[module_name]) == 'undefined')
+ {
+ module_load_request[module_name] = 1;
+ }
+
+ /* following a load, this first executes the script
+ * "preparation" function MODULENAME_loaded_fn()
+ * and then sets up the loaded module in the namespace
+ * of the parent.
+ */
+
+ onload_fn = ''; // module_name + "_loaded_fn();"
+
+ if (parent_module != null)
+ {
+ //onload_fn += parent_module + '.' + module_name + ' = ' + module_name + ';';
+ /*pmod = parent_module + '.' + module_name;
+ onload_fn += 'alert("' + pmod + '"+' + pmod+');';*/
+ }
+
+
+ if (dynamic)
+ {
+ /* this one tacks the script onto the end of the DOM
+ */
+
+ pyjs_load_script(cache_file, onload_fn, async);
+
+ /* this one actually RUNS the script (eval) into the page.
+ my feeling is that this would be better for non-async
+ but i can't get it to work entirely yet.
+ */
+ /*pyjs_ajax_eval(cache_file, onload_fn, async);*/
+ }
+ else
+ {
+ if (module_name != "pyjslib" &&
+ module_name != "sys")
+ pyjs_eval(onload_fn);
+ }
+
+ """)
+
+JS("""
+function import_wait(proceed_fn, parent_mod, dynamic) {
+
+ var data = '';
+ var element = $doc.createElement("div");
+ $doc.body.appendChild(element);
+ function write_dom(txt) {
+ element.innerHTML = txt + '
';
+ }
+
+ var timeoutperiod = 1;
+ if (dynamic)
+ var timeoutperiod = 1;
+
+ var wait = function() {
+
+ var status = '';
+ for (l in module_load_request)
+ {
+ var m = module_load_request[l];
+ if (l == "sys" || l == 'pyjslib')
+ continue;
+ status += l + m + " ";
+ }
+
+ //write_dom( " import wait " + wait_count + " " + status + " parent_mod " + parent_mod);
+ wait_count += 1;
+
+ if (status == '')
+ {
+ setTimeout(wait, timeoutperiod);
+ return;
+ }
+
+ for (l in module_load_request)
+ {
+ var m = module_load_request[l];
+ if (l == "sys" || l == 'pyjslib')
+ {
+ module_load_request[l] = 4;
+ continue;
+ }
+ if ((parent_mod != null) && (l == parent_mod))
+ {
+ if (m == 1)
+ {
+ setTimeout(wait, timeoutperiod);
+ return;
+ }
+ if (m == 2)
+ {
+ /* cheat and move app on to next stage */
+ module_load_request[l] = 3;
+ }
+ }
+ if (m == 1 || m == 2)
+ {
+ setTimeout(wait, timeoutperiod);
+ return;
+ }
+ if (m == 3)
+ {
+ //alert("waited for module " + l + ": loaded");
+ module_load_request[l] = 4;
+ mod_fn = modules[l];
+ }
+ }
+ //alert("module wait done");
+
+ if (proceed_fn.importDone)
+ proceed_fn.importDone(proceed_fn);
+ else
+ proceed_fn();
+ }
+
+ wait();
+}
+""")
+
+class Object:
+ pass
+
+object = Object
+
+class Modload:
+
+ def __init__(self, path, app_modlist, app_imported_fn, dynamic,
+ parent_mod):
+ self.app_modlist = app_modlist
+ self.app_imported_fn = app_imported_fn
+ self.path = path
+ self.idx = 0;
+ self.dynamic = dynamic
+ self.parent_mod = parent_mod
+
+ def next(self):
+
+ for i in range(len(self.app_modlist[self.idx])):
+ app = self.app_modlist[self.idx][i]
+ import_module(self.path, self.parent_mod, app, self.dynamic, True);
+ self.idx += 1
+
+ if self.idx >= len(self.app_modlist):
+ import_wait(self.app_imported_fn, self.parent_mod, self.dynamic)
+ else:
+ import_wait(getattr(self, "next"), self.parent_mod, self.dynamic)
+
+def get_module(module_name):
+ ev = "__mod = %s;" % module_name
+ JS("pyjs_eval(ev);")
+ return __mod
+
+def preload_app_modules(path, app_modnames, app_imported_fn, dynamic,
+ parent_mod=None):
+
+ loader = Modload(path, app_modnames, app_imported_fn, dynamic, parent_mod)
+ loader.next()
+
+import sys
+
+class BaseException:
+
+ name = "BaseException"
+
+ def __init__(self, *args):
+ self.args = args
+
+ def __str__(self):
+ if len(self.args) is 0:
+ return ''
+ elif len(self.args) is 1:
+ return repr(self.args[0])
+ return repr(self.args)
+
+ def toString(self):
+ return str(self)
+
+class Exception(BaseException):
+
+ name = "Exception"
+
+class TypeError(BaseException):
+ name = "TypeError"
+
+class StandardError(Exception):
+ name = "StandardError"
+
+class LookupError(StandardError):
+ name = "LookupError"
+
+ def toString(self):
+ return self.name + ": " + self.args[0]
+
+class KeyError(LookupError):
+ name = "KeyError"
+
+class AttributeError(StandardError):
+
+ name = "AttributeError"
+
+ def toString(self):
+ return "AttributeError: %s of %s" % (self.args[1], self.args[0])
+
+JS("""
+pyjslib.StopIteration = function () { };
+pyjslib.StopIteration.prototype = new Error();
+pyjslib.StopIteration.name = 'StopIteration';
+pyjslib.StopIteration.message = 'StopIteration';
+
+pyjslib.String_find = function(sub, start, end) {
+ var pos=this.indexOf(sub, start);
+ if (pyjslib.isUndefined(end)) return pos;
+
+ if (pos + sub.length>end) return -1;
+ return pos;
+}
+
+pyjslib.String_join = function(data) {
+ var text="";
+
+ if (pyjslib.isArray(data)) {
+ return data.join(this);
+ }
+ else if (pyjslib.isIteratable(data)) {
+ var iter=data.__iter__();
+ try {
+ text+=iter.next();
+ while (true) {
+ var item=iter.next();
+ text+=this + item;
+ }
+ }
+ catch (e) {
+ if (e != pyjslib.StopIteration) throw e;
+ }
+ }
+
+ return text;
+}
+
+pyjslib.String_isdigit = function() {
+ return (this.match(/^\d+$/g) != null);
+}
+
+pyjslib.String_replace = function(old, replace, count) {
+ var do_max=false;
+ var start=0;
+ var new_str="";
+ var pos=0;
+
+ if (!pyjslib.isString(old)) return this.__replace(old, replace);
+ if (!pyjslib.isUndefined(count)) do_max=true;
+
+ while (start= s.length) {
+ throw pyjslib.StopIteration;
+ }
+ return s.substring(i++, i, 1);
+ },
+ '__iter__': function() {
+ return this;
+ }
+ };
+}
+
+pyjslib.String_strip = function(chars) {
+ return this.lstrip(chars).rstrip(chars);
+}
+
+pyjslib.String_lstrip = function(chars) {
+ if (pyjslib.isUndefined(chars)) return this.replace(/^\s+/, "");
+
+ return this.replace(new RegExp("^[" + chars + "]+"), "");
+}
+
+pyjslib.String_rstrip = function(chars) {
+ if (pyjslib.isUndefined(chars)) return this.replace(/\s+$/, "");
+
+ return this.replace(new RegExp("[" + chars + "]+$"), "");
+}
+
+pyjslib.String_startswith = function(prefix, start) {
+ if (pyjslib.isUndefined(start)) start = 0;
+
+ if (this.substring(start, prefix.length) == prefix) return true;
+ return false;
+}
+
+pyjslib.abs = Math.abs;
+
+""")
+
+class Class:
+ def __init__(self, name):
+ self.name = name
+
+ def __str___(self):
+ return self.name
+
+def eq(a,b):
+ JS("""
+ if (pyjslib.hasattr(a, "__cmp__")) {
+ return a.__cmp__(b) == 0;
+ } else if (pyjslib.hasattr(b, "__cmp__")) {
+ return b.__cmp__(a) == 0;
+ }
+ return a == b;
+ """)
+
+def cmp(a,b):
+ if hasattr(a, "__cmp__"):
+ return a.__cmp__(b)
+ elif hasattr(b, "__cmp__"):
+ return -b.__cmp__(a)
+ if a > b:
+ return 1
+ elif b > a:
+ return -1
+ else:
+ return 0
+
+def bool(v):
+ # this needs to stay in native code without any dependencies here,
+ # because this is used by if and while, we need to prevent
+ # recursion
+ JS("""
+ if (!v) return false;
+ switch(typeof v){
+ case 'boolean':
+ return v;
+ case 'object':
+ if (v.__nonzero__){
+ return v.__nonzero__();
+ }else if (v.__len__){
+ return v.__len__()>0;
+ }
+ return true;
+ }
+ return Boolean(v);
+ """)
+
+class List:
+ def __init__(self, data=None):
+ JS("""
+ this.l = [];
+ this.extend(data);
+ """)
+
+ def append(self, item):
+ JS(""" this.l[this.l.length] = item;""")
+
+ def extend(self, data):
+ JS("""
+ if (pyjslib.isArray(data)) {
+ n = this.l.length;
+ for (var i=0; i < data.length; i++) {
+ this.l[n+i]=data[i];
+ }
+ }
+ else if (pyjslib.isIteratable(data)) {
+ var iter=data.__iter__();
+ var i=this.l.length;
+ try {
+ while (true) {
+ var item=iter.next();
+ this.l[i++]=item;
+ }
+ }
+ catch (e) {
+ if (e != pyjslib.StopIteration) throw e;
+ }
+ }
+ """)
+
+ def remove(self, value):
+ JS("""
+ var index=this.index(value);
+ if (index<0) return false;
+ this.l.splice(index, 1);
+ return true;
+ """)
+
+ def index(self, value, start=0):
+ JS("""
+ var length=this.l.length;
+ for (var i=start; i= 0
+
+ def __iter__(self):
+ JS("""
+ var i = 0;
+ var l = this.l;
+ return {
+ 'next': function() {
+ if (i >= l.length) {
+ throw pyjslib.StopIteration;
+ }
+ return l[i++];
+ },
+ '__iter__': function() {
+ return this;
+ }
+ };
+ """)
+
+ def reverse(self):
+ JS(""" this.l.reverse();""")
+
+ def sort(self, compareFunc=None, keyFunc=None, reverse=False):
+ if not compareFunc:
+ global cmp
+ compareFunc = cmp
+ if keyFunc and reverse:
+ def thisSort1(a,b):
+ return -compareFunc(keyFunc(a), keyFunc(b))
+ self.l.sort(thisSort1)
+ elif keyFunc:
+ def thisSort2(a,b):
+ return compareFunc(keyFunc(a), keyFunc(b))
+ self.l.sort(thisSort2)
+ elif reverse:
+ def thisSort3(a,b):
+ return -compareFunc(a, b)
+ self.l.sort(thisSort3)
+ else:
+ self.l.sort(compareFunc)
+
+ def getArray(self):
+ """
+ Access the javascript Array that is used internally by this list
+ """
+ return self.l
+
+ def __str__(self):
+ return repr(self)
+
+list = List
+
+class Tuple:
+ def __init__(self, data=None):
+ JS("""
+ this.l = [];
+ this.extend(data);
+ """)
+
+ def append(self, item):
+ JS(""" this.l[this.l.length] = item;""")
+
+ def extend(self, data):
+ JS("""
+ if (pyjslib.isArray(data)) {
+ n = this.l.length;
+ for (var i=0; i < data.length; i++) {
+ this.l[n+i]=data[i];
+ }
+ }
+ else if (pyjslib.isIteratable(data)) {
+ var iter=data.__iter__();
+ var i=this.l.length;
+ try {
+ while (true) {
+ var item=iter.next();
+ this.l[i++]=item;
+ }
+ }
+ catch (e) {
+ if (e != pyjslib.StopIteration) throw e;
+ }
+ }
+ """)
+
+ def remove(self, value):
+ JS("""
+ var index=this.index(value);
+ if (index<0) return false;
+ this.l.splice(index, 1);
+ return true;
+ """)
+
+ def index(self, value, start=0):
+ JS("""
+ var length=this.l.length;
+ for (var i=start; i= 0
+
+ def __iter__(self):
+ JS("""
+ var i = 0;
+ var l = this.l;
+ return {
+ 'next': function() {
+ if (i >= l.length) {
+ throw pyjslib.StopIteration;
+ }
+ return l[i++];
+ },
+ '__iter__': function() {
+ return this;
+ }
+ };
+ """)
+
+ def reverse(self):
+ JS(""" this.l.reverse();""")
+
+ def sort(self, compareFunc=None, keyFunc=None, reverse=False):
+ if not compareFunc:
+ global cmp
+ compareFunc = cmp
+ if keyFunc and reverse:
+ def thisSort1(a,b):
+ return -compareFunc(keyFunc(a), keyFunc(b))
+ self.l.sort(thisSort1)
+ elif keyFunc:
+ def thisSort2(a,b):
+ return compareFunc(keyFunc(a), keyFunc(b))
+ self.l.sort(thisSort2)
+ elif reverse:
+ def thisSort3(a,b):
+ return -compareFunc(a, b)
+ self.l.sort(thisSort3)
+ else:
+ self.l.sort(compareFunc)
+
+ def getArray(self):
+ """
+ Access the javascript Array that is used internally by this list
+ """
+ return self.l
+
+ def __str__(self):
+ return repr(self)
+
+tuple = Tuple
+
+
+class Dict:
+ def __init__(self, data=None):
+ JS("""
+ this.d = {};
+
+ if (pyjslib.isArray(data)) {
+ for (var i in data) {
+ var item=data[i];
+ this.__setitem__(item[0], item[1]);
+ //var sKey=pyjslib.hash(item[0]);
+ //this.d[sKey]=item[1];
+ }
+ }
+ else if (pyjslib.isIteratable(data)) {
+ var iter=data.__iter__();
+ try {
+ while (true) {
+ var item=iter.next();
+ this.__setitem__(item.__getitem__(0), item.__getitem__(1));
+ }
+ }
+ catch (e) {
+ if (e != pyjslib.StopIteration) throw e;
+ }
+ }
+ else if (pyjslib.isObject(data)) {
+ for (var key in data) {
+ this.__setitem__(key, data[key]);
+ }
+ }
+ """)
+
+ def __setitem__(self, key, value):
+ JS("""
+ var sKey = pyjslib.hash(key);
+ this.d[sKey]=[key, value];
+ """)
+
+ def __getitem__(self, key):
+ JS("""
+ var sKey = pyjslib.hash(key);
+ var value=this.d[sKey];
+ if (pyjslib.isUndefined(value)){
+ throw pyjslib.KeyError(key);
+ }
+ return value[1];
+ """)
+
+ def __nonzero__(self):
+ JS("""
+ for (var i in this.d){
+ return true;
+ }
+ return false;
+ """)
+
+ def __len__(self):
+ JS("""
+ var size=0;
+ for (var i in this.d) size++;
+ return size;
+ """)
+
+ def has_key(self, key):
+ return self.__contains__(key)
+
+ def __delitem__(self, key):
+ JS("""
+ var sKey = pyjslib.hash(key);
+ delete this.d[sKey];
+ """)
+
+ def __contains__(self, key):
+ JS("""
+ var sKey = pyjslib.hash(key);
+ return (pyjslib.isUndefined(this.d[sKey])) ? false : true;
+ """)
+
+ def keys(self):
+ JS("""
+ var keys=new pyjslib.List();
+ for (var key in this.d) {
+ keys.append(this.d[key][0]);
+ }
+ return keys;
+ """)
+
+ def values(self):
+ JS("""
+ var values=new pyjslib.List();
+ for (var key in this.d) values.append(this.d[key][1]);
+ return values;
+ """)
+
+ def items(self):
+ JS("""
+ var items = new pyjslib.List();
+ for (var key in this.d) {
+ var kv = this.d[key];
+ items.append(new pyjslib.List(kv))
+ }
+ return items;
+ """)
+
+ def __iter__(self):
+ return self.keys().__iter__()
+
+ def iterkeys(self):
+ return self.__iter__()
+
+ def itervalues(self):
+ return self.values().__iter__();
+
+ def iteritems(self):
+ return self.items().__iter__();
+
+ def setdefault(self, key, default_value):
+ if not self.has_key(key):
+ self[key] = default_value
+
+ def get(self, key, default_=None):
+ if not self.has_key(key):
+ return default_
+ return self[key]
+
+ def update(self, d):
+ for k,v in d.iteritems():
+ self[k] = v
+
+ def getObject(self):
+ """
+ Return the javascript Object which this class uses to store
+ dictionary keys and values
+ """
+ return self.d
+
+ def copy(self):
+ return Dict(self.items())
+
+ def __str__(self):
+ return repr(self)
+
+dict = Dict
+
+# taken from mochikit: range( [start,] stop[, step] )
+def range():
+ JS("""
+ var start = 0;
+ var stop = 0;
+ var step = 1;
+
+ if (arguments.length == 2) {
+ start = arguments[0];
+ stop = arguments[1];
+ }
+ else if (arguments.length == 3) {
+ start = arguments[0];
+ stop = arguments[1];
+ step = arguments[2];
+ }
+ else if (arguments.length>0) stop = arguments[0];
+
+ return {
+ 'next': function() {
+ if ((step > 0 && start >= stop) || (step < 0 && start <= stop)) throw pyjslib.StopIteration;
+ var rval = start;
+ start += step;
+ return rval;
+ },
+ '__iter__': function() {
+ return this;
+ }
+ }
+ """)
+
+def slice(object, lower, upper):
+ JS("""
+ if (pyjslib.isString(object)) {
+ if (lower < 0) {
+ lower = object.length + lower;
+ }
+ if (upper < 0) {
+ upper = object.length + upper;
+ }
+ if (pyjslib.isNull(upper)) upper=object.length;
+ return object.substring(lower, upper);
+ }
+ if (pyjslib.isObject(object) && object.slice)
+ return object.slice(lower, upper);
+
+ return null;
+ """)
+
+def str(text):
+ JS("""
+ if (pyjslib.hasattr(text,"__str__")) {
+ return text.__str__();
+ }
+ return String(text);
+ """)
+
+def ord(x):
+ if(isString(x) and len(x) is 1):
+ JS("""
+ return x.charCodeAt(0);
+ """)
+ else:
+ JS("""
+ throw pyjslib.TypeError();
+ """)
+ return None
+
+def chr(x):
+ JS("""
+ return String.fromCharCode(x)
+ """)
+
+def is_basetype(x):
+ JS("""
+ var t = typeof(x);
+ return t == 'boolean' ||
+ t == 'function' ||
+ t == 'number' ||
+ t == 'string' ||
+ t == 'undefined'
+ ;
+ """)
+
+def get_pyjs_classtype(x):
+ JS("""
+ if (pyjslib.hasattr(x, "__class__"))
+ if (pyjslib.hasattr(x.__class__, "__new__"))
+ var src = x.__class__.__name__;
+ return src;
+ return null;
+ """)
+
+def repr(x):
+ """ Return the string representation of 'x'.
+ """
+ JS("""
+ if (x === null)
+ return "null";
+
+ if (x === undefined)
+ return "undefined";
+
+ var t = typeof(x);
+
+ //alert("repr typeof " + t + " : " + x);
+
+ if (t == "boolean")
+ return x.toString();
+
+ if (t == "function")
+ return "";
+
+ if (t == "number")
+ return x.toString();
+
+ if (t == "string") {
+ if (x.indexOf("'") == -1)
+ return "'" + x + "'";
+ if (x.indexOf('"') == -1)
+ return '"' + x + '"';
+ var s = x.replace(new RegExp('"', "g"), '\\\\"');
+ return '"' + s + '"';
+ };
+
+ if (t == "undefined")
+ return "undefined";
+
+ // If we get here, x is an object. See if it's a Pyjamas class.
+
+ if (!pyjslib.hasattr(x, "__init__"))
+ return "<" + x.toString() + ">";
+
+ // Handle the common Pyjamas data types.
+
+ var constructor = "UNKNOWN";
+
+ constructor = pyjslib.get_pyjs_classtype(x);
+
+ //alert("repr constructor: " + constructor);
+
+ if (constructor == "Tuple") {
+ var contents = x.getArray();
+ var s = "(";
+ for (var i=0; i < contents.length; i++) {
+ s += pyjslib.repr(contents[i]);
+ if (i < contents.length - 1)
+ s += ", ";
+ };
+ s += ")"
+ return s;
+ };
+
+ if (constructor == "List") {
+ var contents = x.getArray();
+ var s = "[";
+ for (var i=0; i < contents.length; i++) {
+ s += pyjslib.repr(contents[i]);
+ if (i < contents.length - 1)
+ s += ", ";
+ };
+ s += "]"
+ return s;
+ };
+
+ if (constructor == "Dict") {
+ var keys = new Array();
+ for (var key in x.d)
+ keys.push(key);
+
+ var s = "{";
+ for (var i=0; i return the class name.
+ // Note that we replace underscores with dots so that the name will
+ // (hopefully!) look like the original Python name.
+
+ //var s = constructor.replace(new RegExp('_', "g"), '.');
+ return "<" + constructor + " object>";
+ """)
+
+def float(text):
+ JS("""
+ return parseFloat(text);
+ """)
+
+def int(text, radix=0):
+ JS("""
+ return parseInt(text, radix);
+ """)
+
+def len(object):
+ JS("""
+ if (object==null) return 0;
+ if (pyjslib.isObject(object) && object.__len__) return object.__len__();
+ return object.length;
+ """)
+
+def isinstance(object_, classinfo):
+ if pyjslib.isUndefined(object_):
+ return False
+ if not pyjslib.isObject(object_):
+
+ return False
+ if _isinstance(classinfo, Tuple):
+ for ci in classinfo:
+ if isinstance(object_, ci):
+ return True
+ return False
+ else:
+ return _isinstance(object_, classinfo)
+
+def _isinstance(object_, classinfo):
+ if not pyjslib.isObject(object_):
+ return False
+ JS("""
+ if (object_.__class__){
+ var res = object_ instanceof classinfo.constructor;
+ return res;
+ }
+ return false;
+ """)
+
+def getattr(obj, name, default_):
+ JS("""
+ if ((!pyjslib.isObject(obj))||(pyjslib.isUndefined(obj[name]))){
+ if (pyjslib.isUndefined(default_)){
+ throw pyjslib.AttributeError(obj, name);
+ }else{
+ return default_;
+ }
+ }
+ if (!pyjslib.isFunction(obj[name])) return obj[name];
+ var fnwrap = function() {
+ var args = [];
+ for (var i = 0; i < arguments.length; i++) {
+ args.push(arguments[i]);
+ }
+ return obj[name].apply(obj,args);
+ }
+ fnwrap.__name__ = name;
+ return fnwrap;
+ """)
+
+def setattr(obj, name, value):
+ JS("""
+ if (!pyjslib.isObject(obj)) return null;
+
+ obj[name] = value;
+
+ """)
+
+def hasattr(obj, name):
+ JS("""
+ if (!pyjslib.isObject(obj)) return false;
+ if (pyjslib.isUndefined(obj[name])) return false;
+
+ return true;
+ """)
+
+def dir(obj):
+ JS("""
+ var properties=new pyjslib.List();
+ for (property in obj) properties.append(property);
+ return properties;
+ """)
+
+def filter(obj, method, sequence=None):
+ # object context is LOST when a method is passed, hence object must be passed separately
+ # to emulate python behaviour, should generate this code inline rather than as a function call
+ items = []
+ if sequence is None:
+ sequence = method
+ method = obj
+
+ for item in sequence:
+ if method(item):
+ items.append(item)
+ else:
+ for item in sequence:
+ if method.call(obj, item):
+ items.append(item)
+
+ return items
+
+
+def map(obj, method, sequence=None):
+ items = []
+
+ if sequence is None:
+ sequence = method
+ method = obj
+
+ for item in sequence:
+ items.append(method(item))
+ else:
+ for item in sequence:
+ items.append(method.call(obj, item))
+
+ return items
+
+
+def enumerate(sequence):
+ enumeration = []
+ nextIndex = 0
+ for item in sequence:
+ enumeration.append([nextIndex, item])
+ nextIndex = nextIndex + 1
+ return enumeration
+
+
+def min(*sequence):
+ minValue = None
+ for item in sequence:
+ if minValue is None:
+ minValue = item
+ elif item < minValue:
+ minValue = item
+ return minValue
+
+
+def max(*sequence):
+ maxValue = None
+ for item in sequence:
+ if maxValue is None:
+ maxValue = item
+ elif item > maxValue:
+ maxValue = item
+ return maxValue
+
+
+next_hash_id = 0
+
+def hash(obj):
+ JS("""
+ if (obj == null) return null;
+
+ if (obj.$H) return obj.$H;
+ if (obj.__hash__) return obj.__hash__();
+ if (obj.constructor == String || obj.constructor == Number || obj.constructor == Date) return obj;
+
+ obj.$H = ++pyjslib.next_hash_id;
+ return obj.$H;
+ """)
+
+
+# type functions from Douglas Crockford's Remedial Javascript: http://www.crockford.com/javascript/remedial.html
+def isObject(a):
+ JS("""
+ return (a != null && (typeof a == 'object')) || pyjslib.isFunction(a);
+ """)
+
+def isFunction(a):
+ JS("""
+ return typeof a == 'function';
+ """)
+
+def isString(a):
+ JS("""
+ return typeof a == 'string';
+ """)
+
+def isNull(a):
+ JS("""
+ return typeof a == 'object' && !a;
+ """)
+
+def isArray(a):
+ JS("""
+ return pyjslib.isObject(a) && a.constructor == Array;
+ """)
+
+def isUndefined(a):
+ JS("""
+ return typeof a == 'undefined';
+ """)
+
+def isIteratable(a):
+ JS("""
+ return pyjslib.isString(a) || (pyjslib.isObject(a) && a.__iter__);
+ """)
+
+def isNumber(a):
+ JS("""
+ return typeof a == 'number' && isFinite(a);
+ """)
+
+def toJSObjects(x):
+ """
+ Convert the pyjs pythonic List and Dict objects into javascript Object and Array
+ objects, recursively.
+ """
+ if isArray(x):
+ JS("""
+ var result = [];
+ for(var k=0; k < x.length; k++) {
+ var v = x[k];
+ var tv = pyjslib.toJSObjects(v);
+ result.push(tv);
+ }
+ return result;
+ """)
+ if isObject(x):
+ if isinstance(x, Dict):
+ JS("""
+ var o = x.getObject();
+ var result = {};
+ for (var i in o) {
+ result[o[i][0].toString()] = o[i][1];
+ }
+ return pyjslib.toJSObjects(result)
+ """)
+ elif isinstance(x, List):
+ return toJSObjects(x.l)
+ elif hasattr(x, '__class__'):
+ # we do not have a special implementation for custom
+ # classes, just pass it on
+ return x
+ if isObject(x):
+ JS("""
+ var result = {};
+ for(var k in x) {
+ var v = x[k];
+ var tv = pyjslib.toJSObjects(v)
+ result[k] = tv;
+ }
+ return result;
+ """)
+ return x
+
+def printFunc(objs):
+ JS("""
+ if ($wnd.console==undefined) return;
+ var s = "";
+ for(var i=0; i < objs.length; i++) {
+ if(s != "") s += " ";
+ s += objs[i];
+ }
+ console.debug(s)
+ """)
+
+def type(clsname, bases=None, methods=None):
+ """ creates a class, derived from bases, with methods and variables
+ """
+
+ JS(" var mths = {}; ")
+ if methods:
+ for k in methods.keys():
+ mth = methods[k]
+ JS(" mths[k] = mth; ")
+
+ JS(" var bss = null; ")
+ if bases:
+ JS("bss = bases.l;")
+ JS(" return pyjs_type(clsname, bss, mths); ")
+
diff -r 35cc4c6a2936 -r 46d7d2ce84d2 plugins/python/modules/svgui/pyjs/lib/sys.py
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/plugins/python/modules/svgui/pyjs/lib/sys.py Thu Aug 13 11:48:55 2009 +0200
@@ -0,0 +1,59 @@
+# the platform name (PyV8, smjs, Mozilla, IE6, Opera, Safari etc.)
+platform = '' # to be updated by app, on compile
+
+# a dictionary of module override names (platform-specific)
+overrides = None # to be updated by app, on compile
+
+# the remote path for loading modules
+loadpath = None
+
+stacktrace = None
+
+appname = None
+
+def setloadpath(lp):
+ global loadpath
+ loadpath = lp
+
+def setappname(an):
+ global appname
+ appname = an
+
+def getloadpath():
+ global loadpath
+ return loadpath
+
+def addoverride(module_name, path):
+ global overrides
+ overrides[module_name] = path
+
+def addstack(linedebug):
+ JS("""
+ if (pyjslib.bool((sys.stacktrace === null))) {
+ sys.stacktrace = new pyjslib.List([]);
+ }
+ sys.stacktrace.append(linedebug);
+ """)
+def popstack():
+ JS("""
+ sys.stacktrace.pop()
+ """)
+
+def printstack():
+ JS("""
+ var res = '';
+
+ var __l = sys.stacktrace.__iter__();
+ try {
+ while (true) {
+ var l = __l.next();
+ res += ( l + '\\n' ) ;
+ }
+ } catch (e) {
+ if (e != pyjslib.StopIteration) {
+ throw e;
+ }
+ }
+
+ return res;
+ """)
diff -r 35cc4c6a2936 -r 46d7d2ce84d2 plugins/python/modules/svgui/pyjs/pyjs.py
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/plugins/python/modules/svgui/pyjs/pyjs.py Thu Aug 13 11:48:55 2009 +0200
@@ -0,0 +1,1777 @@
+#!/usr/bin/env python
+# Copyright 2006 James Tauber and contributors
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+
+import sys
+from types import StringType
+import compiler
+from compiler import ast
+import os
+import copy
+
+# the standard location for builtins (e.g. pyjslib) can be
+# over-ridden by changing this. it defaults to sys.prefix
+# so that on a system-wide install of pyjamas the builtins
+# can be found in e.g. {sys.prefix}/share/pyjamas
+#
+# over-rides can be done by either explicitly modifying
+# pyjs.prefix or by setting an environment variable, PYJSPREFIX.
+
+prefix = sys.prefix
+
+if os.environ.has_key('PYJSPREFIX'):
+ prefix = os.environ['PYJSPREFIX']
+
+# pyjs.path is the list of paths, just like sys.path, from which
+# library modules will be searched for, for compile purposes.
+# obviously we don't want to use sys.path because that would result
+# in compiling standard python modules into javascript!
+
+path = [os.path.abspath('')]
+
+if os.environ.has_key('PYJSPATH'):
+ for p in os.environ['PYJSPATH'].split(os.pathsep):
+ p = os.path.abspath(p)
+ if os.path.isdir(p):
+ path.append(p)
+
+# this is the python function used to wrap native javascript
+NATIVE_JS_FUNC_NAME = "JS"
+
+UU = ""
+
+PYJSLIB_BUILTIN_FUNCTIONS=("cmp",
+ "map",
+ "filter",
+ "dir",
+ "getattr",
+ "setattr",
+ "hasattr",
+ "int",
+ "float",
+ "str",
+ "repr",
+ "range",
+ "len",
+ "hash",
+ "abs",
+ "ord",
+ "chr",
+ "enumerate",
+ "min",
+ "max",
+ "bool",
+ "type",
+ "isinstance")
+
+PYJSLIB_BUILTIN_CLASSES=("BaseException",
+ "Exception",
+ "StandardError",
+ "StopIteration",
+ "AttributeError",
+ "TypeError",
+ "KeyError",
+ "LookupError",
+ "list",
+ "dict",
+ "object",
+ "tuple",
+ )
+
+def pyjs_builtin_remap(name):
+ # XXX HACK!
+ if name == 'list':
+ name = 'List'
+ if name == 'object':
+ name = '__Object'
+ if name == 'dict':
+ name = 'Dict'
+ if name == 'tuple':
+ name = 'Tuple'
+ return name
+
+# XXX: this is a hack: these should be dealt with another way
+# however, console is currently the only global name which is causing
+# problems.
+PYJS_GLOBAL_VARS=("console")
+
+# This is taken from the django project.
+# Escape every ASCII character with a value less than 32.
+JS_ESCAPES = (
+ ('\\', r'\x5C'),
+ ('\'', r'\x27'),
+ ('"', r'\x22'),
+ ('>', r'\x3E'),
+ ('<', r'\x3C'),
+ ('&', r'\x26'),
+ (';', r'\x3B')
+ ) + tuple([('%c' % z, '\\x%02X' % z) for z in range(32)])
+
+def escapejs(value):
+ """Hex encodes characters for use in JavaScript strings."""
+ for bad, good in JS_ESCAPES:
+ value = value.replace(bad, good)
+ return value
+
+def uuprefix(name, leave_alone=0):
+ name = name.split(".")
+ name = name[:leave_alone] + map(lambda x: "__%s" % x, name[leave_alone:])
+ return '.'.join(name)
+
+class Klass:
+
+ klasses = {}
+
+ def __init__(self, name, name_):
+ self.name = name
+ self.name_ = name_
+ self.klasses[name] = self
+ self.functions = set()
+
+ def set_base(self, base_name):
+ self.base = self.klasses.get(base_name)
+
+ def add_function(self, function_name):
+ self.functions.add(function_name)
+
+
+class TranslationError(Exception):
+ def __init__(self, message, node):
+ self.message = "line %s:\n%s\n%s" % (node.lineno, message, node)
+
+ def __str__(self):
+ return self.message
+
+def strip_py(name):
+ return name
+
+def mod_var_name_decl(raw_module_name):
+ """ function to get the last component of the module e.g.
+ pyjamas.ui.DOM into the "namespace". i.e. doing
+ "import pyjamas.ui.DOM" actually ends up with _two_
+ variables - one pyjamas.ui.DOM, the other just "DOM".
+ but "DOM" is actually local, hence the "var" prefix.
+
+ for PyV8, this might end up causing problems - we'll have
+ to see: gen_mod_import and mod_var_name_decl might have
+ to end up in a library-specific module, somewhere.
+ """
+ name = raw_module_name.split(".")
+ if len(name) == 1:
+ return ''
+ child_name = name[-1]
+ return "var %s = %s;\n" % (child_name, raw_module_name)
+
+def gen_mod_import(parentName, importName, dynamic=1):
+ #pyjs_ajax_eval("%(n)s.cache.js", null, true);
+ return """
+ pyjslib.import_module(sys.loadpath, '%(p)s', '%(n)s', %(d)d, false);
+ """ % ({'p': parentName, 'd': dynamic, 'n': importName}) + \
+ mod_var_name_decl(importName)
+
+class Translator:
+
+ def __init__(self, mn, module_name, raw_module_name, src, debug, mod, output,
+ dynamic=0, optimize=False,
+ findFile=None):
+
+ if module_name:
+ self.module_prefix = module_name + "."
+ else:
+ self.module_prefix = ""
+ self.raw_module_name = raw_module_name
+ src = src.replace("\r\n", "\n")
+ src = src.replace("\n\r", "\n")
+ src = src.replace("\r", "\n")
+ self.src = src.split("\n")
+ self.debug = debug
+ self.imported_modules = []
+ self.imported_modules_as = []
+ self.imported_js = set()
+ self.top_level_functions = set()
+ self.top_level_classes = set()
+ self.top_level_vars = set()
+ self.local_arg_stack = [[]]
+ self.output = output
+ self.imported_classes = {}
+ self.method_imported_globals = set()
+ self.method_self = None
+ self.nextTupleAssignID = 1
+ self.dynamic = dynamic
+ self.optimize = optimize
+ self.findFile = findFile
+
+ if module_name.find(".") >= 0:
+ vdec = ''
+ else:
+ vdec = 'var '
+ print >>self.output, UU+"%s%s = function (__mod_name__) {" % (vdec, module_name)
+
+ print >>self.output, " if("+module_name+".__was_initialized__) return;"
+ print >>self.output, " "+UU+module_name+".__was_initialized__ = true;"
+ print >>self.output, UU+"if (__mod_name__ == null) __mod_name__ = '%s';" % (mn)
+ print >>self.output, UU+"%s.__name__ = __mod_name__;" % (raw_module_name)
+
+ decl = mod_var_name_decl(raw_module_name)
+ if decl:
+ print >>self.output, decl
+
+
+ if self.debug:
+ haltException = self.module_prefix + "HaltException"
+ print >>self.output, haltException + ' = function () {'
+ print >>self.output, ' this.message = "Program Halted";'
+ print >>self.output, ' this.name = "' + haltException + '";'
+ print >>self.output, '}'
+ print >>self.output, ''
+ print >>self.output, haltException + ".prototype.__str__ = function()"
+ print >>self.output, '{'
+ print >>self.output, 'return this.message ;'
+ print >>self.output, '}'
+
+ print >>self.output, haltException + ".prototype.toString = function()"
+ print >>self.output, '{'
+ print >>self.output, 'return this.name + ": \\"" + this.message + "\\"";'
+ print >>self.output, '}'
+
+ isHaltFunction = self.module_prefix + "IsHaltException"
+ print >>self.output, """
+ %s = function (s) {
+ var suffix="HaltException";
+ if (s.length < suffix.length) {
+ //alert(s + " " + suffix);
+ return false;
+ } else {
+ var ss = s.substring(s.length, (s.length - suffix.length));
+ //alert(s + " " + suffix + " " + ss);
+ return ss == suffix;
+ }
+ }
+ """ % isHaltFunction
+ for child in mod.node:
+ if isinstance(child, ast.Function):
+ self.top_level_functions.add(child.name)
+ elif isinstance(child, ast.Class):
+ self.top_level_classes.add(child.name)
+
+ for child in mod.node:
+ if isinstance(child, ast.Function):
+ self._function(child, False)
+ elif isinstance(child, ast.Class):
+ self._class(child)
+ elif isinstance(child, ast.Import):
+ importName = child.names[0][0]
+ if importName == '__pyjamas__': # special module to help make pyjamas modules loadable in the python interpreter
+ pass
+ elif importName.endswith('.js'):
+ self.imported_js.add(importName)
+ else:
+ self.add_imported_module(strip_py(importName))
+ elif isinstance(child, ast.From):
+ if child.modname == '__pyjamas__': # special module to help make pyjamas modules loadable in the python interpreter
+ pass
+ else:
+ self.add_imported_module(child.modname)
+ self._from(child)
+ elif isinstance(child, ast.Discard):
+ self._discard(child, None)
+ elif isinstance(child, ast.Assign):
+ self._assign(child, None, True)
+ elif isinstance(child, ast.AugAssign):
+ self._augassign(child, None)
+ elif isinstance(child, ast.If):
+ self._if(child, None)
+ elif isinstance(child, ast.For):
+ self._for(child, None)
+ elif isinstance(child, ast.While):
+ self._while(child, None)
+ elif isinstance(child, ast.Subscript):
+ self._subscript_stmt(child, None)
+ elif isinstance(child, ast.Global):
+ self._global(child, None)
+ elif isinstance(child, ast.Printnl):
+ self._print(child, None)
+ elif isinstance(child, ast.Print):
+ self._print(child, None)
+ elif isinstance(child, ast.TryExcept):
+ self._tryExcept(child, None)
+ elif isinstance(child, ast.Raise):
+ self._raise(child, None)
+ elif isinstance(child, ast.Stmt):
+ self._stmt(child, None)
+ else:
+ raise TranslationError("unsupported type (in __init__)", child)
+
+ # Initialize all classes for this module
+ #print >> self.output, "__"+self.modpfx()+\
+ # "classes_initialize = function() {\n"
+ #for className in self.top_level_classes:
+ # print >> self.output, "\t"+UU+self.modpfx()+"__"+className+"_initialize();"
+ #print >> self.output, "};\n"
+
+ print >> self.output, "return this;\n"
+ print >> self.output, "}; /* end %s */ \n" % module_name
+
+ def module_imports(self):
+ return self.imported_modules + self.imported_modules_as
+
+ def add_local_arg(self, varname):
+ local_vars = self.local_arg_stack[-1]
+ if varname not in local_vars:
+ local_vars.append(varname)
+
+ def add_imported_module(self, importName):
+
+ if importName in self.imported_modules:
+ return
+ self.imported_modules.append(importName)
+ name = importName.split(".")
+ if len(name) != 1:
+ # add the name of the module to the namespace,
+ # but don't add the short name to imported_modules
+ # because then the short name would be attempted to be
+ # added to the dependencies, and it's half way up the
+ # module import directory structure!
+ child_name = name[-1]
+ self.imported_modules_as.append(child_name)
+ print >> self.output, gen_mod_import(self.raw_module_name,
+ strip_py(importName),
+ self.dynamic)
+
+ def _default_args_handler(self, node, arg_names, current_klass,
+ output=None):
+ if len(node.defaults):
+ output = output or self.output
+ default_pos = len(arg_names) - len(node.defaults)
+ if arg_names and arg_names[0] == self.method_self:
+ default_pos -= 1
+ for default_node in node.defaults:
+ if isinstance(default_node, ast.Const):
+ default_value = self._const(default_node)
+ elif isinstance(default_node, ast.Name):
+ default_value = self._name(default_node, current_klass)
+ elif isinstance(default_node, ast.UnarySub):
+ default_value = self._unarysub(default_node, current_klass)
+ else:
+ raise TranslationError("unsupported type (in _method)", default_node)
+
+ default_name = arg_names[default_pos]
+ default_pos += 1
+ print >> output, " if (typeof %s == 'undefined') %s=%s;" % (default_name, default_name, default_value)
+
+ def _varargs_handler(self, node, varargname, arg_names, current_klass):
+ print >>self.output, " var", varargname, '= new pyjslib.Tuple();'
+ print >>self.output, " for(var __va_arg="+str(len(arg_names))+"; __va_arg < arguments.length; __va_arg++) {"
+ print >>self.output, " var __arg = arguments[__va_arg];"
+ print >>self.output, " "+varargname+".append(__arg);"
+ print >>self.output, " }"
+
+ def _kwargs_parser(self, node, function_name, arg_names, current_klass):
+ if len(node.defaults) or node.kwargs:
+ default_pos = len(arg_names) - len(node.defaults)
+ if arg_names and arg_names[0] == self.method_self:
+ default_pos -= 1
+ print >>self.output, function_name+'.parse_kwargs = function (', ", ".join(["__kwargs"]+arg_names), ") {"
+ for default_node in node.defaults:
+ default_value = self.expr(default_node, current_klass)
+# if isinstance(default_node, ast.Const):
+# default_value = self._const(default_node)
+# elif isinstance(default_node, ast.Name):
+# default_value = self._name(default_node)
+# elif isinstance(default_node, ast.UnarySub):
+# default_value = self._unarysub(default_node, current_klass)
+# else:
+# raise TranslationError("unsupported type (in _method)", default_node)
+
+ default_name = arg_names[default_pos]
+ print >>self.output, " if (typeof %s == 'undefined')"%(default_name)
+ print >>self.output, " %s=__kwargs.%s;"% (default_name, default_name)
+ default_pos += 1
+
+ #self._default_args_handler(node, arg_names, current_klass)
+ if node.kwargs: arg_names += ["pyjslib.Dict(__kwargs)"]
+ print >>self.output, " var __r = "+"".join(["[", ", ".join(arg_names), "]"])+";"
+ if node.varargs:
+ self._varargs_handler(node, "__args", arg_names, current_klass)
+ print >>self.output, " __r.push.apply(__r, __args.getArray())"
+ print >>self.output, " return __r;"
+ print >>self.output, "};"
+
+ def _function(self, node, local=False):
+ if local:
+ function_name = node.name
+ self.add_local_arg(function_name)
+ else:
+ function_name = UU + self.modpfx() + node.name
+
+ arg_names = list(node.argnames)
+ normal_arg_names = list(arg_names)
+ if node.kwargs: kwargname = normal_arg_names.pop()
+ if node.varargs: varargname = normal_arg_names.pop()
+ declared_arg_names = list(normal_arg_names)
+ if node.kwargs: declared_arg_names.append(kwargname)
+
+ function_args = "(" + ", ".join(declared_arg_names) + ")"
+ print >>self.output, "%s = function%s {" % (function_name, function_args)
+ self._default_args_handler(node, normal_arg_names, None)
+
+ local_arg_names = normal_arg_names + declared_arg_names
+
+ if node.varargs:
+ self._varargs_handler(node, varargname, declared_arg_names, None)
+ local_arg_names.append(varargname)
+
+ # stack of local variable names for this function call
+ self.local_arg_stack.append(local_arg_names)
+
+ for child in node.code:
+ self._stmt(child, None)
+
+ # remove the top local arg names
+ self.local_arg_stack.pop()
+
+ # we need to return null always, so it is not undefined
+ lastStmt = [p for p in node.code][-1]
+ if not isinstance(lastStmt, ast.Return):
+ if not self._isNativeFunc(lastStmt):
+ print >>self.output, " return null;"
+
+ print >>self.output, "};"
+ print >>self.output, "%s.__name__ = '%s';\n" % (function_name, node.name)
+
+
+ self._kwargs_parser(node, function_name, normal_arg_names, None)
+
+
+ def _return(self, node, current_klass):
+ expr = self.expr(node.value, current_klass)
+ # in python a function call always returns None, so we do it
+ # here too
+ print >>self.output, " return " + expr + ";"
+
+
+ def _break(self, node, current_klass):
+ print >>self.output, " break;"
+
+
+ def _continue(self, node, current_klass):
+ print >>self.output, " continue;"
+
+
+ def _callfunc(self, v, current_klass):
+
+ if isinstance(v.node, ast.Name):
+ if v.node.name in self.top_level_functions:
+ call_name = self.modpfx() + v.node.name
+ elif v.node.name in self.top_level_classes:
+ call_name = self.modpfx() + v.node.name
+ elif self.imported_classes.has_key(v.node.name):
+ call_name = self.imported_classes[v.node.name] + '.' + v.node.name
+ elif v.node.name in PYJSLIB_BUILTIN_FUNCTIONS:
+ call_name = 'pyjslib.' + v.node.name
+ elif v.node.name in PYJSLIB_BUILTIN_CLASSES:
+ name = pyjs_builtin_remap(v.node.name)
+ call_name = 'pyjslib.' + name
+ elif v.node.name == "callable":
+ call_name = "pyjslib.isFunction"
+ else:
+ call_name = v.node.name
+ call_args = []
+ elif isinstance(v.node, ast.Getattr):
+ attr_name = v.node.attrname
+
+ if isinstance(v.node.expr, ast.Name):
+ call_name = self._name2(v.node.expr, current_klass, attr_name)
+ call_args = []
+ elif isinstance(v.node.expr, ast.Getattr):
+ call_name = self._getattr2(v.node.expr, current_klass, attr_name)
+ call_args = []
+ elif isinstance(v.node.expr, ast.CallFunc):
+ call_name = self._callfunc(v.node.expr, current_klass) + "." + v.node.attrname
+ call_args = []
+ elif isinstance(v.node.expr, ast.Subscript):
+ call_name = self._subscript(v.node.expr, current_klass) + "." + v.node.attrname
+ call_args = []
+ elif isinstance(v.node.expr, ast.Const):
+ call_name = self.expr(v.node.expr, current_klass) + "." + v.node.attrname
+ call_args = []
+ else:
+ raise TranslationError("unsupported type (in _callfunc)", v.node.expr)
+ else:
+ raise TranslationError("unsupported type (in _callfunc)", v.node)
+
+ call_name = strip_py(call_name)
+
+ kwargs = []
+ star_arg_name = None
+ if v.star_args:
+ star_arg_name = self.expr(v.star_args, current_klass)
+
+ for ch4 in v.args:
+ if isinstance(ch4, ast.Keyword):
+ kwarg = ch4.name + ":" + self.expr(ch4.expr, current_klass)
+ kwargs.append(kwarg)
+ else:
+ arg = self.expr(ch4, current_klass)
+ call_args.append(arg)
+
+ if kwargs:
+ fn_args = ", ".join(['{' + ', '.join(kwargs) + '}']+call_args)
+ else:
+ fn_args = ", ".join(call_args)
+
+ if kwargs or star_arg_name:
+ if not star_arg_name:
+ star_arg_name = 'null'
+ try: call_this, method_name = call_name.rsplit(".", 1)
+ except ValueError:
+ # Must be a function call ...
+ return ("pyjs_kwargs_function_call("+call_name+", "
+ + star_arg_name
+ + ", ["+fn_args+"]"
+ + ")" )
+ else:
+ return ("pyjs_kwargs_method_call("+call_this+", '"+method_name+"', "
+ + star_arg_name
+ + ", ["+fn_args+"]"
+ + ")")
+ else:
+ return call_name + "(" + ", ".join(call_args) + ")"
+
+ def _print(self, node, current_klass):
+ if self.optimize:
+ return
+ call_args = []
+ for ch4 in node.nodes:
+ arg = self.expr(ch4, current_klass)
+ call_args.append(arg)
+
+ print >>self.output, "pyjslib.printFunc([", ', '.join(call_args), "],", int(isinstance(node, ast.Printnl)), ");"
+
+ def _tryExcept(self, node, current_klass):
+ if len(node.handlers) != 1:
+ raise TranslationError("except statements in this form are" +
+ " not supported", node)
+
+ expr = node.handlers[0][0]
+ as_ = node.handlers[0][1]
+ if as_:
+ errName = as_.name
+ else:
+ errName = 'err'
+
+ # XXX TODO: check that this should instead be added as a _separate_
+ # local scope, temporary to the function. oh dearie me.
+ self.add_local_arg(errName)
+
+ print >>self.output, " try {"
+ for stmt in node.body.nodes:
+ self._stmt(stmt, current_klass)
+ print >> self.output, " } catch(%s) {" % errName
+ if expr:
+ l = []
+ if isinstance(expr, ast.Tuple):
+ for x in expr.nodes:
+ l.append("(%(err)s.__name__ == %(expr)s.__name__)" % dict (err=errName, expr=self.expr(x, current_klass)))
+ else:
+ l = [ " (%(err)s.__name__ == %(expr)s.__name__) " % dict (err=errName, expr=self.expr(expr, current_klass)) ]
+ print >> self.output, " if(%s) {" % '||\n\t\t'.join(l)
+ for stmt in node.handlers[0][2]:
+ self._stmt(stmt, current_klass)
+ if expr:
+ #print >> self.output, "} else { throw(%s); } " % errName
+ print >> self.output, "}"
+ if node.else_ != None:
+ print >>self.output, " } finally {"
+ for stmt in node.else_:
+ self._stmt(stmt, current_klass)
+ print >>self.output, " }"
+
+ # XXX: change use_getattr to True to enable "strict" compilation
+ # but incurring a 100% performance penalty. oops.
+ def _getattr(self, v, current_klass, use_getattr=False):
+ attr_name = v.attrname
+ if isinstance(v.expr, ast.Name):
+ obj = self._name(v.expr, current_klass, return_none_for_module=True)
+ if obj == None and v.expr.name in self.module_imports():
+ # XXX TODO: distinguish between module import classes
+ # and variables. right now, this is a hack to get
+ # the sys module working.
+ #if v.expr.name == 'sys':
+ return v.expr.name+'.'+attr_name
+ #return v.expr.name+'.__'+attr_name+'.prototype.__class__'
+ if not use_getattr or attr_name == '__class__' or \
+ attr_name == '__name__':
+ return obj + "." + attr_name
+ return "pyjslib.getattr(%s, '%s')" % (obj, attr_name)
+ elif isinstance(v.expr, ast.Getattr):
+ return self._getattr(v.expr, current_klass) + "." + attr_name
+ elif isinstance(v.expr, ast.Subscript):
+ return self._subscript(v.expr, self.modpfx()) + "." + attr_name
+ elif isinstance(v.expr, ast.CallFunc):
+ return self._callfunc(v.expr, self.modpfx()) + "." + attr_name
+ else:
+ raise TranslationError("unsupported type (in _getattr)", v.expr)
+
+
+ def modpfx(self):
+ return strip_py(self.module_prefix)
+
+ def _name(self, v, current_klass, top_level=False,
+ return_none_for_module=False):
+
+ if v.name == 'ilikesillynamesfornicedebugcode':
+ print top_level, current_klass, repr(v)
+ print self.top_level_vars
+ print self.top_level_functions
+ print self.local_arg_stack
+ print "error..."
+
+ local_var_names = None
+ las = len(self.local_arg_stack)
+ if las > 0:
+ local_var_names = self.local_arg_stack[-1]
+
+ if v.name == "True":
+ return "true"
+ elif v.name == "False":
+ return "false"
+ elif v.name == "None":
+ return "null"
+ elif v.name == '__name__' and current_klass is None:
+ return self.modpfx() + v.name
+ elif v.name == self.method_self:
+ return "this"
+ elif v.name in self.top_level_functions:
+ return UU+self.modpfx() + v.name
+ elif v.name in self.method_imported_globals:
+ return UU+self.modpfx() + v.name
+ elif not current_klass and las == 1 and v.name in self.top_level_vars:
+ return UU+self.modpfx() + v.name
+ elif v.name in local_var_names:
+ return v.name
+ elif self.imported_classes.has_key(v.name):
+ return UU+self.imported_classes[v.name] + '.__' + v.name + ".prototype.__class__"
+ elif v.name in self.top_level_classes:
+ return UU+self.modpfx() + "__" + v.name + ".prototype.__class__"
+ elif v.name in self.module_imports() and return_none_for_module:
+ return None
+ elif v.name in PYJSLIB_BUILTIN_CLASSES:
+ return "pyjslib." + pyjs_builtin_remap( v.name )
+ elif current_klass:
+ if v.name not in local_var_names and \
+ v.name not in self.top_level_vars and \
+ v.name not in PYJS_GLOBAL_VARS and \
+ v.name not in self.top_level_functions:
+
+ cls_name = current_klass
+ if hasattr(cls_name, "name"):
+ cls_name_ = cls_name.name_
+ cls_name = cls_name.name
+ else:
+ cls_name_ = current_klass + "_" # XXX ???
+ name = UU+cls_name_ + ".prototype.__class__." \
+ + v.name
+ if v.name == 'listener':
+ name = 'listener+' + name
+ return name
+
+ return v.name
+
+ def _name2(self, v, current_klass, attr_name):
+ obj = v.name
+
+ if obj in self.method_imported_globals:
+ call_name = UU+self.modpfx() + obj + "." + attr_name
+ elif self.imported_classes.has_key(obj):
+ #attr_str = ""
+ #if attr_name != "__init__":
+ attr_str = ".prototype.__class__." + attr_name
+ call_name = UU+self.imported_classes[obj] + '.__' + obj + attr_str
+ elif obj in self.module_imports():
+ call_name = obj + "." + attr_name
+ elif obj[0] == obj[0].upper(): # XXX HACK ALERT
+ call_name = UU + self.modpfx() + "__" + obj + ".prototype.__class__." + attr_name
+ else:
+ call_name = UU+self._name(v, current_klass) + "." + attr_name
+
+ return call_name
+
+
+ def _getattr2(self, v, current_klass, attr_name):
+ if isinstance(v.expr, ast.Getattr):
+ call_name = self._getattr2(v.expr, current_klass, v.attrname + "." + attr_name)
+ elif isinstance(v.expr, ast.Name) and v.expr.name in self.module_imports():
+ call_name = UU+v.expr.name + '.__' +v.attrname+".prototype.__class__."+attr_name
+ else:
+ obj = self.expr(v.expr, current_klass)
+ call_name = obj + "." + v.attrname + "." + attr_name
+
+ return call_name
+
+
+ def _class(self, node):
+ """
+ Handle a class definition.
+
+ In order to translate python semantics reasonably well, the following
+ structure is used:
+
+ A special object is created for the class, which inherits attributes
+ from the superclass, or Object if there's no superclass. This is the
+ class object; the object which you refer to when specifying the
+ class by name. Static, class, and unbound methods are copied
+ from the superclass object.
+
+ A special constructor function is created with the same name as the
+ class, which is used to create instances of that class.
+
+ A javascript class (e.g. a function with a prototype attribute) is
+ created which is the javascript class of created instances, and
+ which inherits attributes from the class object. Bound methods are
+ copied from the superclass into this class rather than inherited,
+ because the class object contains unbound, class, and static methods
+ that we don't necessarily want to inherit.
+
+ The type of a method can now be determined by inspecting its
+ static_method, unbound_method, class_method, or instance_method
+ attribute; only one of these should be true.
+
+ Much of this work is done in pyjs_extend, is pyjslib.py
+ """
+ class_name = self.modpfx() + uuprefix(node.name, 1)
+ class_name_ = self.modpfx() + uuprefix(node.name)
+ current_klass = Klass(class_name, class_name_)
+ init_method = None
+ for child in node.code:
+ if isinstance(child, ast.Function):
+ current_klass.add_function(child.name)
+ if child.name == "__init__":
+ init_method = child
+
+
+ if len(node.bases) == 0:
+ base_class = "pyjslib.__Object"
+ elif len(node.bases) == 1:
+ if isinstance(node.bases[0], ast.Name):
+ if self.imported_classes.has_key(node.bases[0].name):
+ base_class_ = self.imported_classes[node.bases[0].name] + '.__' + node.bases[0].name
+ base_class = self.imported_classes[node.bases[0].name] + '.' + node.bases[0].name
+ else:
+ base_class_ = self.modpfx() + "__" + node.bases[0].name
+ base_class = self.modpfx() + node.bases[0].name
+ elif isinstance(node.bases[0], ast.Getattr):
+ # the bases are not in scope of the class so do not
+ # pass our class to self._name
+ base_class_ = self._name(node.bases[0].expr, None) + \
+ ".__" + node.bases[0].attrname
+ base_class = self._name(node.bases[0].expr, None) + \
+ "." + node.bases[0].attrname
+ else:
+ raise TranslationError("unsupported type (in _class)", node.bases[0])
+
+ current_klass.set_base(base_class)
+ else:
+ raise TranslationError("more than one base (in _class)", node)
+
+ print >>self.output, UU+class_name_ + " = function () {"
+ # call superconstructor
+ #if base_class:
+ # print >>self.output, " __" + base_class + ".call(this);"
+ print >>self.output, "}"
+
+ if not init_method:
+ init_method = ast.Function([], "__init__", ["self"], [], 0, None, [])
+ #self._method(init_method, current_klass, class_name)
+
+ # Generate a function which constructs the object
+ clsfunc = ast.Function([],
+ node.name,
+ init_method.argnames[1:],
+ init_method.defaults,
+ init_method.flags,
+ None,
+ [ast.Discard(ast.CallFunc(ast.Name("JS"), [ast.Const(
+# I attempted lazy initialization, but then you can't access static class members
+# " if(!__"+base_class+".__was_initialized__)"+
+# " __" + class_name + "_initialize();\n" +
+ " var instance = new " + UU + class_name_ + "();\n" +
+ " if(instance.__init__) instance.__init__.apply(instance, arguments);\n" +
+ " return instance;"
+ )]))])
+
+ self._function(clsfunc, False)
+ print >>self.output, UU+class_name_ + ".__initialize__ = function () {"
+ print >>self.output, " if("+UU+class_name_+".__was_initialized__) return;"
+ print >>self.output, " "+UU+class_name_+".__was_initialized__ = true;"
+ cls_obj = UU+class_name_ + '.prototype.__class__'
+
+ if class_name == "pyjslib.__Object":
+ print >>self.output, " "+cls_obj+" = {};"
+ else:
+ if base_class and base_class not in ("object", "pyjslib.__Object"):
+ print >>self.output, " if(!"+UU+base_class_+".__was_initialized__)"
+ print >>self.output, " "+UU+base_class_+".__initialize__();"
+ print >>self.output, " pyjs_extend(" + UU+class_name_ + ", "+UU+base_class_+");"
+ else:
+ print >>self.output, " pyjs_extend(" + UU+class_name_ + ", "+UU+"pyjslib.__Object);"
+
+ print >>self.output, " "+cls_obj+".__new__ = "+UU+class_name+";"
+ print >>self.output, " "+cls_obj+".__name__ = '"+UU+node.name+"';"
+
+ for child in node.code:
+ if isinstance(child, ast.Pass):
+ pass
+ elif isinstance(child, ast.Function):
+ self._method(child, current_klass, class_name, class_name_)
+ elif isinstance(child, ast.Assign):
+ self.classattr(child, current_klass)
+ elif isinstance(child, ast.Discard) and isinstance(child.expr, ast.Const):
+ # Probably a docstring, turf it
+ pass
+ else:
+ raise TranslationError("unsupported type (in _class)", child)
+ print >>self.output, "}"
+
+ print >> self.output, class_name_+".__initialize__();"
+
+
+ def classattr(self, node, current_klass):
+ self._assign(node, current_klass, True)
+
+ def _raise(self, node, current_klass):
+ if node.expr2:
+ raise TranslationError("More than one expression unsupported",
+ node)
+ print >> self.output, "throw (%s);" % self.expr(
+ node.expr1, current_klass)
+
+ def _method(self, node, current_klass, class_name, class_name_):
+ # reset global var scope
+ self.method_imported_globals = set()
+
+ arg_names = list(node.argnames)
+
+ classmethod = False
+ staticmethod = False
+ if node.decorators:
+ for d in node.decorators:
+ if d.name == "classmethod":
+ classmethod = True
+ elif d.name == "staticmethod":
+ staticmethod = True
+
+ if staticmethod:
+ staticfunc = ast.Function([], class_name_+"."+node.name, node.argnames, node.defaults, node.flags, node.doc, node.code, node.lineno)
+ self._function(staticfunc, True)
+ print >>self.output, " " + UU+class_name_ + ".prototype.__class__." + node.name + " = " + class_name_+"."+node.name+";";
+ print >>self.output, " " + UU+class_name_ + ".prototype.__class__." + node.name + ".static_method = true;";
+ return
+ else:
+ if len(arg_names) == 0:
+ raise TranslationError("methods must take an argument 'self' (in _method)", node)
+ self.method_self = arg_names[0]
+
+ #if not classmethod and arg_names[0] != "self":
+ # raise TranslationError("first arg not 'self' (in _method)", node)
+
+ normal_arg_names = arg_names[1:]
+ if node.kwargs: kwargname = normal_arg_names.pop()
+ if node.varargs: varargname = normal_arg_names.pop()
+ declared_arg_names = list(normal_arg_names)
+ if node.kwargs: declared_arg_names.append(kwargname)
+
+ function_args = "(" + ", ".join(declared_arg_names) + ")"
+
+ if classmethod:
+ fexpr = UU + class_name_ + ".prototype.__class__." + node.name
+ else:
+ fexpr = UU + class_name_ + ".prototype." + node.name
+ print >>self.output, " "+fexpr + " = function" + function_args + " {"
+
+ # default arguments
+ self._default_args_handler(node, normal_arg_names, current_klass)
+
+ local_arg_names = normal_arg_names + declared_arg_names
+
+ if node.varargs:
+ self._varargs_handler(node, varargname, declared_arg_names, current_klass)
+ local_arg_names.append(varargname)
+
+
+ # stack of local variable names for this function call
+ self.local_arg_stack.append(local_arg_names)
+
+ for child in node.code:
+ self._stmt(child, current_klass)
+
+ # remove the top local arg names
+ self.local_arg_stack.pop()
+
+ print >>self.output, " };"
+
+ self._kwargs_parser(node, fexpr, normal_arg_names, current_klass)
+
+ if classmethod:
+ # Have to create a version on the instances which automatically passes the
+ # class as "self"
+ altexpr = UU + class_name_ + ".prototype." + node.name
+ print >>self.output, " "+altexpr + " = function() {"
+ print >>self.output, " return " + fexpr + ".apply(this.__class__, arguments);"
+ print >>self.output, " };"
+ print >>self.output, " "+fexpr+".class_method = true;"
+ print >>self.output, " "+altexpr+".instance_method = true;"
+ else:
+ # For instance methods, we need an unbound version in the class object
+ altexpr = UU + class_name_ + ".prototype.__class__." + node.name
+ print >>self.output, " "+altexpr + " = function() {"
+ print >>self.output, " return " + fexpr + ".call.apply("+fexpr+", arguments);"
+ print >>self.output, " };"
+ print >>self.output, " "+altexpr+".unbound_method = true;"
+ print >>self.output, " "+fexpr+".instance_method = true;"
+ print >>self.output, " "+altexpr+".__name__ = '%s';" % node.name
+
+ print >>self.output, UU + class_name_ + ".prototype.%s.__name__ = '%s';" % \
+ (node.name, node.name)
+
+ if node.kwargs or len(node.defaults):
+ print >>self.output, " "+altexpr + ".parse_kwargs = " + fexpr + ".parse_kwargs;"
+
+ self.method_self = None
+ self.method_imported_globals = set()
+
+ def _isNativeFunc(self, node):
+ if isinstance(node, ast.Discard):
+ if isinstance(node.expr, ast.CallFunc):
+ if isinstance(node.expr.node, ast.Name) and \
+ node.expr.node.name == NATIVE_JS_FUNC_NAME:
+ return True
+ return False
+
+ def _stmt(self, node, current_klass):
+ debugStmt = self.debug and not self._isNativeFunc(node)
+ if debugStmt:
+ print >>self.output, ' try {'
+
+ if isinstance(node, ast.Return):
+ self._return(node, current_klass)
+ elif isinstance(node, ast.Break):
+ self._break(node, current_klass)
+ elif isinstance(node, ast.Continue):
+ self._continue(node, current_klass)
+ elif isinstance(node, ast.Assign):
+ self._assign(node, current_klass)
+ elif isinstance(node, ast.AugAssign):
+ self._augassign(node, current_klass)
+ elif isinstance(node, ast.Discard):
+ self._discard(node, current_klass)
+ elif isinstance(node, ast.If):
+ self._if(node, current_klass)
+ elif isinstance(node, ast.For):
+ self._for(node, current_klass)
+ elif isinstance(node, ast.While):
+ self._while(node, current_klass)
+ elif isinstance(node, ast.Subscript):
+ self._subscript_stmt(node, current_klass)
+ elif isinstance(node, ast.Global):
+ self._global(node, current_klass)
+ elif isinstance(node, ast.Pass):
+ pass
+ elif isinstance(node, ast.Function):
+ self._function(node, True)
+ elif isinstance(node, ast.Printnl):
+ self._print(node, current_klass)
+ elif isinstance(node, ast.Print):
+ self._print(node, current_klass)
+ elif isinstance(node, ast.TryExcept):
+ self._tryExcept(node, current_klass)
+ elif isinstance(node, ast.Raise):
+ self._raise(node, current_klass)
+ else:
+ raise TranslationError("unsupported type (in _stmt)", node)
+
+ if debugStmt:
+
+ lt = self.get_line_trace(node)
+
+ haltException = self.module_prefix + "HaltException"
+ isHaltFunction = self.module_prefix + "IsHaltException"
+
+ print >>self.output, ' } catch (__err) {'
+ print >>self.output, ' if (' + isHaltFunction + '(__err.name)) {'
+ print >>self.output, ' throw __err;'
+ print >>self.output, ' } else {'
+ print >>self.output, " st = sys.printstack() + "\
+ + '"%s"' % lt + "+ '\\n' ;"
+ print >>self.output, ' alert("' + "Error in " \
+ + lt + '"' \
+ + '+"\\n"+__err.name+": "+__err.message'\
+ + '+"\\n\\nStack trace:\\n"' \
+ + '+st' \
+ + ');'
+ print >>self.output, ' debugger;'
+
+ print >>self.output, ' throw new ' + self.module_prefix + "HaltException();"
+ print >>self.output, ' }'
+ print >>self.output, ' }'
+
+
+ def get_line_trace(self, node):
+ lineNum = "Unknown"
+ srcLine = ""
+ if hasattr(node, "lineno"):
+ if node.lineno != None:
+ lineNum = node.lineno
+ srcLine = self.src[min(lineNum, len(self.src))-1]
+ srcLine = srcLine.replace('\\', '\\\\')
+ srcLine = srcLine.replace('"', '\\"')
+ srcLine = srcLine.replace("'", "\\'")
+
+ return self.raw_module_name + ".py, line " \
+ + str(lineNum) + ":"\
+ + "\\n" \
+ + " " + srcLine
+
+ def _augassign(self, node, current_klass):
+ v = node.node
+ if isinstance(v, ast.Getattr):
+ # XXX HACK! don't allow += on return result of getattr.
+ # TODO: create a temporary variable or something.
+ lhs = self._getattr(v, current_klass, False)
+ else:
+ lhs = self._name(node.node, current_klass)
+ op = node.op
+ rhs = self.expr(node.expr, current_klass)
+ print >>self.output, " " + lhs + " " + op + " " + rhs + ";"
+
+
+ def _assign(self, node, current_klass, top_level = False):
+ if len(node.nodes) != 1:
+ tempvar = '__temp'+str(node.lineno)
+ tnode = ast.Assign([ast.AssName(tempvar, "OP_ASSIGN", node.lineno)], node.expr, node.lineno)
+ self._assign(tnode, current_klass, top_level)
+ for v in node.nodes:
+ tnode2 = ast.Assign([v], ast.Name(tempvar, node.lineno), node.lineno)
+ self._assign(tnode2, current_klass, top_level)
+ return
+
+ local_var_names = None
+ if len(self.local_arg_stack) > 0:
+ local_var_names = self.local_arg_stack[-1]
+
+ def _lhsFromAttr(v, current_klass):
+ attr_name = v.attrname
+ if isinstance(v.expr, ast.Name):
+ obj = v.expr.name
+ lhs = self._name(v.expr, current_klass) + "." + attr_name
+ elif isinstance(v.expr, ast.Getattr):
+ lhs = self._getattr(v, current_klass)
+ elif isinstance(v.expr, ast.Subscript):
+ lhs = self._subscript(v.expr, current_klass) + "." + attr_name
+ else:
+ raise TranslationError("unsupported type (in _assign)", v.expr)
+ return lhs
+
+ def _lhsFromName(v, top_level, current_klass):
+ if top_level:
+ if current_klass:
+ lhs = UU+current_klass.name_ + ".prototype.__class__." \
+ + v.name
+ else:
+ self.top_level_vars.add(v.name)
+ vname = self.modpfx() + v.name
+ if not self.modpfx() and v.name not in\
+ self.method_imported_globals:
+ lhs = "var " + vname
+ else:
+ lhs = UU + vname
+ self.add_local_arg(v.name)
+ else:
+ if v.name in local_var_names:
+ lhs = v.name
+ elif v.name in self.method_imported_globals:
+ lhs = self.modpfx() + v.name
+ else:
+ lhs = "var " + v.name
+ self.add_local_arg(v.name)
+ return lhs
+
+ dbg = 0
+ v = node.nodes[0]
+ if isinstance(v, ast.AssAttr):
+ lhs = _lhsFromAttr(v, current_klass)
+ if v.flags == "OP_ASSIGN":
+ op = "="
+ else:
+ raise TranslationError("unsupported flag (in _assign)", v)
+
+ elif isinstance(v, ast.AssName):
+ lhs = _lhsFromName(v, top_level, current_klass)
+ if v.flags == "OP_ASSIGN":
+ op = "="
+ else:
+ raise TranslationError("unsupported flag (in _assign)", v)
+ elif isinstance(v, ast.Subscript):
+ if v.flags == "OP_ASSIGN":
+ obj = self.expr(v.expr, current_klass)
+ if len(v.subs) != 1:
+ raise TranslationError("must have one sub (in _assign)", v)
+ idx = self.expr(v.subs[0], current_klass)
+ value = self.expr(node.expr, current_klass)
+ print >>self.output, " " + obj + ".__setitem__(" + idx + ", " + value + ");"
+ return
+ else:
+ raise TranslationError("unsupported flag (in _assign)", v)
+ elif isinstance(v, (ast.AssList, ast.AssTuple)):
+ uniqueID = self.nextTupleAssignID
+ self.nextTupleAssignID += 1
+ tempName = "__tupleassign" + str(uniqueID) + "__"
+ print >>self.output, " var " + tempName + " = " + \
+ self.expr(node.expr, current_klass) + ";"
+ for index,child in enumerate(v.getChildNodes()):
+ rhs = tempName + ".__getitem__(" + str(index) + ")"
+
+ if isinstance(child, ast.AssAttr):
+ lhs = _lhsFromAttr(child, current_klass)
+ elif isinstance(child, ast.AssName):
+ lhs = _lhsFromName(child, top_level, current_klass)
+ elif isinstance(child, ast.Subscript):
+ if child.flags == "OP_ASSIGN":
+ obj = self.expr(child.expr, current_klass)
+ if len(child.subs) != 1:
+ raise TranslationError("must have one sub " +
+ "(in _assign)", child)
+ idx = self.expr(child.subs[0], current_klass)
+ value = self.expr(node.expr, current_klass)
+ print >>self.output, " " + obj + ".__setitem__(" \
+ + idx + ", " + rhs + ");"
+ continue
+ print >>self.output, " " + lhs + " = " + rhs + ";"
+ return
+ else:
+ raise TranslationError("unsupported type (in _assign)", v)
+
+ rhs = self.expr(node.expr, current_klass)
+ if dbg:
+ print "b", repr(node.expr), rhs
+ print >>self.output, " " + lhs + " " + op + " " + rhs + ";"
+
+
+ def _discard(self, node, current_klass):
+
+ if isinstance(node.expr, ast.CallFunc):
+ debugStmt = self.debug and not self._isNativeFunc(node)
+ if debugStmt and isinstance(node.expr.node, ast.Name) and \
+ node.expr.node.name == 'import_wait':
+ debugStmt = False
+ if debugStmt:
+ st = self.get_line_trace(node)
+ print >>self.output, "sys.addstack('%s');\n" % st
+ if isinstance(node.expr.node, ast.Name) and node.expr.node.name == NATIVE_JS_FUNC_NAME:
+ if len(node.expr.args) != 1:
+ raise TranslationError("native javascript function %s must have one arg" % NATIVE_JS_FUNC_NAME, node.expr)
+ if not isinstance(node.expr.args[0], ast.Const):
+ raise TranslationError("native javascript function %s must have constant arg" % NATIVE_JS_FUNC_NAME, node.expr)
+ raw_js = node.expr.args[0].value
+ print >>self.output, raw_js
+ else:
+ expr = self._callfunc(node.expr, current_klass)
+ print >>self.output, " " + expr + ";"
+
+ if debugStmt:
+ print >>self.output, "sys.popstack();\n"
+
+ elif isinstance(node.expr, ast.Const):
+ if node.expr.value is not None: # Empty statements generate ignore None
+ print >>self.output, self._const(node.expr)
+ else:
+ raise TranslationError("unsupported type (in _discard)", node.expr)
+
+
+ def _if(self, node, current_klass):
+ for i in range(len(node.tests)):
+ test, consequence = node.tests[i]
+ if i == 0:
+ keyword = "if"
+ else:
+ keyword = "else if"
+
+ self._if_test(keyword, test, consequence, current_klass)
+
+ if node.else_:
+ keyword = "else"
+ test = None
+ consequence = node.else_
+
+ self._if_test(keyword, test, consequence, current_klass)
+
+
+ def _if_test(self, keyword, test, consequence, current_klass):
+ if test:
+ expr = self.expr(test, current_klass)
+
+ print >>self.output, " " + keyword + " (pyjslib.bool(" + expr + ")) {"
+ else:
+ print >>self.output, " " + keyword + " {"
+
+ if isinstance(consequence, ast.Stmt):
+ for child in consequence.nodes:
+ self._stmt(child, current_klass)
+ else:
+ raise TranslationError("unsupported type (in _if_test)", consequence)
+
+ print >>self.output, " }"
+
+
+ def _from(self, node):
+ for name in node.names:
+ # look up "hack" in AppTranslator as to how findFile gets here
+ module_name = node.modname + "." + name[0]
+ try:
+ ff = self.findFile(module_name + ".py")
+ except Exception:
+ ff = None
+ if ff:
+ self.add_imported_module(module_name)
+ else:
+ self.imported_classes[name[0]] = node.modname
+
+
+ def _compare(self, node, current_klass):
+ lhs = self.expr(node.expr, current_klass)
+
+ if len(node.ops) != 1:
+ raise TranslationError("only one ops supported (in _compare)", node)
+
+ op = node.ops[0][0]
+ rhs_node = node.ops[0][1]
+ rhs = self.expr(rhs_node, current_klass)
+
+ if op == "==":
+ return "pyjslib.eq(%s, %s)" % (lhs, rhs)
+ if op == "in":
+ return rhs + ".__contains__(" + lhs + ")"
+ elif op == "not in":
+ return "!" + rhs + ".__contains__(" + lhs + ")"
+ elif op == "is":
+ op = "==="
+ elif op == "is not":
+ op = "!=="
+
+ return "(" + lhs + " " + op + " " + rhs + ")"
+
+
+ def _not(self, node, current_klass):
+ expr = self.expr(node.expr, current_klass)
+
+ return "!(" + expr + ")"
+
+ def _or(self, node, current_klass):
+ expr = "("+(") || (".join([self.expr(child, current_klass) for child in node.nodes]))+')'
+ return expr
+
+ def _and(self, node, current_klass):
+ expr = "("+(") && (".join([self.expr(child, current_klass) for child in node.nodes]))+")"
+ return expr
+
+ def _for(self, node, current_klass):
+ assign_name = ""
+ assign_tuple = ""
+
+ # based on Bob Ippolito's Iteration in Javascript code
+ if isinstance(node.assign, ast.AssName):
+ assign_name = node.assign.name
+ self.add_local_arg(assign_name)
+ if node.assign.flags == "OP_ASSIGN":
+ op = "="
+ elif isinstance(node.assign, ast.AssTuple):
+ op = "="
+ i = 0
+ for child in node.assign:
+ child_name = child.name
+ if assign_name == "":
+ assign_name = "temp_" + child_name
+ self.add_local_arg(child_name)
+ assign_tuple += """
+ var %(child_name)s %(op)s %(assign_name)s.__getitem__(%(i)i);
+ """ % locals()
+ i += 1
+ else:
+ raise TranslationError("unsupported type (in _for)", node.assign)
+
+ if isinstance(node.list, ast.Name):
+ list_expr = self._name(node.list, current_klass)
+ elif isinstance(node.list, ast.Getattr):
+ list_expr = self._getattr(node.list, current_klass)
+ elif isinstance(node.list, ast.CallFunc):
+ list_expr = self._callfunc(node.list, current_klass)
+ else:
+ raise TranslationError("unsupported type (in _for)", node.list)
+
+ lhs = "var " + assign_name
+ iterator_name = "__" + assign_name
+
+ print >>self.output, """
+ var %(iterator_name)s = %(list_expr)s.__iter__();
+ try {
+ while (true) {
+ %(lhs)s %(op)s %(iterator_name)s.next();
+ %(assign_tuple)s
+ """ % locals()
+ for node in node.body.nodes:
+ self._stmt(node, current_klass)
+ print >>self.output, """
+ }
+ } catch (e) {
+ if (e.__name__ != pyjslib.StopIteration.__name__) {
+ throw e;
+ }
+ }
+ """ % locals()
+
+
+ def _while(self, node, current_klass):
+ test = self.expr(node.test, current_klass)
+ print >>self.output, " while (pyjslib.bool(" + test + ")) {"
+ if isinstance(node.body, ast.Stmt):
+ for child in node.body.nodes:
+ self._stmt(child, current_klass)
+ else:
+ raise TranslationError("unsupported type (in _while)", node.body)
+ print >>self.output, " }"
+
+
+ def _const(self, node):
+ if isinstance(node.value, int):
+ return str(node.value)
+ elif isinstance(node.value, float):
+ return str(node.value)
+ elif isinstance(node.value, basestring):
+ v = node.value
+ if isinstance(node.value, unicode):
+ v = v.encode('utf-8')
+ return "String('%s')" % escapejs(v)
+ elif node.value is None:
+ return "null"
+ else:
+ raise TranslationError("unsupported type (in _const)", node)
+
+ def _unaryadd(self, node, current_klass):
+ return self.expr(node.expr, current_klass)
+
+ def _unarysub(self, node, current_klass):
+ return "-" + self.expr(node.expr, current_klass)
+
+ def _add(self, node, current_klass):
+ return self.expr(node.left, current_klass) + " + " + self.expr(node.right, current_klass)
+
+ def _sub(self, node, current_klass):
+ return self.expr(node.left, current_klass) + " - " + self.expr(node.right, current_klass)
+
+ def _div(self, node, current_klass):
+ return self.expr(node.left, current_klass) + " / " + self.expr(node.right, current_klass)
+
+ def _mul(self, node, current_klass):
+ return self.expr(node.left, current_klass) + " * " + self.expr(node.right, current_klass)
+
+ def _mod(self, node, current_klass):
+ if isinstance(node.left, ast.Const) and isinstance(node.left.value, StringType):
+ self.imported_js.add("sprintf.js") # Include the sprintf functionality if it is used
+ return "sprintf("+self.expr(node.left, current_klass) + ", " + self.expr(node.right, current_klass)+")"
+ return self.expr(node.left, current_klass) + " % " + self.expr(node.right, current_klass)
+
+ def _invert(self, node, current_klass):
+ return "~" + self.expr(node.expr, current_klass)
+
+ def _bitand(self, node, current_klass):
+ return " & ".join([self.expr(child, current_klass) for child in node.nodes])
+
+ def _bitshiftleft(self, node, current_klass):
+ return self.expr(node.left, current_klass) + " << " + self.expr(node.right, current_klass)
+
+ def _bitshiftright(self, node, current_klass):
+ return self.expr(node.left, current_klass) + " >>> " + self.expr(node.right, current_klass)
+
+ def _bitxor(self,node, current_klass):
+ return " ^ ".join([self.expr(child, current_klass) for child in node.nodes])
+
+ def _bitor(self, node, current_klass):
+ return " | ".join([self.expr(child, current_klass) for child in node.nodes])
+
+ def _subscript(self, node, current_klass):
+ if node.flags == "OP_APPLY":
+ if len(node.subs) == 1:
+ return self.expr(node.expr, current_klass) + ".__getitem__(" + self.expr(node.subs[0], current_klass) + ")"
+ else:
+ raise TranslationError("must have one sub (in _subscript)", node)
+ else:
+ raise TranslationError("unsupported flag (in _subscript)", node)
+
+ def _subscript_stmt(self, node, current_klass):
+ if node.flags == "OP_DELETE":
+ print >>self.output, " " + self.expr(node.expr, current_klass) + ".__delitem__(" + self.expr(node.subs[0], current_klass) + ");"
+ else:
+ raise TranslationError("unsupported flag (in _subscript)", node)
+
+ def _list(self, node, current_klass):
+ return "new pyjslib.List([" + ", ".join([self.expr(x, current_klass) for x in node.nodes]) + "])"
+
+ def _dict(self, node, current_klass):
+ items = []
+ for x in node.items:
+ key = self.expr(x[0], current_klass)
+ value = self.expr(x[1], current_klass)
+ items.append("[" + key + ", " + value + "]")
+ return "new pyjslib.Dict([" + ", ".join(items) + "])"
+
+ def _tuple(self, node, current_klass):
+ return "new pyjslib.Tuple([" + ", ".join([self.expr(x, current_klass) for x in node.nodes]) + "])"
+
+ def _lambda(self, node, current_klass):
+ if node.varargs:
+ raise TranslationError("varargs are not supported in Lambdas", node)
+ if node.kwargs:
+ raise TranslationError("kwargs are not supported in Lambdas", node)
+ res = cStringIO.StringIO()
+ arg_names = list(node.argnames)
+ function_args = ", ".join(arg_names)
+ for child in node.getChildNodes():
+ expr = self.expr(child, None)
+ print >> res, "function (%s){" % function_args
+ self._default_args_handler(node, arg_names, None,
+ output=res)
+ print >> res, 'return %s;}' % expr
+ return res.getvalue()
+
+ def _slice(self, node, current_klass):
+ if node.flags == "OP_APPLY":
+ lower = "null"
+ upper = "null"
+ if node.lower != None:
+ lower = self.expr(node.lower, current_klass)
+ if node.upper != None:
+ upper = self.expr(node.upper, current_klass)
+ return "pyjslib.slice(" + self.expr(node.expr, current_klass) + ", " + lower + ", " + upper + ")"
+ else:
+ raise TranslationError("unsupported flag (in _slice)", node)
+
+ def _global(self, node, current_klass):
+ for name in node.names:
+ self.method_imported_globals.add(name)
+
+ def expr(self, node, current_klass):
+ if isinstance(node, ast.Const):
+ return self._const(node)
+ # @@@ not sure if the parentheses should be here or in individual operator functions - JKT
+ elif isinstance(node, ast.Mul):
+ return " ( " + self._mul(node, current_klass) + " ) "
+ elif isinstance(node, ast.Add):
+ return " ( " + self._add(node, current_klass) + " ) "
+ elif isinstance(node, ast.Sub):
+ return " ( " + self._sub(node, current_klass) + " ) "
+ elif isinstance(node, ast.Div):
+ return " ( " + self._div(node, current_klass) + " ) "
+ elif isinstance(node, ast.Mod):
+ return self._mod(node, current_klass)
+ elif isinstance(node, ast.UnaryAdd):
+ return self._unaryadd(node, current_klass)
+ elif isinstance(node, ast.UnarySub):
+ return self._unarysub(node, current_klass)
+ elif isinstance(node, ast.Not):
+ return self._not(node, current_klass)
+ elif isinstance(node, ast.Or):
+ return self._or(node, current_klass)
+ elif isinstance(node, ast.And):
+ return self._and(node, current_klass)
+ elif isinstance(node, ast.Invert):
+ return self._invert(node, current_klass)
+ elif isinstance(node, ast.Bitand):
+ return "("+self._bitand(node, current_klass)+")"
+ elif isinstance(node,ast.LeftShift):
+ return self._bitshiftleft(node, current_klass)
+ elif isinstance(node, ast.RightShift):
+ return self._bitshiftright(node, current_klass)
+ elif isinstance(node, ast.Bitxor):
+ return "("+self._bitxor(node, current_klass)+")"
+ elif isinstance(node, ast.Bitor):
+ return "("+self._bitor(node, current_klass)+")"
+ elif isinstance(node, ast.Compare):
+ return self._compare(node, current_klass)
+ elif isinstance(node, ast.CallFunc):
+ return self._callfunc(node, current_klass)
+ elif isinstance(node, ast.Name):
+ return self._name(node, current_klass)
+ elif isinstance(node, ast.Subscript):
+ return self._subscript(node, current_klass)
+ elif isinstance(node, ast.Getattr):
+ return self._getattr(node, current_klass)
+ elif isinstance(node, ast.List):
+ return self._list(node, current_klass)
+ elif isinstance(node, ast.Dict):
+ return self._dict(node, current_klass)
+ elif isinstance(node, ast.Tuple):
+ return self._tuple(node, current_klass)
+ elif isinstance(node, ast.Slice):
+ return self._slice(node, current_klass)
+ elif isinstance(node, ast.Lambda):
+ return self._lambda(node, current_klass)
+ else:
+ raise TranslationError("unsupported type (in expr)", node)
+
+
+
+import cStringIO
+
+def translate(file_name, module_name, debug=False):
+ f = file(file_name, "r")
+ src = f.read()
+ f.close()
+ output = cStringIO.StringIO()
+ mod = compiler.parseFile(file_name)
+ t = Translator(module_name, module_name, module_name, src, debug, mod, output)
+ return output.getvalue()
+
+
+class PlatformParser:
+ def __init__(self, platform_dir = "", verbose=True):
+ self.platform_dir = platform_dir
+ self.parse_cache = {}
+ self.platform = ""
+ self.verbose = verbose
+
+ def setPlatform(self, platform):
+ self.platform = platform
+
+ def parseModule(self, module_name, file_name):
+
+ importing = False
+ if not self.parse_cache.has_key(file_name):
+ importing = True
+ mod = compiler.parseFile(file_name)
+ self.parse_cache[file_name] = mod
+ else:
+ mod = self.parse_cache[file_name]
+
+ override = False
+ platform_file_name = self.generatePlatformFilename(file_name)
+ if self.platform and os.path.isfile(platform_file_name):
+ mod = copy.deepcopy(mod)
+ mod_override = compiler.parseFile(platform_file_name)
+ self.merge(mod, mod_override)
+ override = True
+
+ if self.verbose:
+ if override:
+ print "Importing %s (Platform %s)" % (module_name, self.platform)
+ elif importing:
+ print "Importing %s" % (module_name)
+
+ return mod, override
+
+ def generatePlatformFilename(self, file_name):
+ (module_name, extension) = os.path.splitext(os.path.basename(file_name))
+ platform_file_name = module_name + self.platform + extension
+
+ return os.path.join(os.path.dirname(file_name), self.platform_dir, platform_file_name)
+
+ def merge(self, tree1, tree2):
+ for child in tree2.node:
+ if isinstance(child, ast.Function):
+ self.replaceFunction(tree1, child.name, child)
+ elif isinstance(child, ast.Class):
+ self.replaceClassMethods(tree1, child.name, child)
+
+ return tree1
+
+ def replaceFunction(self, tree, function_name, function_node):
+ # find function to replace
+ for child in tree.node:
+ if isinstance(child, ast.Function) and child.name == function_name:
+ self.copyFunction(child, function_node)
+ return
+ raise TranslationError("function not found: " + function_name, function_node)
+
+ def replaceClassMethods(self, tree, class_name, class_node):
+ # find class to replace
+ old_class_node = None
+ for child in tree.node:
+ if isinstance(child, ast.Class) and child.name == class_name:
+ old_class_node = child
+ break
+
+ if not old_class_node:
+ raise TranslationError("class not found: " + class_name, class_node)
+
+ # replace methods
+ for function_node in class_node.code:
+ if isinstance(function_node, ast.Function):
+ found = False
+ for child in old_class_node.code:
+ if isinstance(child, ast.Function) and child.name == function_node.name:
+ found = True
+ self.copyFunction(child, function_node)
+ break
+
+ if not found:
+ raise TranslationError("class method not found: " + class_name + "." + function_node.name, function_node)
+
+ def copyFunction(self, target, source):
+ target.code = source.code
+ target.argnames = source.argnames
+ target.defaults = source.defaults
+ target.doc = source.doc # @@@ not sure we need to do this any more
+
+def dotreplace(fname):
+ path, ext = os.path.splitext(fname)
+ return path.replace(".", "/") + ext
+
+class AppTranslator:
+
+ def __init__(self, library_dirs=[], parser=None, dynamic=False,
+ optimize=False, verbose=True):
+ self.extension = ".py"
+ self.optimize = optimize
+ self.library_modules = []
+ self.overrides = {}
+ self.library_dirs = path + library_dirs
+ self.dynamic = dynamic
+ self.verbose = verbose
+
+ if not parser:
+ self.parser = PlatformParser()
+ else:
+ self.parser = parser
+
+ self.parser.dynamic = dynamic
+
+ def findFile(self, file_name):
+ if os.path.isfile(file_name):
+ return file_name
+
+ for library_dir in self.library_dirs:
+ file_name = dotreplace(file_name)
+ full_file_name = os.path.join(
+ os.path.abspath(os.path.dirname(__file__)), library_dir, file_name)
+ if os.path.isfile(full_file_name):
+ return full_file_name
+
+ fnameinit, ext = os.path.splitext(file_name)
+ fnameinit = fnameinit + "/__init__.py"
+
+ full_file_name = os.path.join(
+ os.path.abspath(os.path.dirname(__file__)), library_dir, fnameinit)
+ if os.path.isfile(full_file_name):
+ return full_file_name
+
+ raise Exception("file not found: " + file_name)
+
+ def _translate(self, module_name, is_app=True, debug=False,
+ imported_js=set()):
+ if module_name not in self.library_modules:
+ self.library_modules.append(module_name)
+
+ file_name = self.findFile(module_name + self.extension)
+
+ output = cStringIO.StringIO()
+
+ f = file(file_name, "r")
+ src = f.read()
+ f.close()
+
+ mod, override = self.parser.parseModule(module_name, file_name)
+ if override:
+ override_name = "%s.%s" % (self.parser.platform.lower(),
+ module_name)
+ self.overrides[override_name] = override_name
+ if is_app:
+ mn = '__main__'
+ else:
+ mn = module_name
+ t = Translator(mn, module_name, module_name,
+ src, debug, mod, output, self.dynamic, self.optimize,
+ self.findFile)
+
+ module_str = output.getvalue()
+ imported_js.update(set(t.imported_js))
+ imported_modules_str = ""
+ for module in t.imported_modules:
+ if module not in self.library_modules:
+ self.library_modules.append(module)
+ #imported_js.update(set(t.imported_js))
+ #imported_modules_str += self._translate(
+ # module, False, debug=debug, imported_js=imported_js)
+
+ return imported_modules_str + module_str
+
+
+ def translate(self, module_name, is_app=True, debug=False,
+ library_modules=[]):
+ app_code = cStringIO.StringIO()
+ lib_code = cStringIO.StringIO()
+ imported_js = set()
+ self.library_modules = []
+ self.overrides = {}
+ for library in library_modules:
+ if library.endswith(".js"):
+ imported_js.add(library)
+ continue
+ self.library_modules.append(library)
+ if self.verbose:
+ print 'Including LIB', library
+ print >> lib_code, '\n//\n// BEGIN LIB '+library+'\n//\n'
+ print >> lib_code, self._translate(
+ library, False, debug=debug, imported_js=imported_js)
+
+ print >> lib_code, "/* initialize static library */"
+ print >> lib_code, "%s%s();\n" % (UU, library)
+
+ print >> lib_code, '\n//\n// END LIB '+library+'\n//\n'
+ if module_name:
+ print >> app_code, self._translate(
+ module_name, is_app, debug=debug, imported_js=imported_js)
+ for js in imported_js:
+ path = self.findFile(js)
+ if os.path.isfile(path):
+ if self.verbose:
+ print 'Including JS', js
+ print >> lib_code, '\n//\n// BEGIN JS '+js+'\n//\n'
+ print >> lib_code, file(path).read()
+ print >> lib_code, '\n//\n// END JS '+js+'\n//\n'
+ else:
+ print >>sys.stderr, 'Warning: Unable to find imported javascript:', js
+ return lib_code.getvalue(), app_code.getvalue()
+
+usage = """
+ usage: %s file_name [module_name]
+"""
+
+def main():
+ import sys
+ if len(sys.argv)<2:
+ print >> sys.stderr, usage % sys.argv[0]
+ sys.exit(1)
+ file_name = os.path.abspath(sys.argv[1])
+ if not os.path.isfile(file_name):
+ print >> sys.stderr, "File not found %s" % file_name
+ sys.exit(1)
+ if len(sys.argv) > 2:
+ module_name = sys.argv[2]
+ else:
+ module_name = None
+ print translate(file_name, module_name),
+
+if __name__ == "__main__":
+ main()
+
diff -r 35cc4c6a2936 -r 46d7d2ce84d2 plugins/python/modules/svgui/svgui.py
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/plugins/python/modules/svgui/svgui.py Thu Aug 13 11:48:55 2009 +0200
@@ -0,0 +1,105 @@
+import wx
+import os, sys
+
+from plugger import opjimg
+from plugins.python import PythonCodeTemplate
+
+from pyjs import translate
+
+from docutils import *
+
+class RootClass:
+
+ PluginMethods = [
+ {"bitmap" : os.path.join("images","ImportSVG"),
+ "name" : "Import SVG",
+ "tooltip" : "Import SVG",
+ "method" : "_ImportSVG"},
+ {"bitmap" : os.path.join("images","ImportSVG"),
+ "name" : "Inkscape",
+ "tooltip" : "Create HMI",
+ "method" : "_StartInkscape"},
+ ]
+
+ def PluginPath(self):
+ return os.path.join(self.PlugParent.PluginPath(), "modules", self.PlugType)
+
+ def _getSVGpath(self):
+ # define name for IEC raw code file
+ return os.path.join(self.PlugPath(), "gui.svg")
+
+ def _getSVGUIserverpath(self):
+ return os.path.join(os.path.dirname(__file__), "svgui_server.py")
+
+ def PlugGenerate_C(self, buildpath, locations):
+ """
+ Return C code generated by iec2c compiler
+ when _generate_softPLC have been called
+ @param locations: ignored
+ @return: [(C_file_name, CFLAGS),...] , LDFLAGS_TO_APPEND
+ """
+
+ current_location = self.GetCurrentLocation()
+ # define a unique name for the generated C file
+ location_str = "_".join(map(lambda x:str(x), current_location))
+
+ res = ([], "", False)
+
+ svgfile=self._getSVGpath()
+ if os.path.exists(svgfile):
+ res += (("gui.svg", file(svgfile,"rb")),)
+
+ svguiserverfile = open(self._getSVGUIserverpath(), 'r')
+ svguiservercode = svguiserverfile.read()
+ svguiserverfile.close()
+
+ svguilibpath = os.path.join(self._getBuildPath(), "svguilib.js")
+ svguilibfile = open(svguilibpath, 'w')
+ svguilibfile.write(translate(os.path.join(os.path.dirname(__file__), "pyjs", "lib", "sys.py"), "sys"))
+ svguilibfile.write(open(os.path.join(os.path.dirname(__file__), "pyjs", "lib", "_pyjs.js"), 'r').read())
+ svguilibfile.write(translate(os.path.join(os.path.dirname(__file__), "pyjs", "lib", "pyjslib.py"), "pyjslib"))
+ svguilibfile.write(translate(os.path.join(os.path.dirname(__file__), "svguilib.py"), "svguilib"))
+ svguilibfile.write("pyjslib();\nsvguilib();\n")
+ svguilibfile.write(open(os.path.join(os.path.dirname(__file__), "pyjs", "lib", "json.js"), 'r').read())
+ svguilibfile.write(open(os.path.join(os.path.dirname(__file__), "livesvg.js"), 'r').read())
+ svguilibfile.close()
+ jsmodules = {"LiveSVGPage": "svguilib.js"}
+ res += (("svguilib.js", file(svguilibpath,"rb")),)
+
+ runtimefile_path = os.path.join(buildpath, "runtime_%s.py"%location_str)
+ runtimefile = open(runtimefile_path, 'w')
+ runtimefile.write(svguiservercode % {"svgfile" : "gui.svg"})
+ runtimefile.write("""
+def _runtime_%(location)s_begin():
+ print "SVGUI start"
+ website.LoadHMI(%(svgui_class)s, %(jsmodules)s)
+
+def _runtime_%(location)s_cleanup():
+ print "SVGUI stop"
+ website.UnLoadHMI()
+
+""" % {"location": location_str,
+ "svgui_class": "SVGUI_HMI",
+ "jsmodules" : str(jsmodules),
+ })
+ runtimefile.close()
+
+ res += (("runtime_%s.py"%location_str, file(runtimefile_path,"rb")),)
+
+ return res
+
+ def _ImportSVG(self):
+ dialog = wx.FileDialog(self.GetPlugRoot().AppFrame, "Choose a SVG file", os.getcwd(), "", "SVG files (*.svg)|*.svg|All files|*.*", wx.OPEN)
+ if dialog.ShowModal() == wx.ID_OK:
+ svgpath = dialog.GetPath()
+ if os.path.isfile(svgpath):
+ shutil.copy(svgpath, self._getSVGpath())
+ else:
+ self.logger.write_error("No such SVG file: %s\n"%svgpath)
+ dialog.Destroy()
+
+ def _StartInkscape(self):
+ svgfile = self._getSVGpath()
+ if not os.path.isfile(svgfile):
+ svgfile = None
+ open_svg(svgfile)
diff -r 35cc4c6a2936 -r 46d7d2ce84d2 plugins/python/modules/svgui/svgui_server.py
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/plugins/python/modules/svgui/svgui_server.py Thu Aug 13 11:48:55 2009 +0200
@@ -0,0 +1,84 @@
+#!/usr/bin/python
+# -*- coding: utf-8 -*-
+
+import os
+
+from nevow import rend, appserver, inevow, tags, loaders, athena
+import simplejson as json
+
+svgfile = '%(svgfile)s'
+
+svguiWidgets={}
+
+class SvguiWidget:
+
+ def __init__(self, classname, back_id, **kwargs):
+ self.classname = classname
+ self.back_id = back_id
+ self.attrs = kwargs.copy()
+ self.lastattrs = kwargs.copy()
+ self.inhibit = False
+ self.changed = False
+
+ def setattr(self, attrname, value):
+ self.attrs[attrname] = value
+
+ def getattr(self, attrname):
+ return self.args.get(attrname, None)
+
+ def update(self, **kwargs):
+ for attrname, value in kwargs.iteritems():
+ if self.lastattrs.get(attrname, None) != value:
+ self.changed = True
+ self.attrs[attrname] = value
+ self.lastattrs[attrname] = value
+ interface = website.getHMI()
+ if interface is not None and self.changed and not self.inhibit:
+ self.changed = False
+ interface.sendData(self)
+
+ return self.attrs["state"]
+
+def convert_to_builtin_type(obj):
+ # Convert objects to a dictionary of their representation
+ d = { '__class__':obj.classname,
+ 'back_id':obj.back_id,
+ 'kwargs':json.dumps(obj.attrs),
+ }
+ return d
+
+def dataToSend():
+ gadgets = []
+ for gadget in svguiWidgets.values():
+ gadgets.append(unicode(json.dumps(gadget, default=convert_to_builtin_type, indent=2), 'ascii'))
+ return gadgets
+
+
+class SVGUI_HMI(athena.LiveElement):
+ jsClass = u"LiveSVGPage.LiveSVGWidget"
+
+ docFactory = loaders.stan(tags.div(render=tags.directive('liveElement'))[
+ tags.xml(loaders.xmlfile(os.path.join(WorkingDir, svgfile))),
+ ])
+
+ def sendData(self,data):
+ objDefer = self.callRemote('receiveData',unicode(json.dumps(data, default=convert_to_builtin_type, indent=2), 'ascii'))
+
+ def initClient(self):
+ self.callRemote('init', dataToSend())
+
+ def setattr(self, id, attrname, value):
+ svguiWidgets[id].setattr(attrname, value)
+
+def SVGUI(*args, **kwargs):
+ classname, back_id = args
+ gad = svguiWidgets.get(back_id, None)
+ if gad is None:
+ gad = SvguiWidget(classname, back_id, **kwargs)
+ svguiWidgets[back_id] = gad
+ gadget = [unicode(json.dumps(gad, default=convert_to_builtin_type, indent=2), 'ascii')]
+ interface = website.getHMI()
+ if interface is not None:
+ interface.callRemote('init', gadget)
+
+ return gad.update(**kwargs)
diff -r 35cc4c6a2936 -r 46d7d2ce84d2 plugins/python/modules/svgui/svguilib.py
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/plugins/python/modules/svgui/svguilib.py Thu Aug 13 11:48:55 2009 +0200
@@ -0,0 +1,106 @@
+
+class button:
+
+ def __init__(self, parent, back_id, sele_id, toggle, state, active):
+ self.parent = parent
+ self.back_elt = getSVGElementById(back_id)
+ self.sele_elt = getSVGElementById(sele_id)
+ self.toggle = toggle
+ self.state = state
+ self.active = active
+ self.dragging = False
+ if toggle:
+ self.up = not state
+ else:
+ self.up = True
+
+ # Add event on each element of the button
+ if self.active:
+ self.back_elt.addEventListener("mouseup", self, False)
+ self.back_elt.addEventListener("mousedown", self, False)
+ self.back_elt.addEventListener("mouseover", self, False)
+ self.back_elt.addEventListener("mouseout", self, False)
+
+ self.sele_elt.addEventListener("mouseup", self, False)
+ self.sele_elt.addEventListener("mousedown", self, False)
+ self.sele_elt.addEventListener("mouseover", self, False)
+ self.sele_elt.addEventListener("mouseout", self, False)
+
+ blockSVGElementDrag(self.back_elt)
+ blockSVGElementDrag(self.sele_elt)
+
+ self.updateElements()
+
+ # method to display the current state of interface
+ def updateElements(self):
+ if self.up:
+ self.sele_elt.setAttribute("visibility", "hidden")
+ self.back_elt.setAttribute("visibility", "visible")
+ else:
+ self.sele_elt.setAttribute("visibility", "visible")
+ self.back_elt.setAttribute("visibility", "hidden")
+
+ def updateState(self, value):
+ self.up = not value
+ self.updateElements()
+
+ def handleEvent(self, evt):
+ # Quand le bouton de la souris est presse
+ if evt.type == "mousedown":
+ evt.stopPropagation()
+ setCurrentObject(self)
+
+ self.dragging = True
+
+ if self.toggle:
+ self.up = self.state
+ else:
+ self.up = False
+ self.state = True
+ updateAttr(self.back_elt.id, 'state', self.state)
+ self.updateElements()
+
+ if isCurrentObject(self) and self.dragging:
+ # Quand le bouton est survole
+ if evt.type == "mouseover" and self.toggle:
+ self.up = self.state
+ self.updateElements()
+
+ # Quand le curseur quitte la zone du bouton
+ elif evt.type == "mouseout" and self.toggle:
+ self.up = not self.state
+ self.updateElements()
+
+ # Quand le bouton de la souris est relache
+ elif evt.type == "mouseup":
+ evt.stopPropagation()
+ if self.toggle and self.up == self.state:
+ self.state = not self.state
+ updateAttr(self.back_elt.id, 'state', self.state)
+ elif not self.toggle:
+ self.up = True
+ self.state = False
+ updateAttr(self.back_elt.id, 'state', self.state)
+ self.updateElements()
+ self.dragging = False
+
+class textControl:
+
+ def __init__(self, parent, back_id, state):
+ self.parent = parent
+ self.back_elt = getSVGElementById(back_id)
+ self.state = state
+ self.setValue(self.state)
+
+ def handleEvent(self, evt):
+ pass
+
+ def getValue(self):
+ return self.back_elt.firstChild.firstChild.textContent
+
+ def setValue(self, value):
+ self.back_elt.firstChild.firstChild.textContent = value
+
+ def updateState(self, value):
+ self.setValue(value)
+
\ No newline at end of file
diff -r 35cc4c6a2936 -r 46d7d2ce84d2 plugins/svgui/.cvsignore
--- a/plugins/svgui/.cvsignore Mon Aug 10 11:35:14 2009 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-*.pyc
diff -r 35cc4c6a2936 -r 46d7d2ce84d2 plugins/svgui/README
--- a/plugins/svgui/README Mon Aug 10 11:35:14 2009 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-SVGUI HMI
\ No newline at end of file
diff -r 35cc4c6a2936 -r 46d7d2ce84d2 plugins/svgui/__init__.py
--- a/plugins/svgui/__init__.py Mon Aug 10 11:35:14 2009 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,3 +0,0 @@
-from svgui import *
-controller = None
-view = None
\ No newline at end of file
diff -r 35cc4c6a2936 -r 46d7d2ce84d2 plugins/svgui/svgui.py
--- a/plugins/svgui/svgui.py Mon Aug 10 11:35:14 2009 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,798 +0,0 @@
-import os, shutil, sys
-base_folder = os.path.split(sys.path[0])[0]
-sys.path.append(os.path.join(base_folder, "wxsvg", "SVGUIEditor"))
-sys.path.append(os.path.join(base_folder, "plcopeneditor", "graphics"))
-
-import wx, subprocess
-
-from SVGUIGenerator import *
-from SVGUIControler import *
-from SVGUIEditor import *
-from FBD_Objects import *
-from PLCGenerator import PLCGenException
-
-from wxPopen import ProcessLogger
-from wx.wxsvg import SVGDocument
-from docutils import *
-
-[ID_SVGUIEDITORFBDPANEL,
-] = [wx.NewId() for _init_ctrls in range(1)]
-
-SVGUIFB_Types = {ITEM_CONTAINER : "Container",
- ITEM_BUTTON : "Button",
- ITEM_TEXT : "TextCtrl",
- ITEM_SCROLLBAR : "ScrollBar",
- ITEM_ROTATING : "RotatingCtrl",
- ITEM_NOTEBOOK : "NoteBook",
- ITEM_TRANSFORM : "Transform"}
-
-class _SVGUIEditor(SVGUIEditor):
- """
- This Class add IEC specific features to the SVGUIEditor :
- - FDB preview
- - FBD begin drag
- """
-
- def _init_coll_EditorGridSizer_Items(self, parent):
- SVGUIEditor._init_coll_EditorGridSizer_Items(self, parent)
- parent.AddWindow(self.FBDPanel, 0, border=0, flag=wx.GROW)
-
- def _init_ctrls(self, prnt):
- SVGUIEditor._init_ctrls(self, prnt, False)
-
- self.FBDPanel = wx.Panel(id=ID_SVGUIEDITORFBDPANEL,
- name='FBDPanel', parent=self.EditorPanel, pos=wx.Point(0, 0),
- size=wx.Size(0, 0), style=wx.TAB_TRAVERSAL|wx.SIMPLE_BORDER)
- self.FBDPanel.SetBackgroundColour(wx.WHITE)
- self.FBDPanel.Bind(wx.EVT_LEFT_DOWN, self.OnFBDPanelClick)
- self.FBDPanel.Bind(wx.EVT_PAINT, self.OnPaintFBDPanel)
-
- setattr(self.FBDPanel, "GetScaling", lambda: None)
- setattr(self.FBDPanel, "IsOfType", self.IsOfType)
- setattr(self.FBDPanel, "GetBlockType", self.GetBlockType)
-
- self._init_sizers()
-
- def __init__(self, parent, controler = None, fileOpen = None):
- SVGUIEditor.__init__(self, parent, controler, fileOpen)
-
- self.FBDBlock = None
-
- def IsOfType(self, type, reference):
- return self.Controler.GetPlugRoot().IsOfType(type, reference)
-
- def GetBlockType(self, type, inputs = None):
- return self.Controler.GetPlugRoot().GetBlockType(type, inputs)
-
- def RefreshView(self, select_id = None):
- SVGUIEditor.RefreshView(self, select_id)
- self.FBDPanel.Refresh()
-
- def OnPaintFBDPanel(self,event):
- dc = wx.ClientDC(self.FBDPanel)
- dc.Clear()
- selected = self.GetSelected()
- if selected is not None:
- selected_type = self.Controler.GetElementType(selected)
- if selected_type is not None:
- self.FBDBlock = FBD_Block(parent=self.FBDPanel,type=SVGUIFB_Types[selected_type],name=self.Controler.GetElementName(selected))
- width, height = self.FBDBlock.GetMinSize()
- self.FBDBlock.SetSize(width,height)
- clientsize = self.FBDPanel.GetClientSize()
- x = (clientsize.width - width) / 2
- y = (clientsize.height - height) / 2
- self.FBDBlock.SetPosition(x, y)
- self.FBDBlock.Draw(dc)
- else:
- self.FBDBlock = None
- event.Skip()
-
- def OnFBDPanelClick(self, event):
- if self.FBDBlock:
- data = wx.TextDataObject(str((self.FBDBlock.GetType(), "functionBlock", self.FBDBlock.GetName())))
- DropSrc = wx.DropSource(self.FBDPanel)
- DropSrc.SetData(data)
- DropSrc.DoDragDrop()
- event.Skip()
-
- def OnInterfaceTreeItemSelected(self, event):
- self.FBDPanel.Refresh()
- SVGUIEditor.OnInterfaceTreeItemSelected(self, event)
-
- def OnGenerate(self,event):
- self.SaveProject()
- self.Controler.PlugGenerate_C(sys.path[0],(0,0,4,5),None)
- event.Skip()
-
-TYPECONVERSION = {"BOOL" : "X", "SINT" : "B", "INT" : "W", "DINT" : "D", "LINT" : "L",
- "USINT" : "B", "UINT" : "W", "UDINT" : "D", "ULINT" : "L", "REAL" : "D", "LREAL" : "L",
- "STRING" : "B", "BYTE" : "B", "WORD" : "W", "DWORD" : "D", "LWORD" : "L", "WSTRING" : "W"}
-
-CTYPECONVERSION = {"BOOL" : "IEC_BOOL", "UINT" : "IEC_UINT", "STRING" : "IEC_STRING", "REAL" : "IEC_REAL"}
-CPRINTTYPECONVERSION = {"BOOL" : "d", "UINT" : "d", "STRING" : "s", "REAL" : "f"}
-
-class RootClass(SVGUIControler):
-
- def __init__(self):
- SVGUIControler.__init__(self)
- filepath = os.path.join(self.PlugPath(), "gui.xml")
-
- if os.path.isfile(filepath):
- svgfile = os.path.join(self.PlugPath(), "gui.svg")
- if os.path.isfile(svgfile):
- self.SvgFilepath = svgfile
- self.OpenXMLFile(filepath)
- else:
- self.CreateNewInterface()
- self.SetFilePath(filepath)
-
- def GetElementIdFromName(self, name):
- element = self.GetElementByName(name)
- if element is not None:
- return element.getid()
- return None
-
- _View = None
- def _OpenView(self):
- if not self._View:
- def _onclose():
- self._View = None
- def _onsave():
- self.GetPlugRoot().SaveProject()
- self._View = _SVGUIEditor(self.GetPlugRoot().AppFrame, self)
- self._View._onclose = _onclose
- self._View._onsave = _onsave
- self._View.Show()
-
- def _ImportSVG(self):
- if not self._View:
- dialog = wx.FileDialog(self.GetPlugRoot().AppFrame, "Choose a SVG file", os.getcwd(), "", "SVG files (*.svg)|*.svg|All files|*.*", wx.OPEN)
- if dialog.ShowModal() == wx.ID_OK:
- svgpath = dialog.GetPath()
- if os.path.isfile(svgpath):
- shutil.copy(svgpath, os.path.join(self.PlugPath(), "gui.svg"))
- else:
- self.logger.write_error("No such SVG file: %s\n"%svgpath)
- dialog.Destroy()
-
- def _ImportXML(self):
- if not self._View:
- dialog = wx.FileDialog(self.GetPlugRoot().AppFrame, "Choose a XML file", os.getcwd(), "", "XML files (*.xml)|*.xml|All files|*.*", wx.OPEN)
- if dialog.ShowModal() == wx.ID_OK:
- xmlpath = dialog.GetPath()
- if os.path.isfile(xmlpath):
- shutil.copy(xmlpath, os.path.join(self.PlugPath(), "gui.xml"))
- else:
- self.logger.write_error("No such XML file: %s\n"%xmlpath)
- dialog.Destroy()
-
- def _StartInkscape(self):
- svgfile = os.path.join(self.PlugPath(), "gui.svg")
- if not os.path.isfile(svgfile):
- svgfile = None
- open_svg(svgfile)
-
- PluginMethods = [
- {"bitmap" : os.path.join("images","HMIEditor"),
- "name" : "HMI Editor",
- "tooltip" : "HMI Editor",
- "method" : "_OpenView"},
- {"bitmap" : os.path.join("images","ImportSVG"),
- "name" : "Import SVG",
- "tooltip" : "Import SVG",
- "method" : "_ImportSVG"},
- {"bitmap" : os.path.join("images","ImportDEF"),
- "name" : "Import XML",
- "tooltip" : "Import XML",
- "method" : "_ImportXML"},
- {"bitmap" : os.path.join("images","ImportSVG"),
- "name" : "Inkscape",
- "tooltip" : "Create HMI",
- "method" : "_StartInkscape"},
- ]
-
- def OnPlugSave(self):
- self.SaveXMLFile(os.path.join(self.PlugPath(), "gui.xml"))
- return True
-
- def PlugGenerate_C(self, buildpath, locations):
- progname = "SVGUI_%s"%"_".join(map(str, self.GetCurrentLocation()))
-
- doc = SVGDocument(self.GetSVGFilePath())
- root_element = doc.GetRootElement()
- window_size = (int(float(root_element.GetAttribute("width"))),
- int(float(root_element.GetAttribute("height"))))
-
-# svgfilepath = self.GetSVGFilePath()
-# xmlfilepath = self.GetFilePath()
-# shutil.copy(svgfilepath, buildpath)
-# shutil.copy(xmlfilepath, buildpath)
-
- SVGFilePath = self.GetSVGFilePath()
- SVGFileBaseName = os.path.split(SVGFilePath)[1]
- FilePath = self.GetFilePath()
- FileBaseName = os.path.split(FilePath)[1]
-
- generator = _SVGUICGenerator(self, self.GetElementsByType(),
- os.path.split(self.GetSVGFilePath())[1],
- os.path.split(self.GetFilePath())[1],
- self.GetCurrentLocation())
- generator.GenerateProgram(window_size, buildpath, progname)
- Gen_C_file = os.path.join(buildpath, progname+".cpp" )
-
- if wx.Platform == '__WXMSW__':
- cxx_flags = "-I..\\lib\\wx\\include\\msw-unicode-release-2.8 -I..\\include\\wx-2.8 -I..\\..\\matiec\\lib -DWXUSINGDLL -D__WXMSW__ -mthreads"
- libs = "\"..\\lib\\libwxsvg.a\" \"..\\lib\\libwxsvg_agg.a\" \"..\\lib\\libagg.a\" \"..\\lib\\libaggplatformwin32.a\" \"..\\lib\\libaggfontwin32tt.a\" -L..\\lib -mwindows -mthreads -Wl,--subsystem,windows -mwindows -lwx_mswu_richtext-2.8 -lwx_mswu_aui-2.8 -lwx_mswu_xrc-2.8 -lwx_mswu_qa-2.8 -lwx_mswu_html-2.8 -lwx_mswu_adv-2.8 -lwx_mswu_core-2.8 -lwx_baseu_xml-2.8 -lwx_baseu_net-2.8 -lwx_baseu-2.8"
- else:
- status, result, err_result = ProcessLogger(self.logger, "wx-config --cxxflags", no_stdout=True).spin()
- if status:
- self.logger.write_error("Unable to get wx cxxflags\n")
- cxx_flags = result.strip() + " -I../matiec/lib"
-
- status, result, err_result = ProcessLogger(self.logger, "wx-config --libs", no_stdout=True).spin()
- if status:
- self.logger.write_error("Unable to get wx libs\n")
- libs = result.strip() + " -lwxsvg"
-
- return [(Gen_C_file, cxx_flags)],libs,True,(SVGFileBaseName, file(SVGFilePath, "rb")), (FileBaseName, file(FilePath, "rb"))
-
- def BlockTypesFactory(self):
-
- SVGUIBlock_Types = []
-
- def GetSVGUIBlockType(type):
- for category in SVGUIBlock_Types:
- for blocktype in category["list"]:
- if blocktype["name"] == type:
- return blocktype
- setattr(self, "GetSVGUIBlockType", GetSVGUIBlockType)
-
- def generate_svgui_block(generator, block, body, link, order=False):
- name = block.getinstanceName()
- block_id = self.GetElementIdFromName(name)
- if block_id == None:
- raise PLCGenException, "Undefined SVGUI Block \"%s\""%name
- type = block.gettypeName()
- block_infos = GetSVGUIBlockType(type)
- current_location = ".".join(map(str, self.GetCurrentLocation()))
- if not generator.ComputedBlocks.get(block, False) and not order:
- generator.ComputedBlocks[block] = True
- for num, variable in enumerate(block.inputVariables.getvariable()):
- connections = variable.connectionPointIn.getconnections()
- if connections is not None:
- input_info = (generator.TagName, "block", block.getlocalId(), "input", num)
- parameter = "%sQ%s%s.%d.%d"%("%", TYPECONVERSION[block_infos["inputs"][num][1]], current_location, block_id, num+1)
- value = generator.ComputeExpression(body, connections)
- generator.Program += [(generator.CurrentIndent, ()),
- (parameter, input_info),
- (" := ", ())]
- generator.Program += generator.ExtractModifier(variable, value, input_info)
- generator.Program += [(";\n", ())]
- if link:
- connectionPoint = link.getposition()[-1]
- for num, variable in enumerate(block.outputVariables.getvariable()):
- blockPointx, blockPointy = variable.connectionPointOut.getrelPositionXY()
- output_info = (generator.TagName, "block", block.getlocalId(), "output", num)
- parameter = "%sI%s%s.%d.%d"%("%", TYPECONVERSION[block_infos["outputs"][num][1]], current_location, block_id, num+1)
- if block.getx() + blockPointx == connectionPoint.getx() and block.gety() + blockPointy == connectionPoint.gety():
- return generator.ExtractModifier(variable, [(parameter, output_info)], output_info)
- raise PLCGenException, "No corresponding output variable found on SVGUI Block \"%s\""%name
- else:
- return None
-
- def initialise_block(type, name, block = None):
- block_id = self.GetElementIdFromName(name)
- if block_id == None:
- raise PLCGenException, "Undefined SVGUI Block \"%s\""%name
- block_infos = GetSVGUIBlockType(type)
- current_location = ".".join(map(str, self.GetCurrentLocation()))
- variables = []
- if block is not None:
- input_variables = block.inputVariables.getvariable()
- output_variables = block.outputVariables.getvariable()
- else:
- input_variables = None
- output_variables = None
- for num, (input_name, input_type, input_modifier) in enumerate(block_infos["inputs"]):
- if input_variables is not None and num < len(input_variables):
- connections = input_variables[num].connectionPointIn.getconnections()
- if input_variables is None or connections and len(connections) == 1:
- variables.append((input_type, None, "%sQ%s%s.%d.%d"%("%", TYPECONVERSION[input_type], current_location, block_id, num+1), None))
- for num, (output_name, output_type, output_modifier) in enumerate(block_infos["outputs"]):
- variables.append((output_type, None, "%sI%s%s.%d.%d"%("%", TYPECONVERSION[input_type], current_location, block_id, num+1), None))
- return variables
-
- SVGUIBlock_Types.extend([{"name" : "SVGUI function blocks", "list" :
- [{"name" : "Container", "type" : "functionBlock", "extensible" : False,
- "inputs" : [("Show","BOOL","none"),("Enable","BOOL","none")],
- "outputs" : [],
- "comment" : "SVGUI Container",
- "generate" : generate_svgui_block, "initialise" : initialise_block},
- {"name" : "Button", "type" : "functionBlock", "extensible" : False,
- "inputs" : [("Show","BOOL","none"),("Enable","BOOL","none"),("Value","BOOL","none")],
- "outputs" : [("State","BOOL","none")],
- "comment" : "SVGUI Button",
- "generate" : generate_svgui_block, "initialise" : initialise_block},
- {"name" : "TextCtrl", "type" : "functionBlock", "extensible" : False,
- "inputs" : [("Show","BOOL","none"),("Enable","BOOL","none"),("SetText","STRING","none")],
- "outputs" : [("Text","STRING","none")],
- "comment" : "SVGUI Text Control",
- "generate" : generate_svgui_block, "initialise" : initialise_block},
- {"name" : "ScrollBar", "type" : "functionBlock", "extensible" : False,
- "inputs" : [("Show","BOOL","none"),("Enable","BOOL","none"),("SetThumb","UINT","none"),("SetRange","UINT","none"),("SetPosition","UINT","none")],
- "outputs" : [("Position","UINT","none")],
- "comment" : "SVGUI ScrollBar",
- "generate" : generate_svgui_block, "initialise" : initialise_block},
- {"name" : "NoteBook", "type" : "functionBlock", "extensible" : False,
- "inputs" : [("Show","BOOL","none"),("Enable","BOOL","none"),("SetSelected","BOOL","none")],
- "outputs" : [("Selected","UINT","none")],
- "comment" : "SVGUI Notebook",
- "generate" : generate_svgui_block, "initialise" : initialise_block},
- {"name" : "RotatingCtrl", "type" : "functionBlock", "extensible" : False,
- "inputs" : [("Show","BOOL","none"),("Enable","BOOL","none"),("SetAngle","REAL","none")],
- "outputs" : [("Angle","REAL","none")],
- "comment" : "SVGUI Rotating Control",
- "generate" : generate_svgui_block, "initialise" : initialise_block},
- {"name" : "Transform", "type" : "functionBlock", "extensible" : False,
- "inputs" : [("Show","BOOL","none"),("Enable","BOOL","none"),("SetX","REAL","none"),("SetY","REAL","none"),("SetXScale","REAL","none"),("SetYScale","REAL","none"),("SetAngle","REAL","none")],
- "outputs" : [("X","REAL","none"),("Y","REAL","none")],
- "comment" : "SVGUI Transform",
- "generate" : generate_svgui_block, "initialise" : initialise_block},
- ]}
- ])
-
- return SVGUIBlock_Types
-
-
-class _SVGUICGenerator(SVGUICGenerator):
-
- def __init__(self, controler, elements, svgfile, xmlfile, current_location):
- SVGUICGenerator.__init__(self, elements, svgfile, xmlfile)
-
- self.CurrentLocation = current_location
- self.Controler = controler
-
- def GenerateProgramHeadersPublicVars(self):
- text = """
- void OnPlcOutEvent(wxEvent& event);
-
- void Retrieve();
- void Publish();
- void Initialize();
-"""
-# text += " void Print();\n"
- return text
-
- def GenerateIECVars(self):
- text = ""
- for element in self.Elements:
- text += "STATE_TYPE out_state_%d;\n"%element.getid()
- text += "STATE_TYPE in_state_%d;\n"%element.getid()
- text +="\n"
- current_location = "_".join(map(str, self.CurrentLocation))
- #Declaration des variables
- for element in self.Elements:
- block_infos = self.Controler.GetSVGUIBlockType(SVGUIFB_Types[GetElementType(element)])
- block_id = element.getid()
- for i, input in enumerate(block_infos["inputs"]):
- element_c_type = CTYPECONVERSION[input[1]]
- variable = "__Q%s%s_%d_%d"%(TYPECONVERSION[input[1]], current_location, block_id, i + 1)
- text += "%s beremiz%s;\n"%(element_c_type, variable)
- text += "%s* %s = &beremiz%s;\n"%(element_c_type, variable, variable)
- text += "%s _copy%s;\n"%(element_c_type, variable)
- for i, output in enumerate(block_infos["outputs"]):
- element_c_type = CTYPECONVERSION[output[1]]
- variable = "__I%s%s_%d_%d"%(TYPECONVERSION[output[1]], current_location, block_id, i + 1)
- text += "%s beremiz%s;\n"%(element_c_type, variable)
- text += "%s* %s = &beremiz%s;\n"%(element_c_type, variable, variable)
- text += "%s _copy%s;\n"%(element_c_type, variable)
- text +="\n"
- return text
-
- def GenerateGlobalVarsAndFuncs(self, size):
- text = """#include "iec_types.h"
-#ifdef __WXMSW__
-#define COMPARE_AND_SWAP_VAL(Destination, comparand, exchange) InterlockedCompareExchange(Destination, exchange, comparand)
-#define THREAD_RETURN_TYPE DWORD WINAPI
-#define STATE_TYPE long int
-#else
-#define COMPARE_AND_SWAP_VAL(Destination, comparand, exchange) __sync_val_compare_and_swap(Destination, comparand, exchange)
-#define THREAD_RETURN_TYPE void*
-#define STATE_TYPE volatile int
-#endif
-
-"""
-
- text += self.GenerateIECVars()
-
- text += """IMPLEMENT_APP_NO_MAIN(SVGViewApp);
-SVGViewApp *myapp = NULL;
-wxSemaphore MyInitSem;
-
-#ifdef __WXMSW__
-HANDLE wxMainLoop;
-DWORD wxMainLoopId;
-#else
-pthread_t wxMainLoop;
-#endif
-
-"""
-
- text += """int myargc = 0;
-char** myargv = NULL;
-
-#define UNCHANGED 1
-#define PLC_BUSY 2
-#define CHANGED 3
-#define GUI_BUSY 4
-#ifdef __WXMSW__
-#else
-#endif
-
-bool refresh = false;
-bool refreshing = false;
-
-THREAD_RETURN_TYPE InitWxEntry(void* args)
-{
- wxEntry(myargc,myargv);
- myapp = NULL;
- MyInitSem.Post();
- return 0;
-}
-
-"""
-
- text += """
-bool SVGViewApp::OnInit()
-{
- #ifndef __WXMSW__
- setlocale(LC_NUMERIC, "C");
- #endif
-"""
-
- text += """ frame = new MainFrame(NULL, wxT("Program"),wxDefaultPosition, wxSize(%d, %d));
- frame->Show();
- myapp = this;
-"""%size
- text += """ return true;
-}
-
-extern "C" {
-
-int __init_%(location)s(int argc, char** argv)
-{
- myargc = argc;
- myargv = argv;
-#ifdef __WXMSW__
- wxMainLoop = CreateThread(NULL, 0, InitWxEntry, 0, 0, &wxMainLoopId);
-#else
- pthread_create(&wxMainLoop, NULL, InitWxEntry, NULL);
-#endif
- MyInitSem.Wait();
- return 0;
-}
-
-void __cleanup_%(location)s()
-{
- if(myapp){
- wxCloseEvent event(wxEVT_CLOSE_WINDOW);
- myapp->frame->AddPendingEvent(event);
- myapp = NULL;
- }
- MyInitSem.Wait();
-}
-
-void __retrieve_%(location)s()
-{
- if(myapp){
- myapp->frame->m_svgCtrl->Retrieve();
- }
-}
-
-void __publish_%(location)s()
-{
- if(myapp){
- myapp->frame->m_svgCtrl->Publish();
- }
-}
-
-}
-
-IEC_STRING wxStringToIEC_STRING(wxString s)
-{
- IEC_STRING res = {0,""};
- int i;
- for(i = 0; iargv[1], wxT("%s"));
- wxFileName xmlfilepath(wxTheApp->argv[1], wxT("%s"));
-
- m_svgCtrl = new Program(this);
- if (m_svgCtrl->LoadFiles(svgfilepath.GetFullPath(), xmlfilepath.GetFullPath()))
- {
- Show(true);
- m_svgCtrl->SetFocus();
- m_svgCtrl->SetFitToFrame(true);
- m_svgCtrl->InitScrollBars();
- m_svgCtrl->Initialize();
- m_svgCtrl->Update();
- }
- else
- {
- printf("Error while opening SVGUI files\\n");
- }
-}
-
-
-"""%(self.SVGFilePath, self.XMLFilePath)
-
- return text
-
- def GenerateProgramInitProgram(self):
- text = "Program::Program(wxWindow* parent):SVGUIWindow(parent)\n{\n"
- for element in self.Elements:
- text += " out_state_%d = UNCHANGED;\n"%element.getid()
- text += " in_state_%d = UNCHANGED;\n"%element.getid()
- text += "}\n\n"
- return text
-
- def GenerateProgramEventFunctions(self):
- text = ""
- current_location = "_".join(map(str, self.CurrentLocation))
- for element in self.Elements:
- element_type = GetElementType(element)
- element_lock = """
- if (COMPARE_AND_SWAP_VAL(&in_state_%d, CHANGED, GUI_BUSY) == CHANGED ||
- COMPARE_AND_SWAP_VAL(&in_state_%d, UNCHANGED, GUI_BUSY) == UNCHANGED) {
-"""%(element.getid(), element.getid())
- element_unlock = """
- COMPARE_AND_SWAP_VAL(&in_state_%d, GUI_BUSY, CHANGED);
- event.Skip();
- }else{
- /* re post event for idle */
- AddPendingEvent(event);
- }
-}
-
-"""%element.getid()
- element_name = element.getname()
-
- if element_type == ITEM_BUTTON:
- text += """void Program::On%sClick(wxCommandEvent& event)
-{
- SVGUIButton* button = (SVGUIButton*)GetElementByName(wxT("%s"));\n"""%(element_name, element_name)
- text += element_lock
- text += " _copy__IX%s_%d_1 = button->GetToggle();\n"%(current_location, element.getid())
- text += element_unlock
- elif element_type == ITEM_ROTATING:
- text += """void Program::On%sChanging(wxScrollEvent& event)
-{
- SVGUIRotatingCtrl* rotating = (SVGUIRotatingCtrl*)GetElementByName(wxT("%s"));
-"""%(element_name, element_name)
- text += element_lock
- text += " _copy__ID%s_%d_1 = rotating->GetAngle();\n"%(current_location, element.getid())
- text += element_unlock
- elif element_type == ITEM_NOTEBOOK:
- text += """void Program::On%sTabChanged(wxNotebookEvent& event)
-{
- SVGUINoteBook* notebook = (SVGUINoteBook*)GetElementByName(wxT("%s"));
-"""%(element_name, element_name)
- text += element_lock
- text += " _copy__IB%s_%d_1 = notebook->GetCurrentPage();\n"%(current_location, element.getid())
- text += element_unlock
- elif element_type == ITEM_TRANSFORM:
- text += """void Program::On%sChanging(wxScrollEvent& event)
-{
- SVGUITransform* transform = (SVGUITransform*)GetElementByName(wxT("%s"));
-"""%(element_name, element_name)
- text += element_lock
- text += " _copy__ID%s_%d_1 = transform->GetX();\n"%(current_location, element.getid())
- text += " _copy__ID%s_%d_2 = transform->GetY();\n"%(current_location, element.getid())
- text += element_unlock
-
- text += "/* OnPlcOutEvent update GUI with provided IEC __Q* PLC output variables */\n"
- text += """void Program::OnPlcOutEvent(wxEvent& event)
-{
- SVGUIElement* element;
-
- refreshing = true;
-
-
-"""
- for element in self.Elements:
- element_type = GetElementType(element)
- texts = {"location" : current_location, "id" : element.getid()}
-
- text += """ if (COMPARE_AND_SWAP_VAL(&out_state_%(id)d, CHANGED, GUI_BUSY) == CHANGED)
- {
- element = (SVGUIElement*)GetElementById(wxT("%(id)d"));
-
- if (_copy__QX%(location)s_%(id)d_1 != element->IsVisible()) {
- if (_copy__QX%(location)s_%(id)d_1)
- element->Show();
- else
- element->Hide();
- }
- if (_copy__QX%(location)s_%(id)d_2 != element->IsEnabled()) {
- if (_copy__QX%(location)s_%(id)d_2)
- element->Enable();
- else
- element->Disable();
- }
-"""%texts
- if element_type == ITEM_BUTTON:
- text += """ if (_copy__QX%(location)s_%(id)d_3 != ((SVGUIButton*)element)->GetToggle())
- ((SVGUIButton*)element)->SetToggle(_copy__QX%(location)s_%(id)d_3);
-"""%texts
- elif element_type == ITEM_TEXT:
- text += """ if (((SVGUITextCtrl*)element)->GetValue().compare(_copy__QX%(location)s_%(id)d_3))
- {
- wxString str = wxString::FromAscii(_copy__QB%(location)s_%(id)d_3);
- ((SVGUITextCtrl*)element)->SetText(str);
- }
-"""%texts
- elif element_type == ITEM_SCROLLBAR:
- text += """ if (_copy__QW%(location)s_%(id)d_3 != ((SVGUIScrollBar*)element)->GetThumbPosition() ||
- _copy__QW%(location)s_%(id)d_4 != ((SVGUIScrollBar*)element)->GetThumbSize() ||
- _copy__QW%(location)s_%(id)d_5 != ((SVGUIScrollBar*)element)->GetRange())
- ((SVGUIScrollBar*)element)->Init_ScrollBar(_copy__QW%(location)s_%(id)d_3, _copy__QW%(location)s_%(id)d_4, _copy__QW%(location)s_%(id)d_5);
-"""%texts
- elif element_type == ITEM_ROTATING:
- text += """ if (_copy__QD%(location)s_%(id)d_3 != ((SVGUIRotatingCtrl*)element)->GetAngle())
- ((SVGUIRotatingCtrl*)element)->SetAngle(_copy__QD%(location)s_%(id)d_3);
-"""%texts
- elif element_type == ITEM_NOTEBOOK:
- text += """ if (_copy__QB%(location)s_%(id)d_3 != ((SVGUINoteBook*)element)->GetCurrentPage())
- ((SVGUINoteBook*)element)->SetCurrentPage(_copy__QB%(location)s_%(id)d_3);
-"""%texts
- elif element_type == ITEM_TRANSFORM:
- text += """ if (_copy__QD%(location)s_%(id)d_3 != ((SVGUITransform*)element)->GetX() ||
- _copy__QD%(location)s_%(id)d_4 != ((SVGUITransform*)element)->GetY())
- ((SVGUITransform*)element)->Move(_copy__QD%(location)s_%(id)d_3, _copy__QD%(location)s_%(id)d_4);
- if (_copy__QD%(location)s_%(id)d_5 != ((SVGUITransform*)element)->GetXScale() ||
- _copy__QD%(location)s_%(id)d_6 != ((SVGUITransform*)element)->GetYScale())
- ((SVGUITransform*)element)->Scale(_copy__QD%(location)s_%(id)d_5, _copy__QD%(location)s_%(id)d_6);
- if (_copy__QD%(location)s_%(id)d_7 != ((SVGUITransform*)element)->GetAngle())
- ((SVGUITransform*)element)->Rotate(_copy__QD%(location)s_%(id)d_7);
-"""%texts
- text += " COMPARE_AND_SWAP_VAL(&out_state_%(id)d, GUI_BUSY, UNCHANGED);\n }\n"%texts
-
- text += """
-
- refreshing = false;
-
- event.Skip();
-}
-
-"""
- return text
-
- def GenerateProgramPrivateFunctions(self):
- current_location = "_".join(map(str, self.CurrentLocation))
-
- text = "void Program::Retrieve()\n{\n"
- for element in self.Elements:
- element_type = GetElementType(element)
- texts = {"location" : current_location, "id" : element.getid()}
- block_infos = self.Controler.GetSVGUIBlockType(SVGUIFB_Types[GetElementType(element)])
- if len(block_infos["outputs"]) > 0:
- text += """ if (COMPARE_AND_SWAP_VAL(&in_state_%(id)d, CHANGED, PLC_BUSY) == CHANGED) {
-"""%texts
- for i, output in enumerate(block_infos["outputs"]):
- texts["type"] = TYPECONVERSION[output[1]]
- texts["pin"] = i + 1
-
- variable = "__I%(type)s%(location)s_%(id)d_%(pin)d"%texts
- text +=" beremiz%s = _copy%s;\n"%(variable, variable)
-
- text += """ COMPARE_AND_SWAP_VAL(&in_state_%(id)d, PLC_BUSY, UNCHANGED);
- }
-"""%texts
- text += "}\n\n"
-
- text += "void Program::Publish()\n{\n STATE_TYPE new_state;\n\n"
- for element in self.Elements:
- element_type = GetElementType(element)
- texts = {"location" : current_location, "id" : element.getid()}
- block_infos = self.Controler.GetSVGUIBlockType(SVGUIFB_Types[GetElementType(element)])
-
- text += """ if ((new_state = COMPARE_AND_SWAP_VAL(&out_state_%(id)d, UNCHANGED, PLC_BUSY)) == UNCHANGED ||
- (new_state = COMPARE_AND_SWAP_VAL(&out_state_%(id)d, CHANGED, PLC_BUSY)) == CHANGED) {
-"""%texts
- for i, input in enumerate(block_infos["inputs"]):
- texts["type"] = TYPECONVERSION[input[1]]
- texts["pin"] = i + 1
- variable = "__Q%(type)s%(location)s_%(id)d_%(pin)d"%texts
- text += " if (_copy%s != beremiz%s) {\n"%(variable, variable)
- text += " _copy%s = beremiz%s;\n"%(variable, variable)
- text += " new_state = CHANGED;\n }\n"%texts
- text += """ COMPARE_AND_SWAP_VAL(&out_state_%(id)d, PLC_BUSY, new_state);
- refresh |= new_state == CHANGED;
- }
-"""%texts
-
- text += """ /* Replace this with determinist signal if called from RT */
- if (refresh && !refreshing) {
- wxCommandEvent event( EVT_PLC );
- AddPendingEvent(event);
- refresh = false;
- }
-};
-
-"""
-
- text += """void Program::Initialize()
-{
- SVGUIElement* element;
-"""
- for element in self.Elements:
- element_type = GetElementType(element)
- texts = {"location" : current_location, "id" : element.getid()}
-
- text += """
- element = (SVGUIElement*)GetElementById(wxT("%(id)d"));
- beremiz__QX%(location)s_%(id)d_1 = _copy__QX%(location)s_%(id)d_1 = element->IsVisible();
- beremiz__QX%(location)s_%(id)d_2 = _copy__QX%(location)s_%(id)d_2 = element->IsEnabled();
-"""%texts
- if element_type == ITEM_BUTTON:
- text += " beremiz__QX%(location)s_%(id)d_3 = _copy__QX%(location)s_%(id)d_3 = ((SVGUIButton*)element)->GetToggle();\n"%texts
- text += " beremiz__IX%(location)s_%(id)d_1 = _copy__IX%(location)s_%(id)d_1 = ((SVGUIButton*)element)->GetToggle();\n"%texts
- elif element_type == ITEM_TEXT:
- text += " beremiz__QB%(location)s_%(id)d_3 = _copy__QB%(location)s_%(id)d_3 = ((SVGUITextCtrl*)element)->GetValue();\n"%texts
- text += " beremiz__IB%(location)s_%(id)d_1 = _copy__IB%(location)s_%(id)d_1 = ((SVGUITextCtrl*)element)->GetValue();\n"%texts
- elif element_type == ITEM_SCROLLBAR:
- text += " beremiz__QW%(location)s_%(id)d_3 = _copy__QW%(location)s_%(id)d_3 = ((SVGUIScrollBar*)element)->GetThumbSize();\n"%texts
- text += " beremiz__QW%(location)s_%(id)d_4 = _copy__QW%(location)s_%(id)d_4 = ((SVGUIScrollBar*)element)->GetRange();\n"%texts
- text += " beremiz__QW%(location)s_%(id)d_5 = _copy__QW%(location)s_%(id)d_5 = ((SVGUIScrollBar*)element)->GetThumbPosition();\n"%texts
- text += " beremiz__IW%(location)s_%(id)d_1 = _copy__IW%(location)s_%(id)d_1 = ((SVGUIScrollBar*)element)->GetThumbPosition();\n"%texts
- elif element_type == ITEM_ROTATING:
- text += " beremiz__QD%(location)s_%(id)d_3 = _copy__QD%(location)s_%(id)d_3 = ((SVGUIRotatingCtrl*)element)->GetAngle();\n"%texts
- text += " beremiz__ID%(location)s_%(id)d_1 = _copy__ID%(location)s_%(id)d_1 = ((SVGUIRotatingCtrl*)element)->GetAngle();\n"%texts
- elif element_type == ITEM_NOTEBOOK:
- text += " beremiz__QB%(location)s_%(id)d_3 = _copy__QB%(location)s_%(id)d_3 = ((SVGUINoteBook*)element)->GetCurrentPage();\n"%texts
- text += " beremiz__IB%(location)s_%(id)d_1 = _copy__IB%(location)s_%(id)d_1 = ((SVGUINoteBook*)element)->GetCurrentPage();\n"%texts
- elif element_type == ITEM_TRANSFORM:
- text += " beremiz__QD%(location)s_%(id)d_3 = _copy__QD%(location)s_%(id)d_3 = ((SVGUITransform*)element)->GetX();\n"%texts
- text += " beremiz__QD%(location)s_%(id)d_4 = _copy__QD%(location)s_%(id)d_4 = ((SVGUITransform*)element)->GetY();\n"%texts
- text += " beremiz__QD%(location)s_%(id)d_5 = _copy__QD%(location)s_%(id)d_5 = ((SVGUITransform*)element)->GetXScale();\n"%texts
- text += " beremiz__QD%(location)s_%(id)d_6 = _copy__QD%(location)s_%(id)d_6 = ((SVGUITransform*)element)->GetYScale();\n"%texts
- text += " beremiz__QD%(location)s_%(id)d_7 = _copy__QD%(location)s_%(id)d_7 = ((SVGUITransform*)element)->GetAngle();\n"%texts
- text += " beremiz__ID%(location)s_%(id)d_1 = _copy__ID%(location)s_%(id)d_1 = ((SVGUITransform*)element)->GetX();\n"%texts
- text += " beremiz__ID%(location)s_%(id)d_2 = _copy__ID%(location)s_%(id)d_2 = ((SVGUITransform*)element)->GetY();\n"%texts
-
- text += "\n MyInitSem.Post();\n}\n\n"
- return text
diff -r 35cc4c6a2936 -r 46d7d2ce84d2 runtime/PLCObject.py
--- a/runtime/PLCObject.py Mon Aug 10 11:35:14 2009 +0200
+++ b/runtime/PLCObject.py Thu Aug 13 11:48:55 2009 +0200
@@ -45,7 +45,7 @@
class PLCObject(pyro.ObjBase):
_Idxs = []
- def __init__(self, workingdir, daemon, argv, statuschange, evaluator):
+ def __init__(self, workingdir, daemon, argv, statuschange, evaluator, website):
pyro.ObjBase.__init__(self)
self.evaluator = evaluator
self.argv = [workingdir] + argv # force argv[0] to be "path" to exec...
@@ -59,6 +59,7 @@
self.daemon = daemon
self.statuschange = statuschange
self.hmi_frame = None
+ self.website = website
# Get the last transfered PLC if connector must be restart
try:
@@ -205,49 +206,10 @@
def PrepareRuntimePy(self):
self.python_threads_vars = globals().copy()
self.python_threads_vars["WorkingDir"] = self.workingdir
+ self.python_threads_vars["website"] = self.website
self.python_threads_vars["_runtime_begin"] = []
self.python_threads_vars["_runtime_cleanup"] = []
-# pyfile = os.path.join(self.workingdir, "runtime.py")
-# hmifile = os.path.join(self.workingdir, "hmi.py")
-# if os.path.exists(hmifile):
-# try:
-# execfile(hmifile, self.python_threads_vars)
-# if os.path.exists(pyfile):
-# try:
-# # TODO handle exceptions in runtime.py
-# # pyfile may redefine _runtime_cleanup
-# # or even call _PythonThreadProc itself.
-# execfile(pyfile, self.python_threads_vars)
-# except:
-# PLCprint(traceback.format_exc())
-# if self.python_threads_vars.has_key('wx'):
-# wx = self.python_threads_vars['wx']
-# # try to instanciate the first frame found.
-# for name, obj in self.python_threads_vars.iteritems():
-# # obj is a class
-# if type(obj)==type(type) and issubclass(obj,wx.Frame):
-# def create_frame():
-# self.hmi_frame = obj(None)
-# self.python_threads_vars[name] = self.hmi_frame
-# # keep track of class... never know
-# self.python_threads_vars['Class_'+name] = obj
-# self.hmi_frame.Bind(wx.EVT_CLOSE, OnCloseFrame)
-# self.hmi_frame.Show()
-#
-# def OnCloseFrame(evt):
-# wx.MessageBox(_("Please stop PLC to close"))
-# create_frame()
-# break
-# except:
-# PLCprint(traceback.format_exc())
-# elif os.path.exists(pyfile):
-# try:
-# # TODO handle exceptions in runtime.py
-# # pyfile may redefine _runtime_cleanup
-# # or even call _PythonThreadProc itself.
-# execfile(pyfile, self.python_threads_vars)
-# except:
-# PLCprint(traceback.format_exc())
+
for filename in os.listdir(self.workingdir):
name, ext = os.path.splitext(filename)
if name.startswith("runtime") and ext == ".py":
@@ -267,16 +229,15 @@
for runtime_begin in self.python_threads_vars.get("_runtime_begin", []):
runtime_begin()
+
+ if self.website is not None:
+ self.website.PLCStarted()
def FinishRuntimePy(self):
for runtime_cleanup in self.python_threads_vars.get("_runtime_cleanup", []):
runtime_cleanup()
-# if self.python_threads_vars is not None:
-# runtime_cleanup = self.python_threads_vars.get("_runtime_cleanup",None)
-# if runtime_cleanup is not None:
-# runtime_cleanup()
-# if self.hmi_frame is not None:
-# self.hmi_frame.Destroy()
+ if self.website is not None:
+ self.website.PLCStopped()
self.python_threads_vars = None
def PythonThreadProc(self, debug):
diff -r 35cc4c6a2936 -r 46d7d2ce84d2 tests/linux/test_svgui/.cvsignore
--- a/tests/linux/test_svgui/.cvsignore Mon Aug 10 11:35:14 2009 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-build
diff -r 35cc4c6a2936 -r 46d7d2ce84d2 tests/linux/test_svgui/CANopen@canfestival/Master@CanOpenNode/baseplugin.xml
--- a/tests/linux/test_svgui/CANopen@canfestival/Master@CanOpenNode/baseplugin.xml Mon Aug 10 11:35:14 2009 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-
-
diff -r 35cc4c6a2936 -r 46d7d2ce84d2 tests/linux/test_svgui/CANopen@canfestival/Master@CanOpenNode/eds/DS401_Slave_Gui.eds
--- a/tests/linux/test_svgui/CANopen@canfestival/Master@CanOpenNode/eds/DS401_Slave_Gui.eds Mon Aug 10 11:35:14 2009 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1142 +0,0 @@
-[FileInfo]
-FileName=DS401_Slave_Gui.eds
-FileVersion=1
-FileRevision=1
-EDSVersion=4.0
-Description=
-CreationTime=05:58PM
-CreationDate=10-02-2007
-CreatedBy=CANFestival
-ModificationTime=05:58PM
-ModificationDate=10-02-2007
-ModifiedBy=CANFestival
-
-[DeviceInfo]
-VendorName=CANFestival
-VendorNumber=0x00000175
-ProductName=ObjDict
-ProductNumber=0x00100000
-RevisionNumber=0x00010001
-BaudRate_10=1
-BaudRate_20=1
-BaudRate_50=1
-BaudRate_125=1
-BaudRate_250=1
-BaudRate_500=1
-BaudRate_800=1
-BaudRate_1000=1
-SimpleBootUpMaster=0
-SimpleBootUpSlave=1
-Granularity=8
-DynamicChannelsSupported=0
-CompactPDO=0
-GroupMessaging=0
-NrOfRXPDO=2
-NrOfTXPDO=3
-LSS_Supported=0
-
-[DummyUsage]
-Dummy0001=0
-Dummy0002=1
-Dummy0003=1
-Dummy0004=1
-Dummy0005=1
-Dummy0006=1
-Dummy0007=1
-
-[Comments]
-Lines=0
-
-[MandatoryObjects]
-SupportedObjects=3
-1=0x1000
-2=0x1001
-3=0x1018
-
-[1000]
-ParameterName=Device Type
-ObjectType=0x7
-DataType=0x0007
-AccessType=ro
-DefaultValue=983441
-PDOMapping=0
-
-[1001]
-ParameterName=Error Register
-ObjectType=0x7
-DataType=0x0005
-AccessType=ro
-DefaultValue=0
-PDOMapping=1
-
-[1018]
-ParameterName=Identity
-ObjectType=0x8
-SubNumber=4
-
-[1018sub0]
-ParameterName=Number of Entries
-ObjectType=0x7
-DataType=0x0005
-AccessType=ro
-DefaultValue=3
-PDOMapping=0
-
-[1018sub1]
-ParameterName=Vendor ID
-ObjectType=0x7
-DataType=0x0007
-AccessType=ro
-DefaultValue=373
-PDOMapping=0
-
-[1018sub2]
-ParameterName=Product Code
-ObjectType=0x7
-DataType=0x0007
-AccessType=ro
-DefaultValue=1048576
-PDOMapping=0
-
-[1018sub3]
-ParameterName=Revision Number
-ObjectType=0x7
-DataType=0x0007
-AccessType=ro
-DefaultValue=65537
-PDOMapping=0
-
-[OptionalObjects]
-SupportedObjects=35
-1=0x1002
-2=0x1005
-3=0x1008
-4=0x1009
-5=0x100A
-6=0x100C
-7=0x100D
-8=0x1010
-9=0x1011
-10=0x1016
-11=0x1017
-12=0x1020
-13=0x1200
-14=0x1400
-15=0x1401
-16=0x1600
-17=0x1601
-18=0x1800
-19=0x1801
-20=0x1802
-21=0x1A00
-22=0x1A01
-23=0x1A02
-24=0x6000
-25=0x6002
-26=0x6200
-27=0x6202
-28=0x6206
-29=0x6207
-30=0x6401
-31=0x6411
-32=0x6423
-33=0x6426
-34=0x6443
-35=0x6444
-
-[1002]
-ParameterName=Manufacturer Status Register
-ObjectType=0x7
-DataType=0x0007
-AccessType=ro
-DefaultValue=0
-PDOMapping=1
-
-[1005]
-ParameterName=SYNC COB ID
-ObjectType=0x7
-DataType=0x0007
-AccessType=rw
-DefaultValue=128
-PDOMapping=0
-
-[1008]
-ParameterName=Manufacturer Device Name
-ObjectType=0x7
-DataType=0x0009
-AccessType=ro
-DefaultValue=0
-PDOMapping=0
-
-[1009]
-ParameterName=Manufacturer Hardware Version
-ObjectType=0x7
-DataType=0x0009
-AccessType=ro
-DefaultValue=0
-PDOMapping=0
-
-[100A]
-ParameterName=Manufacturer Software Version
-ObjectType=0x7
-DataType=0x0009
-AccessType=ro
-DefaultValue=0
-PDOMapping=0
-
-[100C]
-ParameterName=Guard Time
-ObjectType=0x7
-DataType=0x0006
-AccessType=rw
-DefaultValue=0
-PDOMapping=0
-
-[100D]
-ParameterName=Life Time Factor
-ObjectType=0x7
-DataType=0x0005
-AccessType=rw
-DefaultValue=0
-PDOMapping=0
-
-[1010]
-ParameterName=Store parameters
-ObjectType=0x8
-SubNumber=2
-
-[1010sub0]
-ParameterName=Number of Entries
-ObjectType=0x7
-DataType=0x0005
-AccessType=ro
-DefaultValue=1
-PDOMapping=0
-
-[1010sub1]
-ParameterName=Save All Parameters
-ObjectType=0x7
-DataType=0x0007
-AccessType=rw
-DefaultValue=0
-PDOMapping=0
-
-[1011]
-ParameterName=Restore Default Parameters
-ObjectType=0x8
-SubNumber=2
-
-[1011sub0]
-ParameterName=Number of Entries
-ObjectType=0x7
-DataType=0x0005
-AccessType=ro
-DefaultValue=1
-PDOMapping=0
-
-[1011sub1]
-ParameterName=Restore All Default Parameters
-ObjectType=0x7
-DataType=0x0007
-AccessType=rw
-DefaultValue=0
-PDOMapping=0
-
-[1016]
-ParameterName=Consumer Heartbeat Time
-ObjectType=0x9
-SubNumber=4
-
-[1016sub0]
-ParameterName=Number of Entries
-ObjectType=0x7
-DataType=0x0005
-AccessType=ro
-DefaultValue=3
-PDOMapping=0
-
-[1016sub1]
-ParameterName=Consumer Heartbeat Time
-ObjectType=0x7
-DataType=0x0007
-AccessType=rw
-DefaultValue=0
-PDOMapping=0
-
-[1016sub2]
-ParameterName=Consumer Heartbeat Time
-ObjectType=0x7
-DataType=0x0007
-AccessType=rw
-DefaultValue=0
-PDOMapping=0
-
-[1016sub3]
-ParameterName=Consumer Heartbeat Time
-ObjectType=0x7
-DataType=0x0007
-AccessType=rw
-DefaultValue=0
-PDOMapping=0
-
-[1017]
-ParameterName=Producer Heartbeat Time
-ObjectType=0x7
-DataType=0x0006
-AccessType=rw
-DefaultValue=0
-PDOMapping=0
-
-[1020]
-ParameterName=Verify Configuration
-ObjectType=0x8
-SubNumber=3
-
-[1020sub0]
-ParameterName=Number of Entries
-ObjectType=0x7
-DataType=0x0005
-AccessType=ro
-DefaultValue=2
-PDOMapping=0
-
-[1020sub1]
-ParameterName=Configuration Date
-ObjectType=0x7
-DataType=0x0007
-AccessType=ro
-DefaultValue=0
-PDOMapping=0
-
-[1020sub2]
-ParameterName=Configuration Time
-ObjectType=0x7
-DataType=0x0007
-AccessType=ro
-DefaultValue=0
-PDOMapping=0
-
-[1200]
-ParameterName=Server SDO Parameter
-ObjectType=0x8
-SubNumber=3
-
-[1200sub0]
-ParameterName=Number of Entries
-ObjectType=0x7
-DataType=0x0005
-AccessType=ro
-DefaultValue=2
-PDOMapping=0
-
-[1200sub1]
-ParameterName=COB ID Client to Server (Receive SDO)
-ObjectType=0x7
-DataType=0x0007
-AccessType=ro
-DefaultValue=$NODEID+0x600
-PDOMapping=0
-
-[1200sub2]
-ParameterName=COB ID Server to Client (Transmit SDO)
-ObjectType=0x7
-DataType=0x0007
-AccessType=ro
-DefaultValue=$NODEID+0x580
-PDOMapping=0
-
-[1400]
-ParameterName=Receive PDO 1 Parameter
-ObjectType=0x8
-SubNumber=3
-
-[1400sub0]
-ParameterName=Highest SubIndex Supported
-ObjectType=0x7
-DataType=0x0005
-AccessType=ro
-DefaultValue=2
-PDOMapping=0
-
-[1400sub1]
-ParameterName=COB ID used by PDO
-ObjectType=0x7
-DataType=0x0007
-AccessType=rw
-DefaultValue=$NODEID+0x200
-PDOMapping=0
-
-[1400sub2]
-ParameterName=Transmission Type
-ObjectType=0x7
-DataType=0x0005
-AccessType=rw
-DefaultValue=1
-PDOMapping=0
-
-[1401]
-ParameterName=Receive PDO 2 Parameter
-ObjectType=0x8
-SubNumber=3
-
-[1401sub0]
-ParameterName=Highest SubIndex Supported
-ObjectType=0x7
-DataType=0x0005
-AccessType=ro
-DefaultValue=2
-PDOMapping=0
-
-[1401sub1]
-ParameterName=COB ID used by PDO
-ObjectType=0x7
-DataType=0x0007
-AccessType=rw
-DefaultValue=$NODEID+0x300
-PDOMapping=0
-
-[1401sub2]
-ParameterName=Transmission Type
-ObjectType=0x7
-DataType=0x0005
-AccessType=rw
-DefaultValue=1
-PDOMapping=0
-
-[1600]
-ParameterName=Receive PDO 1 Mapping
-ObjectType=0x9
-SubNumber=2
-
-[1600sub0]
-ParameterName=Number of Entries
-ObjectType=0x7
-DataType=0x0005
-AccessType=rw
-DefaultValue=1
-PDOMapping=0
-
-[1600sub1]
-ParameterName=PDO 1 Mapping for an application object 1
-ObjectType=0x7
-DataType=0x0007
-AccessType=rw
-DefaultValue=1644167432
-PDOMapping=0
-
-[1601]
-ParameterName=Receive PDO 2 Mapping
-ObjectType=0x9
-SubNumber=5
-
-[1601sub0]
-ParameterName=Number of Entries
-ObjectType=0x7
-DataType=0x0005
-AccessType=rw
-DefaultValue=4
-PDOMapping=0
-
-[1601sub1]
-ParameterName=PDO 2 Mapping for an application object 1
-ObjectType=0x7
-DataType=0x0007
-AccessType=rw
-DefaultValue=1678835984
-PDOMapping=0
-
-[1601sub2]
-ParameterName=PDO 2 Mapping for an application object 2
-ObjectType=0x7
-DataType=0x0007
-AccessType=rw
-DefaultValue=1678836240
-PDOMapping=0
-
-[1601sub3]
-ParameterName=PDO 2 Mapping for an application object 3
-ObjectType=0x7
-DataType=0x0007
-AccessType=rw
-DefaultValue=1678836496
-PDOMapping=0
-
-[1601sub4]
-ParameterName=PDO 2 Mapping for an application object 4
-ObjectType=0x7
-DataType=0x0007
-AccessType=rw
-DefaultValue=1678836752
-PDOMapping=0
-
-[1800]
-ParameterName=Transmit PDO 1 Parameter
-ObjectType=0x8
-SubNumber=5
-
-[1800sub0]
-ParameterName=Highest SubIndex Supported
-ObjectType=0x7
-DataType=0x0005
-AccessType=ro
-DefaultValue=5
-PDOMapping=0
-
-[1800sub1]
-ParameterName=COB ID used by PDO
-ObjectType=0x7
-DataType=0x0007
-AccessType=rw
-DefaultValue=$NODEID+0x180
-PDOMapping=0
-
-[1800sub2]
-ParameterName=Transmission Type
-ObjectType=0x7
-DataType=0x0005
-AccessType=rw
-DefaultValue=1
-PDOMapping=0
-
-[1800sub3]
-ParameterName=Inhibit Time
-ObjectType=0x7
-DataType=0x0006
-AccessType=rw
-DefaultValue=0
-PDOMapping=0
-
-[1800sub5]
-ParameterName=Event Timer
-ObjectType=0x7
-DataType=0x0006
-AccessType=rw
-DefaultValue=0
-PDOMapping=0
-
-[1801]
-ParameterName=Transmit PDO 2 Parameter
-ObjectType=0x8
-SubNumber=5
-
-[1801sub0]
-ParameterName=Highest SubIndex Supported
-ObjectType=0x7
-DataType=0x0005
-AccessType=ro
-DefaultValue=5
-PDOMapping=0
-
-[1801sub1]
-ParameterName=COB ID used by PDO
-ObjectType=0x7
-DataType=0x0007
-AccessType=rw
-DefaultValue=$NODEID+0x280
-PDOMapping=0
-
-[1801sub2]
-ParameterName=Transmission Type
-ObjectType=0x7
-DataType=0x0005
-AccessType=rw
-DefaultValue=1
-PDOMapping=0
-
-[1801sub3]
-ParameterName=Inhibit Time
-ObjectType=0x7
-DataType=0x0006
-AccessType=rw
-DefaultValue=0
-PDOMapping=0
-
-[1801sub5]
-ParameterName=Event Timer
-ObjectType=0x7
-DataType=0x0006
-AccessType=rw
-DefaultValue=0
-PDOMapping=0
-
-[1802]
-ParameterName=Transmit PDO 3 Parameter
-ObjectType=0x8
-SubNumber=5
-
-[1802sub0]
-ParameterName=Highest SubIndex Supported
-ObjectType=0x7
-DataType=0x0005
-AccessType=ro
-DefaultValue=5
-PDOMapping=0
-
-[1802sub1]
-ParameterName=COB ID used by PDO
-ObjectType=0x7
-DataType=0x0007
-AccessType=rw
-DefaultValue=$NODEID+0x380
-PDOMapping=0
-
-[1802sub2]
-ParameterName=Transmission Type
-ObjectType=0x7
-DataType=0x0005
-AccessType=rw
-DefaultValue=1
-PDOMapping=0
-
-[1802sub3]
-ParameterName=Inhibit Time
-ObjectType=0x7
-DataType=0x0006
-AccessType=rw
-DefaultValue=0
-PDOMapping=0
-
-[1802sub5]
-ParameterName=Event Timer
-ObjectType=0x7
-DataType=0x0006
-AccessType=rw
-DefaultValue=0
-PDOMapping=0
-
-[1A00]
-ParameterName=Transmit PDO 1 Mapping
-ObjectType=0x9
-SubNumber=2
-
-[1A00sub0]
-ParameterName=Number of Entries
-ObjectType=0x7
-DataType=0x0005
-AccessType=rw
-DefaultValue=1
-PDOMapping=0
-
-[1A00sub1]
-ParameterName=PDO 1 Mapping for a process data variable 1
-ObjectType=0x7
-DataType=0x0007
-AccessType=rw
-DefaultValue=1610613000
-PDOMapping=0
-
-[1A01]
-ParameterName=Transmit PDO 2 Mapping
-ObjectType=0x9
-SubNumber=5
-
-[1A01sub0]
-ParameterName=Number of Entries
-ObjectType=0x7
-DataType=0x0005
-AccessType=rw
-DefaultValue=4
-PDOMapping=0
-
-[1A01sub1]
-ParameterName=PDO 2 Mapping for a process data variable 1
-ObjectType=0x7
-DataType=0x0007
-AccessType=rw
-DefaultValue=1677787408
-PDOMapping=0
-
-[1A01sub2]
-ParameterName=PDO 2 Mapping for a process data variable 2
-ObjectType=0x7
-DataType=0x0007
-AccessType=rw
-DefaultValue=1677787664
-PDOMapping=0
-
-[1A01sub3]
-ParameterName=PDO 2 Mapping for a process data variable 3
-ObjectType=0x7
-DataType=0x0007
-AccessType=rw
-DefaultValue=1677787920
-PDOMapping=0
-
-[1A01sub4]
-ParameterName=PDO 2 Mapping for a process data variable 4
-ObjectType=0x7
-DataType=0x0007
-AccessType=rw
-DefaultValue=1677788176
-PDOMapping=0
-
-[1A02]
-ParameterName=Transmit PDO 3 Mapping
-ObjectType=0x9
-SubNumber=5
-
-[1A02sub0]
-ParameterName=Number of Entries
-ObjectType=0x7
-DataType=0x0005
-AccessType=rw
-DefaultValue=4
-PDOMapping=0
-
-[1A02sub1]
-ParameterName=PDO 3 Mapping for a process data variable 1
-ObjectType=0x7
-DataType=0x0007
-AccessType=rw
-DefaultValue=1677788432
-PDOMapping=0
-
-[1A02sub2]
-ParameterName=PDO 3 Mapping for a process data variable 2
-ObjectType=0x7
-DataType=0x0007
-AccessType=rw
-DefaultValue=1677788688
-PDOMapping=0
-
-[1A02sub3]
-ParameterName=PDO 3 Mapping for a process data variable 3
-ObjectType=0x7
-DataType=0x0007
-AccessType=rw
-DefaultValue=1677788944
-PDOMapping=0
-
-[1A02sub4]
-ParameterName=PDO 3 Mapping for a process data variable 4
-ObjectType=0x7
-DataType=0x0007
-AccessType=rw
-DefaultValue=1677789200
-PDOMapping=0
-
-[6000]
-ParameterName=Read Inputs 8 Bit
-ObjectType=0x9
-SubNumber=2
-
-[6000sub0]
-ParameterName=Number of Input 8 bit
-ObjectType=0x7
-DataType=0x0005
-AccessType=ro
-DefaultValue=1
-PDOMapping=0
-
-[6000sub1]
-ParameterName=Read Inputs 0x1 to 0x8
-ObjectType=0x7
-DataType=0x0005
-AccessType=ro
-DefaultValue=0
-PDOMapping=1
-
-[6002]
-ParameterName=Polarity Input 8 Bit
-ObjectType=0x9
-SubNumber=2
-
-[6002sub0]
-ParameterName=Number of Input 8 bit
-ObjectType=0x7
-DataType=0x0005
-AccessType=ro
-DefaultValue=1
-PDOMapping=0
-
-[6002sub1]
-ParameterName=Polarity Input 0x1 to 0x8
-ObjectType=0x7
-DataType=0x0005
-AccessType=rw
-DefaultValue=0
-PDOMapping=1
-
-[6200]
-ParameterName=Write Outputs 8 Bit
-ObjectType=0x9
-SubNumber=2
-
-[6200sub0]
-ParameterName=Number of Output 8 Bit
-ObjectType=0x7
-DataType=0x0005
-AccessType=ro
-DefaultValue=1
-PDOMapping=0
-
-[6200sub1]
-ParameterName=Write Outputs 0x1 to 0x8
-ObjectType=0x7
-DataType=0x0005
-AccessType=rw
-DefaultValue=0
-PDOMapping=1
-
-[6202]
-ParameterName=Change Polarity Outputs 8 Bit
-ObjectType=0x9
-SubNumber=2
-
-[6202sub0]
-ParameterName=Number of Output 8 Bit
-ObjectType=0x7
-DataType=0x0005
-AccessType=ro
-DefaultValue=1
-PDOMapping=0
-
-[6202sub1]
-ParameterName=Change Polarity Outputs 0x1 to 0x8
-ObjectType=0x7
-DataType=0x0005
-AccessType=rw
-DefaultValue=0
-PDOMapping=1
-
-[6206]
-ParameterName=Error Mode Outputs 8 Bit
-ObjectType=0x9
-SubNumber=2
-
-[6206sub0]
-ParameterName=Number of Output 8 Bit
-ObjectType=0x7
-DataType=0x0005
-AccessType=ro
-DefaultValue=1
-PDOMapping=0
-
-[6206sub1]
-ParameterName=Error Mode Outputs 0x1 to 0x8
-ObjectType=0x7
-DataType=0x0005
-AccessType=rw
-DefaultValue=0
-PDOMapping=1
-
-[6207]
-ParameterName=Error Value Outputs 8 Bit
-ObjectType=0x9
-SubNumber=2
-
-[6207sub0]
-ParameterName=Number of Output 8 Bit
-ObjectType=0x7
-DataType=0x0005
-AccessType=ro
-DefaultValue=1
-PDOMapping=0
-
-[6207sub1]
-ParameterName=Error Value Outputs 0x1 to 0x8
-ObjectType=0x7
-DataType=0x0005
-AccessType=rw
-DefaultValue=0
-PDOMapping=1
-
-[6401]
-ParameterName=Read Analogue Input 16 Bit
-ObjectType=0x9
-SubNumber=9
-
-[6401sub0]
-ParameterName=Number of Analogue Input 16 Bit
-ObjectType=0x7
-DataType=0x0005
-AccessType=ro
-DefaultValue=8
-PDOMapping=0
-
-[6401sub1]
-ParameterName=Analogue Input 1
-ObjectType=0x7
-DataType=0x0003
-AccessType=ro
-DefaultValue=0
-PDOMapping=1
-
-[6401sub2]
-ParameterName=Analogue Input 2
-ObjectType=0x7
-DataType=0x0003
-AccessType=ro
-DefaultValue=0
-PDOMapping=1
-
-[6401sub3]
-ParameterName=Analogue Input 3
-ObjectType=0x7
-DataType=0x0003
-AccessType=ro
-DefaultValue=0
-PDOMapping=1
-
-[6401sub4]
-ParameterName=Analogue Input 4
-ObjectType=0x7
-DataType=0x0003
-AccessType=ro
-DefaultValue=0
-PDOMapping=1
-
-[6401sub5]
-ParameterName=Analogue Input 5
-ObjectType=0x7
-DataType=0x0003
-AccessType=ro
-DefaultValue=0
-PDOMapping=1
-
-[6401sub6]
-ParameterName=Analogue Input 6
-ObjectType=0x7
-DataType=0x0003
-AccessType=ro
-DefaultValue=0
-PDOMapping=1
-
-[6401sub7]
-ParameterName=Analogue Input 7
-ObjectType=0x7
-DataType=0x0003
-AccessType=ro
-DefaultValue=0
-PDOMapping=1
-
-[6401sub8]
-ParameterName=Analogue Input 8
-ObjectType=0x7
-DataType=0x0003
-AccessType=ro
-DefaultValue=0
-PDOMapping=1
-
-[6411]
-ParameterName=Write Analogue Output 16 Bit
-ObjectType=0x9
-SubNumber=5
-
-[6411sub0]
-ParameterName=Number of Analogue Input 16 Bit
-ObjectType=0x7
-DataType=0x0005
-AccessType=ro
-DefaultValue=4
-PDOMapping=0
-
-[6411sub1]
-ParameterName=Analogue Output 1
-ObjectType=0x7
-DataType=0x0003
-AccessType=rw
-DefaultValue=0
-PDOMapping=1
-
-[6411sub2]
-ParameterName=Analogue Output 2
-ObjectType=0x7
-DataType=0x0003
-AccessType=rw
-DefaultValue=0
-PDOMapping=1
-
-[6411sub3]
-ParameterName=Analogue Output 3
-ObjectType=0x7
-DataType=0x0003
-AccessType=rw
-DefaultValue=0
-PDOMapping=1
-
-[6411sub4]
-ParameterName=Analogue Output 4
-ObjectType=0x7
-DataType=0x0003
-AccessType=rw
-DefaultValue=0
-PDOMapping=1
-
-[6423]
-ParameterName=Analogue Input Global Interrupt Enable
-ObjectType=0x7
-DataType=0x0001
-AccessType=rw
-DefaultValue=0
-PDOMapping=1
-
-[6426]
-ParameterName=Analogue Input Interrupt Delta Unsigned
-ObjectType=0x9
-SubNumber=9
-
-[6426sub0]
-ParameterName=Number of Analogue Inputs
-ObjectType=0x7
-DataType=0x0005
-AccessType=ro
-DefaultValue=8
-PDOMapping=0
-
-[6426sub1]
-ParameterName=Analogue Input 1
-ObjectType=0x7
-DataType=0x0007
-AccessType=rw
-DefaultValue=0
-PDOMapping=1
-
-[6426sub2]
-ParameterName=Analogue Input 2
-ObjectType=0x7
-DataType=0x0007
-AccessType=rw
-DefaultValue=0
-PDOMapping=1
-
-[6426sub3]
-ParameterName=Analogue Input 3
-ObjectType=0x7
-DataType=0x0007
-AccessType=rw
-DefaultValue=0
-PDOMapping=1
-
-[6426sub4]
-ParameterName=Analogue Input 4
-ObjectType=0x7
-DataType=0x0007
-AccessType=rw
-DefaultValue=0
-PDOMapping=1
-
-[6426sub5]
-ParameterName=Analogue Input 5
-ObjectType=0x7
-DataType=0x0007
-AccessType=rw
-DefaultValue=0
-PDOMapping=1
-
-[6426sub6]
-ParameterName=Analogue Input 6
-ObjectType=0x7
-DataType=0x0007
-AccessType=rw
-DefaultValue=0
-PDOMapping=1
-
-[6426sub7]
-ParameterName=Analogue Input 7
-ObjectType=0x7
-DataType=0x0007
-AccessType=rw
-DefaultValue=0
-PDOMapping=1
-
-[6426sub8]
-ParameterName=Analogue Input 8
-ObjectType=0x7
-DataType=0x0007
-AccessType=rw
-DefaultValue=0
-PDOMapping=1
-
-[6443]
-ParameterName=Analogue Output Error Mode
-ObjectType=0x9
-SubNumber=5
-
-[6443sub0]
-ParameterName=Number of Analogue Outputs
-ObjectType=0x7
-DataType=0x0005
-AccessType=ro
-DefaultValue=4
-PDOMapping=0
-
-[6443sub1]
-ParameterName=Error Mode Analogue Output 1
-ObjectType=0x7
-DataType=0x0005
-AccessType=rw
-DefaultValue=0
-PDOMapping=1
-
-[6443sub2]
-ParameterName=Error Mode Analogue Output 2
-ObjectType=0x7
-DataType=0x0005
-AccessType=rw
-DefaultValue=0
-PDOMapping=1
-
-[6443sub3]
-ParameterName=Error Mode Analogue Output 3
-ObjectType=0x7
-DataType=0x0005
-AccessType=rw
-DefaultValue=0
-PDOMapping=1
-
-[6443sub4]
-ParameterName=Error Mode Analogue Output 4
-ObjectType=0x7
-DataType=0x0005
-AccessType=rw
-DefaultValue=0
-PDOMapping=1
-
-[6444]
-ParameterName=Analogue Output Error Value Integer
-ObjectType=0x9
-SubNumber=5
-
-[6444sub0]
-ParameterName=Number of Analogue Outputs
-ObjectType=0x7
-DataType=0x0005
-AccessType=ro
-DefaultValue=4
-PDOMapping=0
-
-[6444sub1]
-ParameterName=Analogue Output 1
-ObjectType=0x7
-DataType=0x0004
-AccessType=rw
-DefaultValue=0
-PDOMapping=1
-
-[6444sub2]
-ParameterName=Analogue Output 2
-ObjectType=0x7
-DataType=0x0004
-AccessType=rw
-DefaultValue=0
-PDOMapping=1
-
-[6444sub3]
-ParameterName=Analogue Output 3
-ObjectType=0x7
-DataType=0x0004
-AccessType=rw
-DefaultValue=0
-PDOMapping=1
-
-[6444sub4]
-ParameterName=Analogue Output 4
-ObjectType=0x7
-DataType=0x0004
-AccessType=rw
-DefaultValue=0
-PDOMapping=1
-
-[ManufacturerObjects]
-SupportedObjects=0
diff -r 35cc4c6a2936 -r 46d7d2ce84d2 tests/linux/test_svgui/CANopen@canfestival/Master@CanOpenNode/eds/PEAK MicroMod.eds
--- a/tests/linux/test_svgui/CANopen@canfestival/Master@CanOpenNode/eds/PEAK MicroMod.eds Mon Aug 10 11:35:14 2009 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1289 +0,0 @@
-[FileInfo]
-CreatedBy=ESAcademy
-ModifiedBy=ESAcademy
-Description=PEAK MicroMod CANopenIA Generic
-CreationTime=09:41PM
-CreationDate=05-05-2003
-ModificationTime=05:05PM
-ModificationDate=03-23-2005
-FileName=C:\CANopenCT\Tests\PEAK MicroMod.eds
-FileVersion=1
-FileRevision=1
-EDSVersion=4
-
-[DeviceInfo]
-VendorName=PEAK System Technik
-VendorNumber=0x00000175
-ProductName=PEAK MicroMod CANopenIA Generic
-ProductNumber=0x00100000
-RevisionNumber=0x00010001
-OrderCode=na
-BaudRate_10=0
-BaudRate_20=0
-BaudRate_50=1
-BaudRate_125=1
-BaudRate_250=1
-BaudRate_500=1
-BaudRate_800=1
-BaudRate_1000=1
-SimpleBootUpMaster=0
-SimpleBootUpSlave=1
-Granularity=0
-DynamicChannelsSupported=0
-CompactPDO=0
-GroupMessaging=0
-NrOfRXPDO=4
-NrOfTXPDO=4
-LSS_Supported=0
-
-[DummyUsage]
-Dummy0001=0
-Dummy0002=0
-Dummy0003=0
-Dummy0004=0
-Dummy0005=1
-Dummy0006=1
-Dummy0007=1
-
-[Comments]
-Lines=0
-
-[MandatoryObjects]
-SupportedObjects=3
-1=0x1000
-2=0x1001
-3=0x1018
-
-[1000]
-ParameterName=Device Type
-ObjectType=0x7
-DataType=0x0007
-AccessType=ro
-DefaultValue=0x000F0191
-PDOMapping=0
-
-[1001]
-ParameterName=Error Register
-ObjectType=0x7
-DataType=0x0005
-AccessType=ro
-DefaultValue=0
-PDOMapping=0
-
-[1018]
-ParameterName=Identity Object
-ObjectType=0x9
-SubNumber=4
-
-[1018sub0]
-ParameterName=number of entries
-ObjectType=0x7
-DataType=0x0005
-AccessType=ro
-DefaultValue=3
-PDOMapping=0
-
-[1018sub1]
-ParameterName=Vendor ID
-ObjectType=0x7
-DataType=0x0007
-AccessType=ro
-DefaultValue=0x00000175
-PDOMapping=0
-
-[1018sub2]
-ParameterName=Product Code
-ObjectType=0x7
-DataType=0x0007
-AccessType=ro
-DefaultValue=0x00100000
-PDOMapping=0
-
-[1018sub3]
-ParameterName=Revision number
-ObjectType=0x7
-DataType=0x0007
-AccessType=ro
-DefaultValue=0x00010001
-PDOMapping=0
-
-[OptionalObjects]
-SupportedObjects=41
-1=0x1002
-2=0x1005
-3=0x1008
-4=0x1009
-5=0x100A
-6=0x100C
-7=0x100D
-8=0x1010
-9=0x1011
-10=0x1016
-11=0x1017
-12=0x1020
-13=0x1400
-14=0x1401
-15=0x1402
-16=0x1403
-17=0x1600
-18=0x1601
-19=0x1602
-20=0x1603
-21=0x1800
-22=0x1801
-23=0x1802
-24=0x1803
-25=0x1A00
-26=0x1A01
-27=0x1A02
-28=0x1A03
-29=0x1F50
-30=0x6000
-31=0x6002
-32=0x6200
-33=0x6202
-34=0x6206
-35=0x6207
-36=0x6401
-37=0x6411
-38=0x6423
-39=0x6426
-40=0x6443
-41=0x6444
-
-[1002]
-ParameterName=PEAK Status Register
-ObjectType=0x7
-DataType=0x0007
-AccessType=ro
-PDOMapping=0
-
-[1005]
-ParameterName=COB-ID SYNC
-ObjectType=0x7
-DataType=0x0007
-AccessType=rw
-DefaultValue=0x00000080
-PDOMapping=0
-
-[1008]
-ParameterName=Manufacturer Device Name
-ObjectType=0x7
-DataType=0x0009
-AccessType=const
-PDOMapping=0
-
-[1009]
-ParameterName=Manufacturer Hardware Version
-ObjectType=0x7
-DataType=0x0009
-AccessType=const
-PDOMapping=0
-
-[100a]
-ParameterName=Manufacturer Software Version
-ObjectType=0x7
-DataType=0x0009
-AccessType=const
-PDOMapping=0
-
-[100c]
-ParameterName=Guard Time
-ObjectType=0x7
-DataType=0x0006
-AccessType=rw
-DefaultValue=0
-PDOMapping=0
-
-[100d]
-ParameterName=Life Time Factor
-ObjectType=0x7
-DataType=0x0005
-AccessType=rw
-DefaultValue=0x00
-PDOMapping=0
-
-[1010]
-ParameterName=Store Parameter Field
-ObjectType=0x8
-SubNumber=2
-
-[1010sub0]
-ParameterName=Number of Entries
-ObjectType=0x7
-DataType=0x0005
-AccessType=ro
-DefaultValue=1
-PDOMapping=0
-
-[1010sub1]
-ParameterName=Save all Parameters
-ObjectType=0x7
-DataType=0x0007
-AccessType=rw
-PDOMapping=0
-
-[1011]
-ParameterName=Restore Default Parameters
-ObjectType=0x8
-SubNumber=2
-
-[1011sub0]
-ParameterName=Number of Entries
-ObjectType=0x7
-DataType=0x0005
-AccessType=ro
-DefaultValue=1
-PDOMapping=0
-
-[1011sub1]
-ParameterName=Restore all Default Parameters
-ObjectType=0x7
-DataType=0x0007
-AccessType=rw
-PDOMapping=0
-
-[1016]
-ParameterName=Consumer Heartbeat Time
-ObjectType=0x8
-SubNumber=4
-
-[1016sub0]
-ParameterName=Number of Entries
-ObjectType=0x7
-DataType=0x0005
-AccessType=ro
-DefaultValue=3
-PDOMapping=0
-LowLimit=0x1
-
-[1016sub1]
-ParameterName=Consumer Heartbeat Time
-ObjectType=0x7
-DataType=0x0007
-AccessType=rw
-DefaultValue=0
-PDOMapping=0
-
-[1016sub2]
-ParameterName=Consumer Heartbeat Time
-ObjectType=0x7
-DataType=0x0007
-AccessType=rw
-DefaultValue=0
-PDOMapping=0
-
-[1016sub3]
-ParameterName=Consumer Heartbeat Time
-ObjectType=0x7
-DataType=0x0007
-AccessType=rw
-DefaultValue=0
-PDOMapping=0
-
-[1017]
-ParameterName=Producer Heartbeat Time
-ObjectType=0x7
-DataType=0x0006
-AccessType=rw
-DefaultValue=0
-PDOMapping=0
-
-[1020]
-ParameterName=Verify Configuration
-ObjectType=0x8
-SubNumber=3
-
-[1020sub0]
-ParameterName=Number of entries
-ObjectType=0x7
-DataType=0x0005
-AccessType=ro
-DefaultValue=2
-PDOMapping=0
-
-[1020sub1]
-ParameterName=Configuration date
-ObjectType=0x7
-DataType=0x0007
-AccessType=rw
-PDOMapping=0
-
-[1020sub2]
-ParameterName=Configuration time
-ObjectType=0x7
-DataType=0x0007
-AccessType=rw
-PDOMapping=0
-
-[1400]
-ParameterName=Receive PDO Communication Parameter
-ObjectType=0x9
-SubNumber=3
-
-[1400sub0]
-ParameterName=Number of Entries
-ObjectType=0x7
-DataType=0x0005
-AccessType=ro
-DefaultValue=2
-PDOMapping=0
-
-[1400sub1]
-ParameterName=COB-ID
-ObjectType=0x7
-DataType=0x0007
-AccessType=rw
-DefaultValue=$NODEID+0x200
-PDOMapping=0
-LowLimit=0x00000001
-HighLimit=0xFFFFFFFF
-
-[1400sub2]
-ParameterName=Transmission Type
-ObjectType=0x7
-DataType=0x0005
-AccessType=rw
-DefaultValue=255
-PDOMapping=0
-
-[1401]
-ParameterName=Receive PDO Communication Parameter
-ObjectType=0x9
-SubNumber=3
-
-[1401sub0]
-ParameterName=Number of Entries
-ObjectType=0x7
-DataType=0x0005
-AccessType=ro
-DefaultValue=2
-PDOMapping=0
-
-[1401sub1]
-ParameterName=COB-ID
-ObjectType=0x7
-DataType=0x0007
-AccessType=rw
-DefaultValue=$NODEID+0x300
-PDOMapping=0
-LowLimit=0x00000001
-HighLimit=0xFFFFFFFF
-
-[1401sub2]
-ParameterName=Transmission Type
-ObjectType=0x7
-DataType=0x0005
-AccessType=rw
-DefaultValue=255
-PDOMapping=0
-
-[1402]
-ParameterName=Receive PDO Communication Parameter
-ObjectType=0x9
-SubNumber=3
-
-[1402sub0]
-ParameterName=Number of Entries
-ObjectType=0x7
-DataType=0x0005
-AccessType=ro
-DefaultValue=2
-PDOMapping=0
-LowLimit=0x02
-HighLimit=0x05
-
-[1402sub1]
-ParameterName=COB-ID
-ObjectType=0x7
-DataType=0x0007
-AccessType=rw
-DefaultValue=$NODEID+0x80000400
-PDOMapping=0
-LowLimit=0x00000001
-HighLimit=0xFFFFFFFF
-
-[1402sub2]
-ParameterName=Transmission Type
-ObjectType=0x7
-DataType=0x0005
-AccessType=rw
-DefaultValue=255
-PDOMapping=0
-
-[1403]
-ParameterName=Receive PDO Communication Parameter
-ObjectType=0x9
-SubNumber=3
-
-[1403sub0]
-ParameterName=Number of Entries
-ObjectType=0x7
-DataType=0x0005
-AccessType=ro
-DefaultValue=2
-PDOMapping=0
-LowLimit=0x02
-HighLimit=0x05
-
-[1403sub1]
-ParameterName=COB-ID
-ObjectType=0x7
-DataType=0x0007
-AccessType=rw
-DefaultValue=$NODEID+0x80000500
-PDOMapping=0
-LowLimit=0x00000001
-HighLimit=0xFFFFFFFF
-
-[1403sub2]
-ParameterName=Transmission Type
-ObjectType=0x7
-DataType=0x0005
-AccessType=rw
-DefaultValue=255
-PDOMapping=0
-
-[1600]
-ParameterName=Receive PDO Mapping Parameter
-ObjectType=0x9
-SubNumber=2
-
-[1600sub0]
-ParameterName=Number of Entries
-ObjectType=0x7
-DataType=0x0005
-AccessType=rw
-DefaultValue=1
-PDOMapping=0
-
-[1600sub1]
-ParameterName=PDO Mapping Entry
-ObjectType=0x7
-DataType=0x0007
-AccessType=rw
-DefaultValue=0x62000108
-PDOMapping=0
-
-[1601]
-ParameterName=Receive PDO Mapping Parameter
-ObjectType=0x9
-SubNumber=5
-
-[1601sub0]
-ParameterName=Number of Entries
-ObjectType=0x7
-DataType=0x0005
-AccessType=rw
-DefaultValue=4
-PDOMapping=0
-
-[1601sub1]
-ParameterName=PDO Mapping Entry
-ObjectType=0x7
-DataType=0x0007
-AccessType=rw
-DefaultValue=0x64110110
-PDOMapping=0
-
-[1601sub2]
-ParameterName=PDO Mapping Entry
-ObjectType=0x7
-DataType=0x0007
-AccessType=rw
-DefaultValue=0x64110210
-PDOMapping=0
-
-[1601sub3]
-ParameterName=PDO Mapping Entry
-ObjectType=0x7
-DataType=0x0007
-AccessType=rw
-DefaultValue=0x64110310
-PDOMapping=0
-
-[1601sub4]
-ParameterName=PDO Mapping Entry
-ObjectType=0x7
-DataType=0x0007
-AccessType=rw
-DefaultValue=0x64110410
-PDOMapping=0
-
-[1602]
-ParameterName=Receive PDO Mapping Parameter
-ObjectType=0x9
-SubNumber=1
-
-[1602sub0]
-ParameterName=Number of Entries
-ObjectType=0x7
-DataType=0x0005
-AccessType=rw
-DefaultValue=0
-PDOMapping=0
-
-[1603]
-ParameterName=Receive PDO Mapping Parameter
-ObjectType=0x9
-SubNumber=1
-
-[1603sub0]
-ParameterName=Number of Entries
-ObjectType=0x7
-DataType=0x0005
-AccessType=rw
-DefaultValue=0
-PDOMapping=0
-
-[1800]
-ParameterName=Transmit PDO Communication Parameter
-ObjectType=0x9
-SubNumber=5
-
-[1800sub0]
-ParameterName=Number of Entries
-ObjectType=0x7
-DataType=0x0005
-AccessType=ro
-DefaultValue=5
-PDOMapping=0
-LowLimit=0x02
-HighLimit=0x05
-
-[1800sub1]
-ParameterName=COB-ID
-ObjectType=0x7
-DataType=0x0007
-AccessType=rw
-DefaultValue=$NODEID+0x180
-PDOMapping=0
-LowLimit=0x00000001
-HighLimit=0xFFFFFFFF
-
-[1800sub2]
-ParameterName=Transmission Type
-ObjectType=0x7
-DataType=0x0005
-AccessType=rw
-DefaultValue=255
-PDOMapping=0
-
-[1800sub3]
-ParameterName=Inhibit Time
-ObjectType=0x7
-DataType=0x0006
-AccessType=rw
-DefaultValue=0x0000
-PDOMapping=0
-
-[1800sub5]
-ParameterName=Event Timer
-ObjectType=0x7
-DataType=0x0006
-AccessType=rw
-DefaultValue=0
-PDOMapping=0
-
-[1801]
-ParameterName=Transmit PDO Communication Parameter
-ObjectType=0x9
-SubNumber=5
-
-[1801sub0]
-ParameterName=Number of Entries
-ObjectType=0x7
-DataType=0x0005
-AccessType=ro
-DefaultValue=5
-PDOMapping=0
-LowLimit=0x02
-HighLimit=0x05
-
-[1801sub1]
-ParameterName=COB-ID
-ObjectType=0x7
-DataType=0x0007
-AccessType=rw
-DefaultValue=$NODEID+0x280
-PDOMapping=0
-LowLimit=0x00000001
-HighLimit=0xFFFFFFFF
-
-[1801sub2]
-ParameterName=Transmission Type
-ObjectType=0x7
-DataType=0x0005
-AccessType=rw
-DefaultValue=255
-PDOMapping=0
-
-[1801sub3]
-ParameterName=Inhibit Time
-ObjectType=0x7
-DataType=0x0006
-AccessType=rw
-DefaultValue=0x0000
-PDOMapping=0
-
-[1801sub5]
-ParameterName=Event Timer
-ObjectType=0x7
-DataType=0x0006
-AccessType=rw
-DefaultValue=0
-PDOMapping=0
-
-[1802]
-ParameterName=Transmit PDO Communication Parameter
-ObjectType=0x9
-SubNumber=5
-
-[1802sub0]
-ParameterName=Number of Entries
-ObjectType=0x7
-DataType=0x0005
-AccessType=ro
-DefaultValue=5
-PDOMapping=0
-LowLimit=0x02
-HighLimit=0x05
-
-[1802sub1]
-ParameterName=COB-ID
-ObjectType=0x7
-DataType=0x0007
-AccessType=rw
-DefaultValue=$NODEID+0x380
-PDOMapping=0
-LowLimit=0x00000001
-HighLimit=0xFFFFFFFF
-
-[1802sub2]
-ParameterName=Transmission Type
-ObjectType=0x7
-DataType=0x0005
-AccessType=rw
-DefaultValue=255
-PDOMapping=0
-
-[1802sub3]
-ParameterName=Inhibit Time
-ObjectType=0x7
-DataType=0x0006
-AccessType=rw
-DefaultValue=0x0000
-PDOMapping=0
-
-[1802sub5]
-ParameterName=Event Timer
-ObjectType=0x7
-DataType=0x0006
-AccessType=rw
-DefaultValue=0
-PDOMapping=0
-
-[1803]
-ParameterName=Transmit PDO Communication Parameter
-ObjectType=0x9
-SubNumber=5
-
-[1803sub0]
-ParameterName=Number of Entries
-ObjectType=0x7
-DataType=0x0005
-AccessType=ro
-DefaultValue=5
-PDOMapping=0
-LowLimit=0x02
-HighLimit=0x05
-
-[1803sub1]
-ParameterName=COB-ID
-ObjectType=0x7
-DataType=0x0007
-AccessType=rw
-DefaultValue=$NODEID+0x80000480
-PDOMapping=0
-LowLimit=0x00000001
-HighLimit=0xFFFFFFFF
-
-[1803sub2]
-ParameterName=Transmission Type
-ObjectType=0x7
-DataType=0x0005
-AccessType=rw
-DefaultValue=255
-PDOMapping=0
-
-[1803sub3]
-ParameterName=Inhibit Time
-ObjectType=0x7
-DataType=0x0006
-AccessType=rw
-DefaultValue=0x0000
-PDOMapping=0
-
-[1803sub5]
-ParameterName=Event Timer
-ObjectType=0x7
-DataType=0x0006
-AccessType=rw
-DefaultValue=0
-PDOMapping=0
-
-[1a00]
-ParameterName=Transmit PDO Mapping Parameter
-ObjectType=0x9
-SubNumber=2
-
-[1a00sub0]
-ParameterName=Number of Entries
-ObjectType=0x7
-DataType=0x0005
-AccessType=rw
-DefaultValue=1
-PDOMapping=0
-
-[1a00sub1]
-ParameterName=PDO Mapping Entry
-ObjectType=0x7
-DataType=0x0007
-AccessType=rw
-DefaultValue=0x60000108
-PDOMapping=0
-
-[1a01]
-ParameterName=Transmit PDO Mapping Parameter
-ObjectType=0x9
-SubNumber=5
-
-[1a01sub0]
-ParameterName=Number of Entries
-ObjectType=0x7
-DataType=0x0005
-AccessType=rw
-DefaultValue=4
-PDOMapping=0
-
-[1a01sub1]
-ParameterName=PDO Mapping Entry
-ObjectType=0x7
-DataType=0x0007
-AccessType=rw
-DefaultValue=0x64010110
-PDOMapping=0
-
-[1a01sub2]
-ParameterName=PDO Mapping Entry
-ObjectType=0x7
-DataType=0x0007
-AccessType=rw
-DefaultValue=0x64010210
-PDOMapping=0
-
-[1a01sub3]
-ParameterName=PDO Mapping Entry
-ObjectType=0x7
-DataType=0x0007
-AccessType=rw
-DefaultValue=0x64010310
-PDOMapping=0
-
-[1a01sub4]
-ParameterName=PDO Mapping Entry
-ObjectType=0x7
-DataType=0x0007
-AccessType=rw
-DefaultValue=0x64010410
-PDOMapping=0
-
-[1a02]
-ParameterName=Transmit PDO Mapping Parameter
-ObjectType=0x9
-SubNumber=5
-
-[1a02sub0]
-ParameterName=Number of Entries
-ObjectType=0x7
-DataType=0x0005
-AccessType=rw
-DefaultValue=4
-PDOMapping=0
-
-[1a02sub1]
-ParameterName=PDO Mapping Entry
-ObjectType=0x7
-DataType=0x0007
-AccessType=rw
-DefaultValue=0x64010510
-PDOMapping=0
-
-[1a02sub2]
-ParameterName=PDO Mapping Entry
-ObjectType=0x7
-DataType=0x0007
-AccessType=rw
-DefaultValue=0x64010610
-PDOMapping=0
-
-[1a02sub3]
-ParameterName=PDO Mapping Entry
-ObjectType=0x7
-DataType=0x0007
-AccessType=rw
-DefaultValue=0x64010710
-PDOMapping=0
-
-[1a02sub4]
-ParameterName=PDO Mapping Entry
-ObjectType=0x7
-DataType=0x0007
-AccessType=rw
-DefaultValue=0x64010810
-PDOMapping=0
-
-[1a03]
-ParameterName=Transmit PDO Mapping Parameter
-ObjectType=0x9
-SubNumber=1
-
-[1a03sub0]
-ParameterName=Number of Entries
-ObjectType=0x7
-DataType=0x0005
-AccessType=rw
-DefaultValue=0
-PDOMapping=0
-
-[1f50]
-ParameterName=Download Program Data
-ObjectType=0x8
-SubNumber=2
-
-[1f50sub0]
-ParameterName=Number of elements
-ObjectType=0x7
-DataType=0x0005
-AccessType=ro
-DefaultValue=3
-PDOMapping=0
-
-[1f50sub3]
-ParameterName=Download Program Data - HW Settings
-ObjectType=0x7
-DataType=0x000F
-AccessType=rw
-PDOMapping=0
-
-[6000]
-ParameterName=Read Digital Input 8-bit
-ObjectType=0x8
-SubNumber=2
-
-[6000sub0]
-ParameterName=Number of Elements
-ObjectType=0x7
-DataType=0x0005
-AccessType=ro
-DefaultValue=1
-PDOMapping=0
-
-[6000sub1]
-ParameterName=DigInput8_1
-ObjectType=0x7
-DataType=0x0005
-AccessType=ro
-PDOMapping=1
-
-[6002]
-ParameterName=Polarity Digital Input
-ObjectType=0x8
-SubNumber=2
-
-[6002sub0]
-ParameterName=Number of Elements
-ObjectType=0x7
-DataType=0x0005
-AccessType=ro
-DefaultValue=1
-PDOMapping=0
-
-[6002sub1]
-ParameterName=Polarity8_1
-ObjectType=0x7
-DataType=0x0005
-AccessType=rw
-DefaultValue=0
-PDOMapping=0
-
-[6200]
-ParameterName=Write Digital Output 8-bit
-ObjectType=0x8
-SubNumber=2
-
-[6200sub0]
-ParameterName=Number of elements
-ObjectType=0x7
-DataType=0x0005
-AccessType=ro
-DefaultValue=1
-PDOMapping=0
-
-[6200sub1]
-ParameterName=DigOutput8_1
-ObjectType=0x7
-DataType=0x0005
-AccessType=rww
-PDOMapping=1
-
-[6202]
-ParameterName=Polarity Digital Output
-ObjectType=0x8
-SubNumber=2
-
-[6202sub0]
-ParameterName=Number of Elements
-ObjectType=0x7
-DataType=0x0005
-AccessType=ro
-DefaultValue=1
-PDOMapping=0
-
-[6202sub1]
-ParameterName=Polarity8_1
-ObjectType=0x7
-DataType=0x0005
-AccessType=rw
-DefaultValue=0
-PDOMapping=0
-
-[6206]
-ParameterName=Error Mode Digital Output
-ObjectType=0x8
-SubNumber=2
-
-[6206sub0]
-ParameterName=Number of elements
-ObjectType=0x7
-DataType=0x0005
-AccessType=ro
-DefaultValue=1
-PDOMapping=0
-
-[6206sub1]
-ParameterName=Error Mode 1
-ObjectType=0x7
-DataType=0x0005
-AccessType=rw
-DefaultValue=0
-PDOMapping=0
-
-[6207]
-ParameterName=Error Value Digital Output
-ObjectType=0x8
-SubNumber=2
-
-[6207sub0]
-ParameterName=Number of elements
-ObjectType=0x7
-DataType=0x0005
-AccessType=ro
-DefaultValue=1
-PDOMapping=0
-
-[6207sub1]
-ParameterName=Error Value 1
-ObjectType=0x7
-DataType=0x0005
-AccessType=rw
-DefaultValue=0
-PDOMapping=0
-
-[6401]
-ParameterName=Read Analog Input 16-bit
-ObjectType=0x8
-SubNumber=9
-
-[6401sub0]
-ParameterName=Number of elements
-ObjectType=0x7
-DataType=0x0005
-AccessType=ro
-DefaultValue=8
-PDOMapping=0
-
-[6401sub1]
-ParameterName=AnalogInput16_1
-ObjectType=0x7
-DataType=0x0003
-AccessType=ro
-PDOMapping=1
-
-[6401sub2]
-ParameterName=AnalogInput16_2
-ObjectType=0x7
-DataType=0x0003
-AccessType=ro
-PDOMapping=1
-
-[6401sub3]
-ParameterName=AnalogInput16_3
-ObjectType=0x7
-DataType=0x0003
-AccessType=ro
-PDOMapping=1
-
-[6401sub4]
-ParameterName=AnalogInput16_4
-ObjectType=0x7
-DataType=0x0003
-AccessType=ro
-PDOMapping=1
-
-[6401sub5]
-ParameterName=AnalogInput16_5
-ObjectType=0x7
-DataType=0x0003
-AccessType=ro
-PDOMapping=1
-
-[6401sub6]
-ParameterName=AnalogInput16_6
-ObjectType=0x7
-DataType=0x0003
-AccessType=ro
-PDOMapping=1
-
-[6401sub7]
-ParameterName=AnalogInput16_7
-ObjectType=0x7
-DataType=0x0003
-AccessType=ro
-PDOMapping=1
-
-[6401sub8]
-ParameterName=AnalogInput16_8
-ObjectType=0x7
-DataType=0x0003
-AccessType=ro
-PDOMapping=1
-
-[6411]
-ParameterName=Write Analog Output 16-bit
-ObjectType=0x8
-SubNumber=5
-
-[6411sub0]
-ParameterName=Number of elements
-ObjectType=0x7
-DataType=0x0005
-AccessType=ro
-DefaultValue=4
-PDOMapping=0
-
-[6411sub1]
-ParameterName=AnalogOutput16_1
-ObjectType=0x7
-DataType=0x0003
-AccessType=rww
-PDOMapping=1
-
-[6411sub2]
-ParameterName=AnalogOutput16_2
-ObjectType=0x7
-DataType=0x0003
-AccessType=rww
-PDOMapping=1
-
-[6411sub3]
-ParameterName=AnalogOutput16_3
-ObjectType=0x7
-DataType=0x0003
-AccessType=rww
-PDOMapping=1
-
-[6411sub4]
-ParameterName=AnalogOutput16_4
-ObjectType=0x7
-DataType=0x0003
-AccessType=rww
-PDOMapping=1
-
-[6423]
-ParameterName=Analog Input Global Interrupt
-ObjectType=0x7
-DataType=0x0001
-AccessType=rw
-DefaultValue=0
-PDOMapping=0
-
-[6426]
-ParameterName=Analog Input Interrupt Delta
-ObjectType=0x8
-SubNumber=9
-
-[6426sub0]
-ParameterName=NrOfObjects
-ObjectType=0x7
-DataType=0x0005
-AccessType=ro
-DefaultValue=8
-PDOMapping=0
-
-[6426sub1]
-ParameterName=Analog Input Delta 1
-ObjectType=0x7
-DataType=0x0007
-AccessType=rw
-DefaultValue=0
-PDOMapping=0
-
-[6426sub2]
-ParameterName=Analog Input Delta 2
-ObjectType=0x7
-DataType=0x0007
-AccessType=rw
-DefaultValue=0
-PDOMapping=0
-
-[6426sub3]
-ParameterName=Analog Input Delta 3
-ObjectType=0x7
-DataType=0x0007
-AccessType=rw
-DefaultValue=0
-PDOMapping=0
-
-[6426sub4]
-ParameterName=Analog Input Delta 4
-ObjectType=0x7
-DataType=0x0007
-AccessType=rw
-DefaultValue=0
-PDOMapping=0
-
-[6426sub5]
-ParameterName=Analog Input Delta 5
-ObjectType=0x7
-DataType=0x0007
-AccessType=rw
-DefaultValue=0
-PDOMapping=0
-
-[6426sub6]
-ParameterName=Analog Input Delta 6
-ObjectType=0x7
-DataType=0x0007
-AccessType=rw
-DefaultValue=0
-PDOMapping=0
-
-[6426sub7]
-ParameterName=Analog Input Delta 7
-ObjectType=0x7
-DataType=0x0007
-AccessType=rw
-DefaultValue=0
-PDOMapping=0
-
-[6426sub8]
-ParameterName=Analog Input Delta 8
-ObjectType=0x7
-DataType=0x0007
-AccessType=rw
-DefaultValue=0
-PDOMapping=0
-
-[6443]
-ParameterName=Error Mode Analog Output
-ObjectType=0x8
-SubNumber=5
-
-[6443sub0]
-ParameterName=Number of elements
-ObjectType=0x7
-DataType=0x0005
-AccessType=ro
-DefaultValue=4
-PDOMapping=0
-
-[6443sub1]
-ParameterName=Error Mode 1
-ObjectType=0x7
-DataType=0x0005
-AccessType=rw
-DefaultValue=0
-PDOMapping=0
-
-[6443sub2]
-ParameterName=Error Mode 2
-ObjectType=0x7
-DataType=0x0005
-AccessType=rw
-DefaultValue=0
-PDOMapping=0
-
-[6443sub3]
-ParameterName=Error Mode 3
-ObjectType=0x7
-DataType=0x0005
-AccessType=rw
-DefaultValue=0
-PDOMapping=0
-
-[6443sub4]
-ParameterName=Error Mode 4
-ObjectType=0x7
-DataType=0x0005
-AccessType=rw
-DefaultValue=0
-PDOMapping=0
-
-[6444]
-ParameterName=Error Value Analog Output
-ObjectType=0x8
-SubNumber=5
-
-[6444sub0]
-ParameterName=Number of elements
-ObjectType=0x7
-DataType=0x0005
-AccessType=ro
-DefaultValue=4
-PDOMapping=0
-
-[6444sub1]
-ParameterName=Error Value 1
-ObjectType=0x7
-DataType=0x0004
-AccessType=rw
-DefaultValue=0
-PDOMapping=0
-
-[6444sub2]
-ParameterName=Error Value 2
-ObjectType=0x7
-DataType=0x0004
-AccessType=rw
-DefaultValue=0
-PDOMapping=0
-
-[6444sub3]
-ParameterName=Error Value 3
-ObjectType=0x7
-DataType=0x0004
-AccessType=rw
-DefaultValue=0
-PDOMapping=0
-
-[6444sub4]
-ParameterName=Error Value 4
-ObjectType=0x7
-DataType=0x0004
-AccessType=rw
-DefaultValue=0
-PDOMapping=0
-
-[ManufacturerObjects]
-SupportedObjects=0
diff -r 35cc4c6a2936 -r 46d7d2ce84d2 tests/linux/test_svgui/CANopen@canfestival/Master@CanOpenNode/master.od
--- a/tests/linux/test_svgui/CANopen@canfestival/Master@CanOpenNode/master.od Mon Aug 10 11:35:14 2009 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,224 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- -
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- -
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- -
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- -
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- -
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- -
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff -r 35cc4c6a2936 -r 46d7d2ce84d2 tests/linux/test_svgui/CANopen@canfestival/Master@CanOpenNode/nodelist.cpj
--- a/tests/linux/test_svgui/CANopen@canfestival/Master@CanOpenNode/nodelist.cpj Mon Aug 10 11:35:14 2009 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,10 +0,0 @@
-[TOPOLOGY]
-NetName=None
-Nodes=0x02
-Node16Present=0x01
-Node16Name=DS401_Slave_GUI
-Node16DCFName=DS401_Slave_Gui.eds
-Node32Present=0x01
-Node32Name=GUI2
-Node32DCFName=DS401_Slave_Gui.eds
-EDSBaseName=eds
diff -r 35cc4c6a2936 -r 46d7d2ce84d2 tests/linux/test_svgui/CANopen@canfestival/Master@CanOpenNode/plugin.xml
--- a/tests/linux/test_svgui/CANopen@canfestival/Master@CanOpenNode/plugin.xml Mon Aug 10 11:35:14 2009 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-
-
diff -r 35cc4c6a2936 -r 46d7d2ce84d2 tests/linux/test_svgui/CANopen@canfestival/baseplugin.xml
--- a/tests/linux/test_svgui/CANopen@canfestival/baseplugin.xml Mon Aug 10 11:35:14 2009 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-
-
diff -r 35cc4c6a2936 -r 46d7d2ce84d2 tests/linux/test_svgui/CANopen@canfestival/plugin.xml
--- a/tests/linux/test_svgui/CANopen@canfestival/plugin.xml Mon Aug 10 11:35:14 2009 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-
-
diff -r 35cc4c6a2936 -r 46d7d2ce84d2 tests/linux/test_svgui/beremiz.xml
--- a/tests/linux/test_svgui/beremiz.xml Mon Aug 10 11:35:14 2009 +0200
+++ b/tests/linux/test_svgui/beremiz.xml Thu Aug 13 11:48:55 2009 +0200
@@ -1,6 +1,6 @@
-
+
diff -r 35cc4c6a2936 -r 46d7d2ce84d2 tests/linux/test_svgui/methods.py
--- a/tests/linux/test_svgui/methods.py Mon Aug 10 11:35:14 2009 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,66 +0,0 @@
-self.logger.write_error("Welcome to the Beremiz Demo\n\n")
-self.logger.write("This demo provides a PLC working with the CANopen plugin\n")
-self.logger.write("""Some external programs are also provided:\n
-- a CAN TCP server to simulate the CANopen network
-- a virtual slave node to simulate input block
-- a virtual slave node to simulate output block
-""")
-self.logger.write("\nInfo: For this demo, %s plugin has some special methods to run external programs.\nThese methods are defined in methods.py\n" % (PlugName or "Root"))
-#open_pdf(os.path.join(os.path.split(__file__)[0], "doc", "manual_beremiz.pdf"), pagenum=21)
-
-if wx.Platform == '__WXMSW__':
- self.listLaunchProg = [
- {'name' : 'Can Tcp Server',
- 'command' : 'can_tcp_win32_server.exe',
- 'keyword' : 'Accepts',
- 'pid' : None,
- 'no_gui' : True},
- {'name' : 'DS401 Slave Gui NodeId 32',
- 'command' : 'DS401_Slave_Gui.exe -sI -l can_tcp_win32.dll -b 127.0.0.1 -i 20 -B 125K',
- 'keyword' : '[OK]',
- 'pid' : None,
- 'no_gui' : False},
- {'name' : 'DS401 Slave Gui NodeId 16',
- 'command' : 'DS401_Slave_Gui.exe -sO -l can_tcp_win32.dll -b 127.0.0.1 -i 10 -B 125K',
- 'keyword' : '[OK]',
- 'pid' : None,
- 'no_gui' : False}
- ]
-else:
- self.listLaunchProg = [
- {'name' : 'DS401 Slave Gui NodeId 32',
- 'command' : '../CanFestival-3/examples/DS401_Slave_Gui/DS401_Slave_Gui -sI -l ../CanFestival-3/drivers/can_socket/libcanfestival_can_socket.so -b vcan0 -i 20 -B 125K',
- 'keyword' : '[OK]',
- 'pid' : None,
- 'no_gui' : False},
- {'name' : 'DS401 Slave Gui NodeId 16',
- 'command' : '../CanFestival-3/examples/DS401_Slave_Gui/DS401_Slave_Gui -sO -l ../CanFestival-3/drivers/can_socket/libcanfestival_can_socket.so -b vcan0 -i 10 -B 125K',
- 'keyword' : '[OK]',
- 'pid' : None,
- 'no_gui' : False}
- ]
-
-
-def my_methods(self):
- def _Run():
- # External programs list
- # Launch them and get their pid
- for prog in self.listLaunchProg:
- self.logger.write("Starting %s\n" % prog['name'])
- prog['pid'] = ProcessLogger(self.logger, prog['command'], no_gui=prog['no_gui'])
- prog['pid'].spin(
- timeout=200,
- keyword = prog['keyword'],
- kill_it = False)
-
- PluginsRoot._Run(self)
-
- def _Stop():
- PluginsRoot._Stop(self)
- for prog in self.listLaunchProg:
- self.logger.write("Stopping %s\n" % prog['name'])
- prog['pid'].kill()
-
- return _Run, _Stop
-
-self._Run, self._Stop = my_methods(self)
\ No newline at end of file
diff -r 35cc4c6a2936 -r 46d7d2ce84d2 tests/linux/test_svgui/plc.xml
--- a/tests/linux/test_svgui/plc.xml Mon Aug 10 11:35:14 2009 +0200
+++ b/tests/linux/test_svgui/plc.xml Thu Aug 13 11:48:55 2009 +0200
@@ -2,17 +2,15 @@
+ xsi:schemaLocation="http://www.plcopen.org/xml/tc6.xsd">
-
+ productName="Beremiz"
+ productVersion="0.0"
+ creationDateTime="2008-12-14T16:21:19"/>
+
+
@@ -25,2676 +23,890 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
-
+
-
+
-
+
-
+
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
- DigitalOut
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- AnalogOut1
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
+
+
+
+
+
- AnalogOut1
-
-
-
-
-
-
- AnalogIn1
-
-
-
-
-
+
+
+
+ counter
+
+
+
+
+
+
+ INT#1
+
+
+
+
+
+
+ 'stop_back'
+
+
+
+
+
+
+ 'stop_sele'
+
+
+
+
+
+
+ 'text_compteur'
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 'led_stop'
+
+
+
+
+
+
+ 'led_start'
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 'btn1_back'
+
+
+
+
+
+
+ 'btn1_sele'
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 'btn2_back'
+
+
+
+
+
+
+ 'btn3_sele'
+
+
+
+
+
+
+ 'btn3_back'
+
+
+
+
+
+
+ 'btn2_sele'
+
+
+
+
+
+
+ 'btn4_back'
+
+
+
+
+
+
+ 'btn4_sele'
+
+
+
+
+
+
+ 'btn5_back'
+
+
+
+
+
+
+ 'btn5_sele'
+
+
+
+
+
+
+ 'btn6_back'
+
+
+
+
+
+
+ 'btn6_sele'
+
+
+
+
+
+
+ 'btn7_back'
+
+
+
+
+
+
+ 'btn7_sele'
+
+
+
+
+
+
+ 'btn8_back'
+
+
+
+
+
+
+ 'btn8_sele'
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
+
+
+
- AnalogOut2
+ DigitalBit0
-
-
-
-
-
- AnalogOut2
-
-
-
-
-
-
- AnalogIn2
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- UINT#7
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-
-
-
+
+
+
- DigitalOut
+ DigitalBit1
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- T#1s
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-
-
-
+
+
+
- AnalogOut3
+ DigitalBit7
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- REAL#10000.0
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- REAL#400.0
-
-
-
-
-
-
- REAL#-180.0
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- REAL#-180.0
-
-
-
-
-
-
- REAL#400.0
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- INPUT_BYTE
-
-
-
-
-
-
- NUM_BIT
-
-
-
+
+
-
-
-
+
+
+
- GETBIT
+ DigitalBit6
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- BYTE#1
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- INPUT_BYTE
-
-
-
-
-
-
- INPUT_BIT
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- NUM_BIT
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- BYTE#1
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-
-
-
+
+
+
- SETBIT
+ DigitalBit5
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-
-
-
-
+
+
+
+
-
-
-
- IN1
-
-
-
+ DigitalBit4
+
+
+
-
-
-
-
+
+
+
+
-
-
-
- IN2
-
-
-
+ DigitalBit3
+
+
+
-
-
-
-
-
-
-
-
-
-
+
+
+
+
-
-
-
- OUT_OR
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- IN1
-
-
-
-
-
-
-
-
-
-
-
-
-
- IN2
-
-
-
-
-
-
-
-
-
-
-
-
-
- OUT_AND
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- IN1
-
-
-
-
-
-
-
-
-
-
-
-
-
- IN1
-
-
-
-
-
-
-
-
-
-
-
-
-
- IN2
-
-
-
-
-
-
-
-
-
-
-
-
-
- IN2
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- OUT_XOR
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- IN1
-
-
-
-
-
-
-
-
-
-
-
-
-
- IN2
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- OUT_SR
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-= UPPER1;]]>
-
-
-
-
-
-
-= UPPER2;]]>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- CNT1
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- CNT2
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- CNT1
-
-
-
-
-
-
-
-
-
-
-
-
-
- CNT2
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- TEST_ARRAY[0, 1]
-
-
-
-
-
-
- UINT#0
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+ DigitalBit2
+
+
-
-
-
-
-
+
+
+
+
diff -r 35cc4c6a2936 -r 46d7d2ce84d2 tests/linux/test_svgui/python@python/baseplugin.xml
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/tests/linux/test_svgui/python@python/baseplugin.xml Thu Aug 13 11:48:55 2009 +0200
@@ -0,0 +1,2 @@
+
+
diff -r 35cc4c6a2936 -r 46d7d2ce84d2 tests/linux/test_svgui/python@python/python.xml
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/tests/linux/test_svgui/python@python/python.xml Thu Aug 13 11:48:55 2009 +0200
@@ -0,0 +1,8 @@
+
+
+
+
diff -r 35cc4c6a2936 -r 46d7d2ce84d2 tests/linux/test_svgui/python@python/svgui@svgui/baseplugin.xml
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/tests/linux/test_svgui/python@python/svgui@svgui/baseplugin.xml Thu Aug 13 11:48:55 2009 +0200
@@ -0,0 +1,2 @@
+
+
diff -r 35cc4c6a2936 -r 46d7d2ce84d2 tests/linux/test_svgui/python@python/svgui@svgui/gui.svg
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/tests/linux/test_svgui/python@python/svgui@svgui/gui.svg Thu Aug 13 11:48:55 2009 +0200
@@ -0,0 +1,1505 @@
+
+
+
diff -r 35cc4c6a2936 -r 46d7d2ce84d2 tests/linux/test_svgui/python@python/svgui@svgui/python.xml
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/tests/linux/test_svgui/python@python/svgui@svgui/python.xml Thu Aug 13 11:48:55 2009 +0200
@@ -0,0 +1,4 @@
+
+
+
+
diff -r 35cc4c6a2936 -r 46d7d2ce84d2 tests/linux/test_svgui/supervisor@svgui/baseplugin.xml
--- a/tests/linux/test_svgui/supervisor@svgui/baseplugin.xml Mon Aug 10 11:35:14 2009 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-
-
diff -r 35cc4c6a2936 -r 46d7d2ce84d2 tests/linux/test_svgui/supervisor@svgui/gui.svg
--- a/tests/linux/test_svgui/supervisor@svgui/gui.svg Mon Aug 10 11:35:14 2009 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,834 +0,0 @@
-
-
-
diff -r 35cc4c6a2936 -r 46d7d2ce84d2 tests/linux/test_svgui/supervisor@svgui/gui.xml
--- a/tests/linux/test_svgui/supervisor@svgui/gui.xml Mon Aug 10 11:35:14 2009 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,11 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
diff -r 35cc4c6a2936 -r 46d7d2ce84d2 webinterface.js
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/webinterface.js Thu Aug 13 11:48:55 2009 +0200
@@ -0,0 +1,17 @@
+// import Nevow.Athena
+
+WebInterface.PLC = Nevow.Athena.Widget.subclass('WebInterface.PLC');
+WebInterface.PLC.method(
+ 'updateHMI',
+ function (self, data) {
+ d = self.callRemote('getPLCElement');
+ d.addCallback(
+ function liveElementReceived(le) {
+ d2 = self.addChildWidgetFromWidgetInfo(le);
+ d2.addCallback(
+ function childAdded(widget) {
+ var node = self.nodeById('content');
+ node.replaceChild(widget.node, node.getElementsByTagName('div')[0]);
+ });
+ });
+ });
\ No newline at end of file