@@ -956,7 +956,7 class Project(Process): | |||||
956 |
|
956 | |||
957 | self.procUnitConfObjDict = newProcUnitConfObjDict |
|
957 | self.procUnitConfObjDict = newProcUnitConfObjDict | |
958 |
|
958 | |||
959 |
def setup(self, id, name='', description='', email=None, alarm=[ |
|
959 | def setup(self, id, name='', description='', email=None, alarm=[]): | |
960 |
|
960 | |||
961 |
|
961 | |||
962 | print '*' * 60 |
|
962 | print '*' * 60 | |
@@ -1187,6 +1187,9 class Project(Process): | |||||
1187 | if modes is None: |
|
1187 | if modes is None: | |
1188 | modes = self.alarm |
|
1188 | modes = self.alarm | |
1189 |
|
1189 | |||
|
1190 | if not self.alarm: | |||
|
1191 | modes = [] | |||
|
1192 | ||||
1190 | err = traceback.format_exception(sys.exc_info()[0], |
|
1193 | err = traceback.format_exception(sys.exc_info()[0], | |
1191 | sys.exc_info()[1], |
|
1194 | sys.exc_info()[1], | |
1192 | sys.exc_info()[2]) |
|
1195 | sys.exc_info()[2]) | |
@@ -1302,6 +1305,8 class Project(Process): | |||||
1302 | is_ok = is_ok or sts |
|
1305 | is_ok = is_ok or sts | |
1303 | except SchainWarning: |
|
1306 | except SchainWarning: | |
1304 | err = self.__handleError(procUnitConfObj, modes=[2, 3], stdout=False) |
|
1307 | err = self.__handleError(procUnitConfObj, modes=[2, 3], stdout=False) | |
|
1308 | is_ok = False | |||
|
1309 | break | |||
1305 | except KeyboardInterrupt: |
|
1310 | except KeyboardInterrupt: | |
1306 | is_ok = False |
|
1311 | is_ok = False | |
1307 | break |
|
1312 | break |
@@ -512,6 +512,8 class PlotData(Operation, Process): | |||||
512 | self.__plot() |
|
512 | self.__plot() | |
513 |
|
513 | |||
514 | except zmq.Again as e: |
|
514 | except zmq.Again as e: | |
|
515 | if self.data and self.data.ended: | |||
|
516 | break | |||
515 | log.log('Waiting for data...') |
|
517 | log.log('Waiting for data...') | |
516 | if self.data: |
|
518 | if self.data: | |
517 | figpause(self.data.throttle) |
|
519 | figpause(self.data.throttle) |
General Comments 0
You need to be logged in to leave comments.
Login now