Merge pull request #142 from MIERUNE/feat/anchor-point

MIERUNE · Aug 25, 2023 · a490426 · a490426
2 parents 34568bf + aae0fec
commit a490426
Show file tree

Hide file tree

Showing 3 changed files with 38 additions and 0 deletions.
diff --git a/docs/README.md b/docs/README.md
@@ -104,6 +104,8 @@
           "outline_width": 2,
           "asset_name": "some.svg",
           "offset": [0.0, 0.0],
+          "anchor_x": "center", // 配置のX原点: left | center | right
+          "anchor_y": "middle", // 配置のY原点: top | middle | bottom 
           "rotation": 0.0, // degrees, 時計回り
           "level": 0,
           "opacity": 0.5 // 透過度: 0.0 ~ 1.0

diff --git a/docs/SYMBOLS.md b/docs/SYMBOLS.md
@@ -25,6 +25,8 @@
   },
   "shape": "circle", //square | diamond | pentagon | hexagon | triangle | equilateraltriangle | star | arrow | circle | cross | crossfill | cross2 | line | arrowhead | arrowheadfilled | semicircle | thirdcircle | quartercircle | quartersquare | halfsquare | diagonalhalfsquare | righthalftriangle | lefthalftriangle | trapezoid | parallelogramleft | parallelogramright | shield | octagon | decagon | squarecorners | squarerounded | diamondstar | heart | halfarc | thirdarc | quarterarc | asteriskfill
   "offset": [0.0, 0.0],
+  "anchor_x": "center", // 配置のX原点: left | center | right
+  "anchor_y": "middle", // 配置のY原点: top | middle | bottom 
   "rotation": 0.0, //degrees, 時計回り
   "level": 0,
   "opacity": 1.0 // 透過度: 0.0 ~ 1.0
@@ -45,6 +47,8 @@
   "outline_width": 2,
   "asset_name": "some.svg",
   "offset": [0.0, 0.0],
+  "anchor_x": "center", // 配置のX原点: left | center | right
+  "anchor_y": "middle", // 配置のY原点: top | middle | bottom 
   "rotation": 180.0, //degrees, 時計回り
   "level": 0,
   "opacity": 1.0 // 透過度: 0.0 ~ 1.0
@@ -62,6 +66,8 @@
   "height": 5,
   "asset_name": "some.png",
   "offset": [0.0, 0.0],
+  "anchor_x": "center", // 配置のX原点: left | center | right
+  "anchor_y": "middle", // 配置のY原点: top | middle | bottom 
   "rotation": 0.0, // degrees, 時計回り
   "level": 1,
   "opacity": 1.0 // 透過度: 0.0 ~ 1.0

diff --git a/translator/vector/symbol/marker.py b/translator/vector/symbol/marker.py
@@ -57,6 +57,30 @@ def _get_markershape_from(symbol_shape: QgsSimpleMarkerSymbolLayerBase.Shape) ->
     )
 
 
+def _get_x_position_from(
+    symbol_anchor_x: QgsMarkerSymbolLayer.HorizontalAnchorPoint,
+) -> str:
+    return {
+        QgsMarkerSymbolLayer.HorizontalAnchorPoint.Left: "left",
+        QgsMarkerSymbolLayer.HorizontalAnchorPoint.HCenter: "center",
+        QgsMarkerSymbolLayer.HorizontalAnchorPoint.Right: "right",
+    }.get(
+        symbol_anchor_x, "center"  # fallback
+    )
+
+
+def _get_y_position_from(
+    symbol_anchor_y: QgsMarkerSymbolLayer.VerticalAnchorPoint,
+) -> str:
+    return {
+        QgsMarkerSymbolLayer.VerticalAnchorPoint.Top: "top",
+        QgsMarkerSymbolLayer.VerticalAnchorPoint.VCenter: "middle",
+        QgsMarkerSymbolLayer.VerticalAnchorPoint.Bottom: "bottom",
+    }.get(
+        symbol_anchor_y, "middle"  # fallback
+    )
+
+
 def _get_svg_param(
     symbol_layer: QgsSvgMarkerSymbolLayer,
 ) -> Tuple[Union[str, None], Union[float, None], Union[str, None]]:
@@ -113,6 +137,8 @@ def get_point_symbol_data(
                 convert_to_point(symbol_layer.offset().x(), symbol_layer.offsetUnit()),
                 convert_to_point(symbol_layer.offset().y(), symbol_layer.offsetUnit()),
             ],
+            "anchor_x": _get_x_position_from(symbol_layer.horizontalAnchorPoint()),
+            "anchor_y": _get_y_position_from(symbol_layer.verticalAnchorPoint()),
             "rotation": symbol_layer.angle(),
             "level": symbol_layer.renderingPass(),  # renderingPass means symbolLevels
             # https://github.com/qgis/QGIS/blob/65d40ee0ce59e761ee2de366ca9a963f35adfcfd/src/core/vector/qgsvectorlayerrenderer.cpp#L702
@@ -136,6 +162,8 @@ def get_point_symbol_data(
                 convert_to_point(symbol_layer.offset().x(), symbol_layer.offsetUnit()),
                 convert_to_point(symbol_layer.offset().y(), symbol_layer.offsetUnit()),
             ],
+            "anchor_x": _get_x_position_from(symbol_layer.horizontalAnchorPoint()),
+            "anchor_y": _get_y_position_from(symbol_layer.verticalAnchorPoint()),
             "rotation": symbol_layer.angle(),
             "level": symbol_layer.renderingPass(),
             "opacity": symbol_opacity,
@@ -156,6 +184,8 @@ def get_point_symbol_data(
                 convert_to_point(symbol_layer.offset().x(), symbol_layer.offsetUnit()),
                 convert_to_point(symbol_layer.offset().y(), symbol_layer.offsetUnit()),
             ],
+            "anchor_x": _get_x_position_from(symbol_layer.horizontalAnchorPoint()),
+            "anchor_y": _get_y_position_from(symbol_layer.verticalAnchorPoint()),
             "rotation": symbol_layer.angle(),
             "level": symbol_layer.renderingPass(),
             "opacity": symbol_opacity,