# HG changeset patch
# User Laurent Bessard
# Date 1350406725 -7200
# Node ID 0f97bddb5a301f24ed6a9cb19aad1e4c3779185b
# Parent  1009f956d2ee709471cbb9a6fd5afa6eeebe9c2c
Adding datatypes defined in ConfNode as possible function return type

diff -r 1009f956d2ee -r 0f97bddb5a30 PLCControler.py
--- a/PLCControler.py	Tue Oct 16 11:34:24 2012 +0200
+++ b/PLCControler.py	Tue Oct 16 18:58:45 2012 +0200
@@ -1568,6 +1568,8 @@
             if words[0] in ["D"]:
                 name = words[1]
             datatypes.extend([datatype["name"] for datatype in project.GetCustomDataTypes(name, only_locatables)])
+        for category in self.GetConfNodeDataTypes():
+            datatypes.extend(category["list"])
         return datatypes
 
     # Return Base Type of given possible derived type
diff -r 1009f956d2ee -r 0f97bddb5a30 controls/VariablePanel.py
--- a/controls/VariablePanel.py	Tue Oct 16 11:34:24 2012 +0200
+++ b/controls/VariablePanel.py	Tue Oct 16 18:58:45 2012 +0200
@@ -580,8 +580,8 @@
         else:
             if self.ElementType == "function":
                 self.ReturnType.Clear()
-                for base_type in self.Controler.GetDataTypes(self.TagName, True, debug=self.Debug):
-                    self.ReturnType.Append(base_type)
+                for data_type in self.Controler.GetDataTypes(self.TagName, debug=self.Debug):
+                    self.ReturnType.Append(data_type)
                 returnType = self.Controler.GetEditedElementInterfaceReturnType(self.TagName)
             description = self.Controler.GetPouDescription(words[1])
             self.PouIsUsed = self.Controler.PouIsUsed(words[1])