beremiz: comparison svghmi/ui.py

equal deleted inserted replaced

-:6bd918732047
+:06ea7a1152af
 from __future__ import absolute_import
 import os
 import hashlib
 import weakref
 import re
+from threading import Thread, Lock
 from functools import reduce
 from itertools import izip
 from operator import or_
 from tempfile import NamedTemporaryFile
 self.main_sizer.Add(self.desc, flag=wx.GROW)
 self.main_sizer.Add(self.edit_sizer, flag=wx.GROW)
 self.SetSizer(self.main_sizer)
 self.main_sizer.Fit(self)
+def GetValue(self):
+return self.edit.GetValue()
 def setValidity(self, validity):
 if validity is not None:
 bmp = self.valid_bmp if validity else self.invalid_bmp
 self.validity_sbmp.SetBitmap(bmp)
 self.validity_sbmp.Show(True)
 map(lambda typename:
 models[typename].match(txt) is not None,
 accepts),
 False)
 if accepts and txt else None)
+self.ParentObj.RegenSVGLater()
 event.Skip()
 class PathEditor(ParamEditor):
 def __init__(self, parent, pathdesc):
 ParamEditor.__init__(self, parent, pathdesc)
 def OnPathChanged(self, event):
 # TODO : find corresponding hmitre node and type to update validity
 # Lazy way : hide validity
 self.setValidity(None)
+self.ParentObj.RegenSVGLater()
 event.Skip()
 def KeepDoubleNewLines(txt):
 return "\n\n".join(map(
 lambda s:re.sub(r'\s+',' ',s),
 self.picker_desc_splitter.SplitHorizontally(self.picker_panel, self.desc, 400)
 self.SplitVertically(self.main_panel, self.picker_desc_splitter, 300)
 self.tempf = None
+self.RegenSVGThread = None
+self.RegenSVGLock = Lock()
+self.RegenSVGTimer = wx.Timer(self, -1)
+self.RegenSVGParams = None
+self.Bind(wx.EVT_TIMER,
+self.RegenSVG,
+self.RegenSVGTimer)
 self.args_editors = []
 self.paths_editors = []
 def ResetSignature(self):
 self.args_sizer.Clear()
 dndindex = self.paths_editors.index(target_editor)
 for hmitree_node,editor in zip(self.hmitree_nodes,
 self.paths_editors[dndindex:]):
 editor.SetPath(hmitree_node)
+self.RegenSVGNow()
 def RecallLibDir(self):
 conf = self.Config.Read(_conf_key)
 if len(conf) == 0:
 return None
 self.selected_SVG = svgpath if have_thumb else None
 self.AnalyseWidgetAndUpdateUI(fname)
-if self.msg:
+self.staticmsg.SetLabel(self.msg)
-self.staticmsg.Show()
-self.staticmsg.SetLabel(self.msg)
-else:
-self.staticmsg.Hide()
 except IOError:
 self.msg = _("Widget library must be writable")
 self.Refresh()
 event.Skip()
 def OnHMITreeNodeSelection(self, hmitree_nodes):
 self.hmitree_nodes = hmitree_nodes
-# [0] if len(hmitree_nodes) else None
-# self.ValidateWidget()
-# self.Refresh()
 def OnLeftDown(self, evt):
 if self.tempf is not None:
 filename = self.tempf.name
 data = wx.FileDataObject()
 data.AddFile(filename)
 dropSource = wx.DropSource(self)
 dropSource.SetData(data)
 dropSource.DoDragDrop(wx.Drag_AllowMove)
-def GiveDetails(self, _context, msgs):
+def RegenSVGLater(self, when=1):
-for msg in msgs:
+self.RegenSVGTimer.Start(milliseconds=when*1000, oneShot=True)
-self.msg += msg.text + "\n"
+def RegenSVGNow(self):
+self.RegenSVGLater(when=0)
+def RegenSVG(self, event):
+args = [arged.GetValue() for arged in self.args_editors]
+paths = [pathed.GetValue() for pathed in self.paths_editors]
+if self.RegenSVGLock.acquire(True):
+self.RegenSVGParams = (args, paths)
+if self.RegenSVGThread is None:
+self.RegenSVGThread = \
+Thread(target=self.RegenSVGProc,
+name="RegenSVGThread").start()
+self.RegenSVGLock.release()
+event.Skip()
+def RegenSVGProc(self):
+self.RegenSVGLock.acquire(True)
+newparams = self.RegenSVGParams
+self.RegenSVGParams = None
+while newparams is not None:
+self.RegenSVGLock.release()
+res = self.GenDnDSVG(newparams)
+self.RegenSVGLock.acquire(True)
+newparams = self.RegenSVGParams
+self.RegenSVGParams = None
+self.RegenSVGThread = None
+self.RegenSVGLock.release()
+wx.CallAfter(self.DoneRegenSVG)
-def PassMessage(self, _context, msgs):
+def DoneRegenSVG(self):
-for msg in msgs:
+self.staticmsg.SetLabel(self.msg)
-self.msg += msg.text + "\n"
-def GetSubHMITree(self, _context):
-return [self.hmitree_node.etree()]
 def AnalyseWidgetAndUpdateUI(self, fname):
 self.msg = ""
 self.ResetSignature()
 try:
 print(path, path_value, path_accepts)
 self.main_panel.SetupScrolling(scroll_x=False)
+def PassMessage(self, _context, msgs):
-def ValidateWidget(self):
+for msg in msgs:
+self.msg += msg.text + "\n"
+def GetWidgetParams(self, _context):
+args,paths = self.GenDnDSVGParams
+root = etree.Element("params")
+for arg in args:
+etree.SubElement(root, "arg", value=arg)
+for path in paths:
+etree.SubElement(root, "path", value=path)
+return root
+def GenDnDSVG(self, newparams):
 self.msg = ""
+self.GenDnDSVGParams = newparams
 if self.tempf is not None:
 os.unlink(self.tempf.name)
 self.tempf = None
 try:
 if self.selected_SVG is None:
 raise Exception(_("No widget selected"))
-if self.hmitree_node is None:
-raise Exception(_("No HMI tree node selected"))
 transform = XSLTransform(
 os.path.join(ScriptDirectory, "gen_dnd_widget_svg.xslt"),
-[("GetSubHMITree", self.GetSubHMITree),
+[("GetWidgetParams", self.GetWidgetParams),
-("PassMessage", self.GiveDetails)])
+("PassMessage", self.PassMessage)])
 svgdom = etree.parse(self.selected_SVG)
-result = transform.transform(
+result = transform.transform(svgdom)
-svgdom, hmi_path = self.hmitree_node.hmi_path())
 for entry in transform.get_error_log():
 self.msg += "XSLT: " + entry.message + "\n"
 self.tempf = NamedTemporaryFile(suffix='.svg', delete=False)

branch	svghmi
changeset 3261	06ea7a1152af
parent 3259	76da573569a6
child 3263	1205b2d0acf2