From af4e8afe44c743a9fc77817c451d175f0b9dd9c3 Mon Sep 17 00:00:00 2001 From: KmolYuan Date: Fri, 30 Aug 2019 14:44:44 +0800 Subject: [PATCH] Update version and fix namespace. --- core/info/about.py | 2 +- core/main_window/io.py | 8 ++++---- depend/pyslvs | 2 +- requirements.txt | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/core/info/about.py b/core/info/about.py index f7fb1a55b..0b17a4738 100644 --- a/core/info/about.py +++ b/core/info/about.py @@ -66,7 +66,7 @@ def __init__(self, parent: QWidget): self.license_text.setText(LICENSE_STRING) self.ver_text.setText(html(_order_list(*SYS_INFO))) self.args_text.setText(html(_content("Startup arguments are as follows:") + _order_list( - f"Open with: {ARGUMENTS.file}", + f"Open with: {ARGUMENTS.filepath}", f"Start Path: {ARGUMENTS.c}", f"Fusion style: {ARGUMENTS.fusion}", f"Debug mode: {ARGUMENTS.debug_mode}", diff --git a/core/main_window/io.py b/core/main_window/io.py index c61e9f9a8..8bbddd227 100644 --- a/core/main_window/io.py +++ b/core/main_window/io.py @@ -717,13 +717,13 @@ def reset_options(self): widget.setText(value) def load_from_args(self): - if not ARGUMENTS.file: + if not ARGUMENTS.filepath: return - suffix = QFileInfo(ARGUMENTS.file).suffix() + suffix = QFileInfo(ARGUMENTS.filepath).suffix() if suffix == 'pyslvs': - self.database_widget.read(ARGUMENTS.file) + self.database_widget.read(ARGUMENTS.filepath) elif suffix == 'slvs': - self.__read_slvs(ARGUMENTS.file) + self.__read_slvs(ARGUMENTS.filepath) else: logger.critical("Unsupported format has been ignore when startup.") diff --git a/depend/pyslvs b/depend/pyslvs index 1883a6e21..f4e990097 160000 --- a/depend/pyslvs +++ b/depend/pyslvs @@ -1 +1 @@ -Subproject commit 1883a6e21986b9f0df4d11519caa55611c413fb2 +Subproject commit f4e99009796e2a50a3152d33095a8d468c438534 diff --git a/requirements.txt b/requirements.txt index 6a6ea3b0b..ac8fdcf5d 100644 --- a/requirements.txt +++ b/requirements.txt @@ -6,7 +6,7 @@ pyqtchart; sys_platform != 'win32' pyqt5<=5.12.2; sys_platform == 'win32' pyqtchart<=5.12.2; sys_platform == 'win32' ezdxf -numpy<1.17 +numpy cython openpyxl psutil