|
@@
-53,7
+53,8
class Controller():
|
|
53
|
|
|
53
|
|
|
54
|
id = len(self.readBranchObjList) + 1
|
|
54
|
id = len(self.readBranchObjList) + 1
|
|
55
|
|
|
55
|
|
|
56
|
readBranchObj = ReadBranch(id, dpath, dataformat, readMode, startDate, endDate, startTime, endTime)
|
|
56
|
readBranchObj = ReadBranch()
|
|
|
|
|
57
|
readBranchObj.setup(id, dpath, dataformat, readMode, startDate, endDate, startTime, endTime)
|
|
57
|
|
|
58
|
|
|
58
|
self.readBranchObjList.append(readBranchObj)
|
|
59
|
self.readBranchObjList.append(readBranchObj)
|
|
59
|
|
|
60
|
|
|
@@
-63,7
+64,8
class Controller():
|
|
63
|
|
|
64
|
|
|
64
|
id = len(self.procBranchObjList) + 1
|
|
65
|
id = len(self.procBranchObjList) + 1
|
|
65
|
|
|
66
|
|
|
66
|
procBranchObj = ProcBranch(id, name)
|
|
67
|
procBranchObj = ProcBranch()
|
|
|
|
|
68
|
procBranchObj.setup(id, name)
|
|
67
|
|
|
69
|
|
|
68
|
self.procBranchObjList.append(procBranchObj)
|
|
70
|
self.procBranchObjList.append(procBranchObj)
|
|
69
|
|
|
71
|
|
|
@@
-97,58
+99,52
class Controller():
|
|
97
|
|
|
99
|
|
|
98
|
#tree = ET.parse(filename)
|
|
100
|
#tree = ET.parse(filename)
|
|
99
|
self.projectElement = None
|
|
101
|
self.projectElement = None
|
|
100
|
tree = ElementTree(self.projectElement).parse(filename)
|
|
102
|
self.readBranchObjList = None
|
|
|
|
|
103
|
self.procBranchObjList = None
|
|
|
|
|
104
|
|
|
|
|
|
105
|
self.projectElement = ElementTree().parse(filename)
|
|
101
|
|
|
106
|
|
|
102
|
self.project = self.projectElement.tag
|
|
107
|
self.project = self.projectElement.tag
|
|
103
|
|
|
108
|
|
|
104
|
self.id = self.projectElement.get('id')
|
|
109
|
self.id = self.projectElement.get('id')
|
|
105
|
self.name = self.projectElement.get('name')
|
|
110
|
self.name = self.projectElement.get('name')
|
|
106
|
|
|
111
|
|
|
107
|
readElement = self.projectElement.getiterator('readBranch')
|
|
112
|
self.readBranchObjList = []
|
|
108
|
|
|
113
|
|
|
109
|
root = tree.getroot()
|
|
114
|
readBranchElementList = self.projectElement.getiterator('readBranch')
|
|
110
|
self.project = root.tag
|
|
115
|
|
|
111
|
self.id = root.attrib.get('id')
|
|
116
|
for readBranchElement in readBranchElementList:
|
|
112
|
self.name = root.attrib.get('name')
|
|
117
|
readBrachObj = ReadBranch()
|
|
113
|
|
|
118
|
readBrachObj.readXml(readBranchElement)
|
|
114
|
for description in root.findall('description'):
|
|
119
|
self.readBranchObjList.append(readBranchObj)
|
|
115
|
description = description.get('description')
|
|
120
|
|
|
116
|
|
|
121
|
self.procBranchObjList = []
|
|
117
|
self.description= description
|
|
122
|
|
|
118
|
|
|
123
|
procBranchElementList = self.projectElement.getiterator('procBranch')
|
|
119
|
for readBranch in root.findall('readBranch'):
|
|
124
|
|
|
120
|
id = readBranch.get('id')
|
|
125
|
for procBranchElement in procBranchElementList:
|
|
121
|
self.idrb=id
|
|
126
|
procBranchObj = ProcBranch()
|
|
122
|
|
|
127
|
procBranchObj.readXml(procBranchElement)
|
|
123
|
for procBranch in root.findall('procBranch'):
|
|
128
|
self.procBranchObjList.append(procBranchObj)
|
|
124
|
id = readBranch.get('id')
|
|
|
|
|
125
|
name = readBranch.get('name')
|
|
|
|
|
126
|
self.idpb=id
|
|
|
|
|
127
|
self.nameBranch=name
|
|
|
|
|
128
|
|
|
|
|
|
129
|
root=tree.getroot()
|
|
|
|
|
130
|
print root.tag , root.attrib
|
|
|
|
|
131
|
for child in root:
|
|
|
|
|
132
|
print child.tag ,child.attrib
|
|
|
|
|
133
|
for child in child:
|
|
|
|
|
134
|
print child.tag ,child.attrib
|
|
|
|
|
135
|
for child in child:
|
|
|
|
|
136
|
print child.tag ,child.attrib
|
|
|
|
|
137
|
for child in child:
|
|
|
|
|
138
|
print child.tag ,child.attrib
|
|
|
|
|
139
|
#
|
|
129
|
#
|
|
140
|
class ReadBranch():
|
|
130
|
class ReadBranch():
|
|
141
|
|
|
131
|
|
|
142
|
id = None
|
|
132
|
id = None
|
|
143
|
dpath = None
|
|
133
|
# dpath = None
|
|
144
|
dataformat = None
|
|
134
|
# dataformat = None
|
|
145
|
readMode = None
|
|
135
|
# readMode = None
|
|
146
|
startDate = None
|
|
136
|
# startDate = None
|
|
147
|
endDate = None
|
|
137
|
# endDate = None
|
|
148
|
startTime = None
|
|
138
|
# startTime = None
|
|
149
|
endTime = None
|
|
139
|
# endTime = None
|
|
|
|
|
140
|
|
|
|
|
|
141
|
parmObjList = []
|
|
150
|
|
|
142
|
|
|
151
|
def __init__(self, id, dpath, dataformat, readMode, startDate, endDate, startTime, endTime):
|
|
143
|
def __init__(self):
|
|
|
|
|
144
|
|
|
|
|
|
145
|
self.parmObjList = []
|
|
|
|
|
146
|
|
|
|
|
|
147
|
def setup(self, id, dpath, dataformat, readMode, startDate, endDate, startTime, endTime):
|
|
152
|
|
|
148
|
|
|
153
|
self.id = id
|
|
149
|
self.id = id
|
|
154
|
self.dpath = dpath
|
|
150
|
self.dpath = dpath
|
|
@@
-159,19
+155,46
class ReadBranch():
|
|
159
|
self.startTime = startTime
|
|
155
|
self.startTime = startTime
|
|
160
|
self.endTime = endTime
|
|
156
|
self.endTime = endTime
|
|
161
|
|
|
157
|
|
|
|
|
|
158
|
def addParameter(self, name, value):
|
|
|
|
|
159
|
|
|
|
|
|
160
|
id = len(self.parmObjList) + 1
|
|
|
|
|
161
|
|
|
|
|
|
162
|
parmObj = ParameterConf()
|
|
|
|
|
163
|
parmObj.setup(id, name, value)
|
|
|
|
|
164
|
|
|
|
|
|
165
|
self.parmObjList.append(parmObj)
|
|
|
|
|
166
|
|
|
|
|
|
167
|
return parmObj
|
|
|
|
|
168
|
|
|
162
|
def makeXml(self, projectElement):
|
|
169
|
def makeXml(self, projectElement):
|
|
163
|
|
|
170
|
|
|
164
|
readBranchElement = SubElement(projectElement, 'readBranch')
|
|
171
|
readBranchElement = SubElement(projectElement, 'readBranch')
|
|
165
|
readBranchElement.set('id', str(self.id))
|
|
172
|
readBranchElement.set('id', str(self.id))
|
|
|
|
|
173
|
|
|
|
|
|
174
|
self.addParameter(name='dpath' , value=self.dpath)
|
|
|
|
|
175
|
self.addParameter(name='dataformat', value=self.dataformat)
|
|
|
|
|
176
|
self.addParameter(name='startDate' , value=self.startDate)
|
|
|
|
|
177
|
self.addParameter(name='endDate' , value=self.endDate)
|
|
|
|
|
178
|
self.addParameter(name='startTime' , value=self.startTime)
|
|
|
|
|
179
|
self.addParameter(name='endTime' , value=self.endTime)
|
|
|
|
|
180
|
self.addParameter(name='readMode' , value=str(self.readMode))
|
|
|
|
|
181
|
|
|
|
|
|
182
|
for parmObj in self.parmObjList:
|
|
|
|
|
183
|
parmObj.makeXml(readBranchElement)
|
|
|
|
|
184
|
|
|
|
|
|
185
|
def readXml(self, readBranchElement):
|
|
|
|
|
186
|
|
|
|
|
|
187
|
self.id = readBranchElement.get('id')
|
|
|
|
|
188
|
|
|
|
|
|
189
|
self.parmObjList = []
|
|
|
|
|
190
|
|
|
|
|
|
191
|
parmElementList = readBranchElement.getiterator('Parameter')
|
|
|
|
|
192
|
|
|
|
|
|
193
|
for parmElement in parmElementList:
|
|
|
|
|
194
|
parmObj = Parameter()
|
|
|
|
|
195
|
parmObj.readXml(parmElement)
|
|
|
|
|
196
|
self.parmObjList.append(parmObj)
|
|
166
|
|
|
197
|
|
|
167
|
se = SubElement(readBranchElement, 'parameter', name='dpath' , value=self.dpath)
|
|
|
|
|
168
|
se = SubElement(readBranchElement, 'parameter', name='dataformat', value=self.dataformat)
|
|
|
|
|
169
|
se = SubElement(readBranchElement, 'parameter', name='startDate' , value=self.startDate)
|
|
|
|
|
170
|
se = SubElement(readBranchElement, 'parameter', name='endDate' , value=self.endDate)
|
|
|
|
|
171
|
se = SubElement(readBranchElement, 'parameter', name='startTime' , value=self.startTime)
|
|
|
|
|
172
|
se = SubElement(readBranchElement, 'parameter', name='endTime' , value=self.endTime)
|
|
|
|
|
173
|
se = SubElement(readBranchElement, 'parameter', name='readMode' , value=str(self.readMode))
|
|
|
|
|
174
|
|
|
|
|
|
175
|
|
|
198
|
|
|
176
|
class ProcBranch():
|
|
199
|
class ProcBranch():
|
|
177
|
|
|
200
|
|
|
@@
-180,7
+203,10
class ProcBranch():
|
|
180
|
|
|
203
|
|
|
181
|
upObjList = None
|
|
204
|
upObjList = None
|
|
182
|
|
|
205
|
|
|
183
|
def __init__(self, id, name):
|
|
206
|
def __init__(self):
|
|
|
|
|
207
|
pass
|
|
|
|
|
208
|
|
|
|
|
|
209
|
def setup(self, id, name):
|
|
184
|
|
|
210
|
|
|
185
|
self.id = id
|
|
211
|
self.id = id
|
|
186
|
self.name = name
|
|
212
|
self.name = name
|
|
@@
-191,7
+217,8
class ProcBranch():
|
|
191
|
|
|
217
|
|
|
192
|
id = len(self.upObjList) + 1
|
|
218
|
id = len(self.upObjList) + 1
|
|
193
|
|
|
219
|
|
|
194
|
upObj = UPConf(id, name, type)
|
|
220
|
upObj = UPConf()
|
|
|
|
|
221
|
upObj.setup(id, name, type)
|
|
195
|
|
|
222
|
|
|
196
|
self.upObjList.append(upObj)
|
|
223
|
self.upObjList.append(upObj)
|
|
197
|
|
|
224
|
|
|
@@
-206,6
+233,20
class ProcBranch():
|
|
206
|
for upObj in self.upObjList:
|
|
233
|
for upObj in self.upObjList:
|
|
207
|
upObj.makeXml(procBranchElement)
|
|
234
|
upObj.makeXml(procBranchElement)
|
|
208
|
|
|
235
|
|
|
|
|
|
236
|
def readXml(self, procBranchElement):
|
|
|
|
|
237
|
|
|
|
|
|
238
|
self.id = procBranchElement.get('id')
|
|
|
|
|
239
|
self.name = procBranchElement.get('name')
|
|
|
|
|
240
|
|
|
|
|
|
241
|
self.upObjList = []
|
|
|
|
|
242
|
|
|
|
|
|
243
|
upElementList = procBranchElement.getiterator('UP')
|
|
|
|
|
244
|
|
|
|
|
|
245
|
for upElement in upElementList:
|
|
|
|
|
246
|
upObj = UPConf()
|
|
|
|
|
247
|
#upObj.readXml(upElement)
|
|
|
|
|
248
|
self.upObjList.append(upObj)
|
|
|
|
|
249
|
|
|
209
|
class UPConf():
|
|
250
|
class UPConf():
|
|
210
|
|
|
251
|
|
|
211
|
id = None
|
|
252
|
id = None
|
|
@@
-214,7
+255,10
class UPConf():
|
|
214
|
|
|
255
|
|
|
215
|
opObjList = []
|
|
256
|
opObjList = []
|
|
216
|
|
|
257
|
|
|
217
|
def __init__(self, id, name, type):
|
|
258
|
def __init__(self):
|
|
|
|
|
259
|
pass
|
|
|
|
|
260
|
|
|
|
|
|
261
|
def setup(self, id, name, type):
|
|
218
|
|
|
262
|
|
|
219
|
self.id = id
|
|
263
|
self.id = id
|
|
220
|
self.name = name
|
|
264
|
self.name = name
|
|
@@
-226,7
+270,8
class UPConf():
|
|
226
|
|
|
270
|
|
|
227
|
id = len(self.opObjList) + 1
|
|
271
|
id = len(self.opObjList) + 1
|
|
228
|
|
|
272
|
|
|
229
|
opObj = OperationConf(id, name, priority, type)
|
|
273
|
opObj = OperationConf()
|
|
|
|
|
274
|
opObj.setup(id, name, priority, type)
|
|
230
|
|
|
275
|
|
|
231
|
self.opObjList.append(opObj)
|
|
276
|
self.opObjList.append(opObj)
|
|
232
|
|
|
277
|
|
|
@@
-242,6
+287,17
class UPConf():
|
|
242
|
for opObj in self.opObjList:
|
|
287
|
for opObj in self.opObjList:
|
|
243
|
opObj.makeXml(upElement)
|
|
288
|
opObj.makeXml(upElement)
|
|
244
|
|
|
289
|
|
|
|
|
|
290
|
def readXml(self, upElement):
|
|
|
|
|
291
|
|
|
|
|
|
292
|
self.id = upElement.get('id')
|
|
|
|
|
293
|
self.name = upElement.get('name')
|
|
|
|
|
294
|
self.type = upElement.get('type')
|
|
|
|
|
295
|
|
|
|
|
|
296
|
opElementList = upElement.getiterator('Operation')
|
|
|
|
|
297
|
|
|
|
|
|
298
|
for opElement in opElementList:
|
|
|
|
|
299
|
pass
|
|
|
|
|
300
|
|
|
245
|
def getOperationObjList(self):
|
|
301
|
def getOperationObjList(self):
|
|
246
|
|
|
302
|
|
|
247
|
return self.opObjList
|
|
303
|
return self.opObjList
|
|
@@
-255,7
+311,10
class OperationConf():
|
|
255
|
|
|
311
|
|
|
256
|
parmObjList = []
|
|
312
|
parmObjList = []
|
|
257
|
|
|
313
|
|
|
258
|
def __init__(self, id, name, priority, type):
|
|
314
|
def __init__(self):
|
|
|
|
|
315
|
pass
|
|
|
|
|
316
|
|
|
|
|
|
317
|
def setup(self, id, name, priority, type):
|
|
259
|
|
|
318
|
|
|
260
|
self.id = id
|
|
319
|
self.id = id
|
|
261
|
self.name = name
|
|
320
|
self.name = name
|
|
@@
-268,7
+327,8
class OperationConf():
|
|
268
|
|
|
327
|
|
|
269
|
id = len(self.parmObjList) + 1
|
|
328
|
id = len(self.parmObjList) + 1
|
|
270
|
|
|
329
|
|
|
271
|
parmObj = ParameterConf(id, name, value)
|
|
330
|
parmObj = ParameterConf()
|
|
|
|
|
331
|
parmObj.setup(id, name, value)
|
|
272
|
|
|
332
|
|
|
273
|
self.parmObjList.append(parmObj)
|
|
333
|
self.parmObjList.append(parmObj)
|
|
274
|
|
|
334
|
|
|
@@
-283,6
+343,17
class OperationConf():
|
|
283
|
|
|
343
|
|
|
284
|
for parmObj in self.parmObjList:
|
|
344
|
for parmObj in self.parmObjList:
|
|
285
|
parmObj.makeXml(opElement)
|
|
345
|
parmObj.makeXml(opElement)
|
|
|
|
|
346
|
|
|
|
|
|
347
|
def readXml(self, opElement):
|
|
|
|
|
348
|
|
|
|
|
|
349
|
self.id = opElement.get('id')
|
|
|
|
|
350
|
self.name = opElement.get('name')
|
|
|
|
|
351
|
self.type = opElement.get('type')
|
|
|
|
|
352
|
|
|
|
|
|
353
|
parmElementList = opElement.getiterator('Parameter')
|
|
|
|
|
354
|
|
|
|
|
|
355
|
for parmElement in parmElementList:
|
|
|
|
|
356
|
pass
|
|
286
|
|
|
357
|
|
|
287
|
def getParameterObjList(self):
|
|
358
|
def getParameterObjList(self):
|
|
288
|
|
|
359
|
|
|
@@
-294,7
+365,10
class ParameterConf():
|
|
294
|
name = None
|
|
365
|
name = None
|
|
295
|
value = None
|
|
366
|
value = None
|
|
296
|
|
|
367
|
|
|
297
|
def __init__(self, id, name, value):
|
|
368
|
def __init__(self):
|
|
|
|
|
369
|
pass
|
|
|
|
|
370
|
|
|
|
|
|
371
|
def setup(self, id, name, value):
|
|
298
|
|
|
372
|
|
|
299
|
self.id = id
|
|
373
|
self.id = id
|
|
300
|
self.name = name
|
|
374
|
self.name = name
|
|
@@
-306,12
+380,11
class ParameterConf():
|
|
306
|
parmElement.set('name', self.name)
|
|
380
|
parmElement.set('name', self.name)
|
|
307
|
parmElement.set('value', self.value)
|
|
381
|
parmElement.set('value', self.value)
|
|
308
|
|
|
382
|
|
|
309
|
def readXml(self, opElement):
|
|
383
|
def readXml(self, parmElement):
|
|
310
|
|
|
|
|
|
311
|
|
|
384
|
|
|
312
|
pass
|
|
385
|
self.id = parmElement.get('id')
|
|
313
|
# se = SubElement(parmElement, 'value')#ESTO ES LO ULTIMO QUE SE TRABAJO
|
|
386
|
self.name = parmElement.get('name')
|
|
314
|
# se.text = self.value
|
|
387
|
self.value = parmElement.get('value')
|
|
315
|
|
|
388
|
|
|
316
|
if __name__ == '__main__':
|
|
389
|
if __name__ == '__main__':
|
|
317
|
|
|
390
|
|