##// END OF EJS Templates
GUI: minor changes
Miguel Valdez -
r680:47e8da85aa0e
parent child
Show More
@@ -1031,7 +1031,9 class Project():
1031 1031 sts = procUnitConfObj.run()
1032 1032 is_ok = is_ok or sts
1033 1033 except:
1034 print "***** Error running %s *****" %procUnitConfObj.name
1034 1035 sleep(1)
1036
1035 1037 err = traceback.format_exception(sys.exc_info()[0],
1036 1038 sys.exc_info()[1],
1037 1039 sys.exc_info()[2])
@@ -1039,7 +1041,11 class Project():
1039 1041 for thisLine in err:
1040 1042 message += thisLine
1041 1043
1042 print message
1044 sys.stderr.write(message)
1045 # print "*"*60
1046 # print message
1047 # print "*"*60
1048
1043 1049 # self.sendReport(message)
1044 1050 sleep(0.1)
1045 1051 is_ok = False
@@ -1048,7 +1054,6 class Project():
1048 1054
1049 1055 #If every process unit finished so end process
1050 1056 if not(is_ok):
1051 print message
1052 1057 print "Every process unit have finished"
1053 1058 break
1054 1059
@@ -256,18 +256,19 class BasicWindow(QMainWindow, Ui_BasicWindow):
256 256
257 257 @pyqtSignature("")
258 258 def on_actionAddPU_triggered(self):
259
259 260 if len(self.__projectObjDict) == 0:
260 outputstr = "First Create a Project then add Processing Unit"
261 outputstr = "First create a Project before add any Processing Unit"
261 262 self.console.clear()
262 263 self.console.append(outputstr)
263 return 0
264 return
264 265 else:
265 266 self.addPUWindow()
266 267 self.console.clear()
267 268 self.console.append("Please, Choose the type of Processing Unit")
268 self.console.append("If your Datatype is rawdata, you will start with processing unit Type Voltage")
269 self.console.append("If your Datatype is pdata, you will choose between processing unit Type Spectra or Correlation")
270 self.console.append("If your Datatype is fits, you will start with processing unit Type SpectraHeis")
269 # self.console.append("If your Datatype is rawdata, you will start with processing unit Type Voltage")
270 # self.console.append("If your Datatype is pdata, you will choose between processing unit Type Spectra or Correlation")
271 # self.console.append("If your Datatype is fits, you will start with processing unit Type SpectraHeis")
271 272
272 273
273 274 @pyqtSignature("")
@@ -404,15 +405,8 class BasicWindow(QMainWindow, Ui_BasicWindow):
404 405
405 406 self.console.clear()
406 407
407 # if not self.getSelectedProjectObj():
408 # self.console.append("Please select a project before load files")
409 # return
410
411 408 parameter_list = self.checkInputsProject()
412 409
413 # if not parameter_list[0]:
414 # return
415
416 410 parms_ok, project_name, datatype, ext, data_path, read_mode, delay, walk, set, expLabel = parameter_list
417 411
418 412 if read_mode == "Offline":
@@ -433,8 +427,15 class BasicWindow(QMainWindow, Ui_BasicWindow):
433 427 self.proEndTime.setEnabled(False)
434 428 self.frame_2.setEnabled(True)
435 429
436 self.loadDays(data_path, ext, walk, expLabel)
437
430 if self.loadDays(data_path, ext, walk, expLabel) == []:
431 self._disable_save_button()
432 self._disable_play_button()
433 self.proOk.setEnabled(False)
434 else:
435 self._enable_save_button()
436 self._enable_play_button()
437 self.proOk.setEnabled(True)
438
438 439 @pyqtSignature("int")
439 440 def on_proComStartDate_activated(self, index):
440 441 """
@@ -4077,7 +4078,7 class BasicWindow(QMainWindow, Ui_BasicWindow):
4077 4078 try:
4078 4079 index.parent()
4079 4080 except:
4080 self.console.append('Please first select a Project or Processing Unit')
4081 self.console.append('Please, first at all select a Project or Processing Unit')
4081 4082 return 0
4082 4083 # print index.parent(),index
4083 4084 if index.parent() == None:
@@ -5257,9 +5258,9 class BasicWindow(QMainWindow, Ui_BasicWindow):
5257 5258 """
5258 5259 Method to loads day
5259 5260 """
5260 self._disable_save_button()
5261 self._disable_play_button()
5262 self.proOk.setEnabled(False)
5261 # self._disable_save_button()
5262 # self._disable_play_button()
5263 # self.proOk.setEnabled(False)
5263 5264
5264 5265 self.proComStartDate.clear()
5265 5266 self.proComEndDate.clear()
@@ -5305,9 +5306,9 class BasicWindow(QMainWindow, Ui_BasicWindow):
5305 5306 self.console.clear()
5306 5307 self.console.append("Successful load")
5307 5308
5308 self.proOk.setEnabled(True)
5309 self._enable_play_button()
5310 self._enable_save_button()
5309 # self.proOk.setEnabled(True)
5310 # self._enable_play_button()
5311 # self._enable_save_button()
5311 5312
5312 5313 return self.dateList
5313 5314
General Comments 0
You need to be logged in to leave comments. Login now