diff --git a/.gitignore b/.gitignore index 8050ebc..865610a 100644 --- a/.gitignore +++ b/.gitignore @@ -210,4 +210,5 @@ nohup.out log/* !log/readme.md example/* -!example/readme.md \ No newline at end of file +!example/readme.md +result/* diff --git a/tools/common.py b/tools/common.py index 6f9149a..98e5f74 100644 --- a/tools/common.py +++ b/tools/common.py @@ -1,7 +1,7 @@ import os import logging -basedir = os.path.dirname(os.path.realpath(__file__)) +basedir = os.path.dirname(os.path.dirname(os.path.realpath(__file__))) def log(name): diff --git a/tools/novaplus.py b/tools/novaplus.py index f9c2d6c..fa16311 100644 --- a/tools/novaplus.py +++ b/tools/novaplus.py @@ -208,7 +208,7 @@ class AutoLayout: try: self.assign_samples() except Exception as e: - self.return_log.append(f'排样出错, 请联系!{e}') + self.return_log.append(f'nova_xplus排样出错, 请联系!{e}') self.index_assignments = {} outputname = 'assignments_%s_%s' % (datetime.now().strftime("%m%d%H%M"), os.path.basename(self.path)) outputpath = os.path.join(self.output, 'result', outputname) diff --git a/tools/t7.py b/tools/t7.py index b7b7ea7..f34e948 100644 --- a/tools/t7.py +++ b/tools/t7.py @@ -266,7 +266,7 @@ class AutoLayout: try: self.assign_samples() except Exception as e: - self.return_log.append(f'排样出错, 请联系!{e}') + self.return_log.append(f'T7排样出错, 请联系!{e}') self.index_assignments = {} outputname = 'assignments_%s_%s' % (datetime.now().strftime("%m%d%H%M"), os.path.basename(self.path)) outputpath = os.path.join(self.output, 'result', outputname)