diff --git a/build.bat b/build.bat index 7aea222..5e9fb44 100644 --- a/build.bat +++ b/build.bat @@ -1,5 +1,5 @@ -nuitka RSCDer.py --standalone --plugin-enable=qt-plugins --plugin-enable=numpy --show-progress --include-package=qgis --plugin-enable=pylint-warnings --output-dir=package --windows-disable-console --windows-icon-from-ico=logo.ico --no-pyi-file -@REM nuitka keygen.py --standalone --plugin-enable=qt-plugins --plugin-enable=numpy --show-progress --include-package=qgis --plugin-enable=pylint-warnings --output-dir=package --windows-disable-console --windows-icon-from-ico=logo.ico --no-pyi-file +nuitka ECD.py --standalone --plugin-enable=qt-plugins --plugin-enable=numpy --show-progress --include-package=qgis --plugin-enable=pylint-warnings --output-dir=package --windows-icon-from-ico=logo.ico --no-pyi-file --follow-import-to=rscder --include-package=osgeo --include-package=PyQtAds +@REM nuitka keygen.py --standalone --plugin-enable=qt-plugins --plugin-enable=numpy --show-progress --plugin-enable=pylint-warnings --output-dir=package --windows-disable-console --windows-icon-from-ico=logo.ico --no-pyi-file REM Win7 with console diff --git a/icons/table.png b/icons/table.png new file mode 100644 index 0000000..97d4b7f Binary files /dev/null and b/icons/table.png differ diff --git a/log.txt b/log.txt index e42a4df..14e9d01 100644 --- a/log.txt +++ b/log.txt @@ -1,4 +1,4 @@ -2022-05-28 17:23:06,221 - root - INFO - lic data:2022-12-01 00:00:00 -2022-05-28 17:23:06,221 - root - INFO - remain_days: 186 -2022-05-28 17:23:07,606 - root - INFO - lic data:2022-12-01 00:00:00 -2022-05-28 17:23:07,606 - root - INFO - remain_days: 186 +2022-05-28 21:40:04,316 - root - INFO - lic data:2022-12-01 00:00:00 +2022-05-28 21:40:04,316 - root - INFO - remain_days: 186 +2022-05-28 21:40:05,077 - root - INFO - lic data:2022-12-01 00:00:00 +2022-05-28 21:40:05,077 - root - INFO - remain_days: 186 diff --git a/rscder/gui/actions.py b/rscder/gui/actions.py index 56aa8be..45ec0d5 100644 --- a/rscder/gui/actions.py +++ b/rscder/gui/actions.py @@ -116,9 +116,9 @@ class ActionManager(QtCore.QObject): ''' Basic menu ''' - grid_line = self.add_action(QAction(IconInstance().GRID_ON,'&网格线', self.w_parent), 'Basic Line') - grid_line.setCheckable(True) - grid_line.setChecked(True) + # grid_line = self.add_action(QAction(IconInstance().GRID_ON,'&网格线', self.w_parent), 'Basic Line') + # grid_line.setCheckable(True) + # grid_line.setChecked(True) zomm_in = self.add_action(QAction(IconInstance().ZOOM_OUT,'&放大', self.w_parent), 'Basic') zomm_out = self.add_action(QAction(IconInstance().ZOOM_IN,'&缩小', self.w_parent), 'Basic') @@ -133,9 +133,9 @@ class ActionManager(QtCore.QObject): zomm_in.setChecked(False) self.double_map.connect_map_tool(pan, zomm_in, zomm_out) - self.double_map.connect_grid_show(grid_line) + # self.double_map.connect_grid_show(grid_line) - self.view_menu.addAction(grid_line) + # self.view_menu.addAction(grid_line) self.view_menu.addSeparator() self.view_menu.addAction(pan) self.view_menu.addAction(zomm_in) diff --git a/rscder/gui/keygen.py b/rscder/gui/keygen.py index 1214702..6fd1298 100644 --- a/rscder/gui/keygen.py +++ b/rscder/gui/keygen.py @@ -11,7 +11,7 @@ class LicenseGen(QDialog): super().__init__(parent, flags) self.setWindowTitle("证书生成器") - self.setWindowIcon(IconInstance().LOGO) + self.setWindowIcon(IconInstance(parent).LOGO) mac_address_label = QLabel("MAC地址:") self.mac_address_text = QLineEdit() diff --git a/rscder/gui/license.py b/rscder/gui/license.py index 88b781a..c767731 100644 --- a/rscder/gui/license.py +++ b/rscder/gui/license.py @@ -4,7 +4,6 @@ from PyQt5 import QtCore from PyQt5.QtGui import QIcon import os from rscder.utils.icons import IconInstance - from rscder.utils.license import LicenseHelper class License(QtWidgets.QDialog): @@ -12,7 +11,7 @@ class License(QtWidgets.QDialog): def __init__(self, parent = None, flags = QtCore.Qt.WindowFlags() ) -> None: super().__init__(parent, flags) self.setWindowTitle("证书") - self.setWindowIcon(IconInstance().LOGO) + self.setWindowIcon(IconInstance(parent).LOGO) self.setWindowFlags(QtCore.Qt.WindowCloseButtonHint) self.setFixedSize(600, 400) diff --git a/rscder/gui/mainwindow.py b/rscder/gui/mainwindow.py index a33c157..bbba437 100644 --- a/rscder/gui/mainwindow.py +++ b/rscder/gui/mainwindow.py @@ -14,6 +14,11 @@ from rscder.utils import Settings from rscder.utils.icons import IconInstance from rscder.utils.project import Project from rscder.gui.layercombox import LayerCombox + +import skimage +import numpy as np +import sys +import scipy class MainWindow(QMainWindow): closed = pyqtSignal() diff --git a/rscder/gui/mapcanvas.py b/rscder/gui/mapcanvas.py index 8ca08a1..dc12353 100644 --- a/rscder/gui/mapcanvas.py +++ b/rscder/gui/mapcanvas.py @@ -58,24 +58,6 @@ class DoubleCanvas(QWidget): layout.addWidget(self.mapcanva2) self.setLayout(layout) - self.grid_show = True - - def connect_grid_show(self, action): - def show_grid(_): - - self.grid_show = not self.grid_show - action.setChecked(self.grid_show) - if self.grid_show: - for layer in Project().layers.values(): - if layer.grid_enable: - self.mapcanva1.add_grid_layer(layer.grid_layer.grid_layer) - self.mapcanva2.add_grid_layer(layer.grid_layer.grid_layer) - else: - self.mapcanva1.remove_grid_layer() - self.mapcanva2.remove_grid_layer() - - action.triggered.connect(show_grid) - def connect_map_tool(self, pan, zoom_in, zoom_out): pan.triggered.connect(self.set_pan_tool) diff --git a/rscder/utils/icons.py b/rscder/utils/icons.py index e307cbf..4643057 100644 --- a/rscder/utils/icons.py +++ b/rscder/utils/icons.py @@ -52,4 +52,12 @@ class IconInstance(QObject): self.EXCIT = QIcon('./icons/退出.png') self.ZOOM_IN = QIcon('./icons/放大.png') - self.ZOOM_OUT = QIcon('./icons/缩小.png') \ No newline at end of file + self.ZOOM_OUT = QIcon('./icons/缩小.png') + + self.TABLE = QIcon('./icons/table.png') + + def __getattr__(self, name: str) -> QIcon: + try: + return getattr(self, name) + except: + return self.LOGO \ No newline at end of file