@@ -25,7 +25,7 class ParameterConf(): | |||||
25 | value = None |
|
25 | value = None | |
26 | format = None |
|
26 | format = None | |
27 |
|
27 | |||
28 | __value = None |
|
28 | __formated_value = None | |
29 |
|
29 | |||
30 | ELEMENTNAME = 'Parameter' |
|
30 | ELEMENTNAME = 'Parameter' | |
31 |
|
31 | |||
@@ -39,37 +39,52 class ParameterConf(): | |||||
39 |
|
39 | |||
40 | def getValue(self): |
|
40 | def getValue(self): | |
41 |
|
41 | |||
42 | if self.__value != None: |
|
42 | if self.__formated_value != None: | |
43 |
|
43 | |||
44 | return self.__value |
|
44 | return self.__formated_value | |
45 |
|
45 | |||
46 | value = self.value |
|
46 | value = self.value | |
47 |
|
47 | |||
48 | if self.format == 'list': |
|
48 | if self.format == 'list': | |
49 | strList = value.split(',') |
|
49 | strList = value.split(',') | |
50 |
|
|
50 | ||
|
51 | self.__formated_value = strList | |||
|
52 | ||||
|
53 | return self.__formated_value | |||
51 |
|
54 | |||
52 | if self.format == 'intlist': |
|
55 | if self.format == 'intlist': | |
53 | strList = value.split(',') |
|
56 | strList = value.split(',') | |
54 | intList = [int(x) for x in strList] |
|
57 | intList = [int(x) for x in strList] | |
55 |
|
|
58 | ||
|
59 | self.__formated_value = intList | |||
|
60 | ||||
|
61 | return self.__formated_value | |||
56 |
|
62 | |||
57 | if self.format == 'floatlist': |
|
63 | if self.format == 'floatlist': | |
58 | strList = value.split(',') |
|
64 | strList = value.split(',') | |
59 | floatList = [float(x) for x in strList] |
|
65 | floatList = [float(x) for x in strList] | |
60 |
|
|
66 | ||
|
67 | self.__formated_value = floatList | |||
|
68 | ||||
|
69 | return self.__formated_value | |||
61 |
|
70 | |||
62 | if self.format == 'date': |
|
71 | if self.format == 'date': | |
63 | strList = value.split('/') |
|
72 | strList = value.split('/') | |
64 | intList = [int(x) for x in strList] |
|
73 | intList = [int(x) for x in strList] | |
65 | date = datetime.date(intList[0], intList[1], intList[2]) |
|
74 | date = datetime.date(intList[0], intList[1], intList[2]) | |
66 |
|
|
75 | ||
|
76 | self.__formated_value = date | |||
|
77 | ||||
|
78 | return self.__formated_value | |||
67 |
|
79 | |||
68 | if self.format == 'time': |
|
80 | if self.format == 'time': | |
69 | strList = value.split(':') |
|
81 | strList = value.split(':') | |
70 | intList = [int(x) for x in strList] |
|
82 | intList = [int(x) for x in strList] | |
71 | time = datetime.time(intList[0], intList[1], intList[2]) |
|
83 | time = datetime.time(intList[0], intList[1], intList[2]) | |
72 |
|
|
84 | ||
|
85 | self.__formated_value = time | |||
|
86 | ||||
|
87 | return self.__formated_value | |||
73 |
|
88 | |||
74 | if self.format == 'bool': |
|
89 | if self.format == 'bool': | |
75 | value = int(value) |
|
90 | value = int(value) | |
@@ -89,7 +104,9 class ParameterConf(): | |||||
89 | for i in range(len(intList)/2): |
|
104 | for i in range(len(intList)/2): | |
90 | pairList.append((intList[i*2], intList[i*2 + 1])) |
|
105 | pairList.append((intList[i*2], intList[i*2 + 1])) | |
91 |
|
106 | |||
92 |
|
|
107 | self.__formated_value = pairList | |
|
108 | ||||
|
109 | return self.__formated_value | |||
93 |
|
110 | |||
94 | if self.format == 'multiList': |
|
111 | if self.format == 'multiList': | |
95 | """ |
|
112 | """ | |
@@ -97,13 +114,16 class ParameterConf(): | |||||
97 | value = (0,1,2),(3,4,5) |
|
114 | value = (0,1,2),(3,4,5) | |
98 | """ |
|
115 | """ | |
99 | multiList = ast.literal_eval(value) |
|
116 | multiList = ast.literal_eval(value) | |
100 |
|
|
117 | ||
|
118 | self.__formated_value = multiList | |||
|
119 | ||||
|
120 | return self.__formated_value | |||
101 |
|
121 | |||
102 | func = eval(self.format) |
|
122 | format_func = eval(self.format) | |
103 |
|
123 | |||
104 | self.__value = func(value) |
|
124 | self.__formated_value = format_func(value) | |
105 |
|
125 | |||
106 | return self.__value |
|
126 | return self.__formated_value | |
107 |
|
127 | |||
108 | def setup(self, id, name, value, format='str'): |
|
128 | def setup(self, id, name, value, format='str'): | |
109 |
|
129 |
General Comments 0
You need to be logged in to leave comments.
Login now