Merge pull request #36 from antback/master

Adds edge labels
hbmartin · Jul 2, 2024 · 052bba2 · 052bba2
2 parents c1746f9 + 368dd03
commit 052bba2
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 2 deletions.
diff --git a/graphviz2drawio/models/SVG.py b/graphviz2drawio/models/SVG.py
@@ -5,6 +5,8 @@ def get_first(g, tag):
 def get_title(g):
     return get_first(g, "title").text
 
+def get_text(g):
+    return get_first(g, "text").text
 
 def is_tag(g, tag):
     return g.tag == "{http://www.w3.org/2000/svg}" + tag

diff --git a/graphviz2drawio/mx/Edge.py b/graphviz2drawio/mx/Edge.py
@@ -3,14 +3,15 @@
 
 
 class Edge(GraphObj):
-    def __init__(self, sid, gid, fr, to, curve):
+    def __init__(self, sid, gid, fr, to, curve, label):
         super(Edge, self).__init__(sid, gid)
         self.fr = fr
         self.to = to
         self.curve = curve
         self.style = None
         self.dir = None
         self.arrowtail = None
+        self.label = label
 
     def curve_start_end(self):
         if self.dir == DotAttr.BACK:

diff --git a/graphviz2drawio/mx/EdgeFactory.py b/graphviz2drawio/mx/EdgeFactory.py
@@ -20,8 +20,9 @@ def from_svg(self, g) -> Edge:
             to = sp_to[0]
         gid = gid_template.format(fr, to)
         curve = None
+        label = SVG.get_text(g)
         if SVG.has(g, "path"):
             path = SVG.get_first(g, "path")
             if "d" in path.attrib:
                 curve = self.curve_factory.from_svg(path.attrib["d"])
-        return Edge(sid=g.attrib["id"], gid=gid, fr=fr, to=to, curve=curve)
+        return Edge(sid=g.attrib["id"], gid=gid, fr=fr, to=to, curve=curve, label=label)
diff --git a/graphviz2drawio/mx/MxGraph.py b/graphviz2drawio/mx/MxGraph.py
@@ -3,6 +3,7 @@
 from graphviz2drawio.models import DotAttr
 from graphviz2drawio.mx import MxConst
 from graphviz2drawio.mx.Styles import Styles
+import uuid
 
 
 class MxGraph:
@@ -35,6 +36,20 @@ def add_edge(self, edge):
                 "target": target.sid,
             },
         )
+
+        if edge.label:
+            edge_label_element = ET.SubElement(
+                self.root,
+                MxConst.CELL,
+                id=uuid.uuid4().hex,
+                style="edgeLabel;html=1;align=center;verticalAlign=middle;resizable=0;points=[];",
+                parent=edge.sid,
+                value=edge.label,
+                vertex="1",
+                connectable="0",
+            )
+            self.add_mx_geo(edge_label_element)
+
         if edge.curve.cb is None and len(edge.curve.cbset) == 0:
             self.add_mx_geo(edge_element)
         else: