Merge pull request #57 from samkhal/fixes

Fix shapes not being correctly propagated from SVG

graphviz2drawio/mx/Node.py

@@ -2,14 +2,14 @@
 
 
 class Node(GraphObj):
-    def __init__(self, sid, gid, rect, texts, fill, stroke):
+    def __init__(self, sid, gid, rect, texts, fill, stroke, shape):
         super(Node, self).__init__(sid, gid)
         self.rect = rect
         self.texts = texts
         self.fill = fill
         self.stroke = stroke
         self.label = None
-        self.shape = None
+        self.shape = shape
 
     def text_to_mx_value(self):
         value = ""

graphviz2drawio/mx/NodeFactory.py

@@ -2,6 +2,7 @@
 from graphviz2drawio.models.Rect import Rect
 from .Node import Node
 from .Text import Text
+from . import Shape
 
 
 class NodeFactory:
@@ -56,8 +57,10 @@ def from_svg(self, g) -> Node:
             rect = self.rect_from_svg_points(
                 SVG.get_first(g, "polygon").attrib["points"]
             )
+            shape = Shape.RECT
         else:
             rect = self.rect_from_ellipse_svg(SVG.get_first(g, "ellipse").attrib)
+            shape = Shape.ELLIPSE
 
         stroke = None
         if SVG.has(g, "polygon"):
@@ -78,4 +81,5 @@ def from_svg(self, g) -> Node:
             texts=texts,
             fill=fill,
             stroke=stroke,
+            shape=shape
         )

test/directed/hello_rect.gv.txt

@@ -0,0 +1,4 @@
+digraph G {
+    node [shape=rect]
+    Hello->World
+}

test/test_graphs.py

@@ -61,6 +61,22 @@ def test_hello():
     check_edge(edge, hello, world)
     check_edge_dir(edge, dx=0, dy=1)
 
+def test_hello_rect():
+    file = "./directed/hello_rect.gv.txt"
+    xml = graphviz2drawio.convert(file)
+    print(xml)
+
+    root = ET.fromstring(xml)
+    elements = check_xml_top(root)
+
+    hello = elements[3]
+    check_value(hello, "Hello")
+    assert "ellipse" not in hello.attrib["style"]
+
+    world = elements[4]
+    check_value(world, "World")
+    assert "ellipse" not in world.attrib["style"]
+
 
 def test_port():
     file = "test/directed/port.gv.txt"