fix code for Switch

FOSSEE · Dec 26, 2024 · 07268b8 · 07268b8
1 parent 5702c53
commit 07268b8
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 8 deletions.
diff --git a/blocks/Xcos/XmlParser.py b/blocks/Xcos/XmlParser.py
@@ -547,7 +547,7 @@ def mergeLinks(vertex, key1, graph_link, removable_link):
 
     sourceVertex = node.attrib.get('sourceVertex')  # small link
     targetVertex = node.attrib.get('targetVertex')  # small link
-    
+
     if sourceVertex in link:
         node2 = nodeList[sourceVertex]
         link_data2 = edgeDict[sourceVertex]  # big removed link
@@ -799,7 +799,6 @@ def mergeLinks(vertex, key1, graph_link, removable_link):
     if sourceVertex not in LINKTOLINK and targetVertex not in LINKTOLINK:
         continue
 
-
     try:
         point = {'x': nodeList[sourceVertex].attrib['tarx'], 'y': nodeList[sourceVertex].attrib['tary']}
         result, i, left_array, right_array = identify_segment(LINKWAYPOINTS[sourceVertex], point)

diff --git a/blocks/Xcos/blocks/STEP_FUNCTION.py b/blocks/Xcos/blocks/STEP_FUNCTION.py
@@ -54,7 +54,7 @@ def STEP_FUNCTION(outroot, attribid, ordering, geometry, parameters, parent=1, s
     Array = addSuperBlkNode(SuperBlockDiagram, TYPE_ARRAY,
                             a="context",
                             scilabClass="String[]")
-    superAddNode(Array, TYPE_ADD, value="")
+    superAddNode(Array, TYPE_ADD, value=" ")
 
     mxGraphModel = addmxGraphModelNode(SuperBlockDiagram,
                                        TYPE_MODEL, a="model")

diff --git a/blocks/Xcos/blocks/Switch.py b/blocks/Xcos/blocks/Switch.py
@@ -55,12 +55,20 @@ def Switch(outroot, attribid, ordering, geometry, parameters, parent=1, style=No
     for param in additionalScilabStrings:
         addDataData(additionalStringNode, param)
 
-    realParts = ["0.01", "100000.0"]
-    additionalStringNode = addDataNode(nestedArrayNode,
-                                       'ScilabDouble',
-                                       height=2, width=1)
+    nestedNestedArrayNode = addArrayNode(nestedArrayNode,
+                                         scilabClass="ScilabList")
+    additionalDataNode = addDataNode(nestedNestedArrayNode,
+                                     'ScilabDouble',
+                                     height=1, width=1)
+    realParts = ["1.0E-5"]
+    for i, realPart in enumerate(realParts):
+        addDData(additionalDataNode, column=0, line=i, realPart=realPart)
+    realParts = ["1.0E8"]
+    additionalDataNode = addDataNode(nestedNestedArrayNode,
+                                     'ScilabDouble',
+                                     height=1, width=1)
     for i, realPart in enumerate(realParts):
-        addDData(additionalStringNode, column=0, line=i, realPart=realPart)
+        addDData(additionalDataNode, column=0, line=i, realPart=realPart)
 
     addgeometryNode(outnode, GEOMETRY, geometry['height'],
                     geometry['width'], geometry['x'], geometry['y'])