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