Updated position of attribute in Port files

18 files changed, 91 insertions, 88 deletions

diff --git a/blocks/Xcos/MxGraphParser.py b/blocks/Xcos/MxGraphParser.py
index 9d427d72..06167419 100755
--- a/blocks/Xcos/MxGraphParser.py
+++ b/blocks/Xcos/MxGraphParser.py
@@ -422,9 +422,10 @@ for key, newEdges in newEdgeDict.items():
                          waypoints[1:-1], parent = parentattribid)
 
 outnode = ET.SubElement(outdiagram, 'mxCell')
-outnode.set('id', str(1))
-outnode.set('parent', str(0))
 outnode.set('as', 'defaultParent')
+outnode.set('id', '0:2:0')
+outnode.set('parent', '0:1:0')
+
 
 outtree = ET.ElementTree(outdiagram)
 ET.indent(outtree)
diff --git a/blocks/Xcos/blocks/CLOCK_c.py b/blocks/Xcos/blocks/CLOCK_c.py
index e6e7db4a..ea0a2771 100644
--- a/blocks/Xcos/blocks/CLOCK_c.py
+++ b/blocks/Xcos/blocks/CLOCK_c.py
@@ -10,7 +10,8 @@ def CLOCK_c(outroot, attribid, ordering, geometry, parameters, parent=1):
     outnode = addOutNode(outroot, BLOCK_BASIC,
                          attribid, ordering, parent,
                          func_name, 'csuper', 'DEFAULT',
-                         func_name, BLOCKTYPE_H)
+                         func_name, BLOCKTYPE_H, dependsOnU='0',
+                         dependsOnT='0')
 
     addExprsNode(outnode, TYPE_DOUBLE, 0, [])
     addTypeNode(outnode, TYPE_DOUBLE, AS_REAL_PARAM, 0,
diff --git a/blocks/Xcos/blocks/CMSCOPE.py b/blocks/Xcos/blocks/CMSCOPE.py
index b7455c95..d5631c91 100644
--- a/blocks/Xcos/blocks/CMSCOPE.py
+++ b/blocks/Xcos/blocks/CMSCOPE.py
@@ -8,13 +8,13 @@ def CMSCOPE(outroot, attribid, ordering, geometry, parameters, parent=1):
                          attribid, ordering, parent,
                          func_name, 'cmscope', 'C_OR_FORTRAN',
                          func_name, BLOCKTYPE_C,
-                         dependsOnU='1',
-                         value=parameters[10])
+                         dependsOnU='1', dependsOnT='0'
+                         )
 
     addExprsNode(outnode, TYPE_STRING, 11, parameters)
     addSciDBNode(outnode, TYPE_DOUBLE, AS_REAL_PARAM,
-                 7, realParts=[0.0, 10.0, 10.0, 0.0, 2.0, 0.0, 2.0])
-    array = ['-1', '2', '20', '-1', '-1', '-1', '-1', '1', '1', '1', '3', '0']
+                 7, realParts=[0.0, 0.25, 0.25, -15.0, 15.0, -15.0, 15.0])
+    array = ['-1', '2', '2', '-1', '-1', '-1', '-1', '1', '1', '1', '3', '0']
     addPrecNode(outnode, TYPE_INTEGER, AS_INT_PARAM, 12, array)
     addObjNode(outnode, TYPE_ARRAY, CLASS_LIST, AS_OBJ_PARAM, parameters)
     array = ['0']
diff --git a/blocks/Xcos/blocks/CurrentSensor.py b/blocks/Xcos/blocks/CurrentSensor.py
index 220d6a4e..4233e2fa 100644
--- a/blocks/Xcos/blocks/CurrentSensor.py
+++ b/blocks/Xcos/blocks/CurrentSensor.py
@@ -8,7 +8,7 @@ def CurrentSensor(outroot, attribid, ordering, geometry, parameters, parent=1):
                          attribid, ordering, parent,
                          func_name, 'CurrentSensor', 'DEFAULT',
                          func_name, BLOCKTYPE_C,
-                         dependsOnU='1')
+                         dependsOnU='1', dependsOnT='0')
 
     addExprsNode(outnode, TYPE_DOUBLE, 0, parameters)
     addTypeNode(outnode, TYPE_DOUBLE, AS_REAL_PARAM, 0,
diff --git a/blocks/Xcos/blocks/EVTDLY_c.py b/blocks/Xcos/blocks/EVTDLY_c.py
index f6e172bc..09847f70 100644
--- a/blocks/Xcos/blocks/EVTDLY_c.py
+++ b/blocks/Xcos/blocks/EVTDLY_c.py
@@ -11,8 +11,9 @@ def EVTDLY_c(outroot, attribid, ordering, geometry, parameters, parent=1):
                          dependsOnT='0')
 
     addExprsNode(outnode, TYPE_STRING, 2, parameters)
-    addSciDBNode(outnode, TYPE_DOUBLE, AS_REAL_PARAM,
-                 2, realParts=[0.1, 0.1])
+    addSciDBNode(outnode, TYPE_DOUBLE, AS_REAL_PARAM, 2, realParts=[
+                 format_real_number(parameters[0]),
+                 format_real_number(parameters[1])])
     addTypeNode(outnode, TYPE_DOUBLE, AS_INT_PARAM, 0, [])
     addObjNode(outnode, TYPE_ARRAY, CLASS_LIST, AS_OBJ_PARAM, parameters)
     array = ['0']
diff --git a/blocks/Xcos/blocks/Ground.py b/blocks/Xcos/blocks/Ground.py
index a490f70b..002f354b 100644
--- a/blocks/Xcos/blocks/Ground.py
+++ b/blocks/Xcos/blocks/Ground.py
@@ -8,7 +8,7 @@ def Ground(outroot, attribid, ordering, geometry, parameters, parent=1):
                          attribid, ordering, parent,
                          func_name, 'Ground', 'DEFAULT',
                          func_name, BLOCKTYPE_C,
-                         dependsOnU='1')
+                         dependsOnU='1', dependsOnT='0')
 
     addExprsNode(outnode, TYPE_STRING, 1, parameters)
     addTypeNode(outnode, TYPE_DOUBLE, AS_REAL_PARAM, 0,
diff --git a/blocks/Xcos/blocks/Inductor.py b/blocks/Xcos/blocks/Inductor.py
index d42faf0c..5c633eac 100644
--- a/blocks/Xcos/blocks/Inductor.py
+++ b/blocks/Xcos/blocks/Inductor.py
@@ -12,8 +12,7 @@ def Inductor(outroot, attribid, ordering, geometry, parameters, parent=1):
 
     addExprsNode(outnode, TYPE_STRING, 1, parameters)
     addSciDBNode(outnode, TYPE_DOUBLE, AS_REAL_PARAM,
-                 1, realParts=[format_real_number(parameters[0])
-                 ])
+                 1, realParts=[format_real_number(parameters[0])])
     addTypeNode(outnode, TYPE_DOUBLE, AS_INT_PARAM, 0, [])
     addObjNode(outnode, TYPE_ARRAY, CLASS_LIST, AS_OBJ_PARAM, [])
     array = ['0']
diff --git a/blocks/Xcos/blocks/OUT_f.py b/blocks/Xcos/blocks/OUT_f.py
index 3c3a7c52..ae615072 100644
--- a/blocks/Xcos/blocks/OUT_f.py
+++ b/blocks/Xcos/blocks/OUT_f.py
@@ -10,7 +10,7 @@ def OUT_f(outroot, attribid, ordering, geometry, parameters, parent=1):
                          func_name, BLOCKTYPE_C, dependsOnU='0',
                          dependsOnT='0')
 
-    addExprsNode(outnode, TYPE_STRING, 1, parameters[1:2])
+    addExprsNode(outnode, TYPE_STRING, 1, parameters[0])
     addTypeNode(outnode, TYPE_DOUBLE, AS_REAL_PARAM, 0,
                 [])
     array = ['1']
diff --git a/blocks/Xcos/blocks/STEP_FUNCTION.py b/blocks/Xcos/blocks/STEP_FUNCTION.py
index 5666b685..9e53bd4e 100644
--- a/blocks/Xcos/blocks/STEP_FUNCTION.py
+++ b/blocks/Xcos/blocks/STEP_FUNCTION.py
@@ -22,7 +22,7 @@ def STEP_FUNCTION(outroot, attribid, ordering, geometry, parameters, parent=1):
     outnode = addOutNode(outroot, BLOCK_BASIC,
                          attribid, ordering, parent,
                          func_name, 'csuper', 'DEFAULT',
-                         func_name, BLOCKTYPE_C, dependsOnU='0',
+                         func_name, BLOCKTYPE_H, dependsOnU='0',
                          dependsOnT='0')
 
     addExprsNode(outnode, TYPE_DOUBLE, 0, parameters)
@@ -80,7 +80,7 @@ def STEP_FUNCTION(outroot, attribid, ordering, geometry, parameters, parent=1):
     addPort(root, TYPE_CMD, id=port_id[2],
             parent=block_id[2], ordering="1",
             dataType="REAL_MATRIX", dataColumns="1",
-            dataLines="-1", initialState="5.0",
+            dataLines="-1", initialState="0.005",
             style="CommandPort", value="")
 
     OUT_f(root, block_id[3], ordering, geometry, parameters, parent=block_id[1])
@@ -88,9 +88,21 @@ def STEP_FUNCTION(outroot, attribid, ordering, geometry, parameters, parent=1):
     adPort(root, TYPE_EXPLICITINPORT, id=port_id[3],
            parent=block_id[3], ordering="1",
            initialState="0.0",
-           style="ExplicitInputPort;align=right;verticalAlign=middle;spacing=10.0;rotation=0",
+           style="ExplicitInputPort;align=left;verticalAlign=middle;spacing=10.0;rotation=0",
            value="")
 
+    CCLink = addLink(root, TYPE_EXLINK, id=link_id[1],
+                     parent=block_id[1],
+                     source=port_id[0],
+                     target=port_id[3],
+                     style="ExplicitLink", value="")
+    gemotryNode = addGeoNode(CCLink, GEOMETRY, a="geometry")
+    addmxPointNode(gemotryNode, 'mxPoint',
+                   a="sourcePoint", x="44.0", y="20.0")
+    addArray(gemotryNode, TYPE_ARRAY, a="points")
+    addmxPointNode(gemotryNode, 'mxPoint',
+                   a="targetPoint", x="-4.0", y="10.0")
+
     CCLink = addLink(root, TYPE_LINK, id=link_id[0],
                      parent=block_id[1],
                      source=port_id[2],
@@ -98,30 +110,18 @@ def STEP_FUNCTION(outroot, attribid, ordering, geometry, parameters, parent=1):
                      style="CommandControlLink", value="")
     gemotryNode = addGeoNode(CCLink, GEOMETRY, a="geometry")
     addmxPointNode(gemotryNode, 'mxPoint',
-                   a="sourcePoint", x="0.0", y="11.0")
+                   a="sourcePoint", x="20.0", y="-4.0")
     arrayNode = addArray(gemotryNode, TYPE_ARRAY, a="points")
     addPointNode(arrayNode, 'mxPoint',
-                 x="180.0", y="220.0")
+                 x="116.00000299999998", y="174.39289999999994")
     addPointNode(arrayNode, 'mxPoint',
-                 x="140.0", y="220.0")
+                 x="77.47839499999999", y="174.39289999999994")
     addPointNode(arrayNode, 'mxPoint',
-                 x="140.0", y="140.0")
+                 x="77.47839499999999", y="84.69677999999999")
     addPointNode(arrayNode, 'mxPoint',
-                 x="180.0", y="140.0")
-    addmxPointNode(gemotryNode, 'mxPoint',
-                   a="targetPoint", x="20.0", y="-4.0")
-
-    CCLink = addLink(root, TYPE_EXLINK, id=link_id[1],
-                     parent=block_id[1],
-                     source=port_id[0],
-                     target=port_id[3],
-                     style="ExplicitLink", value="")
-    gemotryNode = addGeoNode(CCLink, GEOMETRY, a="geometry")
-    addmxPointNode(gemotryNode, 'mxPoint',
-                   a="sourcePoint", x="0.0", y="11.0")
-    addArray(gemotryNode, TYPE_ARRAY, a="points")
+                 x="116.00000299999998", y="84.69677999999999")
     addmxPointNode(gemotryNode, 'mxPoint',
-                   a="targetPoint", x="20.0", y="-4.0")
+                   a="targetPoint", x="20.0", y="44.0")
 
     addNodemxCell(SuperBlockDiagram, TYPE_MXCELL, a='defaultParent',
                   id=block_id[1],
diff --git a/blocks/Xcos/blocks/SineVoltage.py b/blocks/Xcos/blocks/SineVoltage.py
index 3753930a..7468edb1 100644
--- a/blocks/Xcos/blocks/SineVoltage.py
+++ b/blocks/Xcos/blocks/SineVoltage.py
@@ -8,14 +8,14 @@ def SineVoltage(outroot, attribid, ordering, geometry, parameters, parent=1):
                          attribid, ordering, parent,
                          func_name, 'SineVoltage', 'DEFAULT',
                          func_name, BLOCKTYPE_C,
-                         dependsOnU='1')
+                         dependsOnU='1', dependsOnT='0')
 
     addExprsNode(outnode, TYPE_STRING, 5, parameters)
-    addSciDBNode(outnode, TYPE_DOUBLE, AS_REAL_PARAM,
-                 5, realParts=[1.5, 0.0, 15.92356687898089, 0.0, 0.0])
+    addSciDBNode(outnode, TYPE_DOUBLE, AS_REAL_PARAM, 5, realParts=[
+                 parameters[0], parameters[1], parameters[2],
+                 parameters[3], parameters[4]])
     array = ['0']
-    addTypeNode(outnode, TYPE_DOUBLE, AS_INT_PARAM, 0,
-                [])
+    addTypeNode(outnode, TYPE_DOUBLE, AS_INT_PARAM, 0, [])
     addObjNode(outnode, TYPE_ARRAY, CLASS_LIST, AS_OBJ_PARAM, parameters)
     addPrecisionNode(outnode, TYPE_INTEGER, AS_NBZERO, 1, array)
     addPrecisionNode(outnode, TYPE_INTEGER, AS_NMODE, 1, array)
@@ -46,11 +46,11 @@ def SineVoltage(outroot, attribid, ordering, geometry, parameters, parent=1):
     addSciStringNode(innerArrayNode, height=5,
                      parameters=scilabStringParameters)
     nestedArrayNode = addArrayNode(innerArrayNode, scilabClass="ScilabList")
-    addScilabDoubleNode(nestedArrayNode, width=1, realParts=["1.5"])
-    addScilabDoubleNode(nestedArrayNode, width=1, realParts=["0.0"])
-    addScilabDoubleNode(nestedArrayNode, width=1, realParts=["15.92356687898089"])
-    addScilabDoubleNode(nestedArrayNode, width=1, realParts=["0.0"])
-    addScilabDoubleNode(nestedArrayNode, width=1, realParts=["0.0"])
+    addScilabDoubleNode(nestedArrayNode, width=1, realParts=[parameters[0]])
+    addScilabDoubleNode(nestedArrayNode, width=1, realParts=[parameters[1]])
+    addScilabDoubleNode(nestedArrayNode, width=1, realParts=[parameters[2]])
+    addScilabDoubleNode(nestedArrayNode, width=1, realParts=[parameters[3]])
+    addScilabDoubleNode(nestedArrayNode, width=1, realParts=[parameters[4]])
 
     addgeometryNode(outnode, GEOMETRY, geometry['height'],
                     geometry['width'], geometry['x'], geometry['y'])
diff --git a/blocks/Xcos/blocks/Switch.py b/blocks/Xcos/blocks/Switch.py
index 75f0a719..f21295ca 100644
--- a/blocks/Xcos/blocks/Switch.py
+++ b/blocks/Xcos/blocks/Switch.py
@@ -8,7 +8,7 @@ def Switch(outroot, attribid, ordering, geometry, parameters, parent=1):
                          attribid, ordering, parent,
                          func_name, 'Switch', 'DEFAULT',
                          func_name, BLOCKTYPE_C,
-                         dependsOnU='1')
+                         dependsOnU='1', dependsOnT='0')
 
     addExprsNode(outnode, TYPE_STRING, 2, parameters)
     addSciDBNode(outnode, TYPE_DOUBLE, AS_REAL_PARAM,
diff --git a/blocks/Xcos/common/AAAAAA.py b/blocks/Xcos/common/AAAAAA.py
index e77ec4e0..abf6a3d6 100644
--- a/blocks/Xcos/common/AAAAAA.py
+++ b/blocks/Xcos/common/AAAAAA.py
@@ -177,7 +177,7 @@ def addOutNode(node, subNodeType,
     newkwargs.update({'simulationFunctionName': simulation_func_name,
                       'simulationFunctionType': simulation_func_type,
                       'style': style})
-    
+
     return addNode(node, subNodeType, **newkwargs)
 
 
diff --git a/blocks/Xcos/ports/CommandPort.py b/blocks/Xcos/ports/CommandPort.py
index 882277b9..63c1b0b9 100644
--- a/blocks/Xcos/ports/CommandPort.py
+++ b/blocks/Xcos/ports/CommandPort.py
@@ -11,9 +11,9 @@ def CommandPort(outroot, attribid, parentattribid, ordering, geometry,
                           ordering=ordering, parent=parentattribid,
                           style=func_name, visible=0)
     else:
-        outnode = addNode(outroot, func_name, initialState="-1.0",
-                          dataType='UNKNOW_TYPE', **{'id': attribid},
-                          ordering=ordering, parent=parentattribid,
+        outnode = addNode(outroot, func_name, **{'id': attribid},
+                          parent=parentattribid, ordering=ordering,
+                          initialState="-1.0",
                           style=func_name, value=value)
 
     return outnode
diff --git a/blocks/Xcos/ports/ControlPort.py b/blocks/Xcos/ports/ControlPort.py
index 474bbe4a..f1f664bc 100644
--- a/blocks/Xcos/ports/ControlPort.py
+++ b/blocks/Xcos/ports/ControlPort.py
@@ -11,9 +11,9 @@ def ControlPort(outroot, attribid, parentattribid, ordering, geometry,
                           ordering=ordering, parent=parentattribid,
                           style=func_name, visible=0)
     else:
-        outnode = addNode(outroot, func_name, initialState="-1.0",
-                          dataType='UNKNOW_TYPE', **{'id': attribid},
-                          ordering=ordering, parent=parentattribid,
+        outnode = addNode(outroot, func_name, **{'id': attribid},
+                          parent=parentattribid, ordering=ordering,
+                          initialState="-1.0",
                           style=func_name, value=value)
 
     return outnode
diff --git a/blocks/Xcos/ports/ExplicitInputPort.py b/blocks/Xcos/ports/ExplicitInputPort.py
index 40dc2d78..0eb5d61e 100644
--- a/blocks/Xcos/ports/ExplicitInputPort.py
+++ b/blocks/Xcos/ports/ExplicitInputPort.py
@@ -11,16 +11,15 @@ def ExplicitInputPort(outroot, attribid, parentattribid, ordering, geometry,
                           ordering=ordering, parent=parentattribid,
                           style=func_name, visible=0)
     elif addDataLines:
-        outnode = addNode(outroot, func_name, dataColumns=1, dataLines=1,
-                          dataType='REAL_MATRIX', **{'id': attribid},
-                          ordering=ordering, parent=parentattribid,
+        outnode = addNode(outroot, func_name, **{'id': attribid},
+                          parent=parentattribid, ordering=ordering,
+                          dataType='REAL_MATRIX', dataColumns=1, dataLines=1,
                           style=func_name, value=value)
     else:
-        outnode = addNode(outroot, func_name, dataColumns=1,
-                          initialState="-1.0", dataType='REAL_MATRIX',
-                          **{'id': attribid},
-                          ordering=ordering, parent=parentattribid,
-                          style=func_name, value=value)
+        outnode = addNode(outroot, func_name, **{'id': attribid},
+                          parent=parentattribid, ordering=ordering,
+                          dataType='REAL_MATRIX', dataColumns=1,
+                          initialState="-1.0", style=func_name, value=value)
 
     return outnode
 
diff --git a/blocks/Xcos/ports/ExplicitOutputPort.py b/blocks/Xcos/ports/ExplicitOutputPort.py
index 27214f3b..516792e8 100644
--- a/blocks/Xcos/ports/ExplicitOutputPort.py
+++ b/blocks/Xcos/ports/ExplicitOutputPort.py
@@ -11,16 +11,16 @@ def ExplicitOutputPort(outroot, attribid, parentattribid, ordering, geometry,
                           ordering=ordering, parent=parentattribid,
                           style=func_name, visible=0)
     elif addDataLines:
-        outnode = addNode(outroot, func_name, dataColumns=1, dataLines=1,
-                          dataType='REAL_MATRIX', **{'id': attribid},
-                          ordering=ordering, parent=parentattribid,
-                          style=func_name, value=value)
+        outnode = addNode(outroot, func_name, **{'id': attribid},
+                          parent=parentattribid, ordering=ordering,
+                          dataType='REAL_MATRIX', dataColumns=1,
+                          dataLines=1, style=func_name, value=value)
     else:
-        outnode = addNode(outroot, func_name, dataColumns=1,
-                          initialState="-1.0", dataType='REAL_MATRIX',
-                          **{'id': attribid},
-                          ordering=ordering, parent=parentattribid,
-                          style=func_name, value=value)
+        outnode = addNode(outroot, func_name, **{'id': attribid},
+                          parent=parentattribid, ordering=ordering,
+                          dataType='REAL_MATRIX', dataColumns=1,
+                          initialState="-1.0", style=func_name,
+                          value=value)
 
     return outnode
 
diff --git a/blocks/Xcos/ports/ImplicitInputPort.py b/blocks/Xcos/ports/ImplicitInputPort.py
index d40c10f3..41740c25 100644
--- a/blocks/Xcos/ports/ImplicitInputPort.py
+++ b/blocks/Xcos/ports/ImplicitInputPort.py
@@ -11,16 +11,17 @@ def ImplicitInputPort(outroot, attribid, parentattribid, ordering, geometry,
                           ordering=ordering, parent=parentattribid,
                           style=func_name, visible=0)
     elif addDataLines:
-        outnode = addNode(outroot, func_name, dataColumns=1, dataLines=1,
-                          dataType='REAL_MATRIX', **{'id': attribid},
-                          ordering=ordering, parent=parentattribid,
-                          style=func_name, value=value)
+        outnode = addNode(outroot, func_name, **{'id': attribid},
+                          parent=parentattribid, ordering=ordering,
+                          dataType='REAL_MATRIX', dataColumns=1,
+                          dataLines=1, style=func_name,
+                          value=value)
     else:
-        outnode = addNode(outroot, func_name, dataColumns=1,
-                          initialState="-1.0", dataType='REAL_MATRIX',
-                          **{'id': attribid},
-                          ordering=ordering, parent=parentattribid,
-                          style=func_name, value=value)
+        outnode = addNode(outroot, func_name, **{'id': attribid},
+                          parent=parentattribid, ordering=ordering,
+                          dataType='REAL_MATRIX', dataColumns=1,
+                          initialState="-1.0", style=func_name,
+                          value=value)
 
     return outnode
 
diff --git a/blocks/Xcos/ports/ImplicitOutputPort.py b/blocks/Xcos/ports/ImplicitOutputPort.py
index 0f3d83e6..41c8a39c 100644
--- a/blocks/Xcos/ports/ImplicitOutputPort.py
+++ b/blocks/Xcos/ports/ImplicitOutputPort.py
@@ -11,16 +11,17 @@ def ImplicitOutputPort(outroot, attribid, parentattribid, ordering, geometry,
                           ordering=ordering, parent=parentattribid,
                           style=func_name, visible=0)
     elif addDataLines:
-        outnode = addNode(outroot, func_name, dataColumns=1, dataLines=1,
-                          dataType='REAL_MATRIX', **{'id': attribid},
-                          ordering=ordering, parent=parentattribid,
-                          style=func_name, value=value)
+        outnode = addNode(outroot, func_name, **{'id': attribid},
+                          parent=parentattribid, ordering=ordering,
+                          dataType='REAL_MATRIX', dataColumns=1,
+                          dataLines=1, style=func_name,
+                          value=value)
     else:
-        outnode = addNode(outroot, func_name, dataColumns=1,
-                          initialState="-1.0", dataType='REAL_MATRIX',
-                          **{'id': attribid},
-                          ordering=ordering, parent=parentattribid,
-                          style=func_name, value=value)
+        outnode = addNode(outroot, func_name, **{'id': attribid},
+                          parent=parentattribid, ordering=ordering,
+                          dataType='REAL_MATRIX', dataColumns=1,
+                          initialState="-1.0", style=func_name,
+                          value=value)
 
     return outnode