@@ -225,26 +225,24 @@ def from_string(data, max=MAX_LEN, type=None, format=None):
225
225
return out
226
226
227
227
def next (self ) -> str :
228
+ data = None
228
229
if self .qr_type == qr_type .SPECTER :
229
- self .current += 1
230
- if self .current >= self .total_sequences :
231
- self .current = 0
232
-
233
230
data = self .data_stack [self .current ]
234
231
235
232
digit_a = self .current + 1
236
233
digit_b = self .total_sequences
237
234
238
- data = f"p{ digit_a } of{ digit_b } { data } "
239
- print (data )
240
-
241
- return data
235
+ self .current += 1
236
+ if self .current >= self .total_sequences :
237
+ self .current = 0
242
238
239
+ data = f"p{ digit_a } of{ digit_b } { data } "
243
240
elif self .qr_type == qr_type .UR :
244
241
self .current = self .encoder .fountain_encoder .seq_num
245
242
data = self .encoder .next_part ().upper ()
246
- print (data )
247
- return data
243
+
244
+ print (data )
245
+ return data
248
246
249
247
250
248
class ReadQR (QThread ):
@@ -383,19 +381,21 @@ def run(self):
383
381
if self .qr_data .total_sequences > 1 or self .qr_data .qr_type == qr_type .UR :
384
382
remove_qr = True
385
383
while not self .stop :
384
+ self .parent .ui .steps .setText (self .qr_data .step ())
386
385
data = self .qr_data .next ()
386
+ if self .qr_data .qr_type == qr_type .UR :
387
+ self .parent .ui .steps .setText (self .qr_data .step ())
387
388
self .display_qr (data )
388
- self .parent . ui . steps . setText (self .qr_data . step () )
389
+ self .msleep (self .delay )
389
390
if self .qr_data .total_sequences == 1 :
390
391
remove_qr = False
391
392
break
392
- self .msleep (self .delay )
393
393
if remove_qr :
394
394
self .video_stream .emit (None )
395
395
elif self .qr_data .total_sequences == 1 :
396
396
data = self .qr_data .data
397
397
self .display_qr (data )
398
- self .parent .ui .steps .setText ('' )
398
+ self .parent .ui .steps .setText ('' )
399
399
400
400
def display_qr (self , data ):
401
401
try :
@@ -631,11 +631,10 @@ def on_btn_generate(self):
631
631
632
632
self .ui .btn_generate .setText (STOP_QR_TXT )
633
633
else :
634
- self .ui .split_group .setDisabled (False )
635
634
self .display_qr .stop = True
636
- self .ui .steps .setText ('' )
637
635
self .display_qr .video_stream .emit (None )
638
636
637
+ self .ui .split_group .setDisabled (False )
639
638
self .ui .btn_generate .setText (GENERATE_TXT )
640
639
641
640
def on_btn_clear (self ):
0 commit comments