fix import and circular imports

los_tools/classes/__init__.py

@@ -1,3 +0,0 @@
-from .classes_los import LoSGlobal, LoSLocal, LoSWithoutTarget
-from .list_raster import ListOfRasters
-from .sampling_distance_matrix import SamplingDistanceMatrix

los_tools/constants/__init__.py

@@ -1,15 +0,0 @@
-from .field_names import FieldNames
-from .fields import Fields
-from .names_constants import NamesConstants
-from .plugin import PluginConstants
-from .settings import Settings
-from .textlabels import TextLabels
-
-__all__ = (
-    "FieldNames",
-    "Fields",
-    "NamesConstants",
-    "PluginConstants",
-    "TextLabels",
-    "Settings",
-)

los_tools/constants/fields.py

@@ -1,7 +1,7 @@
 from qgis.core import Qgis, QgsField, QgsFields
 from qgis.PyQt.QtCore import QMetaType, QVariant
 
-from .field_names import FieldNames
+from los_tools.constants.field_names import FieldNames
 
 
 class Fields:

los_tools/gui/__init__.py

@@ -1,16 +0,0 @@
-from .create_los_tool.create_los_tool import CreateLoSMapTool
-from .custom_classes import Distance, DistanceWidget
-from .dialog_los_settings import LoSSettings
-from .dialog_raster_validations import RasterValidations
-from .los_without_target_visualization.los_without_target import LoSNoTargetInputWidget
-from .optimize_point_location_tool.optimize_points_location_tool import OptimizePointsLocationTool
-
-__all__ = (
-    "Distance",
-    "DistanceWidget",
-    "LoSSettings",
-    "RasterValidations",
-    "CreateLoSMapTool",
-    "OptimizePointsLocationTool",
-    "LoSNoTargetInputWidget",
-)

los_tools/gui/create_los_tool/__init__.py

@@ -1,3 +0,0 @@
-from .create_los_tool import CreateLoSMapTool
-
-__all__ = "CreateLoSMapTool"

los_tools/gui/create_los_tool/create_los_tool.py

@@ -7,8 +7,9 @@
 from qgis.PyQt.QtGui import QKeyEvent
 from qgis.PyQt.QtWidgets import QAction, QWidget
 
-from los_tools.classes import ListOfRasters
-from los_tools.gui import LoSSettings, RasterValidations
+from los_tools.classes.list_raster import ListOfRasters
+from los_tools.gui.dialog_los_settings import LoSSettings
+from los_tools.gui.dialog_raster_validations import RasterValidations
 from los_tools.processing.tools.util_functions import get_max_decimal_numbers, round_all_values
 
 from .create_los_widget import LoSNoTargetInputWidget

los_tools/gui/create_los_tool/create_los_widget.py

@@ -4,7 +4,7 @@
 from qgis.PyQt.QtCore import pyqtSignal
 from qgis.PyQt.QtWidgets import QComboBox, QFormLayout, QPushButton, QWidget
 
-from los_tools.gui import Distance, DistanceWidget
+from los_tools.gui.custom_classes import Distance, DistanceWidget
 
 
 class LoSNoTargetInputWidget(QWidget):

los_tools/gui/create_los_tool/los_tasks.py

@@ -13,8 +13,10 @@
 )
 from qgis.PyQt.QtCore import pyqtSignal
 
-from los_tools.classes import ListOfRasters, SamplingDistanceMatrix
-from los_tools.constants import FieldNames, NamesConstants
+from los_tools.classes.list_raster import ListOfRasters
+from los_tools.classes.sampling_distance_matrix import SamplingDistanceMatrix
+from los_tools.constants.field_names import FieldNames
+from los_tools.constants.names_constants import NamesConstants
 from los_tools.gui.dialog_los_settings import LoSSettings
 from los_tools.processing.tools.util_functions import segmentize_los_line
 

los_tools/gui/los_without_target_visualization/los_without_target_widget.py

@@ -5,7 +5,7 @@
 from qgis.PyQt.QtCore import pyqtSignal
 from qgis.PyQt.QtWidgets import QFormLayout, QWidget
 
-from los_tools.gui import DistanceWidget
+from los_tools.gui.custom_classes import DistanceWidget
 
 
 class LoSNoTargetInputWidget(QWidget):

los_tools/gui/optimize_point_location_tool/optimize_points_location_tool.py

@@ -27,10 +27,9 @@
 from qgis.PyQt.QtGui import QColor
 from qgis.PyQt.QtWidgets import QWidget
 
+from los_tools.gui.optimize_point_location_tool.optimize_points_location_widget import OptimizePointLocationInputWidget
 from los_tools.processing.create_points.tool_optimize_point_location import OptimizePointLocationAlgorithm
 
-from .optimize_points_location_widget import OptimizePointLocationInputWidget
-
 
 class OptimizePointsLocationTool(QgsMapToolAdvancedDigitizing):
     def __init__(self, canvas: QgsMapCanvas, iface: QgisInterface) -> None:

los_tools/los_tools_plugin.py

@@ -20,7 +20,7 @@
 
 from .constants.fields import Fields
 from .constants.plugin import PluginConstants
-from .gui.create_los_tool import CreateLoSMapTool
+from .gui.create_los_tool.create_los_tool import CreateLoSMapTool
 from .gui.dialog_los_settings import LoSSettings
 from .gui.dialog_object_parameters import ObjectParameters
 from .gui.dialog_raster_validations import RasterValidations

los_tools/processing/create_los/tool_create_notarget_los.py

@@ -18,8 +18,8 @@
 
 from los_tools.classes.list_raster import ListOfRasters
 from los_tools.classes.sampling_distance_matrix import SamplingDistanceMatrix
-from los_tools.constants import Fields
 from los_tools.constants.field_names import FieldNames
+from los_tools.constants.fields import Fields
 from los_tools.constants.names_constants import NamesConstants
 from los_tools.processing.utils import LoSToolsSettings
 from los_tools.utils import get_doc_file

los_tools/processing/los_tools_provider.py

@@ -2,32 +2,34 @@
 from qgis.core import QgsProcessingProvider
 from qgis.PyQt.QtGui import QIcon
 
-from los_tools.constants import PluginConstants, Settings
+from los_tools.constants.plugin import PluginConstants
+from los_tools.constants.settings import Settings
+from los_tools.processing.analyse_los.tool_analyse_los import AnalyseLosAlgorithm
+from los_tools.processing.analyse_los.tool_extract_los_visibility_parts import ExtractLoSVisibilityPartsAlgorithm
+from los_tools.processing.analyse_los.tool_extract_los_visibility_polygons import ExtractLoSVisibilityPolygonsAlgorithm
+from los_tools.processing.analyse_los.tool_extract_points_los import ExtractPointsLoSAlgorithm
+from los_tools.processing.azimuths.tool_azimuth import AzimuthPointPolygonAlgorithm
+from los_tools.processing.azimuths.tool_limit_angles_vector import LimitAnglesAlgorithm
+from los_tools.processing.create_los.tool_create_global_los import CreateGlobalLosAlgorithm
+from los_tools.processing.create_los.tool_create_local_los import CreateLocalLosAlgorithm
+from los_tools.processing.create_los.tool_create_notarget_los import CreateNoTargetLosAlgorithm
+from los_tools.processing.create_points.tool_optimize_point_location import OptimizePointLocationAlgorithm
+from los_tools.processing.create_points.tool_points_around import CreatePointsAroundAlgorithm
+from los_tools.processing.create_points.tool_points_by_azimuths import CreatePointsInAzimuthsAlgorithm
+from los_tools.processing.create_points.tool_points_in_direction import CreatePointsInDirectionAlgorithm
+from los_tools.processing.horizons.tool_extract_horizon_lines import ExtractHorizonLinesAlgorithm
+from los_tools.processing.horizons.tool_extract_horizons import ExtractHorizonsAlgorithm
+from los_tools.processing.parameter_settings.tool_angle_at_distance_for_size import ObjectDetectionAngleAlgorithm
+from los_tools.processing.parameter_settings.tool_distances_for_sizes import ObjectDistancesAlgorithm
+from los_tools.processing.parameter_settings.tool_sizes_at_distances import ObjectSizesAlgorithm
+from los_tools.processing.to_table.tool_export_horizon_lines import ExportHorizonLinesAlgorithm
+from los_tools.processing.to_table.tool_export_los import ExportLoSAlgorithm
+from los_tools.processing.tools.tool_replace_raster_values_by_constant import (
+    ReplaceRasterValuesByConstantValueAlgorithm,
+)
+from los_tools.processing.tools.tool_replace_raster_values_by_field import ReplaceRasterValuesByFieldValuesAlgorithm
 from los_tools.utils import get_icon_path, get_plugin_version
 
-from .analyse_los.tool_analyse_los import AnalyseLosAlgorithm
-from .analyse_los.tool_extract_los_visibility_parts import ExtractLoSVisibilityPartsAlgorithm
-from .analyse_los.tool_extract_los_visibility_polygons import ExtractLoSVisibilityPolygonsAlgorithm
-from .analyse_los.tool_extract_points_los import ExtractPointsLoSAlgorithm
-from .azimuths.tool_azimuth import AzimuthPointPolygonAlgorithm
-from .azimuths.tool_limit_angles_vector import LimitAnglesAlgorithm
-from .create_los.tool_create_global_los import CreateGlobalLosAlgorithm
-from .create_los.tool_create_local_los import CreateLocalLosAlgorithm
-from .create_los.tool_create_notarget_los import CreateNoTargetLosAlgorithm
-from .create_points.tool_optimize_point_location import OptimizePointLocationAlgorithm
-from .create_points.tool_points_around import CreatePointsAroundAlgorithm
-from .create_points.tool_points_by_azimuths import CreatePointsInAzimuthsAlgorithm
-from .create_points.tool_points_in_direction import CreatePointsInDirectionAlgorithm
-from .horizons.tool_extract_horizon_lines import ExtractHorizonLinesAlgorithm
-from .horizons.tool_extract_horizons import ExtractHorizonsAlgorithm
-from .parameter_settings.tool_angle_at_distance_for_size import ObjectDetectionAngleAlgorithm
-from .parameter_settings.tool_distances_for_sizes import ObjectDistancesAlgorithm
-from .parameter_settings.tool_sizes_at_distances import ObjectSizesAlgorithm
-from .to_table.tool_export_horizon_lines import ExportHorizonLinesAlgorithm
-from .to_table.tool_export_los import ExportLoSAlgorithm
-from .tools.tool_replace_raster_values_by_constant import ReplaceRasterValuesByConstantValueAlgorithm
-from .tools.tool_replace_raster_values_by_field import ReplaceRasterValuesByFieldValuesAlgorithm
-
 
 class LoSToolsProvider(QgsProcessingProvider):
     def __init__(self):

los_tools/processing/utils.py

@@ -1,6 +1,6 @@
 from processing.core.ProcessingConfig import ProcessingConfig
 
-from los_tools.constants import Settings
+from los_tools.constants.settings import Settings
 
 
 class LoSToolsSettings: