Simplify py structure

firetools · Aug 27, 2023 · bbe57d5 · bbe57d5
1 parent 28fd3e1
commit bbe57d5
Show file tree

Hide file tree

Showing 8 changed files with 26 additions and 8 deletions.
diff --git a/lang/__init__.py b/lang/__init__.py
@@ -9,7 +9,27 @@
 
 from .domain import Domain
 from .fds_case import FDSCase
-from .landuse import LanduseType
+from .landuse_type import LanduseType
 from .terrain import GEOMTerrain, OBSTTerrain
 from .texture import Texture
 from .wind import Wind
+from .params import (
+ ChidParam,
+ OriginParam,
+ NMeshParam,
+ PixelSizeParam,
+ TexPixelSizeParam,
+ CellSizeParam,
+ StartTimeParam,
+ EndTimeParam,
+ FDSPathParam,
+ LanduseTypeFilepathParam,
+ TextFilepathParam,
+ WindFilepathParam,
+ DEMLayerParam,
+ LanduseLayerParam,
+ ExtentLayerParam,
+ FireLayer,
+ ExportOBSTParam,
+)
+from .utils import *
diff --git a/lang/domain.py b/lang/domain.py
@@ -8,7 +8,7 @@
 __revision__ = "$Format:%H$" # replaced with git SHA1
 
 from math import sqrt
-from .. import utils
+from . import utils
 
 
 class Domain:

diff --git a/lang/fds_case.py b/lang/fds_case.py
@@ -10,7 +10,7 @@
 import time, os
 from qgis.core import Qgis, QgsProject
 from qgis.utils import pluginMetadata
-from .. import utils
+from . import utils
 
 
 class FDSCase:

diff --git a/lang/landuse.py → lang/landuse_type.py b/lang/landuse.py → lang/landuse_type.py
@@ -9,7 +9,7 @@
 
 import csv, re, os
 from qgis.core import QgsProcessingException
-from .. import utils
+from . import utils
 
 
 class LanduseType:

diff --git a/qgis2fds_params.py → lang/params.py b/qgis2fds_params.py → lang/params.py
diff --git a/lang/terrain.py b/lang/terrain.py
@@ -10,7 +10,7 @@
 import os
 import numpy as np
 from qgis.core import QgsProcessingException
-from .. import utils
+from . import utils
 
 
 class GEOMTerrain:

diff --git a/utils.py → lang/utils.py b/utils.py → lang/utils.py
diff --git a/qgis2fds_export_algo.py b/qgis2fds_export_algo.py
@@ -26,9 +26,7 @@
 import processing
 import time
 
-from .qgis2fds_params import *
-from .lang import FDSCase, Domain, OBSTTerrain, GEOMTerrain, LanduseType, Texture, Wind
-from . import utils
+from .lang import *
 
 DEBUG = False