pyArchimate 2.0.0__tar.gz → 2.0.2__tar.gz

{pyarchimate-2.0.0/src/pyArchimate.egg-info → pyarchimate-2.0.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pyArchimate
-Version: 2.0.0
+Version: 2.0.2
 Summary: A library to create & manage Archimate files
 Author-email: Xavier Mayeur <xavier@mayeur.be>
 License-Expression: GPL-3.0-only
@@ -30,7 +30,7 @@ Dynamic: license-file
 [![Bugs](https://sonarcloud.io/api/project_badges/measure?project=pyArchimate_pyArchimate&metric=bugs)](https://sonarcloud.io/project/overview?id=pyArchimate_pyArchimate)
 [![Security Rating](https://sonarcloud.io/api/project_badges/measure?project=pyArchimate_pyArchimate&metric=security_rating)](https://sonarcloud.io/project/overview?id=pyArchimate_pyArchimate)
 [![Maintainability](https://sonarcloud.io/api/project_badges/measure?project=pyArchimate_pyArchimate&metric=sqale_rating)](https://sonarcloud.io/project/overview?id=pyArchimate_pyArchimate)
-[![Docs](https://readthedocs.org/projects/pyarchimate/badge/?version=master)](https://pyarchimate.readthedocs.io)
+[![Docs](https://img.shields.io/readthedocs/pyarchimate/master)](https://pyarchimate.readthedocs.io)
 
 Documentation: [readthedocs.org](https://pyarchimate.readthedocs.io)
 

{pyarchimate-2.0.0 → pyarchimate-2.0.2}/README.md

@@ -11,7 +11,7 @@
 [![Bugs](https://sonarcloud.io/api/project_badges/measure?project=pyArchimate_pyArchimate&metric=bugs)](https://sonarcloud.io/project/overview?id=pyArchimate_pyArchimate)
 [![Security Rating](https://sonarcloud.io/api/project_badges/measure?project=pyArchimate_pyArchimate&metric=security_rating)](https://sonarcloud.io/project/overview?id=pyArchimate_pyArchimate)
 [![Maintainability](https://sonarcloud.io/api/project_badges/measure?project=pyArchimate_pyArchimate&metric=sqale_rating)](https://sonarcloud.io/project/overview?id=pyArchimate_pyArchimate)
-[![Docs](https://readthedocs.org/projects/pyarchimate/badge/?version=master)](https://pyarchimate.readthedocs.io)
+[![Docs](https://img.shields.io/readthedocs/pyarchimate/master)](https://pyarchimate.readthedocs.io)
 
 Documentation: [readthedocs.org](https://pyarchimate.readthedocs.io)
 

{pyarchimate-2.0.0 → pyarchimate-2.0.2}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "pyArchimate"
-version = "2.0.0"
+version = "2.0.2"
 authors = [
   { name="Xavier Mayeur", email="xavier@mayeur.be" }
 ]

{pyarchimate-2.0.0 → pyarchimate-2.0.2}/src/pyArchimate/view/layout/export/svg_export.py

@@ -181,7 +181,7 @@ class SVGExportService:
         self._add_defs(svg)
 
         # Add white background rectangle
-        self._add_background(svg, svg_width, svg_height)
+        self._add_background(svg, svg_width, svg_height, svg_min_x, svg_min_y)
 
         # Build complete nodes dictionary including nested nodes (for connection rendering)
         complete_nodes_dict = self._build_complete_nodes_dict(view)
@@ -428,20 +428,24 @@ class SVGExportService:
             },
         )
 
-    def _add_background(self, svg: ET.Element, width: float, height: float) -> None:
+    def _add_background(
+        self, svg: ET.Element, width: float, height: float, min_x: float = 0.0, min_y: float = 0.0
+    ) -> None:
         """Add white background rectangle to SVG canvas.
 
         Args:
             svg: SVG root element
             width: SVG canvas width
             height: SVG canvas height
+            min_x: left of the SVG canvas (view box), which may be negative
+            min_y: top of the SVG canvas (view box), which may be negative
         """
         ET.SubElement(
             svg,
             "rect",
             {
-                "x": "0",
-                "y": "0",
+                "x": str(int(min_x)),
+                "y": str(int(min_y)),
                 "width": str(int(width)),
                 "height": str(int(height)),
                 "fill": "white",
@@ -860,7 +864,7 @@ class SVGExportService:
                 tspan.text = line
 
     def _word_wrap_text(self, text: str, max_width: float) -> list[str]:
-        """Word wrap text to fit within max_width.
+        """Word wrap text to fit within max_width, keeping its line breaks.
 
         Args:
             text: Text to wrap
@@ -869,6 +873,9 @@ class SVGExportService:
         Returns:
             List of text lines
         """
+        if "\n" in text:
+            return [line for paragraph in text.splitlines() for line in self._word_wrap_text(paragraph, max_width)]
+
         # Estimate characters per line (rough: ~6 pixels per character)
         chars_per_line = max(1, int(max_width / 6))
 
@@ -1087,8 +1094,9 @@ class SVGExportService:
         return source_node, target_node
 
     def _build_relationship_label(self, rel_type: str, conn: Any) -> str:
-        """Return label text, appending influence_strength for Influence relationships."""
-        label = self._get_short_type_name(rel_type)
+        """Return label text: the relationship name, or its short type name when it has no name, with the
+        influence_strength appended for Influence relationships."""
+        label = getattr(conn, "name", None) or self._get_short_type_name(rel_type)
         if rel_type in ("Influence", "InfluenceRelationship"):
             strength = getattr(conn, "influence_strength", None) or getattr(conn, "_influence_strength", None)
             if strength:
@@ -1194,7 +1202,7 @@ class SVGExportService:
 
         # Render connection label
         rel_type = getattr(conn, "type", "Relationship")
-        label_text = self._get_short_type_name(rel_type)
+        label_text = self._build_relationship_label(rel_type, conn)
 
         if label_text and len(points) >= 2:
             self._render_connection_label(svg, points, label_text)

{pyarchimate-2.0.0 → pyarchimate-2.0.2}/src/pyArchimate/writers/archiWriter.py

@@ -406,6 +406,8 @@ def archi_writer(model: Model, file_path: str) -> str:
     """
 
     root = et.fromstring(xml)
+    # Without the blank text of the template, pretty_print can indent the whole document
+    root.text = None
     xsi_url = "http://www.w3.org/2001/XMLSchema-instance"  # NOSONAR
     xsi = et.QName(xsi_url, "type")
     folders = _create_folders(root)

{pyarchimate-2.0.0 → pyarchimate-2.0.2}/src/pyArchimate/writers/archimateWriter.py

@@ -238,7 +238,7 @@ def _write_node_style(n_elem: _Element, n: Node) -> None:
         rgb = RGBA()
         rgb.color = n.line_color
         lc.set("r", str(rgb.r))
-        lc.set("g", str(rgb.r))
+        lc.set("g", str(rgb.g))
         lc.set("b", str(rgb.b))
         lc.set("a", "100" if n.opacity is None else str(n.lc_opacity))
     if n.fill_color is not None:
@@ -374,6 +374,8 @@ def archimate_writer(model: Model, file_path: str | None = None) -> str:
     """
 
     root = et.fromstring(xml)
+    # Without the blank text of the template, pretty_print can indent the whole document
+    root.text = None
     nsp_url = "http://www.opengroup.org/xsd/archimate/3.0/"  # NOSONAR
     xsi_url = "http://www.w3.org/2001/XMLSchema-instance"  # NOSONAR
     xsi = et.QName(xsi_url, "type")
@@ -393,14 +395,15 @@ def archimate_writer(model: Model, file_path: str | None = None) -> str:
     _write_relationships(root, model, xsi)
     _write_organizations(root, model, ns_find)
 
+    # The definitions are written before the views, as required by the schema, but filled after them, so that they
+    # also include the definitions of the view properties
     pd = et.SubElement(root, "propertyDefinitions")
+    _write_views(root, model, xsi)
     for k, v in model.pdefs.items():
         p = et.SubElement(pd, "propertyDefinition", identifier=k, type="string")
         p_name = et.SubElement(p, "name")
         p_name.text = str(v)
 
-    _write_views(root, model, xsi)
-
     pd_check = root.find("propertyDefinitions")
     if pd_check is not None and pd_check.find("propertyDefinition") is None:
         root.remove(pd_check)

{pyarchimate-2.0.0 → pyarchimate-2.0.2/src/pyArchimate.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pyArchimate
-Version: 2.0.0
+Version: 2.0.2
 Summary: A library to create & manage Archimate files
 Author-email: Xavier Mayeur <xavier@mayeur.be>
 License-Expression: GPL-3.0-only
@@ -30,7 +30,7 @@ Dynamic: license-file
 [![Bugs](https://sonarcloud.io/api/project_badges/measure?project=pyArchimate_pyArchimate&metric=bugs)](https://sonarcloud.io/project/overview?id=pyArchimate_pyArchimate)
 [![Security Rating](https://sonarcloud.io/api/project_badges/measure?project=pyArchimate_pyArchimate&metric=security_rating)](https://sonarcloud.io/project/overview?id=pyArchimate_pyArchimate)
 [![Maintainability](https://sonarcloud.io/api/project_badges/measure?project=pyArchimate_pyArchimate&metric=sqale_rating)](https://sonarcloud.io/project/overview?id=pyArchimate_pyArchimate)
-[![Docs](https://readthedocs.org/projects/pyarchimate/badge/?version=master)](https://pyarchimate.readthedocs.io)
+[![Docs](https://img.shields.io/readthedocs/pyarchimate/master)](https://pyarchimate.readthedocs.io)
 
 Documentation: [readthedocs.org](https://pyarchimate.readthedocs.io)