Updated XmlParser for geometry of Splitblock

Author: suchitalad

blocks/Xcos/XmlParser.py

@@ -533,7 +533,7 @@ def mergeLinks(vertex, key1, graph_link, removable_link):
     print(f"removable link: k: {k}, link: {r_link_0}")
     node = nodeList[r_link_0]
     link_data = edgeDict[r_link_0]  # small removed link
-    # print("#LINKDATA#:", link_data)
+    print("#LINKDATA#:", link_data)
     print("#NODEATTRIB#:", node.attrib)
 
     sourceVertex = link_data[1] # small link
@@ -548,26 +548,26 @@ def mergeLinks(vertex, key1, graph_link, removable_link):
         link_data2 = edgeDict[sourceVertex]  # big removed link
 
         thisVertex = sourceVertex
-        thisx = link_data[9]['x']
-        thisy = link_data[9]['y']
+        thisx = link_data[8]['x']
+        thisy = link_data[8]['y']
 
         otherVertex = targetVertex
-        otherx = link_data[8]['x']
-        othery = link_data[8]['y']
+        otherx = link_data[9]['x']
+        othery = link_data[9]['y']
 
         split_point = link_data[8]
 
     elif targetVertex in link:
         node2 = nodeList[targetVertex]
         link_data2 = edgeDict[targetVertex]  # big removed link
 
-        otherVertex = sourceVertex
-        otherx = link_data[9]['x']
-        othery = link_data[9]['y']
-
         thisVertex = targetVertex
-        thisx = link_data[8]['x']
-        thisy = link_data[8]['y']
+        thisx = link_data[9]['x']
+        thisy = link_data[9]['y']
+
+        otherVertex = sourceVertex
+        otherx = link_data[8]['x']
+        othery = link_data[8]['y']
 
         split_point = link_data[9]
 
@@ -591,8 +591,8 @@ def mergeLinks(vertex, key1, graph_link, removable_link):
     tType = IDLIST[otherVertex]
     sType2 = IDLIST[sourceVertex2]
     tType2 = IDLIST[targetVertex2]
-    height = 7
-    width = 7
+    height = '7.0'
+    width = '7.0'
     # print("LINKDATA:", link_data)
     # print("LINKDATA2:", link_data2)
     # print("#NODEATTRIB2#:", node2.attrib)

blocks/Xcos/blocks/SplitBlock.py

@@ -30,8 +30,9 @@ def SplitBlock(outroot, attribid, ordering, geometry, parameters, parent=1, styl
     addObjNode(outnode, TYPE_ARRAY, CLASS_LIST, AS_ODSTATE, [])
     addObjNode(outnode, TYPE_ARRAY, CLASS_LIST, AS_EQUATIONS, [])
     addNode(outnode, 'mxGeometry', **{'as': 'geometry'},
-            height=geometry['height'], width=geometry['width'],
-            x=geometry['x'], y=geometry['y'])
+            x=geometry['x'], y=geometry['y'],
+            width=geometry['width'], height=geometry['height']
+            )
 
     return outnode