| @@ -57,10 +57,10 class BasicWindow(QMainWindow,Ui_BasicWindow): | |||
|
|
57 | 57 | self.setupUi(self) |
|
|
58 | 58 | self.__projObjDict = {} |
|
|
59 | 59 | self.__upObjDict = {} |
|
|
60 |
self.__ |
|
|
|
60 | self.__treeObjDict = {} | |
|
|
61 | 61 | self.readUnitConfObjList=[] |
|
|
62 | 62 | self.operObjList=[] |
|
|
63 |
self.id |
|
|
|
63 | self.idProject = 0 | |
|
|
64 | 64 | self.idImag=0 |
|
|
65 | 65 | self.online=0 |
|
|
66 | 66 | self.walk=1 |
| @@ -225,10 +225,10 class BasicWindow(QMainWindow,Ui_BasicWindow): | |||
|
|
225 | 225 | """ |
|
|
226 | 226 | |
|
|
227 | 227 | self.console.clear() |
|
|
228 |
self.id |
|
|
|
228 | self.idProject +=1 | |
|
|
229 | 229 | self.projectObj= Project () |
|
|
230 |
self.__projObjDict[self.id |
|
|
|
231 |
id = self.id |
|
|
|
230 | self.__projObjDict[self.idProject]=self.projectObj | |
|
|
231 | id = self.idProject | |
|
|
232 | 232 | name = str(self.proName.text()) |
|
|
233 | 233 | try: |
|
|
234 | 234 | name=str(self.proName.text()) |
| @@ -279,9 +279,9 class BasicWindow(QMainWindow,Ui_BasicWindow): | |||
|
|
279 | 279 | |
|
|
280 | 280 | #Project Explorer |
|
|
281 | 281 | self.parentItem=self.model.invisibleRootItem() |
|
|
282 |
self.__ |
|
|
|
283 |
self.parentItem.appendRow(self.__ |
|
|
|
284 |
self.parentItem=self.__ |
|
|
|
282 | self.__treeObjDict[self.idProject] =QtGui.QStandardItem(QtCore.QString(name).arg(self.idProject)) | |
|
|
283 | self.parentItem.appendRow(self.__treeObjDict[self.idProject]) | |
|
|
284 | self.parentItem=self.__treeObjDict[self.idProject] | |
|
|
285 | 285 | |
|
|
286 | 286 | #Project Properties |
|
|
287 | 287 | self.model_2=treeModel() |
| @@ -396,8 +396,8 class BasicWindow(QMainWindow,Ui_BasicWindow): | |||
|
|
396 | 396 | BUSCA EN LA LISTA DE OPERACIONES DEL TIPO VOLTAJE Y LES AοΏ½ADE EL PARAMETRO ADECUADO ESPERANDO LA ACEPTACION DEL USUARIO |
|
|
397 | 397 | PARA AGREGARLO AL ARCHIVO DE CONFIGURACION XML |
|
|
398 | 398 | """ |
|
|
399 |
for i in self.__ |
|
|
|
400 |
if self.__ |
|
|
|
399 | for i in self.__treeObjDict: | |
|
|
400 | if self.__treeObjDict[i]==self.indexclick: | |
|
|
401 | 401 | if self.__upObjDict.has_key(i)==True: |
|
|
402 | 402 | self.upObj=self.__upObjDict[i] |
|
|
403 | 403 | |
| @@ -541,8 +541,8 class BasicWindow(QMainWindow,Ui_BasicWindow): | |||
|
|
541 | 541 | """ |
|
|
542 | 542 | GRAPH |
|
|
543 | 543 | """ |
|
|
544 |
for i in self.__ |
|
|
|
545 |
if self.__ |
|
|
|
544 | for i in self.__treeObjDict: | |
|
|
545 | if self.__treeObjDict[i]==self.indexclick: | |
|
|
546 | 546 | if self.__upObjDict.has_key(i)==True: |
|
|
547 | 547 | self.upObj=self.__upObjDict[i] |
|
|
548 | 548 | |
| @@ -635,8 +635,8 class BasicWindow(QMainWindow,Ui_BasicWindow): | |||
|
|
635 | 635 | """ |
|
|
636 | 636 | AΓADE OPERACION SPECTRA |
|
|
637 | 637 | """ |
|
|
638 |
for i in self.__ |
|
|
|
639 |
if self.__ |
|
|
|
638 | for i in self.__treeObjDict: | |
|
|
639 | if self.__treeObjDict[i]==self.indexclick: | |
|
|
640 | 640 | if self.__upObjDict.has_key(i)==True: |
|
|
641 | 641 | self.upObj=self.__upObjDict[i] |
|
|
642 | 642 | value1=self.specOpnFFTpoints.text() |
| @@ -860,8 +860,8 class BasicWindow(QMainWindow,Ui_BasicWindow): | |||
|
|
860 | 860 | @pyqtSignature("") |
|
|
861 | 861 | def on_specGraphOk_clicked(self): |
|
|
862 | 862 | |
|
|
863 |
for i in self.__ |
|
|
|
864 |
if self.__ |
|
|
|
863 | for i in self.__treeObjDict: | |
|
|
864 | if self.__treeObjDict[i]==self.indexclick: | |
|
|
865 | 865 | if self.__upObjDict.has_key(i)==True: |
|
|
866 | 866 | self.upObj=self.__upObjDict[i] |
|
|
867 | 867 | if self.specGraphCebSpectraplot.isChecked(): |
| @@ -1167,8 +1167,8 class BasicWindow(QMainWindow,Ui_BasicWindow): | |||
|
|
1167 | 1167 | |
|
|
1168 | 1168 | def playProject(self): |
|
|
1169 | 1169 | |
|
|
1170 |
for i in self.__ |
|
|
|
1171 |
if self.__ |
|
|
|
1170 | for i in self.__treeObjDict: | |
|
|
1171 | if self.__treeObjDict[i]==self.indexclick: | |
|
|
1172 | 1172 | if self.__projObjDict.has_key(i)==True: |
|
|
1173 | 1173 | self.projectObj=self.__projObjDict[i] |
|
|
1174 | 1174 | filename=self.pathWorkSpace+"/"+str(self.projectObj.name)+str(self.projectObj.id)+".xml" |
| @@ -1187,8 +1187,8 class BasicWindow(QMainWindow,Ui_BasicWindow): | |||
|
|
1187 | 1187 | |
|
|
1188 | 1188 | def saveProject(self): |
|
|
1189 | 1189 | print self.indexclick |
|
|
1190 |
for i in self.__ |
|
|
|
1191 |
if self.__ |
|
|
|
1190 | for i in self.__treeObjDict: | |
|
|
1191 | if self.__treeObjDict[i]==self.indexclick: | |
|
|
1192 | 1192 | if self.__projObjDict.has_key(i)==True: |
|
|
1193 | 1193 | self.projectObj=self.__projObjDict[int(i)] |
|
|
1194 | 1194 | else: |
| @@ -1205,8 +1205,8 class BasicWindow(QMainWindow,Ui_BasicWindow): | |||
|
|
1205 | 1205 | self.indexclick= index.model().itemFromIndex(index) |
|
|
1206 | 1206 | |
|
|
1207 | 1207 | def doubleclickFunction(self): |
|
|
1208 |
for i in self.__ |
|
|
|
1209 |
if self.__ |
|
|
|
1208 | for i in self.__treeObjDict: | |
|
|
1209 | if self.__treeObjDict[i]==self.indexclick: | |
|
|
1210 | 1210 | if self.__projObjDict.has_key(i)==True: |
|
|
1211 | 1211 | #self.tabProject.setEnabled(True) |
|
|
1212 | 1212 | |
| @@ -1314,9 +1314,9 class BasicWindow(QMainWindow,Ui_BasicWindow): | |||
|
|
1314 | 1314 | self.console.append("If your Datatype is rawdata, you will start with processing unit Type Voltage") |
|
|
1315 | 1315 | self.console.append("If your Datatype is pdata, you will choose between processing unit Type Spectra or Correlation") |
|
|
1316 | 1316 | if action == quitAction2: |
|
|
1317 |
for i in self.__ |
|
|
|
1318 |
if self.__ |
|
|
|
1319 |
self.arbolItem=self.__ |
|
|
|
1317 | for i in self.__treeObjDict: | |
|
|
1318 | if self.__treeObjDict[i]==self.indexclick: | |
|
|
1319 | self.arbolItem=self.__treeObjDict[i] | |
|
|
1320 | 1320 | self.arbolItem.removeRows(self.arbolItem.row(),1) |
|
|
1321 | 1321 | |
|
|
1322 | 1322 | if action == quitAction3: |
| @@ -1356,8 +1356,8 class BasicWindow(QMainWindow,Ui_BasicWindow): | |||
|
|
1356 | 1356 | |
|
|
1357 | 1357 | def addPU(self): |
|
|
1358 | 1358 | self.configUP=UnitProcess(self) |
|
|
1359 |
for i in self.__ |
|
|
|
1360 |
if self.__ |
|
|
|
1359 | for i in self.__treeObjDict: | |
|
|
1360 | if self.__treeObjDict[i]==self.indexclick: | |
|
|
1361 | 1361 | if self.__projObjDict.has_key(i)==True: |
|
|
1362 | 1362 | self.projectObj=self.__projObjDict[int(i)] |
|
|
1363 | 1363 | self.configUP.dataTypeProject=str(self.proComDataType.currentText()) |
| @@ -1378,8 +1378,8 class BasicWindow(QMainWindow,Ui_BasicWindow): | |||
|
|
1378 | 1378 | self.uporProObjRecover=self.configUP.getFromWindow |
|
|
1379 | 1379 | |
|
|
1380 | 1380 | self.upType = self.configUP.typeofUP |
|
|
1381 |
for i in self.__ |
|
|
|
1382 |
if self.__ |
|
|
|
1381 | for i in self.__treeObjDict: | |
|
|
1382 | if self.__treeObjDict[i]==self.indexclick: | |
|
|
1383 | 1383 | if self.__projObjDict.has_key(i)==True: |
|
|
1384 | 1384 | self.projectObj=self.__projObjDict[int(i)] |
|
|
1385 | 1385 | |
| @@ -1405,11 +1405,11 class BasicWindow(QMainWindow,Ui_BasicWindow): | |||
|
|
1405 | 1405 | self.procUnitConfObj1 = self.projectObj.addProcUnit(datatype=datatype, inputId=inputId) |
|
|
1406 | 1406 | self.__upObjDict[self.procUnitConfObj1.id]= self.procUnitConfObj1 |
|
|
1407 | 1407 | |
|
|
1408 |
self.parentItem=self.__ |
|
|
|
1408 | self.parentItem=self.__treeObjDict[uporprojectObj.id] | |
|
|
1409 | 1409 | self.numbertree=int(self.procUnitConfObj1.getId())-1 |
|
|
1410 |
self.__ |
|
|
|
1411 |
self.parentItem.appendRow(self.__ |
|
|
|
1412 |
self.parentItem=self.__ |
|
|
|
1410 | self.__treeObjDict[self.procUnitConfObj1.id]=QtGui.QStandardItem(QtCore.QString(datatype).arg(self.numbertree)) | |
|
|
1411 | self.parentItem.appendRow(self.__treeObjDict[self.procUnitConfObj1.id]) | |
|
|
1412 | self.parentItem=self.__treeObjDict[self.procUnitConfObj1.id] | |
|
|
1413 | 1413 | self.treeProjectExplorer.expandAll() |
|
|
1414 | 1414 | |
|
|
1415 | 1415 | |
General Comments 0
You need to be logged in to leave comments.
Login now