diff --git a/env.yaml b/env.yaml index c855265..c1fe97e 100644 --- a/env.yaml +++ b/env.yaml @@ -3,30 +3,29 @@ channels: - conda-forge - defaults dependencies: - - cryptography=3.4.7 - - matplotlib - - opencv=4.5.3 - - pandas + - gdal=3.3.1=py37hb11e9a8_2 + - geos=3.9.1=h39d44d4_2 + - opencv=4.5.3=py37h03978a9_1 - pyqt=5.12.3 - pyqtads=3.8.2 - - python=3.7.10 + - python=3.7 - qgis=3.18.3 - - scikit-image - - scipy - - yaml + - scikit-image=0.18.3 + - yaml=0.2.5 - pip: - - attrs==21.4.0 - - autopep8==2.0.0 - cython==0.29.24 - efficientnet-pytorch==0.7.1 - - huggingface-hub==0.14.1 - - nuitka==0.8.3 - - ordered-set==4.1.0 + - joblib==1.1.0 + - nuitka==1.7.6 + - numpy==1.20.0 + - opencv-python==4.5.3.56 - pathlib==1.0.1 - pillow==6.2.2 - pretrainedmodels==0.7.4 - pycryptodome==3.14.1 - scikit-learn==1.0.2 + - scipy==1.6.0 + - threadpoolctl==3.1.0 - timm==0.6.13 - torch==1.13.1 - torchvision==0.14.1 diff --git a/rscder/plugins/ai_method/__init__.py b/rscder/plugins/ai_method/__init__.py index 719c5bd..fcea81b 100644 --- a/rscder/plugins/ai_method/__init__.py +++ b/rscder/plugins/ai_method/__init__.py @@ -1,4 +1,4 @@ -from misc.utils import Register +from rscder.plugins.misc.utils import Register AI_METHOD = Register('AI Method') diff --git a/rscder/plugins/ai_method/basic_cd.py b/rscder/plugins/ai_method/basic_cd.py index 07049af..e5d7120 100644 --- a/rscder/plugins/ai_method/basic_cd.py +++ b/rscder/plugins/ai_method/basic_cd.py @@ -1,5 +1,5 @@ from . import AI_METHOD -from plugins.misc import AlgFrontend +from rscder.plugins.misc import AlgFrontend from rscder.utils.icons import IconInstance from rscder.utils.project import PairLayer from osgeo import gdal, gdal_array diff --git a/rscder/plugins/ai_method/main.py b/rscder/plugins/ai_method/main.py index 4672a3c..b8067fa 100644 --- a/rscder/plugins/ai_method/main.py +++ b/rscder/plugins/ai_method/main.py @@ -1,17 +1,17 @@ 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 from rscder.gui.layercombox import PairLayerCombox from rscder.utils.icons import IconInstance -from filter_collection import FILTER +from ..filter_collection import FILTER from . import AI_METHOD -from thres import THRES -from misc import table_layer, AlgSelectWidget -from follow import FOLLOW +from ..thres import THRES +from ..misc import table_layer, AlgSelectWidget +from ..follow import FOLLOW import os class AICDMethod(QDialog): def __init__(self,parent=None, alg:AlgFrontend=None): diff --git a/rscder/plugins/loader.py b/rscder/plugins/loader.py index a84b0bf..cdfda28 100644 --- a/rscder/plugins/loader.py +++ b/rscder/plugins/loader.py @@ -17,9 +17,9 @@ from rscder.plugins.filter_collection import MainPlugin as FilterPlugin from rscder.plugins.follow import FollowPlugin from rscder.plugins.unsupervised_method import UnsupervisedPlugin from rscder.plugins.veg_method import VegtationPlugin - +from .ai_method import AIPlugin PLUGINS = [ - AboutPlugin, RateSetPlugin, EvaluationPlugin, ExportPlugin, FilterPlugin, FollowPlugin, UnsupervisedPlugin, VegtationPlugin + AboutPlugin, RateSetPlugin, EvaluationPlugin, ExportPlugin, FilterPlugin, FollowPlugin, UnsupervisedPlugin, VegtationPlugin, AIPlugin ] class PluginLoader(QObject):