# HG changeset patch # User laurent # Date 1248705312 -7200 # Node ID e297491483ea8c1909352ab6df4e097c687fc60b # Parent dc35cf4ed127c14dcfa2561e5e15599386858ad2 Adding support for displaying 'unknown' while datatype is not supported by CanFestival diff -r dc35cf4ed127 -r e297491483ea objdictgen/nodemanager.py --- a/objdictgen/nodemanager.py Mon Jul 27 16:32:05 2009 +0200 +++ b/objdictgen/nodemanager.py Mon Jul 27 16:35:12 2009 +0200 @@ -1039,40 +1039,29 @@ dic["subindex"] = "0x%02X"%i dic["name"] = infos["name"] dic["type"] = node.GetTypeName(infos["type"]) + if dic["type"] is None: + dic["type"] = "Unknown" dic["access"] = AccessType[infos["access"]] dic["save"] = OptionType[dic["save"]] - editor = {"subindex" : None, "save" : "option", "callback" : "option", "comment" : "string"} + editor = {"subindex" : None, "name" : None, + "type" : None, "value" : None, + "access" : None, "save" : "option", + "callback" : "option", "comment" : "string"} if isinstance(values, ListType) and i == 0: - editor["name"] = None - editor["type"] = None if 0x1600 <= index <= 0x17FF or 0x1A00 <= index <= 0x1C00: editor["access"] = "raccess" - else: - editor["access"] = None - editor["value"] = None else: if infos["user_defined"]: if entry_infos["struct"] & OD_IdenticalSubindexes: - editor["name"] = None - if i > 1: - editor["type"] = None - editor["access"] = None - else: + if i == 0: editor["type"] = "type" editor["access"] = "access" else: if entry_infos["struct"] & OD_MultipleSubindexes: editor["name"] = "string" - else: - editor["name"] = None editor["type"] = "type" editor["access"] = "access" - else: - editor["name"] = None - editor["type"] = None - editor["access"] = None if index < 0x260: - editor["value"] = None if i == 1: dic["value"] = node.GetTypeName(dic["value"]) elif 0x1600 <= index <= 0x17FF or 0x1A00 <= index <= 0x1C00: