better edge position given direction

Author: hbmartin

graphviz2drawio/models/Rect.py

@@ -4,6 +4,8 @@ def __init__(self, x, y, width, height):
         self.y = y
         self.width = width
         self.height = height
+        self.bottom = y + height
+        self.right = x + width
 
     def to_dict_int(self):
         return {

graphviz2drawio/mx/MxGraph.py

@@ -36,15 +36,26 @@ def add_edge(self, edge):
         if edge.dir == DotAttr.BACK:
             source = self.nodes[edge.to].sid
             target = self.nodes[edge.fr].sid
+            exit_x = 0.5
+            exit_y = 0
+            entry_x = self.edge_reposition_x[edge.sid]
+            entry_y = 1
         else:
             target = self.nodes[edge.to].sid
             source = self.nodes[edge.fr].sid
+            exit_x = 0.5
+            exit_y = 1
+            entry_x = self.edge_reposition_x[edge.sid]
+            entry_y = 0
         edge_element = ET.SubElement(
             self.root,
             MxConst.CELL,
             id=edge.sid,
             style=Styles.EDGE.format(
-                entry_x=self.edge_reposition_x[edge.sid],
+                entry_x=entry_x,
+                entry_y=entry_y,
+                exit_x=exit_x,
+                exit_y=exit_y,
                 end_arrow=end_arrow,
                 dashed=dashed,
                 end_fill=end_fill,

graphviz2drawio/mx/Styles.py

@@ -3,7 +3,7 @@
 
 class Styles(Enum):
     NODE = "verticalAlign=top;align=left;overflow=fill;html=1;rounded=0;shadow=0;comic=0;labelBackgroundColor=none;strokeColor={stroke};strokeWidth=1;fillColor={fill};"
-    EDGE = "edgeStyle=orthogonalEdgeStyle;rounded=1;html=1;exitX=0.5;exitY=0;entryX={entry_x:.3g};entryY=1;jettySize=auto;orthogonalLoop=1;endArrow={end_arrow};dashed={dashed};endFill={end_fill};"
+    EDGE = "edgeStyle=orthogonalEdgeStyle;rounded=1;html=1;exitX={exit_x:.3g};exitY={exit_y:.3g};entryX={entry_x:.3g};entryY={entry_y:.3g};jettySize=auto;orthogonalLoop=1;endArrow={end_arrow};dashed={dashed};endFill={end_fill};"
     TEXT = "margin:0px;text-align:{align};{margin};font-size:{size}px;font-family:{family};color:{color};"
 
     def format(self, **values):