Skip to content
This repository was archived by the owner on Apr 28, 2025. It is now read-only.

Commit 84dfea6

Browse files
committed
Fix starting number and QR for SPECTER pMoFN
1 parent 478cfb0 commit 84dfea6

File tree

1 file changed

+14
-15
lines changed

1 file changed

+14
-15
lines changed

seedqreader.py

Lines changed: 14 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -225,26 +225,24 @@ def from_string(data, max=MAX_LEN, type=None, format=None):
225225
return out
226226

227227
def next(self) -> str:
228+
data = None
228229
if self.qr_type == qr_type.SPECTER:
229-
self.current += 1
230-
if self.current >= self.total_sequences:
231-
self.current = 0
232-
233230
data = self.data_stack[self.current]
234231

235232
digit_a = self.current + 1
236233
digit_b = self.total_sequences
237234

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
242238

239+
data = f"p{digit_a}of{digit_b} {data}"
243240
elif self.qr_type == qr_type.UR:
244241
self.current = self.encoder.fountain_encoder.seq_num
245242
data = self.encoder.next_part().upper()
246-
print(data)
247-
return data
243+
244+
print(data)
245+
return data
248246

249247

250248
class ReadQR(QThread):
@@ -383,19 +381,21 @@ def run(self):
383381
if self.qr_data.total_sequences > 1 or self.qr_data.qr_type == qr_type.UR:
384382
remove_qr = True
385383
while not self.stop:
384+
self.parent.ui.steps.setText(self.qr_data.step())
386385
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())
387388
self.display_qr(data)
388-
self.parent.ui.steps.setText(self.qr_data.step())
389+
self.msleep(self.delay)
389390
if self.qr_data.total_sequences == 1:
390391
remove_qr = False
391392
break
392-
self.msleep(self.delay)
393393
if remove_qr:
394394
self.video_stream.emit(None)
395395
elif self.qr_data.total_sequences == 1:
396396
data = self.qr_data.data
397397
self.display_qr(data)
398-
self.parent.ui.steps.setText('')
398+
self.parent.ui.steps.setText('')
399399

400400
def display_qr(self, data):
401401
try:
@@ -631,11 +631,10 @@ def on_btn_generate(self):
631631

632632
self.ui.btn_generate.setText(STOP_QR_TXT)
633633
else:
634-
self.ui.split_group.setDisabled(False)
635634
self.display_qr.stop = True
636-
self.ui.steps.setText('')
637635
self.display_qr.video_stream.emit(None)
638636

637+
self.ui.split_group.setDisabled(False)
639638
self.ui.btn_generate.setText(GENERATE_TXT)
640639

641640
def on_btn_clear(self):

0 commit comments

Comments
 (0)