@@ -983,9 +983,9 class Project(): | |||||
983 | def run(self): |
|
983 | def run(self): | |
984 |
|
984 | |||
985 |
|
985 | |||
986 |
print "*"* |
|
986 | print "*"*50 | |
987 | print " Starting SIGNAL CHAIN PROCESSING " |
|
987 | print " Starting SIGNAL CHAIN PROCESSING " | |
988 |
print "*"* |
|
988 | print "*"*50 | |
989 |
|
989 | |||
990 |
|
990 | |||
991 | keyList = self.procUnitConfObjDict.keys() |
|
991 | keyList = self.procUnitConfObjDict.keys() |
@@ -404,6 +404,10 class BasicWindow(QMainWindow, Ui_BasicWindow): | |||||
404 |
|
404 | |||
405 | self.console.clear() |
|
405 | self.console.clear() | |
406 |
|
406 | |||
|
407 | if not self.getSelectedProjectObj(): | |||
|
408 | self.console.append("Please select a Project before Load files") | |||
|
409 | return | |||
|
410 | ||||
407 | parameter_list = self.checkInputsProject() |
|
411 | parameter_list = self.checkInputsProject() | |
408 |
|
412 | |||
409 | if not parameter_list[0]: |
|
413 | if not parameter_list[0]: | |
@@ -1176,6 +1180,11 class BasicWindow(QMainWindow, Ui_BasicWindow): | |||||
1176 | self.console.append("Checking input parameters ...") |
|
1180 | self.console.append("Checking input parameters ...") | |
1177 |
|
1181 | |||
1178 | projectObj = self.getSelectedProjectObj() |
|
1182 | projectObj = self.getSelectedProjectObj() | |
|
1183 | ||||
|
1184 | if not projectObj: | |||
|
1185 | self.console.append("Please select a project before update it") | |||
|
1186 | return | |||
|
1187 | ||||
1179 | puObj = self.getSelectedItemObj() |
|
1188 | puObj = self.getSelectedItemObj() | |
1180 |
|
1189 | |||
1181 | puObj.removeOperations() |
|
1190 | puObj.removeOperations() | |
@@ -3978,6 +3987,9 class BasicWindow(QMainWindow, Ui_BasicWindow): | |||||
3978 |
|
3987 | |||
3979 | projectObj = self.getSelectedProjectObj() |
|
3988 | projectObj = self.getSelectedProjectObj() | |
3980 |
|
3989 | |||
|
3990 | if not projectObj: | |||
|
3991 | return | |||
|
3992 | ||||
3981 | for idPU, puObj in projectObj.procUnitConfObjDict.items(): |
|
3993 | for idPU, puObj in projectObj.procUnitConfObjDict.items(): | |
3982 |
|
3994 | |||
3983 | for opObj in puObj.getOperationObjList(): |
|
3995 | for opObj in puObj.getOperationObjList(): | |
@@ -4110,6 +4122,11 class BasicWindow(QMainWindow, Ui_BasicWindow): | |||||
4110 | return None |
|
4122 | return None | |
4111 |
|
4123 | |||
4112 | projectObjView = self.getSelectedProjectObj() |
|
4124 | projectObjView = self.getSelectedProjectObj() | |
|
4125 | ||||
|
4126 | if not projectObjView: | |||
|
4127 | self.console.append("Please select a project before update it") | |||
|
4128 | return None | |||
|
4129 | ||||
4113 | projectObjView.update(name=projectParms.name, description=projectParms.description) |
|
4130 | projectObjView.update(name=projectParms.name, description=projectParms.description) | |
4114 |
|
4131 | |||
4115 | return projectObjView |
|
4132 | return projectObjView | |
@@ -4254,6 +4271,9 class BasicWindow(QMainWindow, Ui_BasicWindow): | |||||
4254 | inputId = fatherObj.getId() |
|
4271 | inputId = fatherObj.getId() | |
4255 | projectObjView = self.getSelectedProjectObj() |
|
4272 | projectObjView = self.getSelectedProjectObj() | |
4256 |
|
4273 | |||
|
4274 | if not projectObjView: | |||
|
4275 | return | |||
|
4276 | ||||
4257 | puObj = self.createProcUnitView(projectObjView, datatype, inputId) |
|
4277 | puObj = self.createProcUnitView(projectObjView, datatype, inputId) | |
4258 |
|
4278 | |||
4259 | self.addPU2ProjectExplorer(puObj) |
|
4279 | self.addPU2ProjectExplorer(puObj) | |
@@ -4320,6 +4340,9 class BasicWindow(QMainWindow, Ui_BasicWindow): | |||||
4320 |
|
4340 | |||
4321 | projectObj = self.getSelectedProjectObj() |
|
4341 | projectObj = self.getSelectedProjectObj() | |
4322 |
|
4342 | |||
|
4343 | if not projectObj: | |||
|
4344 | return | |||
|
4345 | ||||
4323 | self.removeAllFTPProcUnitView(projectObj) |
|
4346 | self.removeAllFTPProcUnitView(projectObj) | |
4324 |
|
4347 | |||
4325 | if not self.__puLocalFolder2FTP: |
|
4348 | if not self.__puLocalFolder2FTP: | |
@@ -4702,7 +4725,7 class BasicWindow(QMainWindow, Ui_BasicWindow): | |||||
4702 | projectObj = self.getSelectedProjectObj() |
|
4725 | projectObj = self.getSelectedProjectObj() | |
4703 |
|
4726 | |||
4704 | if not projectObj: |
|
4727 | if not projectObj: | |
4705 |
|
|
4728 | self.console.append("Please select a project before pressing PLAY button") | |
4706 | return |
|
4729 | return | |
4707 |
|
4730 | |||
4708 | if save: |
|
4731 | if save: | |
@@ -4772,6 +4795,11 class BasicWindow(QMainWindow, Ui_BasicWindow): | |||||
4772 | self.actionStarToolbar.setEnabled(False) |
|
4795 | self.actionStarToolbar.setEnabled(False) | |
4773 |
|
4796 | |||
4774 | projectObj = self.getSelectedProjectObj() |
|
4797 | projectObj = self.getSelectedProjectObj() | |
|
4798 | ||||
|
4799 | if not projectObj: | |||
|
4800 | self.console.append("Please select a project before save it") | |||
|
4801 | return | |||
|
4802 | ||||
4775 | self.refreshGraphicsId() |
|
4803 | self.refreshGraphicsId() | |
4776 |
|
4804 | |||
4777 | sts = True |
|
4805 | sts = True | |
@@ -4802,7 +4830,9 class BasicWindow(QMainWindow, Ui_BasicWindow): | |||||
4802 | filename = os.path.join( str(self.pathWorkSpace), "%s%s" %(str(projectObj.name), '.xml') ) |
|
4830 | filename = os.path.join( str(self.pathWorkSpace), "%s%s" %(str(projectObj.name), '.xml') ) | |
4803 |
|
4831 | |||
4804 | projectObj.writeXml(filename) |
|
4832 | projectObj.writeXml(filename) | |
4805 | self.console.append("\nPress Play button to start data processing ...") |
|
4833 | self.console.clear() | |
|
4834 | self.console.append("Project saved") | |||
|
4835 | self.console.append("Press Play button to start data processing ...") | |||
4806 |
|
4836 | |||
4807 | self.actionStart.setEnabled(True) |
|
4837 | self.actionStart.setEnabled(True) | |
4808 | self.actionStarToolbar.setEnabled(True) |
|
4838 | self.actionStarToolbar.setEnabled(True) | |
@@ -5266,7 +5296,14 class BasicWindow(QMainWindow, Ui_BasicWindow): | |||||
5266 |
|
5296 | |||
5267 | if not dateList: |
|
5297 | if not dateList: | |
5268 | # self.console.clear() |
|
5298 | # self.console.clear() | |
5269 | outputstr = "The path %s has no files with extension *%s" % (data_path, ext) |
|
5299 | if walk: | |
|
5300 | if expLabel: | |||
|
5301 | outputstr = "No files (*%s) were found on %s/DOYPATH/%s" % (ext, data_path, expLabel) | |||
|
5302 | else: | |||
|
5303 | outputstr = "No files (*%s) were found on %s" % (ext, data_path) | |||
|
5304 | else: | |||
|
5305 | outputstr = "No files (*%s) were found on %s" % (ext, data_path) | |||
|
5306 | ||||
5270 | self.console.append(outputstr) |
|
5307 | self.console.append(outputstr) | |
5271 | return |
|
5308 | return | |
5272 |
|
5309 | |||
@@ -5806,6 +5843,12 class ftpBuffer(): | |||||
5806 | return self.server, self.remotefolder, self.username, self.password, self.ftp_wei, self.exp_code, self.sub_exp_code, self.plot_pos, self.extension, self.period, self.protocol |
|
5843 | return self.server, self.remotefolder, self.username, self.password, self.ftp_wei, self.exp_code, self.sub_exp_code, self.plot_pos, self.extension, self.period, self.protocol | |
5807 |
|
5844 | |||
5808 | class ShowMeConsole(QtCore.QObject): |
|
5845 | class ShowMeConsole(QtCore.QObject): | |
|
5846 | ||||
5809 | textWritten = QtCore.pyqtSignal(str) |
|
5847 | textWritten = QtCore.pyqtSignal(str) | |
|
5848 | ||||
5810 | def write(self, text): |
|
5849 | def write(self, text): | |
|
5850 | ||||
|
5851 | if text[-1] == "\n": | |||
|
5852 | text = text[:-1] | |||
|
5853 | ||||
5811 | self.textWritten.emit(str(text)) |
|
5854 | self.textWritten.emit(str(text)) |
General Comments 0
You need to be logged in to leave comments.
Login now