Skip to content
Snippets Groups Projects
Commit be03437e authored by ferrari's avatar ferrari
Browse files

Changed file numbering

parent 351e7dfe
No related branches found
No related tags found
No related merge requests found
...@@ -35,7 +35,7 @@ class BetterIter(object): ...@@ -35,7 +35,7 @@ class BetterIter(object):
val = next(self.wrapped) val = next(self.wrapped)
self.done_file.seek(0) 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.usr_pass = set(v for f in self.save for v in f.passage.unique() if v in self.file_list)
self._test_done() self._test_done()
if (val not in self.list_pass) or (self.overlap and (val not in self.usr_pass)): 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): ...@@ -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) 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]) 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] 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: except (RuntimeError,FileNotFoundError) as e:
print(e, 'Opening next file') print(e, 'Opening next file')
_next_file(event, refs, order, df, save, args, outpath, done_file, text) _next_file(event, refs, order, df, save, args, outpath, done_file, text)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment