diff --git a/build.py b/build.py index e710239..121b7bf 100644 --- a/build.py +++ b/build.py @@ -54,8 +54,17 @@ def replace_openpyxl(path): def package(dist_path): - gen = dist_path + "/" + gen = dist_path + "/lib/" + if os.path.exists(gen): + shutil.rmtree(gen) + if os.path.exists(gen + '../DLLs'): + shutil.rmtree(gen + '../DLLs') + + os.makedirs(gen, exist_ok=True) + + shutil.copytree(Python_path + "DLLs", gen + "../DLLs") + # 解决win32con模块丢失 shutil.copy(Python_path + "Lib/site-packages/win32/lib/win32con.py", gen + "win32con.py") # 解决pymysql模块丢失 @@ -101,6 +110,8 @@ def package(dist_path): # shutil.copytree(Python_path + "Lib/site-packages/google", gen + "google") # 解决PIL模块丢失 shutil.copytree(Python_path + "Lib/site-packages/PIL", gen + "PIL") + shutil.copytree(Python_path + "Lib/urllib", gen + "urllib") + # 解决setuptools模块丢失 shutil.copytree(Python_path + "Lib/site-packages/setuptools", gen + "setuptools") # 解决pkg_resources模块丢失 @@ -145,9 +156,9 @@ def package(dist_path): # 解决matplotlib模块丢失 # shutil.copytree(Python_path + "Lib/site-packages/matplotlib", gen + "matplotlib") # 解决pyparsing.py模块丢失 - shutil.copy(Python_path + "Lib/site-packages/pyparsing.py", gen + "pyparsing.py") + # shutil.copy(Python_path + "Lib/site-packages/pyparsing.py", gen + "pyparsing.py") # 解决cycler.py模块丢失 - shutil.copy(Python_path + "Lib/site-packages/cycler.py", gen + "cycler.py") + # shutil.copy(Python_path + "Lib/site-packages/cycler.py", gen + "cycler.py") # 解决kiwisolver模块丢失 # shutil.copy(Python_path + "Lib/site-packages/kiwisolver.cp37-win_amd64.pyd", gen + "kiwisolver.cp37-win_amd64.pyd") # 解决mpl_toolkits模块丢失 diff --git a/rscder/gui/layertree.py b/rscder/gui/layertree.py index 9beff3a..e7966c4 100644 --- a/rscder/gui/layertree.py +++ b/rscder/gui/layertree.py @@ -1,6 +1,5 @@ import logging -import pdb from PyQt5 import QtCore, QtGui, QtWidgets from PyQt5.QtCore import Qt,QModelIndex from PyQt5.QtGui import QStandardItemModel, QStandardItem, QCursor, QIcon diff --git a/rscder/gui/mainwindow.py b/rscder/gui/mainwindow.py index 51d50cc..b9c4a39 100644 --- a/rscder/gui/mainwindow.py +++ b/rscder/gui/mainwindow.py @@ -1,4 +1,3 @@ -import pdb from PyQt5.QtWidgets import QWidget, QApplication, QMainWindow, QToolBox,QVBoxLayout from PyQt5.QtCore import Qt, QSize, QSettings, pyqtSignal from PyQt5.QtGui import QIcon diff --git a/rscder/gui/mapcanvas.py b/rscder/gui/mapcanvas.py index c74e6b8..cad94d8 100644 --- a/rscder/gui/mapcanvas.py +++ b/rscder/gui/mapcanvas.py @@ -1,14 +1,3 @@ - -# from alg.utils import random_color -# from mul.mulgrubcut import GrabCut -import logging -import multiprocessing -# from alg.grubcut import grubcut -# from gui.layerselect import LayerSelect -# from gui.default import get_default_category_colors, get_default_category_keys -# from os import truncate -from pathlib import Path -import pdb from PyQt5.QtCore import QSettings, QUrl, pyqtSignal, Qt, QVariant from PyQt5.QtWidgets import QMessageBox, QWidget, QHBoxLayout from PyQt5.QtGui import QColor, QDragEnterEvent, QDropEvent @@ -16,10 +5,6 @@ from PyQt5.QtGui import QColor, QDragEnterEvent, QDropEvent from qgis.core import QgsPointXY, QgsRasterLayer, QgsVectorLayer, QgsFeature, QgsGeometry, QgsCategorizedSymbolRenderer, QgsRendererCategory, QgsFillSymbol, QgsPalLayerSettings, QgsRuleBasedLabeling, QgsTextFormat from qgis.gui import QgsMapCanvas, QgsMapToolPan, QgsMapToolZoom from qgis.core import QgsRectangle, QgsVectorFileWriter, QgsProject, QgsField, QgsRasterFileWriter, QgsRasterPipe -import threading -import tempfile -import cv2 -import os from rscder.utils.project import BasicLayer, PairLayer, Project