beremiz: comparison svghmi/svghmi.py

equal deleted inserted replaced

-:17d0d1641090
+:89549813a6c1
 # module scope for HMITree root
 # so that CTN can use HMITree deduced in Library
 # note: this only works because library's Generate_C is
 #       systematicaly invoked before CTN's CTNGenerate_C
-hmi_tree_root = None
-on_hmitree_update = None
-maxConnectionsTotal = 0
 class SVGHMILibrary(POULibrary):
+hmi_tree_root = None
+maxConnectionsTotal = 0
 def GetLibraryPath(self):
 return paths.AbsNeighbourFile(__file__, "pous.xml")
 def Generate_C(self, buildpath, varlist, IECCFLAGS):
-global hmi_tree_root, on_hmitree_update, maxConnectionsTotal
+self.maxConnectionsTotal = 0
-maxConnectionsTotal = 0
 already_found_watchdog = False
 found_SVGHMI_instance = False
 for CTNChild in self.GetCTR().IterChildren():
 if isinstance(CTNChild, SVGHMI):
 found_SVGHMI_instance = True
 # collect maximum connection total for all svghmi nodes
-maxConnectionsTotal += CTNChild.GetParamsAttributes("SVGHMI.MaxConnections")["value"]
+self.maxConnectionsTotal += CTNChild.GetParamsAttributes("SVGHMI.MaxConnections")["value"]
 # spot watchdog abuse
 if CTNChild.GetParamsAttributes("SVGHMI.EnableWatchdog")["value"]:
 if already_found_watchdog:
 self.FatalError("SVGHMI: Only one watchdog enabled HMI allowed")
 """
 # Filter known HMI types
 hmi_types_instances = [v for v in varlist if v["derived"] in HMI_TYPES]
-hmi_tree_root = None
+self.hmi_tree_root = None
 # take first HMI_NODE (placed as special node), make it root
 for i,v in enumerate(hmi_types_instances):
 path = v["IEC_path"].split(".")
 derived = v["derived"]
 if derived == "HMI_NODE":
-hmi_tree_root = HMITreeNode(path, "", derived, v["type"], v["vartype"], v["C_path"])
+self.hmi_tree_root = HMITreeNode(path, "", derived, v["type"], v["vartype"], v["C_path"])
 hmi_types_instances.pop(i)
 break
 # deduce HMI tree from PLC HMI_* instances
 for v in hmi_types_instances:
 name = path[-2]
 kwargs['hmiclass'] = path[-1]
 else:
 name = path[-1]
 new_node = HMITreeNode(path, name, derived, v["type"], vartype, v["C_path"], **kwargs)
-placement_result = hmi_tree_root.place_node(new_node)
+placement_result = self.hmi_tree_root.place_node(new_node)
 if placement_result is not None:
 cause, problematic_node = placement_result
 if cause == "Non_Unique":
 message = _("HMI tree nodes paths are not unique.\nConflicting variable: {} {}").format(
 ".".join(problematic_node.path),
 ".".join(problematic_node.path),
 ".".join(new_node.path))
 self.FatalError("SVGHMI : " + message)
-if on_hmitree_update is not None:
+self.on_hmitree_update()
-on_hmitree_update(hmi_tree_root)
 variable_decl_array = []
 extern_variables_declarations = []
 buf_index = 0
 item_count = 0
 found_heartbeat = False
 hearbeat_IEC_path = ['CONFIG', 'HEARTBEAT']
-for node in hmi_tree_root.traverse():
+for node in self.hmi_tree_root.traverse():
 if not found_heartbeat and node.path == hearbeat_IEC_path:
 hmi_tree_hearbeat_index = item_count
 found_heartbeat = True
 extern_variables_declarations += [
 "#define heartbeat_index "+str(hmi_tree_hearbeat_index)
 "extern_variables_declarations": "\n".join(extern_variables_declarations),
 "buffer_size": buf_index,
 "item_count": item_count,
 "var_access_code": targets.GetCode("var_access.c"),
 "PLC_ticktime": self.GetCTR().GetTicktime(),
-"hmi_hash_ints": ",".join(map(str,hmi_tree_root.hash())),
+"hmi_hash_ints": ",".join(map(str,self.hmi_tree_root.hash())),
-"max_connections": maxConnectionsTotal
+"max_connections": self.maxConnectionsTotal
 }
 gen_svghmi_c_path = os.path.join(buildpath, "svghmi.c")
 gen_svghmi_c = open(gen_svghmi_c_path, 'w')
 gen_svghmi_c.write(svghmi_c_code)
 runtimefile.close()
 # Backup HMI Tree in XML form so that it can be loaded without building
 hmitree_backup_path = os.path.join(buildpath, "hmitree.xml")
 hmitree_backup_file = open(hmitree_backup_path, 'wb')
-hmitree_backup_file.write(etree.tostring(hmi_tree_root.etree()))
+hmitree_backup_file.write(etree.tostring(self.hmi_tree_root.etree()))
 hmitree_backup_file.close()
 return ((["svghmi"], [(gen_svghmi_c_path, IECCFLAGS)], True), "",
 ("runtime_00_svghmi.py", open(runtimefile_path, "rb")))
 #         ^
 def GlobalInstances(self):
 """ Adds HMI tree root and hearbeat to PLC Configuration's globals """
 return [(name, iec_type, "") for name, iec_type in SPECIAL_NODES]
+registered_uis = []
-def Register_SVGHMI_UI_for_HMI_tree_updates(ref):
+def on_hmitree_update(self):
-global on_hmitree_update
+for uiref in self.registered_uis[:]:
-def HMITreeUpdate(_hmi_tree_root):
+obj = uiref()
-obj = ref()
+if obj is None:
-if obj is not None:
+self.registered_uis.remove(uiref)
-obj.HMITreeUpdate(_hmi_tree_root)
+else:
+obj.HMITreeUpdate(self.hmi_tree_root)
-on_hmitree_update = HMITreeUpdate
+def Register_SVGHMI_UI_for_HMI_tree_updates(self, uiref):
+self.registered_uis.append(uiref)
 class SVGHMIEditor(ConfTreeNodeEditor):
 CONFNODEEDITOR_TABS = [
 (_("HMI Tree"), "CreateSVGHMI_UI")]
 def __init__(self, parent, controler, window):
 ConfTreeNodeEditor.__init__(self, parent, controler, window)
 self.Controler = controler
 def CreateSVGHMI_UI(self, parent):
-global hmi_tree_root
+ctroot = self.Controler.GetCTRoot()
+svghmilib = ctroot.Libraries["SVGHMI"]
-if hmi_tree_root is None:
-buildpath = self.Controler.GetCTRoot()._getBuildPath()
+if svghmilib.hmi_tree_root is None:
+buildpath = ctroot._getBuildPath()
 hmitree_backup_path = os.path.join(buildpath, "hmitree.xml")
 if os.path.exists(hmitree_backup_path):
 hmitree_backup_file = open(hmitree_backup_path, 'rb')
-hmi_tree_root = HMITreeNode.from_etree(etree.parse(hmitree_backup_file).getroot())
+svghmilib.hmi_tree_root = HMITreeNode.from_etree(etree.parse(hmitree_backup_file).getroot())
-ret = SVGHMI_UI(parent, self.Controler, Register_SVGHMI_UI_for_HMI_tree_updates)
+ret = SVGHMI_UI(parent, self.Controler, svghmilib.Register_SVGHMI_UI_for_HMI_tree_updates)
-on_hmitree_update(hmi_tree_root)
+svghmilib.on_hmitree_update()
 return ret
 if sys.platform.startswith('win'):
 default_cmds={
 self.ProgressEnd("inkscape")
 return res
 def GetHMITree(self):
-global hmi_tree_root
+ctroot = self.GetCTRoot()
+svghmilib = ctroot.Libraries["SVGHMI"]
 self.ProgressStart("hmitree", "getting HMI tree")
-res = [hmi_tree_root.etree(add_hash=True)]
+res = [svghmilib.hmi_tree_root.etree(add_hash=True)]
 self.ProgressEnd("hmitree")
 return res
 def GetTranslations(self, _context, msgs):
 self.ProgressStart("i18n", "getting Translations")
 path=path,
 enable_watchdog=enable_watchdog,
 url=url)
 def CTNGenerate_C(self, buildpath, locations):
-global hmi_tree_root
+ctroot = self.GetCTRoot()
+svghmilib = ctroot.Libraries["SVGHMI"]
+hmi_tree_root = svghmilib.hmi_tree_root
 if hmi_tree_root is None:
 self.FatalError("SVGHMI : Library is not selected. Please select it in project config.")
 location_str = "_".join(map(str, self.GetCurrentLocation()))
 build_path = self._getBuildPath()
 target_path = os.path.join(build_path, target_fname)
 hash_path = os.path.join(build_path, "svghmi_"+location_str+".md5")
-self.GetCTRoot().logger.write("SVGHMI:\n")
+ctroot.logger.write("SVGHMI:\n")
 if os.path.exists(svgfile):
 hasher = hashlib.md5()
 hmi_tree_root._hash(hasher)
 xhtml=target_fname,
 svghmi_cmds=svghmi_cmds,
 watchdog_initial = self.GetParamsAttributes("SVGHMI.WatchdogInitial")["value"],
 watchdog_interval = self.GetParamsAttributes("SVGHMI.WatchdogInterval")["value"],
 maxConnections = self.GetParamsAttributes("SVGHMI.MaxConnections")["value"],
-maxConnections_total = maxConnectionsTotal,
+maxConnections_total = svghmilib.maxConnectionsTotal,
 **svghmi_options
 ))
 runtimefile.close()

changeset 3880	89549813a6c1
parent 3878	58bce98b9ac6
child 3900	4df9cfd14a3c