|
@@ -255,14 +255,13 @@ class ScanThread(QtCore.QObject):
|
|
|
self.timescan.appendData(mean,std,adc, c_step, c25_step, f_step, c25_step_b)
|
|
|
|
|
|
|
|
|
- if c25_step_b == 4 and c_step_b == 0:
|
|
|
- #print('{:4.3f} emit pbar'.format(time.time()-self.startTime))
|
|
|
- tmpScan = copy.deepcopy(self.timescan)
|
|
|
- self.pbarSignal.emit(tmpScan,
|
|
|
- ((c_step-self.c_min)*(self.c25_max-self.c25_min+1.0) * (self.f_max-self.f_min+1.0) + (c25_step-self.c25_min)*(self.f_max-self.f_min+1.0) + (f_step-self.f_min))/
|
|
|
- ((self.c_max-self.c_min+1.0) * (self.c25_max-self.c25_min+1.0) * (self.f_max-self.f_min+1.0))
|
|
|
- )
|
|
|
- #print('{:4.3f} emit pbar done'.format(time.time()-self.startTime))
|
|
|
+ #print('{:4.3f} emit pbar'.format(time.time()-self.startTime))
|
|
|
+ tmpScan = copy.deepcopy(self.timescan)
|
|
|
+ self.pbarSignal.emit(tmpScan,
|
|
|
+ ((c_step-self.c_min)*(self.c25_max-self.c25_min+1.0) * (self.f_max-self.f_min+1.0) + (c25_step-self.c25_min)*(self.f_max-self.f_min+1.0) + (f_step-self.f_min))/
|
|
|
+ ((self.c_max-self.c_min+1.0) * (self.c25_max-self.c25_min+1.0) * (self.f_max-self.f_min+1.0))
|
|
|
+ )
|
|
|
+ #print('{:4.3f} emit pbar done'.format(time.time()-self.startTime))
|
|
|
|
|
|
def finished(self, c_step=0, c25_step=0, f_step=0):
|
|
|
'''Method to handle the end of the thread'''
|