From be03437e8d8593ca2267e074ce749cc3259cc7f3 Mon Sep 17 00:00:00 2001 From: ferrari <maxence.ferrari@gmail.com> Date: Tue, 23 Mar 2021 13:55:57 +0100 Subject: [PATCH] Changed file numbering --- IPI_bombyx.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/IPI_bombyx.py b/IPI_bombyx.py index fdb9e98..c63f729 100644 --- a/IPI_bombyx.py +++ b/IPI_bombyx.py @@ -35,7 +35,7 @@ class BetterIter(object): val = next(self.wrapped) self.done_file.seek(0) - self.list_pass = set(int(v) for v in self.done_file.read().split('\n') if len(v)) + self.list_pass = list(int(v) for v in self.done_file.read().split('\n') if len(v)) self.usr_pass = set(v for f in self.save for v in f.passage.unique() if v in self.file_list) self._test_done() if (val not in self.list_pass) or (self.overlap and (val not in self.usr_pass)): @@ -63,7 +63,7 @@ def _next_file(event, refs, order, df, save, args, outpath, done_file, text): ipi.reset(refs['callback'], os.path.join(args.wd, df.iloc[ind].filepredmax.strip('/')), args.channel) refs['fig'].canvas.set_window_title('IPI of ' + df.iloc[ind].filepredmax.rsplit('/', 1)[-1]) usr_files = [v for f in save for v in f.passage.unique() if v in order.list_pass] - text.set_text(f'{order.curr_len} files done\n{len(usr_files)} by you') + text.set_text(f'{order.curr_len} files done\n{len(usr_files)}/{len(set(order.list_pass))} by you') except (RuntimeError,FileNotFoundError) as e: print(e, 'Opening next file') _next_file(event, refs, order, df, save, args, outpath, done_file, text) -- GitLab