--- a/DataTypeEditor.py Fri Jul 24 11:55:46 2009 +0200
+++ b/DataTypeEditor.py Fri Jul 24 12:29:48 2009 +0200
@@ -597,8 +597,8 @@
elif type_infos["type"] == "Subrange":
self.SubrangeBaseType.SetStringSelection(type_infos["base_type"])
self.RefreshBoundsRange()
- self.SubrangeMinimum.SetValue(type_infos["min"])
- self.SubrangeMaximum.SetValue(type_infos["max"])
+ self.SubrangeMinimum.SetValue(int(type_infos["min"]))
+ self.SubrangeMaximum.SetValue(int(type_infos["max"]))
self.RefreshSubrangeInitialValueRange()
if type_infos["initial"] != "":
self.SubrangeInitialValue.SetValue(int(type_infos["initial"]))
@@ -610,7 +610,7 @@
self.EnumeratedInitialValue.SetStringSelection(type_infos["initial"])
elif type_infos["type"] == "Array":
self.ArrayBaseType.SetStringSelection(type_infos["base_type"])
- self.ArrayDimensions.SetStrings(map(lambda x : "..".join(map(str, x)), type_infos["dimensions"]))
+ self.ArrayDimensions.SetStrings(map(lambda x : "..".join(x), type_infos["dimensions"]))
self.ArrayInitialValue.SetValue(type_infos["initial"])
elif type_infos["type"] == "Structure":
self.StructureElementsTable.SetData(type_infos["elements"])
@@ -849,8 +849,8 @@
infos["initial"] = self.DirectlyInitialValue.GetValue()
elif selected == "Subrange":
infos["base_type"] = self.SubrangeBaseType.GetStringSelection()
- infos["min"] = self.SubrangeMinimum.GetValue()
- infos["max"] = self.SubrangeMaximum.GetValue()
+ infos["min"] = str(self.SubrangeMinimum.GetValue())
+ infos["max"] = str(self.SubrangeMaximum.GetValue())
initial_value = self.SubrangeInitialValue.GetValue()
if initial_value == infos["min"]:
infos["initial"] = ""
@@ -877,7 +877,7 @@
message.Destroy()
self.RefreshView()
return
- infos["dimensions"].append(map(int, bounds))
+ infos["dimensions"].append(bounds)
infos["initial"] = self.ArrayInitialValue.GetValue()
elif selected == "Structure":
infos["elements"] = self.StructureElementsTable.GetData()