Merge pull request #161 from MIERUNE/fix/install-error

Fix plugin installation
MIERUNE · Nov 2, 2023 · eeac579 · eeac579
2 parents 5ae3f50 + 5a60831
commit eeac579
Show file tree

Hide file tree

Showing 9 changed files with 8 additions and 8 deletions.
diff --git a/utils.py → plugx_utils.py b/utils.py → plugx_utils.py
diff --git a/translator/raster/process.py b/translator/raster/process.py
@@ -12,7 +12,7 @@
 from PyQt5.QtCore import QSize
 from PyQt5.QtGui import QColor
 
-from utils import write_json
+from plugx_utils import write_json
 from translator.utils import get_blend_mode_string
 
 

diff --git a/translator/vector/label.py b/translator/vector/label.py
@@ -4,7 +4,7 @@
 from qgis.core import QgsVectorLayer, QgsRectangle
 from qgis.utils import iface
 
-from utils import write_json
+from plugx_utils import write_json
 
 
 def generate_label_json(

diff --git a/translator/vector/process.py b/translator/vector/process.py
@@ -14,7 +14,7 @@
     is_included_unsupported_symbol_layer,
 )
 
-from utils import write_json
+from plugx_utils import write_json
 from translator.utils import get_blend_mode_string
 
 MAX_NB_SYMBOL_CLASSES = 1500

diff --git a/translator/vector/symbol/fill.py b/translator/vector/symbol/fill.py
@@ -1,5 +1,5 @@
 from qgis.core import QgsSymbolLayer
-from utils import convert_to_point
+from plugx_utils import convert_to_point
 from PyQt5.QtCore import Qt
 from translator.vector.symbol.utils import to_rgba
 from translator.vector.symbol.penstyle import get_penstyle_from

diff --git a/translator/vector/symbol/line.py b/translator/vector/symbol/line.py
@@ -1,5 +1,5 @@
 from qgis.core import QgsSymbolLayer
-from utils import convert_to_point
+from plugx_utils import convert_to_point
 
 from .marker import get_point_symbol_data
 from translator.vector.symbol.utils import to_rgba

diff --git a/translator/vector/symbol/marker.py b/translator/vector/symbol/marker.py
@@ -8,7 +8,7 @@
 from PyQt5.QtGui import QColor
 from typing import Union, Tuple
 
-from utils import convert_to_point
+from plugx_utils import convert_to_point
 from translator.vector.symbol.utils import get_asset_name, to_rgba
 from translator.vector.symbol.penstyle import get_penstyle_from
 

diff --git a/translator/vector/symbol/penstyle.py b/translator/vector/symbol/penstyle.py
@@ -6,7 +6,7 @@
 )
 from qgis.PyQt.QtCore import Qt
 
-from utils import convert_to_point
+from plugx_utils import convert_to_point
 
 PRESET_DASHPATTERN_MULTIPLIER = {
     Qt.DashLine: [4, 2],  # ----  ----  ----...

diff --git a/ui/main_dialog.py b/ui/main_dialog.py
@@ -22,7 +22,7 @@
 from translator.vector.label import generate_label_vector
 from ui.progress_dialog import ProgressDialog
 from translator.thread import ProcessingThread
-from utils import write_json, get_tempdir
+from plugx_utils import write_json, get_tempdir
 from scale import get_scale_from_canvas, set_map_extent_from