Misc cleanup and refactor (#214)

* refactor: move model_utils contents to misc_utils (since most of them are not model related), delete model_utils module * remove old unneeded files * refactor: refactor utils further - combine root utils.py into misc_utils.py, move utils folder to plugin root (out of wizard folder) * remove unneeded prints and add some QGIS messages * fix: add scroll areas to about and settings pages, making whole wizard much more resizable
GispoCoding · Sep 18, 2024 · 1e44120 · 1e44120
1 parent d19300c
commit 1e44120
Show file tree

Hide file tree

Showing 41 changed files with 803 additions and 1,768 deletions.
diff --git a/eis_qgis_plugin/eis_processing/algorithms/prediction/mlp_classifier.py b/eis_qgis_plugin/eis_processing/algorithms/prediction/mlp_classifier.py
@@ -15,7 +15,7 @@
 )
 
 from eis_qgis_plugin.eis_processing.eis_processing_algorithm import EISProcessingAlgorithm
-from eis_qgis_plugin.utils import parse_string_list_parameter_and_run_command
+from eis_qgis_plugin.utils.misc_utils import parse_string_list_parameter_and_run_command
 
 
 class EISMlpClassifier(EISProcessingAlgorithm):

diff --git a/eis_qgis_plugin/eis_processing/algorithms/prediction/mlp_regressor.py b/eis_qgis_plugin/eis_processing/algorithms/prediction/mlp_regressor.py
@@ -15,7 +15,7 @@
 )
 
 from eis_qgis_plugin.eis_processing.eis_processing_algorithm import EISProcessingAlgorithm
-from eis_qgis_plugin.utils import parse_string_list_parameter_and_run_command
+from eis_qgis_plugin.utils.misc_utils import parse_string_list_parameter_and_run_command
 
 
 class EISMlpRegressor(EISProcessingAlgorithm):

diff --git a/eis_qgis_plugin/eis_processing/algorithms/raster_processing/reclassify_with_manual_breaks.py b/eis_qgis_plugin/eis_processing/algorithms/raster_processing/reclassify_with_manual_breaks.py
@@ -11,7 +11,7 @@
 )
 
 from eis_qgis_plugin.eis_processing.eis_processing_algorithm import EISProcessingAlgorithm
-from eis_qgis_plugin.utils import parse_string_list_parameter_and_run_command
+from eis_qgis_plugin.utils.misc_utils import parse_string_list_parameter_and_run_command
 
 
 class EISReclassifyWithManualBreaks(EISProcessingAlgorithm):

diff --git a/eis_qgis_plugin/eis_processing/eis_toolkit_invoker.py b/eis_qgis_plugin/eis_processing/eis_toolkit_invoker.py
@@ -9,7 +9,7 @@
 
 from qgis.core import QgsProcessingFeedback, QgsProject, QgsRasterLayer
 
-from eis_qgis_plugin.wizard.utils.settings_manager import EISSettingsManager
+from eis_qgis_plugin.utils.settings_manager import EISSettingsManager
 
 DEBUG = True
 

diff --git a/eis_qgis_plugin/plugin.py b/eis_qgis_plugin/plugin.py
@@ -10,10 +10,11 @@
 
 from eis_qgis_plugin.eis_processing.eis_provider import EISProvider
 from eis_qgis_plugin.qgis_plugin_tools.tools.custom_logging import setup_logger, teardown_logger
-from eis_qgis_plugin.qgis_plugin_tools.tools.i18n import setup_translation
-from eis_qgis_plugin.utils import PLUGIN_PATH
-from eis_qgis_plugin.wizard.utils.settings_manager import EISSettingsManager
-from eis_qgis_plugin.wizard.wizard_main import EISWizardDialog, EISWizardDocked
+from eis_qgis_plugin.utils.misc_utils import PLUGIN_PATH
+from eis_qgis_plugin.utils.settings_manager import EISSettingsManager
+
+from .qgis_plugin_tools.tools.i18n import setup_translation
+from .wizard.wizard_main import EISWizardDialog, EISWizardDocked
 
 
 class Plugin: