From d9bb27727b5ec1ea921cb94ae9a66135d33af164 Mon Sep 17 00:00:00 2001 From: copper Date: Sat, 29 Jul 2023 16:51:51 +0800 Subject: [PATCH] fix lic path bug --- lic/license.lic | 2 +- rscder/gui/license.py | 9 +++++---- rscder/plugins/filter_collection/bilater_filter.py | 2 -- rscder/plugins/filter_collection/lee_filter.py | 2 -- rscder/plugins/filter_collection/lmsnp_filter.py | 2 -- rscder/plugins/veg_method/main.py | 2 +- rscder/utils/setting.py | 5 +++++ test.lic | 2 +- 8 files changed, 13 insertions(+), 13 deletions(-) diff --git a/lic/license.lic b/lic/license.lic index c20a5a8..5cb411e 100644 --- a/lic/license.lic +++ b/lic/license.lic @@ -1 +1 @@ -U2cvLo/waByK0JLEzMsbuevhDgvFdw9E2wATS9YnC1NrtbmcSH9Rb3F2Bn5G8D8AruY/+S4tf+Lj5PRRyUXubyM2e6erbEYW7HnA9BZljgLMHnmrxpiW1woR6OEWzhJH6Y6GILPn7S0esv4oO3JjRyDRYXecz/lw58wkdZbHktpNVKfjoe827/aKa7gmYNXO \ No newline at end of file +hQVdKBoOtix4FXXBeCS2xKbn62UuzVBawFZNyqe7NC7TmeLHv01DbXw5dn6zRpIAUABwwX/BlC4/ALPfUp3mQMkL54T5w8DnW7Hiy4THLr4NaarWAhaS1y4CKpwmvPQnGyFmbkdAegYs1pX8quGkszDRYXecz/lw58wkdZbHktpNVKfjoe827/aKa7gmYNXO \ No newline at end of file diff --git a/rscder/gui/license.py b/rscder/gui/license.py index 7ac18fd..65282c0 100644 --- a/rscder/gui/license.py +++ b/rscder/gui/license.py @@ -5,7 +5,7 @@ from PyQt5.QtGui import QIcon import os from rscder.utils.icons import IconInstance from rscder.utils.license import LicenseHelper - +from rscder.utils.setting import Settings class License(QtWidgets.QDialog): def __init__(self, parent = None, flags = QtCore.Qt.WindowFlags() ) -> None: @@ -69,8 +69,9 @@ class License(QtWidgets.QDialog): if not os.path.exists(pth): QtWidgets.QMessageBox.warning(self, "Warning", "The selected file does not exist.") else: - if not os.path.exists('lic'): - os.mkdir('lic') - shutil.copy(pth, os.path.join("lic", "license.lic")) + lic_path = Settings.General().lic_path + os.makedirs(os.path.dirname(lic_path), exist_ok=True) + + shutil.copy(pth, lic_path) self.accept() self.close() \ No newline at end of file diff --git a/rscder/plugins/filter_collection/bilater_filter.py b/rscder/plugins/filter_collection/bilater_filter.py index 5930591..1c3aa93 100644 --- a/rscder/plugins/filter_collection/bilater_filter.py +++ b/rscder/plugins/filter_collection/bilater_filter.py @@ -1,8 +1,6 @@ from rscder.plugins.misc import AlgFrontend from rscder.plugins.misc.utils import format_now from osgeo import gdal, gdal_array -from skimage.filters import rank -from skimage.morphology import rectangle from rscder.plugins.filter_collection import FILTER from PyQt5.QtWidgets import QDialog, QAction from PyQt5 import QtCore, QtGui, QtWidgets diff --git a/rscder/plugins/filter_collection/lee_filter.py b/rscder/plugins/filter_collection/lee_filter.py index fd7eea8..f198157 100644 --- a/rscder/plugins/filter_collection/lee_filter.py +++ b/rscder/plugins/filter_collection/lee_filter.py @@ -1,8 +1,6 @@ from rscder.plugins.misc import AlgFrontend from rscder.plugins.misc.utils import format_now from osgeo import gdal, gdal_array -from skimage.filters import rank -from skimage.morphology import rectangle from rscder.plugins.filter_collection import FILTER from PyQt5.QtWidgets import QDialog, QAction from PyQt5 import QtCore, QtGui, QtWidgets diff --git a/rscder/plugins/filter_collection/lmsnp_filter.py b/rscder/plugins/filter_collection/lmsnp_filter.py index 1ef9413..602b022 100644 --- a/rscder/plugins/filter_collection/lmsnp_filter.py +++ b/rscder/plugins/filter_collection/lmsnp_filter.py @@ -1,8 +1,6 @@ from rscder.plugins.misc import AlgFrontend from rscder.plugins.misc.utils import format_now from osgeo import gdal, gdal_array -from skimage.filters import rank -from skimage.morphology import rectangle from rscder.plugins.filter_collection import FILTER from PyQt5.QtWidgets import QDialog, QAction from PyQt5 import QtCore, QtGui, QtWidgets diff --git a/rscder/plugins/veg_method/main.py b/rscder/plugins/veg_method/main.py index 4f81fc5..c458bb5 100644 --- a/rscder/plugins/veg_method/main.py +++ b/rscder/plugins/veg_method/main.py @@ -1,6 +1,6 @@ from functools import partial from threading import Thread -from plugins.misc.main import AlgFrontend +from rscder.plugins.misc.main import AlgFrontend from rscder.gui.actions import ActionManager from rscder.plugins.basic import BasicPlugin from PyQt5.QtWidgets import QAction, QToolBar, QMenu, QDialog, QHBoxLayout, QVBoxLayout, QPushButton, QWidget, QLabel, QLineEdit, QPushButton, QComboBox, QDialogButtonBox diff --git a/rscder/utils/setting.py b/rscder/utils/setting.py index 99872b8..d432da4 100644 --- a/rscder/utils/setting.py +++ b/rscder/utils/setting.py @@ -145,6 +145,11 @@ class Settings(QSettings): except: return datetime.now() + @property + def lic_path(self): + lic_path =os.path.join(BASE_DIR, 'lic', 'license.lic') + return lic_path + @property def license(self): lic_path =os.path.join(BASE_DIR, 'lic', 'license.lic') diff --git a/test.lic b/test.lic index c20a5a8..5cb411e 100644 --- a/test.lic +++ b/test.lic @@ -1 +1 @@ -U2cvLo/waByK0JLEzMsbuevhDgvFdw9E2wATS9YnC1NrtbmcSH9Rb3F2Bn5G8D8AruY/+S4tf+Lj5PRRyUXubyM2e6erbEYW7HnA9BZljgLMHnmrxpiW1woR6OEWzhJH6Y6GILPn7S0esv4oO3JjRyDRYXecz/lw58wkdZbHktpNVKfjoe827/aKa7gmYNXO \ No newline at end of file +hQVdKBoOtix4FXXBeCS2xKbn62UuzVBawFZNyqe7NC7TmeLHv01DbXw5dn6zRpIAUABwwX/BlC4/ALPfUp3mQMkL54T5w8DnW7Hiy4THLr4NaarWAhaS1y4CKpwmvPQnGyFmbkdAegYs1pX8quGkszDRYXecz/lw58wkdZbHktpNVKfjoe827/aKa7gmYNXO \ No newline at end of file