summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSunil Shetye2023-02-03 16:02:03 +0530
committerSunil Shetye2023-02-03 16:02:03 +0530
commitc0c47f812dedea8c212dccbeb7f0160a4e614988 (patch)
tree02b3d2d85c62f008f720788f3fc5569137a9aea6
parentec731abed48923f0f2b328ce2b91a2dc9f6a87ac (diff)
downloadCommon-Interface-Project-c0c47f812dedea8c212dccbeb7f0160a4e614988.tar.gz
Common-Interface-Project-c0c47f812dedea8c212dccbeb7f0160a4e614988.tar.bz2
Common-Interface-Project-c0c47f812dedea8c212dccbeb7f0160a4e614988.zip
fix display_parameter
-rw-r--r--Xcos/blocks/AFFICH_m.py2
-rw-r--r--Xcos/blocks/AUTOMAT.py4
-rw-r--r--Xcos/blocks/BITCLEAR.py2
-rw-r--r--Xcos/blocks/BITSET.py2
-rw-r--r--Xcos/blocks/CBLOCK.py2
-rw-r--r--Xcos/blocks/CBLOCK4.py2
-rw-r--r--Xcos/blocks/CLKGotoTagVisibility.py2
-rw-r--r--Xcos/blocks/CLR.py2
-rw-r--r--Xcos/blocks/CONSTRAINT2_c.py2
-rw-r--r--Xcos/blocks/CONSTRAINT_c.py2
-rw-r--r--Xcos/blocks/CONVERT.py2
-rw-r--r--Xcos/blocks/Capacitor.py2
-rw-r--r--Xcos/blocks/ConstantVoltage.py2
-rw-r--r--Xcos/blocks/Counter.py2
-rw-r--r--Xcos/blocks/DEBUG.py2
-rw-r--r--Xcos/blocks/DLR.py2
-rw-r--r--Xcos/blocks/EVTDLY_c.py2
-rw-r--r--Xcos/blocks/EVTGEN_f.py2
-rw-r--r--Xcos/blocks/EXPBLK_m.py2
-rw-r--r--Xcos/blocks/EXPRESSION.py2
-rw-r--r--Xcos/blocks/EXTRACTBITS.py2
-rw-r--r--Xcos/blocks/FROMWSB.py2
-rw-r--r--Xcos/blocks/GotoTagVisibility.py2
-rw-r--r--Xcos/blocks/GotoTagVisibilityMO.py2
-rw-r--r--Xcos/blocks/Inductor.py2
-rw-r--r--Xcos/blocks/Modulo_Count.py2
-rw-r--r--Xcos/blocks/POWBLK_f.py2
-rw-r--r--Xcos/blocks/Resistor.py2
-rw-r--r--Xcos/blocks/SELECT_m.py2
-rw-r--r--Xcos/blocks/SHIFT.py2
-rw-r--r--Xcos/blocks/SWITCH_f.py2
-rw-r--r--Xcos/blocks/SineVoltage.py2
-rw-r--r--Xcos/blocks/TEXT_f.py2
-rw-r--r--Xcos/blocks/TOWS_c.py2
-rw-r--r--Xcos/blocks/VVsourceAC.py2
-rw-r--r--Xcos/blocks/VsourceAC.py2
-rw-r--r--Xcos/blocks/c_block.py2
-rw-r--r--Xcos/blocks/fortran_block.py2
-rw-r--r--Xcos/blocks/generic_block3.py2
-rw-r--r--Xcos/blocks/scifunc_block_m.py2
-rw-r--r--Xcos/common/AAAAAA.py19
-rw-r--r--blocks/blocks/xcosblocks/fixtures/xcosblocks.yaml266
-rw-r--r--blocks/eda-frontend/src/static/style.json39
-rw-r--r--data/XcosPorts.csv228
44 files changed, 442 insertions, 192 deletions
diff --git a/Xcos/blocks/AFFICH_m.py b/Xcos/blocks/AFFICH_m.py
index 227ccd96..668bddf0 100644
--- a/Xcos/blocks/AFFICH_m.py
+++ b/Xcos/blocks/AFFICH_m.py
@@ -15,7 +15,7 @@ def AFFICH_m(outroot, attribid, ordering, geometry, parameters):
def get_from_AFFICH_m(cell):
parameters = getParametersFromExprsNode(cell, TYPE_STRING)
- display_parameter = ''
+ display_parameter = print_affich_m_by_param(parameters[0], parameters[5])
eiv = ''
iiv = ''
diff --git a/Xcos/blocks/AUTOMAT.py b/Xcos/blocks/AUTOMAT.py
index 69007844..34660ff0 100644
--- a/Xcos/blocks/AUTOMAT.py
+++ b/Xcos/blocks/AUTOMAT.py
@@ -14,9 +14,7 @@ def AUTOMAT(outroot, attribid, ordering, geometry, parameters):
def get_from_AUTOMAT(cell):
parameters = getParametersFromExprsNode(cell, TYPE_STRING)
- modes = parameters[0] + ' modes'
- states = parameters[2] + ' states'
- display_parameter = 'Automaton\n' + modes + ' | ' + states
+ display_parameter = parameters[0] + ',' + parameters[2]
eiv = int(float(parameters[0]))
iiv = ''
diff --git a/Xcos/blocks/BITCLEAR.py b/Xcos/blocks/BITCLEAR.py
index 0e0c96e3..e4b45e12 100644
--- a/Xcos/blocks/BITCLEAR.py
+++ b/Xcos/blocks/BITCLEAR.py
@@ -20,7 +20,7 @@ def BITCLEAR(outroot, attribid, ordering, geometry, parameters):
def get_from_BITCLEAR(cell):
parameters = getParametersFromExprsNode(cell, TYPE_STRING)
- display_parameter = ''
+ display_parameter = parameters[1]
eiv = ''
iiv = ''
diff --git a/Xcos/blocks/BITSET.py b/Xcos/blocks/BITSET.py
index 0f088d0a..bf917cfc 100644
--- a/Xcos/blocks/BITSET.py
+++ b/Xcos/blocks/BITSET.py
@@ -20,7 +20,7 @@ def BITSET(outroot, attribid, ordering, geometry, parameters):
def get_from_BITSET(cell):
parameters = getParametersFromExprsNode(cell, TYPE_STRING)
- display_parameter = ''
+ display_parameter = parameters[1]
eiv = ''
iiv = ''
diff --git a/Xcos/blocks/CBLOCK.py b/Xcos/blocks/CBLOCK.py
index f266e3d4..96e350a4 100644
--- a/Xcos/blocks/CBLOCK.py
+++ b/Xcos/blocks/CBLOCK.py
@@ -36,7 +36,7 @@ def CBLOCK(outroot, attribid, ordering, geometry, parameters):
def get_from_CBLOCK(cell):
parameters = getParametersFromExprsNode(cell)
- display_parameter = 'C block 2:\n' + parameters[0]
+ display_parameter = parameters[0]
eiv = ''
iiv = ''
diff --git a/Xcos/blocks/CBLOCK4.py b/Xcos/blocks/CBLOCK4.py
index 937aa046..a333265e 100644
--- a/Xcos/blocks/CBLOCK4.py
+++ b/Xcos/blocks/CBLOCK4.py
@@ -36,7 +36,7 @@ def CBLOCK4(outroot, attribid, ordering, geometry, parameters):
def get_from_CBLOCK4(cell):
parameters = getParametersFromExprsNode(cell)
- display_parameter = 'C block 4:\n' + parameters[0]
+ display_parameter = parameters[0]
eiv = ''
iiv = ''
diff --git a/Xcos/blocks/CLKGotoTagVisibility.py b/Xcos/blocks/CLKGotoTagVisibility.py
index a8c35ba3..125cda84 100644
--- a/Xcos/blocks/CLKGotoTagVisibility.py
+++ b/Xcos/blocks/CLKGotoTagVisibility.py
@@ -14,7 +14,7 @@ def CLKGotoTagVisibility(outroot, attribid, ordering, geometry, parameters):
def get_from_CLKGotoTagVisibility(cell):
parameters = getParametersFromExprsNode(cell, TYPE_STRING)
- display_parameter = '{' + parameters[0] + '}'
+ display_parameter = parameters[0]
eiv = ''
iiv = ''
diff --git a/Xcos/blocks/CLR.py b/Xcos/blocks/CLR.py
index aeb2be02..4b3516a3 100644
--- a/Xcos/blocks/CLR.py
+++ b/Xcos/blocks/CLR.py
@@ -25,7 +25,7 @@ def get_from_CLR(cell):
while v1 != v2:
(v1, v2) = (v2, re.sub(r'\([^()]*\)', r'', v2))
dp2 = '(' + value + ')' if re.search(r'[^ 0-9a-zA-Z^*/]', v2) else value
- display_parameter = dp1 + '/' + dp2
+ display_parameter = dp1 + ',' + dp2
eiv = ''
iiv = ''
diff --git a/Xcos/blocks/CONSTRAINT2_c.py b/Xcos/blocks/CONSTRAINT2_c.py
index dd37e234..b68afdfa 100644
--- a/Xcos/blocks/CONSTRAINT2_c.py
+++ b/Xcos/blocks/CONSTRAINT2_c.py
@@ -15,7 +15,7 @@ def CONSTRAINT2_c(outroot, attribid, ordering, geometry, parameters):
def get_from_CONSTRAINT2_c(cell):
parameters = getParametersFromExprsNode(cell, TYPE_STRING)
- display_parameter = 'x == ' + parameters[0] + '\nx\' == ' + parameters[1]
+ display_parameter = parameters[0] + ',' + parameters[1]
eiv = ''
iiv = ''
diff --git a/Xcos/blocks/CONSTRAINT_c.py b/Xcos/blocks/CONSTRAINT_c.py
index 4afddb79..f9dd9850 100644
--- a/Xcos/blocks/CONSTRAINT_c.py
+++ b/Xcos/blocks/CONSTRAINT_c.py
@@ -15,7 +15,7 @@ def CONSTRAINT_c(outroot, attribid, ordering, geometry, parameters):
def get_from_CONSTRAINT_c(cell):
parameters = getParametersFromExprsNode(cell, TYPE_STRING)
- display_parameter = 'x == ' + parameters[0]
+ display_parameter = parameters[0]
eiv = ''
iiv = ''
diff --git a/Xcos/blocks/CONVERT.py b/Xcos/blocks/CONVERT.py
index f2260cff..927e364d 100644
--- a/Xcos/blocks/CONVERT.py
+++ b/Xcos/blocks/CONVERT.py
@@ -23,7 +23,7 @@ def get_from_CONVERT(cell):
input_type = types[input_t-1]
output_type = types[output_t-1]
- display_parameter = 'CONVERT\n' + input_type + '\n=>\n' + output_type
+ display_parameter = input_type + ',' + output_type
eiv = ''
iiv = ''
diff --git a/Xcos/blocks/Capacitor.py b/Xcos/blocks/Capacitor.py
index 00826737..7d7e006a 100644
--- a/Xcos/blocks/Capacitor.py
+++ b/Xcos/blocks/Capacitor.py
@@ -15,7 +15,7 @@ def Capacitor(outroot, attribid, ordering, geometry, parameters):
def get_from_Capacitor(cell):
parameters = getParametersFromExprsNode(cell, TYPE_STRING)
- display_parameter = si_format(parameters[0]) + 'F'
+ display_parameter = si_format(parameters[0])
eiv = ''
iiv = ''
diff --git a/Xcos/blocks/ConstantVoltage.py b/Xcos/blocks/ConstantVoltage.py
index 0cffa63e..3947dd08 100644
--- a/Xcos/blocks/ConstantVoltage.py
+++ b/Xcos/blocks/ConstantVoltage.py
@@ -14,7 +14,7 @@ def ConstantVoltage(outroot, attribid, ordering, geometry, parameters):
def get_from_ConstantVoltage(cell):
parameters = getParametersFromExprsNode(cell, TYPE_STRING)
- display_parameter = si_format(parameters[0]) + 'V'
+ display_parameter = si_format(parameters[0])
eiv = ''
iiv = ''
diff --git a/Xcos/blocks/Counter.py b/Xcos/blocks/Counter.py
index 5dc9b9d0..74fcaff0 100644
--- a/Xcos/blocks/Counter.py
+++ b/Xcos/blocks/Counter.py
@@ -14,7 +14,7 @@ def Counter(outroot, attribid, ordering, geometry, parameters):
def get_from_Counter(cell):
parameters = getParametersFromExprsNode(cell, TYPE_STRING)
- display_parameter = 'Counter\n' + parameters[0] + " --> " + parameters[1]
+ display_parameter = parameters[0] + ',' + parameters[1]
eiv = ''
iiv = ''
diff --git a/Xcos/blocks/DEBUG.py b/Xcos/blocks/DEBUG.py
index 00a99e52..c6367ae5 100644
--- a/Xcos/blocks/DEBUG.py
+++ b/Xcos/blocks/DEBUG.py
@@ -17,7 +17,7 @@ def DEBUG(outroot, attribid, ordering, geometry, parameters):
def get_from_DEBUG(cell):
parameters = getParametersFromExprsNode(cell)
- display_parameter = 'Debug:\n' + parameters[0].split('\n')[0]
+ display_parameter = parameters[0]
eiv = ''
iiv = ''
diff --git a/Xcos/blocks/DLR.py b/Xcos/blocks/DLR.py
index b08a6b07..6d46f338 100644
--- a/Xcos/blocks/DLR.py
+++ b/Xcos/blocks/DLR.py
@@ -59,7 +59,7 @@ def get_from_DLR(cell):
while v1 != v2:
(v1, v2) = (v2, re.sub(r'\([^()]*\)', r'', v2))
dp2 = '(' + value + ')' if re.search(r'[^ 0-9a-zA-Z^*/]', v2) else value
- display_parameter = dp1 + '/' + dp2
+ display_parameter = dp1 + ',' + dp2
eiv = ''
iiv = ''
diff --git a/Xcos/blocks/EVTDLY_c.py b/Xcos/blocks/EVTDLY_c.py
index 451b4241..0eef3d90 100644
--- a/Xcos/blocks/EVTDLY_c.py
+++ b/Xcos/blocks/EVTDLY_c.py
@@ -14,7 +14,7 @@ def EVTDLY_c(outroot, attribid, ordering, geometry, parameters):
def get_from_EVTDLY_c(cell):
parameters = getParametersFromExprsNode(cell, TYPE_STRING)
- display_parameter = 'Delay: ' + parameters[0]
+ display_parameter = parameters[0]
eiv = ''
iiv = ''
diff --git a/Xcos/blocks/EVTGEN_f.py b/Xcos/blocks/EVTGEN_f.py
index 2408657d..0ba6065d 100644
--- a/Xcos/blocks/EVTGEN_f.py
+++ b/Xcos/blocks/EVTGEN_f.py
@@ -14,7 +14,7 @@ def EVTGEN_f(outroot, attribid, ordering, geometry, parameters):
def get_from_EVTGEN_f(cell):
parameters = getParametersFromExprsNode(cell, TYPE_STRING)
- display_parameter = 'Event at\n time' + parameters[0]
+ display_parameter = parameters[0]
eiv = ''
iiv = ''
diff --git a/Xcos/blocks/EXPBLK_m.py b/Xcos/blocks/EXPBLK_m.py
index 383e37b3..350a62e4 100644
--- a/Xcos/blocks/EXPBLK_m.py
+++ b/Xcos/blocks/EXPBLK_m.py
@@ -15,7 +15,7 @@ def EXPBLK_m(outroot, attribid, ordering, geometry, parameters):
def get_from_EXPBLK_m(cell):
parameters = getParametersFromExprsNode(cell, TYPE_STRING)
- display_parameter = parameters[0] + '^u'
+ display_parameter = parameters[0]
eiv = ''
iiv = ''
diff --git a/Xcos/blocks/EXPRESSION.py b/Xcos/blocks/EXPRESSION.py
index 7951f1e6..532a4557 100644
--- a/Xcos/blocks/EXPRESSION.py
+++ b/Xcos/blocks/EXPRESSION.py
@@ -15,7 +15,7 @@ def EXPRESSION(outroot, attribid, ordering, geometry, parameters):
def get_from_EXPRESSION(cell):
parameters = getParametersFromExprsNode(cell, TYPE_STRING)
- display_parameter = 'Expression:\n' + parameters[1]
+ display_parameter = parameters[1]
eiv = ''
iiv = ''
diff --git a/Xcos/blocks/EXTRACTBITS.py b/Xcos/blocks/EXTRACTBITS.py
index 75f50d72..4a68b253 100644
--- a/Xcos/blocks/EXTRACTBITS.py
+++ b/Xcos/blocks/EXTRACTBITS.py
@@ -35,7 +35,7 @@ def EXTRACTBITS(outroot, attribid, ordering, geometry, parameters):
def get_from_EXTRACTBITS(cell):
parameters = getParametersFromExprsNode(cell, TYPE_STRING)
- display_parameter = 'Extract Bits ' + parameters[1]
+ display_parameter = parameters[1]
eiv = ''
iiv = ''
diff --git a/Xcos/blocks/FROMWSB.py b/Xcos/blocks/FROMWSB.py
index 97d80ec0..5fae91ea 100644
--- a/Xcos/blocks/FROMWSB.py
+++ b/Xcos/blocks/FROMWSB.py
@@ -14,7 +14,7 @@ def FROMWSB(outroot, attribid, ordering, geometry, parameters):
def get_from_FROMWSB(cell):
parameters = getParametersFromExprsNode(cell, TYPE_DOUBLE)
- display_parameter = 'From workspace\n [ ' + parameters[0] + ' ]'
+ display_parameter = parameters[0]
eiv = ''
iiv = ''
diff --git a/Xcos/blocks/GotoTagVisibility.py b/Xcos/blocks/GotoTagVisibility.py
index 02fcdbf2..b6a1efc6 100644
--- a/Xcos/blocks/GotoTagVisibility.py
+++ b/Xcos/blocks/GotoTagVisibility.py
@@ -14,7 +14,7 @@ def GotoTagVisibility(outroot, attribid, ordering, geometry, parameters):
def get_from_GotoTagVisibility(cell):
parameters = getParametersFromExprsNode(cell, TYPE_STRING)
- display_parameter = '{' + parameters[0] + '}'
+ display_parameter = parameters[0]
eiv = ''
iiv = ''
diff --git a/Xcos/blocks/GotoTagVisibilityMO.py b/Xcos/blocks/GotoTagVisibilityMO.py
index 5aecc5e8..6f2fd163 100644
--- a/Xcos/blocks/GotoTagVisibilityMO.py
+++ b/Xcos/blocks/GotoTagVisibilityMO.py
@@ -14,7 +14,7 @@ def GotoTagVisibilityMO(outroot, attribid, ordering, geometry, parameters):
def get_from_GotoTagVisibilityMO(cell):
parameters = getParametersFromExprsNode(cell, TYPE_STRING)
- display_parameter = '{' + parameters[0] + '}'
+ display_parameter = parameters[0]
eiv = ''
iiv = ''
diff --git a/Xcos/blocks/Inductor.py b/Xcos/blocks/Inductor.py
index 54ececd7..5e252147 100644
--- a/Xcos/blocks/Inductor.py
+++ b/Xcos/blocks/Inductor.py
@@ -15,7 +15,7 @@ def Inductor(outroot, attribid, ordering, geometry, parameters):
def get_from_Inductor(cell):
parameters = getParametersFromExprsNode(cell, TYPE_STRING)
- display_parameter = si_format(parameters[0]) + 'H'
+ display_parameter = si_format(parameters[0])
eiv = ''
iiv = ''
diff --git a/Xcos/blocks/Modulo_Count.py b/Xcos/blocks/Modulo_Count.py
index 78ce61db..317725c5 100644
--- a/Xcos/blocks/Modulo_Count.py
+++ b/Xcos/blocks/Modulo_Count.py
@@ -14,7 +14,7 @@ def Modulo_Count(outroot, attribid, ordering, geometry, parameters):
def get_from_Modulo_Count(cell):
parameters = getParametersFromExprsNode(cell, TYPE_STRING)
- display_parameter = 'Counter\nModulo ' + parameters[1]
+ display_parameter = parameters[1]
eiv = ''
iiv = ''
diff --git a/Xcos/blocks/POWBLK_f.py b/Xcos/blocks/POWBLK_f.py
index 2236493c..783a6e71 100644
--- a/Xcos/blocks/POWBLK_f.py
+++ b/Xcos/blocks/POWBLK_f.py
@@ -15,7 +15,7 @@ def POWBLK_f(outroot, attribid, ordering, geometry, parameters):
def get_from_POWBLK_f(cell):
parameters = getParametersFromExprsNode(cell, TYPE_STRING)
- display_parameter = 'u ^ ' + parameters[0]
+ display_parameter = parameters[0]
eiv = ''
iiv = ''
diff --git a/Xcos/blocks/Resistor.py b/Xcos/blocks/Resistor.py
index a9586b49..98743b7f 100644
--- a/Xcos/blocks/Resistor.py
+++ b/Xcos/blocks/Resistor.py
@@ -15,7 +15,7 @@ def Resistor(outroot, attribid, ordering, geometry, parameters):
def get_from_Resistor(cell):
parameters = getParametersFromExprsNode(cell, TYPE_STRING)
- display_parameter = si_format(parameters[0]) + 'Ω'
+ display_parameter = si_format(parameters[0])
eiv = ''
iiv = ''
diff --git a/Xcos/blocks/SELECT_m.py b/Xcos/blocks/SELECT_m.py
index d2955cbe..169b607a 100644
--- a/Xcos/blocks/SELECT_m.py
+++ b/Xcos/blocks/SELECT_m.py
@@ -15,7 +15,7 @@ def SELECT_m(outroot, attribid, ordering, geometry, parameters):
def get_from_SELECT_m(cell):
parameters = getParametersFromExprsNode(cell, TYPE_STRING)
- display_parameter = ''
+ display_parameter = parameters[10]
eiv = int(float(parameters[1]))
iiv = ''
diff --git a/Xcos/blocks/SHIFT.py b/Xcos/blocks/SHIFT.py
index 7bd106a1..f2474766 100644
--- a/Xcos/blocks/SHIFT.py
+++ b/Xcos/blocks/SHIFT.py
@@ -32,7 +32,7 @@ def SHIFT(outroot, attribid, ordering, geometry, parameters):
def get_from_SHIFT(cell):
parameters = getParametersFromExprsNode(cell, TYPE_STRING)
- display_parameter = 'Arithmetic\nshift ' + parameters[1]
+ display_parameter = parameters[1]
eiv = ''
iiv = ''
diff --git a/Xcos/blocks/SWITCH_f.py b/Xcos/blocks/SWITCH_f.py
index f99728e8..c11fc501 100644
--- a/Xcos/blocks/SWITCH_f.py
+++ b/Xcos/blocks/SWITCH_f.py
@@ -16,7 +16,7 @@ def SWITCH_f(outroot, attribid, ordering, geometry, parameters):
def get_from_SWITCH_f(cell):
parameters = getParametersFromExprsNode(cell, TYPE_STRING)
- display_parameter = 'Static: ' + parameters[1]
+ display_parameter = parameters[1]
eiv = int(float(parameters[0]))
iiv = ''
diff --git a/Xcos/blocks/SineVoltage.py b/Xcos/blocks/SineVoltage.py
index 2087ceca..3aefffb4 100644
--- a/Xcos/blocks/SineVoltage.py
+++ b/Xcos/blocks/SineVoltage.py
@@ -15,7 +15,7 @@ def SineVoltage(outroot, attribid, ordering, geometry, parameters):
def get_from_SineVoltage(cell):
parameters = getParametersFromExprsNode(cell, TYPE_STRING)
- display_parameter = parameters[0] + ' V\n'+'~ ' + parameters[0]
+ display_parameter = parameters[0] + ',' + parameters[0]
eiv = ''
iiv = ''
diff --git a/Xcos/blocks/TEXT_f.py b/Xcos/blocks/TEXT_f.py
index dc1c22c3..b5ebe269 100644
--- a/Xcos/blocks/TEXT_f.py
+++ b/Xcos/blocks/TEXT_f.py
@@ -13,7 +13,7 @@ def TEXT_f(outroot, attribid, ordering, geometry, parameters):
def get_from_TEXT_f(cell):
parameters = [cell.attrib['value']]
- display_parameter = ''
+ display_parameter = parameters[0]
eiv = ''
iiv = ''
diff --git a/Xcos/blocks/TOWS_c.py b/Xcos/blocks/TOWS_c.py
index 617a1760..f8dcf456 100644
--- a/Xcos/blocks/TOWS_c.py
+++ b/Xcos/blocks/TOWS_c.py
@@ -21,7 +21,7 @@ def TOWS_c(outroot, attribid, ordering, geometry, parameters):
def get_from_TOWS_c(cell):
parameters = getParametersFromExprsNode(cell, TYPE_STRING)
- display_parameter = 'To workspace\n'+parameters[1]+' ['+parameters[0]+']'
+ display_parameter = parameters[1] + ',' + parameters[0]
eiv = ''
iiv = ''
diff --git a/Xcos/blocks/VVsourceAC.py b/Xcos/blocks/VVsourceAC.py
index 83fecb8f..1b7ca050 100644
--- a/Xcos/blocks/VVsourceAC.py
+++ b/Xcos/blocks/VVsourceAC.py
@@ -15,7 +15,7 @@ def VVsourceAC(outroot, attribid, ordering, geometry, parameters):
def get_from_VVsourceAC(cell):
parameters = getParametersFromExprsNode(cell, TYPE_STRING)
- display_parameter = '1 V\n~ ' + parameters[0]
+ display_parameter = parameters[0]
eiv = ''
iiv = ''
diff --git a/Xcos/blocks/VsourceAC.py b/Xcos/blocks/VsourceAC.py
index ea8733ca..82b79d56 100644
--- a/Xcos/blocks/VsourceAC.py
+++ b/Xcos/blocks/VsourceAC.py
@@ -15,7 +15,7 @@ def VsourceAC(outroot, attribid, ordering, geometry, parameters):
def get_from_VsourceAC(cell):
parameters = getParametersFromExprsNode(cell, TYPE_STRING)
- display_parameter = parameters[0] + ' V\n'+'~ ' + parameters[1]
+ display_parameter = parameters[0] + ',' + parameters[1]
eiv = ''
iiv = ''
diff --git a/Xcos/blocks/c_block.py b/Xcos/blocks/c_block.py
index 520e41b5..77e39a1c 100644
--- a/Xcos/blocks/c_block.py
+++ b/Xcos/blocks/c_block.py
@@ -18,7 +18,7 @@ def c_block(outroot, attribid, ordering, geometry, parameters):
def get_from_c_block(cell):
parameters = getParametersFromExprsNode(cell)
- display_parameter = 'C block:\n' + parameters[3]
+ display_parameter = parameters[3]
eiv = ''
iiv = ''
diff --git a/Xcos/blocks/fortran_block.py b/Xcos/blocks/fortran_block.py
index 4275fa9d..de1ecb83 100644
--- a/Xcos/blocks/fortran_block.py
+++ b/Xcos/blocks/fortran_block.py
@@ -18,7 +18,7 @@ def fortran_block(outroot, attribid, ordering, geometry, parameters):
def get_from_fortran_block(cell):
parameters = getParametersFromExprsNode(cell)
- display_parameter = 'Fortran block:\n' + parameters[3]
+ display_parameter = parameters[3]
eiv = ''
iiv = ''
diff --git a/Xcos/blocks/generic_block3.py b/Xcos/blocks/generic_block3.py
index 541e57c6..93c1cda5 100644
--- a/Xcos/blocks/generic_block3.py
+++ b/Xcos/blocks/generic_block3.py
@@ -26,7 +26,7 @@ def generic_block3(outroot, attribid, ordering, geometry, parameters):
def get_from_generic_block3(cell):
parameters = getParametersFromExprsNode(cell, TYPE_STRING)
- display_parameter = 'native block:\n' + parameters[0]
+ display_parameter = parameters[0]
eiv = ''
iiv = ''
diff --git a/Xcos/blocks/scifunc_block_m.py b/Xcos/blocks/scifunc_block_m.py
index b9846052..7ae44d86 100644
--- a/Xcos/blocks/scifunc_block_m.py
+++ b/Xcos/blocks/scifunc_block_m.py
@@ -14,7 +14,7 @@ def scifunc_block_m(outroot, attribid, ordering, geometry, parameters):
def get_from_scifunc_block_m(cell):
parameters = getParametersFromExprsNode(cell, TYPE_STRING)
- display_parameter = ''
+ display_parameter = parameters[10]
eiv = ''
iiv = ''
diff --git a/Xcos/common/AAAAAA.py b/Xcos/common/AAAAAA.py
index 8a522150..fa6fa2ef 100644
--- a/Xcos/common/AAAAAA.py
+++ b/Xcos/common/AAAAAA.py
@@ -179,3 +179,22 @@ def si_format(num):
if exp >= p.get(LOWER_LIMIT) and exp <= p.get(UPPER_LIMIT):
return str(round(number/p.get(VALUE)))+' '+p.get(SIGN)
+
+def print_affich_m(rows, columns, prec):
+ s = '<TABLE>'
+ for i in range(rows):
+ s += '<TR>'
+ for j in range(columns):
+ s += '<TD>{:.{prec}f}</TD>'.format(0.0, prec=prec)
+ s += '</TR>'
+ s += '</TABLE>'
+ return s
+
+
+def print_affich_m_by_param(p0, p5):
+ s = re.sub(r' *[\[\]] *', r'', p0)
+ rc = re.split(' *[;,] *', s)
+ rows = int(rc[0])
+ columns = int(rc[1])
+ prec = int(p5)
+ return print_affich_m(rows, columns, prec)
diff --git a/blocks/blocks/xcosblocks/fixtures/xcosblocks.yaml b/blocks/blocks/xcosblocks/fixtures/xcosblocks.yaml
index f56ff724..e429d240 100644
--- a/blocks/blocks/xcosblocks/fixtures/xcosblocks.yaml
+++ b/blocks/blocks/xcosblocks/fixtures/xcosblocks.yaml
@@ -574,7 +574,7 @@
blockprefix: 1
main_category: 2
block_name: CLR
- initial_display_parameter: 1/(1+s)
+ initial_display_parameter: 1,1+s
block_image_path: palettes/CLR.png
block_width: 60
block_height: 40
@@ -647,7 +647,7 @@
blockprefix: 1
main_category: 2
block_name: CLSS
- initial_display_parameter: xd = Ax+ Bu, y = Cx + Du
+ initial_display_parameter: ''
block_image_path: palettes/CLSS.png
block_width: 80
block_height: 40
@@ -720,7 +720,7 @@
blockprefix: 1
main_category: 2
block_name: DERIV
- initial_display_parameter: du/dt
+ initial_display_parameter: ''
block_image_path: palettes/DERIV.png
block_width: 40
block_height: 40
@@ -793,7 +793,7 @@
blockprefix: 1
main_category: 2
block_name: INTEGRAL_f
- initial_display_parameter: 1/s
+ initial_display_parameter: ''
block_image_path: palettes/INTEGRAL_f.png
block_width: 40
block_height: 40
@@ -940,7 +940,7 @@
blockprefix: 1
main_category: 2
block_name: PDE
- initial_display_parameter: PDE
+ initial_display_parameter: ''
block_image_path: palettes/PDE.png
block_width: 60
block_height: 60
@@ -1014,7 +1014,7 @@
blockprefix: 1
main_category: 2
block_name: PID
- initial_display_parameter: PID
+ initial_display_parameter: ''
block_image_path: palettes/PID.png
block_width: 40
block_height: 40
@@ -1087,7 +1087,7 @@
blockprefix: 1
main_category: 2
block_name: TCLSS
- initial_display_parameter: Jump (A,B,C,D)
+ initial_display_parameter: ''
block_image_path: palettes/TCLSS.png
block_width: 60
block_height: 40
@@ -1161,7 +1161,7 @@
blockprefix: 1
main_category: 2
block_name: TIME_DELAY
- initial_display_parameter: Continuous fix delay
+ initial_display_parameter: ''
block_image_path: palettes/TIME_DELAY.png
block_width: 70
block_height: 40
@@ -1234,7 +1234,7 @@
blockprefix: 1
main_category: 2
block_name: VARIABLE_DELAY
- initial_display_parameter: Variable Delay
+ initial_display_parameter: ''
block_image_path: palettes/VARIABLE_DELAY.png
block_width: 60
block_height: 40
@@ -1307,7 +1307,7 @@
blockprefix: 1
main_category: 3
block_name: BACKLASH
- initial_display_parameter: Backlash
+ initial_display_parameter: ''
block_image_path: palettes/BACKLASH.png
block_width: 60
block_height: 40
@@ -1600,7 +1600,7 @@
blockprefix: 1
main_category: 3
block_name: RATELIMITER
- initial_display_parameter: Rate limiter
+ initial_display_parameter: ''
block_image_path: palettes/RATELIMITER.png
block_width: 70
block_height: 40
@@ -1747,7 +1747,7 @@
blockprefix: 1
main_category: 4
block_name: AUTOMAT
- initial_display_parameter: Automaton nM=2, nX=1
+ initial_display_parameter: 2,1
block_image_path: palettes/AUTOMAT.png
block_width: 80
block_height: 40
@@ -1820,7 +1820,7 @@
blockprefix: 1
main_category: 4
block_name: DELAY_f
- initial_display_parameter: Delay
+ initial_display_parameter: ''
block_image_path: palettes/DELAY_f.png
block_width: 40
block_height: 40
@@ -1893,7 +1893,7 @@
blockprefix: 1
main_category: 3
block_name: DELAYV_f
- initial_display_parameter: Variable delay
+ initial_display_parameter: ''
block_image_path: palettes/DELAYV_f.png
block_width: 60
block_height: 40
@@ -1967,7 +1967,7 @@
blockprefix: 1
main_category: 4
block_name: DLR
- initial_display_parameter: 1/(1+z)
+ initial_display_parameter: 1,1+z
block_image_path: palettes/DLR.png
block_width: 60
block_height: 40
@@ -2040,7 +2040,7 @@
blockprefix: 1
main_category: 4
block_name: DLRADAPT_f
- initial_display_parameter: N (z,p)/D (z,p)
+ initial_display_parameter: ''
block_image_path: palettes/DLRADAPT_f.png
block_width: 40
block_height: 40
@@ -2113,7 +2113,7 @@
blockprefix: 1
main_category: 4
block_name: DLSS
- initial_display_parameter: x = Ax+Bu, y = Cx+Du
+ initial_display_parameter: ''
block_image_path: palettes/DLSS.png
block_width: 80
block_height: 40
@@ -2186,7 +2186,7 @@
blockprefix: 1
main_category: 4
block_name: DOLLAR
- initial_display_parameter: 1/z
+ initial_display_parameter: ''
block_image_path: palettes/DOLLAR.png
block_width: 40
block_height: 40
@@ -2259,7 +2259,7 @@
blockprefix: 1
main_category: 4
block_name: DOLLAR_f
- initial_display_parameter: 1/z
+ initial_display_parameter: ''
block_image_path: palettes/DOLLAR_f.png
block_width: 40
block_height: 40
@@ -2333,7 +2333,7 @@
blockprefix: 1
main_category: 4
block_name: DOLLAR_m
- initial_display_parameter: 1/z
+ initial_display_parameter: ''
block_image_path: palettes/DOLLAR_m.png
block_width: 40
block_height: 40
@@ -2406,7 +2406,7 @@
blockprefix: 1
main_category: 4
block_name: REGISTER
- initial_display_parameter: Shift register
+ initial_display_parameter: ''
block_image_path: palettes/REGISTER.png
block_width: 60
block_height: 40
@@ -2479,7 +2479,7 @@
blockprefix: 1
main_category: 4
block_name: SAMPHOLD_m
- initial_display_parameter: S / H
+ initial_display_parameter: ''
block_image_path: palettes/SAMPHOLD_m.png
block_width: 40
block_height: 40
@@ -2553,7 +2553,7 @@
blockprefix: 1
main_category: 5
block_name: INTRP2BLK_f
- initial_display_parameter: Interp 2
+ initial_display_parameter: ''
block_image_path: palettes/INTRP2BLK_f.png
block_width: 60
block_height: 40
@@ -2626,7 +2626,7 @@
blockprefix: 1
main_category: 5
block_name: INTRPLBLK_f
- initial_display_parameter: Interp
+ initial_display_parameter: ''
block_image_path: palettes/INTRPLBLK_f.png
block_width: 40
block_height: 40
@@ -2992,7 +2992,7 @@
blockprefix: 1
main_category: 6
block_name: CLKGotoTagVisibility
- initial_display_parameter: '{A}'
+ initial_display_parameter: A
block_image_path: palettes/CLKGotoTagVisibility.png
block_width: 40
block_height: 40
@@ -3138,7 +3138,7 @@
blockprefix: 1
main_category: 6
block_name: EDGE_TRIGGER
- initial_display_parameter: Edge tigger
+ initial_display_parameter: ''
block_image_path: palettes/EDGE_TRIGGER.png
block_width: 60
block_height: 40
@@ -3211,7 +3211,7 @@
blockprefix: 1
main_category: 6
block_name: END_c
- initial_display_parameter: END
+ initial_display_parameter: ''
block_image_path: palettes/END_c.png
block_width: 40
block_height: 40
@@ -3285,7 +3285,7 @@
blockprefix: 1
main_category: 6
block_name: ENDBLK
- initial_display_parameter: END
+ initial_display_parameter: ''
block_image_path: palettes/ENDBLK.png
block_width: 40
block_height: 40
@@ -3359,7 +3359,7 @@
blockprefix: 1
main_category: 6
block_name: ESELECT_f
- initial_display_parameter: Event select
+ initial_display_parameter: ''
block_image_path: palettes/ESELECT_f.png
block_width: 80
block_height: 40
@@ -3432,7 +3432,7 @@
blockprefix: 1
main_category: 6
block_name: EVTDLY_c
- initial_display_parameter: 'Delay: 0.1'
+ initial_display_parameter: '0.1'
block_image_path: palettes/EVTDLY_c.png
block_width: 60
block_height: 40
@@ -3505,7 +3505,7 @@
blockprefix: 1
main_category: 6
block_name: EVTGEN_f
- initial_display_parameter: Event at time 0
+ initial_display_parameter: '0'
block_image_path: palettes/EVTGEN_f.png
block_width: 60
block_height: 40
@@ -3578,7 +3578,7 @@
blockprefix: 1
main_category: 6
block_name: EVTVARDLY
- initial_display_parameter: Event delay
+ initial_display_parameter: ''
block_image_path: palettes/EVTVARDLY.png
block_width: 60
block_height: 40
@@ -3651,7 +3651,7 @@
blockprefix: 1
main_category: 6
block_name: Extract_Activation
- initial_display_parameter: Extract Activation
+ initial_display_parameter: ''
block_image_path: palettes/Extract_Activation.png
block_width: 60
block_height: 40
@@ -3724,7 +3724,7 @@
blockprefix: 1
main_category: 6
block_name: freq_div
- initial_display_parameter: Frequency division
+ initial_display_parameter: ''
block_image_path: palettes/freq_div.png
block_width: 60
block_height: 40
@@ -3797,7 +3797,7 @@
blockprefix: 1
main_category: 6
block_name: HALT_f
- initial_display_parameter: HALT
+ initial_display_parameter: ''
block_image_path: palettes/HALT_f.png
block_width: 40
block_height: 40
@@ -3871,7 +3871,7 @@
blockprefix: 1
main_category: 6
block_name: IFTHEL_f
- initial_display_parameter: if n>0 then else
+ initial_display_parameter: ''
block_image_path: palettes/IFTHEL_f.png
block_width: 60
block_height: 60
@@ -3944,7 +3944,7 @@
blockprefix: 1
main_category: 6
block_name: M_freq
- initial_display_parameter: Multiple frequency
+ initial_display_parameter: ''
block_image_path: palettes/M_freq.png
block_width: 60
block_height: 40
@@ -4017,7 +4017,7 @@
blockprefix: 1
main_category: 6
block_name: MCLOCK_f
- initial_display_parameter: 2freq clock f/n f
+ initial_display_parameter: ''
block_image_path: palettes/MCLOCK_f.png
block_width: 60
block_height: 40
@@ -4090,7 +4090,7 @@
blockprefix: 1
main_category: 6
block_name: MFCLCK_f
- initial_display_parameter: M. freq clock
+ initial_display_parameter: ''
block_image_path: palettes/MFCLCK_f.png
block_width: 60
block_height: 40
@@ -4236,7 +4236,7 @@
blockprefix: 1
main_category: 7
block_name: ABS_VALUE
- initial_display_parameter: ABS
+ initial_display_parameter: ''
block_image_path: palettes/ABS_VALUE.png
block_width: 40
block_height: 40
@@ -4383,7 +4383,7 @@
blockprefix: 1
main_category: 7
block_name: COSBLK_f
- initial_display_parameter: cos
+ initial_display_parameter: ''
block_image_path: palettes/COSBLK_f.png
block_width: 40
block_height: 40
@@ -4456,7 +4456,7 @@
blockprefix: 1
main_category: 7
block_name: EXPBLK_m
- initial_display_parameter: a^u
+ initial_display_parameter: '%e'
block_image_path: palettes/EXPBLK_m.png
block_width: 40
block_height: 40
@@ -4748,7 +4748,7 @@
blockprefix: 1
main_category: 7
block_name: INVBLK
- initial_display_parameter: 1/u
+ initial_display_parameter: ''
block_image_path: palettes/INVBLK.png
block_width: 40
block_height: 40
@@ -4821,7 +4821,7 @@
blockprefix: 1
main_category: 7
block_name: LOGBLK_f
- initial_display_parameter: LOG
+ initial_display_parameter: ''
block_image_path: palettes/LOGBLK_f.png
block_width: 40
block_height: 40
@@ -4894,7 +4894,7 @@
blockprefix: 1
main_category: 7
block_name: MAX_f
- initial_display_parameter: MAX
+ initial_display_parameter: ''
block_image_path: palettes/MAX_f.png
block_width: 40
block_height: 40
@@ -5040,7 +5040,7 @@
blockprefix: 1
main_category: 7
block_name: MIN_f
- initial_display_parameter: MIN
+ initial_display_parameter: ''
block_image_path: palettes/MIN_f.png
block_width: 40
block_height: 40
@@ -5113,7 +5113,7 @@
blockprefix: 1
main_category: 7
block_name: POWBLK_f
- initial_display_parameter: u ^ a
+ initial_display_parameter: '1.5'
block_image_path: palettes/POWBLK_f.png
block_width: 40
block_height: 40
@@ -5333,7 +5333,7 @@
blockprefix: 1
main_category: 7
block_name: SIGNUM
- initial_display_parameter: SIGN
+ initial_display_parameter: ''
block_image_path: palettes/SIGNUM.png
block_width: 40
block_height: 40
@@ -5406,7 +5406,7 @@
blockprefix: 1
main_category: 7
block_name: SINBLK_f
- initial_display_parameter: SIN
+ initial_display_parameter: ''
block_image_path: palettes/SINBLK_f.png
block_width: 40
block_height: 40
@@ -5698,7 +5698,7 @@
blockprefix: 1
main_category: 7
block_name: TANBLK_f
- initial_display_parameter: TAN
+ initial_display_parameter: ''
block_image_path: palettes/TANBLK_f.png
block_width: 40
block_height: 40
@@ -5771,7 +5771,7 @@
blockprefix: 1
main_category: 7
block_name: TrigFun
- initial_display_parameter: Trig function
+ initial_display_parameter: sin
block_image_path: palettes/TrigFun.png
block_width: 80
block_height: 40
@@ -5844,7 +5844,7 @@
blockprefix: 1
main_category: 8
block_name: CUMSUM
- initial_display_parameter: CUMSUM
+ initial_display_parameter: ''
block_image_path: palettes/CUMSUM.png
block_width: 60
block_height: 40
@@ -5917,7 +5917,7 @@
blockprefix: 1
main_category: 8
block_name: EXTRACT
- initial_display_parameter: EXTRACT
+ initial_display_parameter: ''
block_image_path: palettes/EXTRACT.png
block_width: 60
block_height: 40
@@ -5990,7 +5990,7 @@
blockprefix: 1
main_category: 8
block_name: EXTTRI
- initial_display_parameter: Tri/Diag Extraction
+ initial_display_parameter: ''
block_image_path: palettes/EXTTRI.png
block_width: 60
block_height: 40
@@ -6063,7 +6063,7 @@
blockprefix: 1
main_category: 8
block_name: MATBKSL
- initial_display_parameter: AB
+ initial_display_parameter: ''
block_image_path: palettes/MATBKSL.png
block_width: 40
block_height: 40
@@ -6136,7 +6136,7 @@
blockprefix: 1
main_category: 8
block_name: MATCATH
- initial_display_parameter: Horiz cat
+ initial_display_parameter: ''
block_image_path: palettes/MATCATH.png
block_width: 40
block_height: 60
@@ -6209,7 +6209,7 @@
blockprefix: 1
main_category: 8
block_name: MATCATV
- initial_display_parameter: Vert Cat
+ initial_display_parameter: ''
block_image_path: palettes/MATCATV.png
block_width: 40
block_height: 60
@@ -6282,7 +6282,7 @@
blockprefix: 1
main_category: 8
block_name: MATDET
- initial_display_parameter: DET
+ initial_display_parameter: ''
block_image_path: palettes/MATDET.png
block_width: 40
block_height: 40
@@ -6355,7 +6355,7 @@
blockprefix: 1
main_category: 8
block_name: MATDIAG
- initial_display_parameter: DIAG
+ initial_display_parameter: ''
block_image_path: palettes/MATDIAG.png
block_width: 40
block_height: 40
@@ -6428,7 +6428,7 @@
blockprefix: 1
main_category: 8
block_name: MATDIV
- initial_display_parameter: A/B
+ initial_display_parameter: ''
block_image_path: palettes/MATDIV.png
block_width: 40
block_height: 40
@@ -6501,7 +6501,7 @@
blockprefix: 1
main_category: 8
block_name: MATEIG
- initial_display_parameter: EIG
+ initial_display_parameter: ''
block_image_path: palettes/MATEIG.png
block_width: 40
block_height: 40
@@ -6574,7 +6574,7 @@
blockprefix: 1
main_category: 8
block_name: MATEXPM
- initial_display_parameter: EXPM
+ initial_display_parameter: ''
block_image_path: palettes/MATEXPM.png
block_width: 40
block_height: 40
@@ -6647,7 +6647,7 @@
blockprefix: 1
main_category: 8
block_name: MATINV
- initial_display_parameter: INV
+ initial_display_parameter: ''
block_image_path: palettes/MATINV.png
block_width: 40
block_height: 40
@@ -6720,7 +6720,7 @@
blockprefix: 1
main_category: 8
block_name: MATLU
- initial_display_parameter: LU
+ initial_display_parameter: ''
block_image_path: palettes/MATLU.png
block_width: 40
block_height: 40
@@ -6793,7 +6793,7 @@
blockprefix: 1
main_category: 7
block_name: MATMAGPHI
- initial_display_parameter: Mag & Phi
+ initial_display_parameter: ''
block_image_path: palettes/MATMAGPHI.png
block_width: 60
block_height: 40
@@ -6867,7 +6867,7 @@
blockprefix: 1
main_category: 8
block_name: MATMUL
- initial_display_parameter: MATMUL
+ initial_display_parameter: ''
block_image_path: palettes/MATMUL.png
block_width: 60
block_height: 40
@@ -6940,7 +6940,7 @@
blockprefix: 1
main_category: 8
block_name: MATPINV
- initial_display_parameter: PINV
+ initial_display_parameter: ''
block_image_path: palettes/MATPINV.png
block_width: 40
block_height: 40
@@ -7013,7 +7013,7 @@
blockprefix: 1
main_category: 8
block_name: MATRESH
- initial_display_parameter: RESHAPE
+ initial_display_parameter: ''
block_image_path: palettes/MATRESH.png
block_width: 60
block_height: 40
@@ -7086,7 +7086,7 @@
blockprefix: 1
main_category: 8
block_name: MATSING
- initial_display_parameter: SVD
+ initial_display_parameter: ''
block_image_path: palettes/MATSING.png
block_width: 40
block_height: 40
@@ -7159,7 +7159,7 @@
blockprefix: 1
main_category: 8
block_name: MATSUM
- initial_display_parameter: MATSUM
+ initial_display_parameter: ''
block_image_path: palettes/MATSUM.png
block_width: 60
block_height: 40
@@ -7232,7 +7232,7 @@
blockprefix: 1
main_category: 8
block_name: MATTRAN
- initial_display_parameter: MATTRAN
+ initial_display_parameter: ''
block_image_path: palettes/MATTRAN.png
block_width: 60
block_height: 40
@@ -7305,7 +7305,7 @@
blockprefix: 1
main_category: 8
block_name: MATZCONJ
- initial_display_parameter: CONJ
+ initial_display_parameter: ''
block_image_path: palettes/MATZCONJ.png
block_width: 40
block_height: 40
@@ -7378,7 +7378,7 @@
blockprefix: 1
main_category: 7
block_name: MATZREIM
- initial_display_parameter: Re & Im
+ initial_display_parameter: ''
block_image_path: palettes/MATZREIM.png
block_width: 60
block_height: 40
@@ -7452,7 +7452,7 @@
blockprefix: 1
main_category: 8
block_name: RICC
- initial_display_parameter: RICC
+ initial_display_parameter: ''
block_image_path: palettes/RICC.png
block_width: 40
block_height: 40
@@ -7525,7 +7525,7 @@
blockprefix: 1
main_category: 8
block_name: ROOTCOEF
- initial_display_parameter: ROOT COEF
+ initial_display_parameter: ''
block_image_path: palettes/ROOTCOEF.png
block_width: 60
block_height: 40
@@ -7598,7 +7598,7 @@
blockprefix: 1
main_category: 7
block_name: SQRT
- initial_display_parameter: SQRT
+ initial_display_parameter: ''
block_image_path: palettes/SQRT.png
block_width: 40
block_height: 40
@@ -7672,7 +7672,7 @@
blockprefix: 1
main_category: 8
block_name: SUBMAT
- initial_display_parameter: SUBMAT
+ initial_display_parameter: ''
block_image_path: palettes/SUBMAT.png
block_width: 50
block_height: 40
@@ -7745,7 +7745,7 @@
blockprefix: 1
main_category: 9
block_name: Capacitor
- initial_display_parameter: ''
+ initial_display_parameter: 10 m
block_image_path: palettes/Capacitor.png
block_width: 40
block_height: 22
@@ -7891,7 +7891,7 @@
blockprefix: 1
main_category: 9
block_name: ConstantVoltage
- initial_display_parameter: ''
+ initial_display_parameter: 10 m
block_image_path: palettes/ConstantVoltage.png
block_width: 30
block_height: 22
@@ -8402,7 +8402,7 @@
blockprefix: 1
main_category: 9
block_name: Inductor
- initial_display_parameter: ''
+ initial_display_parameter: 10 μ
block_image_path: palettes/Inductor.png
block_width: 40
block_height: 18
@@ -8913,7 +8913,7 @@
blockprefix: 1
main_category: 9
block_name: Resistor
- initial_display_parameter: ''
+ initial_display_parameter: 10 m
block_image_path: palettes/Resistor.png
block_width: 40
block_height: 20
@@ -8986,7 +8986,7 @@
blockprefix: 1
main_category: 9
block_name: SineVoltage
- initial_display_parameter: 1 V
+ initial_display_parameter: 1,1
block_image_path: palettes/SineVoltage.png
block_width: 40
block_height: 40
@@ -9278,7 +9278,7 @@
blockprefix: 1
main_category: 9
block_name: VsourceAC
- initial_display_parameter: 220 V ~50
+ initial_display_parameter: 220,50
block_image_path: palettes/VsourceAC.png
block_width: 40
block_height: 40
@@ -9351,7 +9351,7 @@
blockprefix: 1
main_category: 9
block_name: VVsourceAC
- initial_display_parameter: 1 V ~ 20
+ initial_display_parameter: '50'
block_image_path: palettes/VVsourceAC.png
block_width: 40
block_height: 40
@@ -9424,7 +9424,7 @@
blockprefix: 1
main_category: 10
block_name: BITCLEAR
- initial_display_parameter: Clear bit 0
+ initial_display_parameter: '0'
block_image_path: palettes/BITCLEAR.png
block_width: 80
block_height: 40
@@ -9497,7 +9497,7 @@
blockprefix: 1
main_category: 10
block_name: BITSET
- initial_display_parameter: Set bit 0
+ initial_display_parameter: '0'
block_image_path: palettes/BITSET.png
block_width: 80
block_height: 40
@@ -9570,7 +9570,7 @@
blockprefix: 1
main_category: 10
block_name: CONVERT
- initial_display_parameter: Convert to
+ initial_display_parameter: decim,int32
block_image_path: palettes/CONVERT.png
block_width: 60
block_height: 40
@@ -9790,7 +9790,7 @@
blockprefix: 1
main_category: 10
block_name: EXTRACTBITS
- initial_display_parameter: Extract Bits 1
+ initial_display_parameter: '1'
block_image_path: palettes/EXTRACTBITS.png
block_width: 80
block_height: 40
@@ -9863,7 +9863,7 @@
blockprefix: 1
main_category: 10
block_name: INTMUL
- initial_display_parameter: INTMUL
+ initial_display_parameter: ''
block_image_path: palettes/INTMUL.png
block_width: 40
block_height: 40
@@ -10009,7 +10009,7 @@
blockprefix: 1
main_category: 10
block_name: LOGIC
- initial_display_parameter: LOGIC
+ initial_display_parameter: ''
block_image_path: palettes/LOGIC.png
block_width: 40
block_height: 40
@@ -10082,7 +10082,7 @@
blockprefix: 1
main_category: 10
block_name: SHIFT
- initial_display_parameter: Arithmetic shift 0
+ initial_display_parameter: '0'
block_image_path: palettes/SHIFT.png
block_width: 60
block_height: 40
@@ -10155,7 +10155,7 @@
blockprefix: 1
main_category: 10
block_name: SRFLIPFLOP
- initial_display_parameter: S Q, R !Q
+ initial_display_parameter: ''
block_image_path: palettes/SRFLIPFLOP.png
block_width: 40
block_height: 60
@@ -10228,7 +10228,7 @@
blockprefix: 1
main_category: 12
block_name: GENERAL_f
- initial_display_parameter: GENERAL
+ initial_display_parameter: ''
block_image_path: palettes/GENERAL_f.png
block_width: 60
block_height: 40
@@ -10301,7 +10301,7 @@
blockprefix: 1
main_category: 12
block_name: NEGTOPOS_f
- initial_display_parameter: '- to +'
+ initial_display_parameter: ''
block_image_path: palettes/NEGTOPOS_f.png
block_width: 40
block_height: 40
@@ -10374,7 +10374,7 @@
blockprefix: 1
main_category: 12
block_name: POSTONEG_f
- initial_display_parameter: + to -
+ initial_display_parameter: ''
block_image_path: palettes/POSTONEG_f.png
block_width: 40
block_height: 40
@@ -10447,7 +10447,7 @@
blockprefix: 1
main_category: 12
block_name: ZCROSS_f
- initial_display_parameter: Zcross
+ initial_display_parameter: ''
block_image_path: palettes/ZCROSS_f.png
block_width: 40
block_height: 40
@@ -10815,7 +10815,7 @@
blockprefix: 1
main_category: 13
block_name: EXTRACTOR
- initial_display_parameter: Extractor
+ initial_display_parameter: ''
block_image_path: palettes/EXTRACTOR.png
block_width: 60
block_height: 40
@@ -11326,7 +11326,7 @@
blockprefix: 1
main_category: 13
block_name: ISELECT_m
- initial_display_parameter: Selector
+ initial_display_parameter: ''
block_image_path: palettes/ISELECT_m.png
block_width: 60
block_height: 40
@@ -11693,7 +11693,7 @@
blockprefix: 1
main_category: 13
block_name: RELAY_f
- initial_display_parameter: Relay
+ initial_display_parameter: ''
block_image_path: palettes/RELAY_f.png
block_width: 40
block_height: 40
@@ -11766,7 +11766,7 @@
blockprefix: 1
main_category: 13
block_name: SCALAR2VECTOR
- initial_display_parameter: SCALAR to VECTOR
+ initial_display_parameter: ''
block_image_path: palettes/SCALAR2VECTOR.png
block_width: 60
block_height: 40
@@ -11839,7 +11839,7 @@
blockprefix: 1
main_category: 13
block_name: SELECT_m
- initial_display_parameter: Selector
+ initial_display_parameter: ''
block_image_path: palettes/SELECT_m.png
block_width: 60
block_height: 40
@@ -11985,7 +11985,7 @@
blockprefix: 1
main_category: 13
block_name: SWITCH_f
- initial_display_parameter: ''
+ initial_display_parameter: '1'
block_image_path: palettes/SWITCH_f.png
block_width: 40
block_height: 40
@@ -12132,7 +12132,7 @@
blockprefix: 1
main_category: 15
block_name: CONSTRAINT_c
- initial_display_parameter: x == 0
+ initial_display_parameter: '0'
block_image_path: palettes/CONSTRAINT_c.png
block_width: 60
block_height: 40
@@ -12205,7 +12205,7 @@
blockprefix: 1
main_category: 15
block_name: CONSTRAINT2_c
- initial_display_parameter: x == 0, x' == 0
+ initial_display_parameter: 0,0
block_image_path: palettes/CONSTRAINT2_c.png
block_width: 60
block_height: 40
@@ -12278,7 +12278,7 @@
blockprefix: 1
main_category: 15
block_name: DIFF_f
- initial_display_parameter: S
+ initial_display_parameter: ''
block_image_path: palettes/DIFF_f.png
block_width: 40
block_height: 40
@@ -12351,7 +12351,7 @@
blockprefix: 1
main_category: 16
block_name: TEXT_f
- initial_display_parameter: '...'
+ initial_display_parameter: Text
block_image_path: palettes/TEXT_f.png
block_width: 40
block_height: 40
@@ -13158,7 +13158,7 @@
blockprefix: 1
main_category: 17
block_name: CSCOPXY
- initial_display_parameter: x, y
+ initial_display_parameter: ''
block_image_path: palettes/CSCOPXY.png
block_width: 40
block_height: 40
@@ -13232,7 +13232,7 @@
blockprefix: 1
main_category: 17
block_name: CSCOPXY3D
- initial_display_parameter: x, y, z
+ initial_display_parameter: ''
block_image_path: palettes/CSCOPXY3D.png
block_width: 40
block_height: 40
@@ -13454,7 +13454,7 @@
blockprefix: 1
main_category: 17
block_name: TOWS_c
- initial_display_parameter: To workspace A [128]
+ initial_display_parameter: A,128
block_image_path: palettes/TOWS_c.png
block_width: 80
block_height: 40
@@ -13527,7 +13527,7 @@
blockprefix: 1
main_category: 17
block_name: TRASH_f
- initial_display_parameter: Trash
+ initial_display_parameter: ''
block_image_path: palettes/TRASH_f.png
block_width: 40
block_height: 40
@@ -13600,7 +13600,7 @@
blockprefix: 1
main_category: 17
block_name: WRITEAU_f
- initial_display_parameter: Write AU to /dev/audio
+ initial_display_parameter: ''
block_image_path: palettes/WRITEAU_f.png
block_width: 80
block_height: 40
@@ -13673,7 +13673,7 @@
blockprefix: 1
main_category: 17
block_name: WRITEC_f
- initial_display_parameter: Write to C binary file
+ initial_display_parameter: ''
block_image_path: palettes/WRITEC_f.png
block_width: 80
block_height: 40
@@ -14114,7 +14114,7 @@
blockprefix: 1
main_category: 18
block_name: Counter
- initial_display_parameter: Counter 0 --> 2
+ initial_display_parameter: 0,2
block_image_path: palettes/Counter.png
block_width: 60
block_height: 40
@@ -14187,7 +14187,7 @@
blockprefix: 1
main_category: 18
block_name: CURV_f
- initial_display_parameter: Curve
+ initial_display_parameter: ''
block_image_path: palettes/CURV_f.png
block_width: 40
block_height: 40
@@ -14260,7 +14260,7 @@
blockprefix: 1
main_category: 18
block_name: FROMWSB
- initial_display_parameter: From workspace
+ initial_display_parameter: Z
block_image_path: palettes/FROMWSB.png
block_width: 100
block_height: 40
@@ -14628,7 +14628,7 @@
blockprefix: 1
main_category: 18
block_name: Modulo_Count
- initial_display_parameter: Counter Modulo 3
+ initial_display_parameter: '3'
block_image_path: palettes/Modulo_Count.png
block_width: 60
block_height: 40
@@ -14847,7 +14847,7 @@
blockprefix: 1
main_category: 18
block_name: RAND_m
- initial_display_parameter: Random generator
+ initial_display_parameter: ''
block_image_path: palettes/RAND_m.png
block_width: 60
block_height: 40
@@ -14920,7 +14920,7 @@
blockprefix: 1
main_category: 18
block_name: READAU_f
- initial_display_parameter: Read from .au sound file
+ initial_display_parameter: ''
block_image_path: palettes/READAU_f.png
block_width: 100
block_height: 40
@@ -14993,7 +14993,7 @@
blockprefix: 1
main_category: 18
block_name: READC_f
- initial_display_parameter: Read from C binary file
+ initial_display_parameter: ''
block_image_path: palettes/READC_f.png
block_width: 80
block_height: 40
@@ -15066,7 +15066,7 @@
blockprefix: 1
main_category: 18
block_name: RFILE_f
- initial_display_parameter: Read from input file
+ initial_display_parameter: ''
block_image_path: palettes/RFILE_f.png
block_width: 60
block_height: 40
@@ -15286,7 +15286,7 @@
blockprefix: 1
main_category: 18
block_name: Sigbuilder
- initial_display_parameter: Signal Builder
+ initial_display_parameter: ''
block_image_path: palettes/Sigbuilder.png
block_width: 60
block_height: 40
@@ -15505,7 +15505,7 @@
blockprefix: 1
main_category: 18
block_name: TKSCALE
- initial_display_parameter: TK Scale
+ initial_display_parameter: ''
block_image_path: palettes/TKSCALE.png
block_width: 60
block_height: 40
@@ -15870,7 +15870,7 @@
blockprefix: 1
main_category: 19
block_name: SourceP
- initial_display_parameter: S
+ initial_display_parameter: ''
block_image_path: palettes/SourceP.png
block_width: 50
block_height: 40
@@ -16016,7 +16016,7 @@
blockprefix: 1
main_category: 20
block_name: BOUNCE
- initial_display_parameter: Bouncing balls
+ initial_display_parameter: ''
block_image_path: palettes/BOUNCE.png
block_width: 60
block_height: 40
@@ -16235,7 +16235,7 @@
blockprefix: 1
main_category: 21
block_name: c_block
- initial_display_parameter: 'C block : toto'
+ initial_display_parameter: toto
block_image_path: palettes/c_block.png
block_width: 60
block_height: 40
@@ -16308,7 +16308,7 @@
blockprefix: 1
main_category: 21
block_name: CBLOCK
- initial_display_parameter: 'C block 2: toto'
+ initial_display_parameter: toto
block_image_path: palettes/CBLOCK.png
block_width: 80
block_height: 40
@@ -16381,7 +16381,7 @@
blockprefix: 1
main_category: 21
block_name: CBLOCK4
- initial_display_parameter: 'C block 4: toto'
+ initial_display_parameter: toto
block_image_path: palettes/CBLOCK4.png
block_width: 80
block_height: 40
@@ -16454,7 +16454,7 @@
blockprefix: 1
main_category: 21
block_name: DEBUG
- initial_display_parameter: 'Debug : xcos_debug_gui(flag, block);'
+ initial_display_parameter: xcos_debug_gui(flag, block);
block_image_path: palettes/DEBUG.png
block_width: 160
block_height: 40
@@ -16527,7 +16527,7 @@
blockprefix: 1
main_category: 21
block_name: EXPRESSION
- initial_display_parameter: 'Expression : (u1>0)*sin(u2)^2'
+ initial_display_parameter: (u1>0)*sin(u2)^2
block_image_path: palettes/EXPRESSION.png
block_width: 100
block_height: 40
@@ -16600,7 +16600,7 @@
blockprefix: 1
main_category: 21
block_name: fortran_block
- initial_display_parameter: 'Fortran block: forty'
+ initial_display_parameter: forty
block_image_path: palettes/fortran_block.png
block_width: 80
block_height: 40
@@ -16673,7 +16673,7 @@
blockprefix: 1
main_category: 21
block_name: generic_block3
- initial_display_parameter: 'native block : sinblk'
+ initial_display_parameter: sinblk
block_image_path: palettes/generic_block3.png
block_width: 80
block_height: 40
@@ -16746,7 +16746,7 @@
blockprefix: 1
main_category: 21
block_name: MBLOCK
- initial_display_parameter: Modelica generic
+ initial_display_parameter: ''
block_image_path: palettes/MBLOCK.png
block_width: 60
block_height: 40
@@ -16819,7 +16819,7 @@
blockprefix: 1
main_category: 21
block_name: scifunc_block_m
- initial_display_parameter: 'Function: y1=sin(u1)'
+ initial_display_parameter: y1=sin(u1)
block_image_path: palettes/scifunc_block_m.png
block_width: 80
block_height: 40
diff --git a/blocks/eda-frontend/src/static/style.json b/blocks/eda-frontend/src/static/style.json
index e76bf7e4..63c19405 100644
--- a/blocks/eda-frontend/src/static/style.json
+++ b/blocks/eda-frontend/src/static/style.json
@@ -557,7 +557,7 @@
"spacing": 13,
"gradientColor": "white",
"rounded": 1,
- "displayedLabel": "From workspace"
+ "displayedLabel": "From workspace<BR>[ %s ]"
},
"DERIV": {
"shape": "label",
@@ -1038,7 +1038,7 @@
"spacing": 13,
"gradientColor": "white",
"rounded": 1,
- "displayedLabel": "u^a"
+ "displayedLabel": "u^%s"
},
"INVBLK": {
"shape": "label",
@@ -1129,7 +1129,7 @@
"spacing": 13,
"gradientColor": "white",
"rounded": 1,
- "displayedLabel": "a^u"
+ "displayedLabel": "%s^u"
},
"PROD_f": {
"shape": "ellipse",
@@ -1234,7 +1234,7 @@
"spacing": 13,
"gradientColor": "white",
"rounded": 1,
- "displayedLabel": "Trig function"
+ "displayedLabel": "%s"
},
"PRODUCT": {
"shape": "label",
@@ -1260,7 +1260,7 @@
"spacing": 13,
"gradientColor": "white",
"rounded": 1,
- "displayedLabel": "MIN / MAX"
+ "displayedLabel": "MIN / MAX<BR>%s"
},
"ABS_VALUE": {
"shape": "label",
@@ -1339,7 +1339,7 @@
"spacing": 13,
"gradientColor": "white",
"rounded": 1,
- "displayedLabel": "x == %s<br/>x' == %s"
+ "displayedLabel": "x == %s<BR>x' == %s"
},
"MBLOCK": {
"shape": "label",
@@ -1443,7 +1443,7 @@
"spacing": 13,
"gradientColor": "white",
"rounded": 1,
- "displayedLabel": "Convert to"
+ "displayedLabel": "CONVERT<BR>%s<BR>=><BR>%s"
},
"EXTRACTBITS": {
"shape": "label",
@@ -1482,7 +1482,7 @@
"spacing": 13,
"gradientColor": "white",
"rounded": 1,
- "displayedLabel": "Arithmetic<BR> shift %s"
+ "displayedLabel": "Arithmetic<BR>shift %s"
},
"LOGIC": {
"shape": "label",
@@ -2497,7 +2497,8 @@
"gradientColor": "white",
"rounded": 1,
"imageBorder": "black",
- "image": "/django_static/blocks/SWITCH.svg"
+ "image": "/django_static/blocks/SWITCH.svg",
+ "displayedLabel": "Static: %s"
},
"SWITCH2_m": {
"shape": "label",
@@ -2838,7 +2839,8 @@
"gradientColor": "white",
"rounded": 1,
"imageBorder": "black",
- "image": "/django_static/blocks/Capacitor.svg"
+ "image": "/django_static/blocks/Capacitor.svg",
+ "displayedLabel": "%sF"
},
"Ground": {
"shape": "label",
@@ -2864,7 +2866,7 @@
"spacing": 13,
"gradientColor": "white",
"rounded": 1,
- "displayedLabel": "1 V<br/>~ %s"
+ "displayedLabel": "1 V<BR>~ %s"
},
"ConstantVoltage": {
"shape": "label",
@@ -2877,7 +2879,8 @@
"gradientColor": "white",
"rounded": 1,
"imageBorder": "black",
- "image": "/django_static/blocks/ConstantVoltage.svg"
+ "image": "/django_static/blocks/ConstantVoltage.svg",
+ "displayedLabel": "%sV"
},
"Inductor": {
"shape": "label",
@@ -2890,7 +2893,8 @@
"gradientColor": "white",
"rounded": 1,
"imageBorder": "black",
- "image": "/django_static/blocks/Inductor.svg"
+ "image": "/django_static/blocks/Inductor.svg",
+ "displayedLabel": "%sH"
},
"PotentialSensor": {
"shape": "label",
@@ -2942,7 +2946,8 @@
"gradientColor": "white",
"rounded": 1,
"imageBorder": "black",
- "image": "/django_static/blocks/Resistor.svg"
+ "image": "/django_static/blocks/Resistor.svg",
+ "displayedLabel": "%sΩ"
},
"VoltageSensor": {
"shape": "label",
@@ -2982,7 +2987,7 @@
"gradientColor": "white",
"rounded": 1,
"textAlign": "center",
- "displayedLabel": "%s V<br/>~ %s"
+ "displayedLabel": "%s V<BR>~ %s"
},
"NPN": {
"shape": "label",
@@ -3021,7 +3026,7 @@
"spacing": 13,
"gradientColor": "white",
"rounded": 1,
- "displayedLabel": "%s V<br/>~"
+ "displayedLabel": "%s V<BR>~ %s"
},
"Switch": {
"shape": "label",
@@ -3259,7 +3264,7 @@
"spacing": 13,
"gradientColor": "white",
"rounded": 1,
- "displayedLabel": "Automaton<BR> nM=2, nX=1"
+ "displayedLabel": "Automaton<BR>%s modes | %s states"
},
"SPLIT_f": {
"shape": "rectangle",
diff --git a/data/XcosPorts.csv b/data/XcosPorts.csv
new file mode 100644
index 00000000..a0789a30
--- /dev/null
+++ b/data/XcosPorts.csv
@@ -0,0 +1,228 @@
+Block Names,Display Label,Initial Explicit Input Ports,Initial Implicit Input Ports,Initial Control Ports,Initial Explicit Output Ports,Initial Implicit Output Ports,Initial Command Ports,Initial Display Parameter,Variable Explicit Input Ports,Variable Implicit Input Ports,Variable Control Ports,Variable Explicit Output Ports,Variable Implicit Output Ports,Variable Command Ports,Variable Display Parameter
+ABS_VALUE,,1,0,0,1,0,0,,,,,,,,
+AFFICH_m,%s,1,0,1,0,0,0,0.0,,,(ScilabString[exprs] -> data[6][0]) == 0,,,,0.0
+ANDBLK,,0,0,2,0,0,1,,,,,,,,
+ANDLOG_f,,0,0,2,1,0,0,,,,,,,,
+AUTOMAT,Automaton<BR>%s modes | %s states,2,0,0,2,0,1,"2,1",ScilabString[exprs] -> data[0][0],,,,,,"parameters[0],parameters[2]"
+Bache,,0,2,0,1,2,0,,,,,,,,
+BACKLASH,,1,0,0,1,0,0,,,,,,,,
+BARXY,,2,0,1,0,0,0,,,,,,,,
+BIGSOM_f,,2,0,0,1,0,0,,ScilabString[exprs] -> data[0][0],,,,,,
+BITCLEAR,Clear bit %s,1,0,0,1,0,0,0,,,,,,,parameters[1]
+BITSET,Set bit %s,1,0,0,1,0,0,0,,,,,,,parameters[1]
+BOUNCE,,0,0,0,2,0,0,,,,,,,,
+BOUNCEXY,,2,0,1,0,0,0,,,,,,,,
+BPLATFORM,,2,0,1,0,0,0,,,,,,,,
+c_block,C block:<BR>%s,1,0,0,1,0,0,toto,,,,,,,parameters[3]
+CANIMXY,,2,0,1,0,0,0,,,,,,,,
+CANIMXY3D,,3,0,1,0,0,0,,,,,,,,
+Capacitor,%sF,0,1,0,0,1,0,10 m,,,,,,,format(parameters[0])
+CBLOCK,C block 2:<BR>%s,1,0,0,1,0,0,toto,,,(Array[exprs]->1st ScilabString -> data[4][0]) ==1,,,(Array[exprs]->1st ScilabString -> data[5][0]) ==1,parameters[0]
+CBLOCK4,C block 4:<BR>%s,1,0,0,1,0,0,toto,,,(Array[exprs]->1st ScilabString -> data[6][0]) ==1,,,(Array[exprs]->1st ScilabString -> data[7][0]) ==1,parameters[0]
+CCS,,1,1,0,0,1,0,,,,,,,,
+CEVENTSCOPE,,0,0,1,0,0,0,,,,ScilabString[exprs] -> data[0][0],,,,
+CFSCOPE,,0,0,1,0,0,0,,,,,,,,
+CLINDUMMY_f,,0,0,0,0,0,0,,,,,,,,
+CLKFROM,%s,0,0,0,0,0,1,A,,,,,,,parameters[0]
+CLKGOTO,%s,0,0,1,0,0,0,A,,,,,,,parameters[0]
+CLKGotoTagVisibility,{%s},0,0,0,0,0,0,A,,,,,,,parameters[0]
+CLKINV_f,%s,0,0,0,0,0,1,1,,,,,,,parameters[0]
+CLKOUTV_f,%s,0,0,1,0,0,0,1,,,,,,,parameters[0]
+CLKSOMV_f,,0,0,3,0,0,1,,,,,,,,
+CLOCK_c,,0,0,0,0,0,1,,,,,,,,
+CLR,%s<BR><HR>%s,1,0,0,1,0,0,"1,1+s",,,,,,,"parameters[0],parameters[1]"
+CLSS,,1,0,0,1,0,0,,,,,,,,
+CMAT3D,,1,0,1,0,0,0,,,,,,,,
+CMATVIEW,,1,0,1,0,0,0,,,,,,,,
+CMSCOPE,,2,0,1,0,0,0,,len(ScilabString[exprs] -> data[0][0]),,(ScilabString[exprs] -> data[9][0]) == 0,,,,
+CONST,%s,0,0,0,1,0,0,1,,,,,,,parameters[0]
+CONST_f,%s,0,0,0,1,0,0,1,,,,,,,parameters[0]
+CONST_m,%s,0,0,0,1,0,0,1,,,,,,,parameters[0]
+ConstantVoltage,%sV,0,1,0,0,1,0,10 m,,,,,,,format(parameters[0])
+CONSTRAINT_c,x == %s,1,0,0,1,0,0,0,,,,,,,parameters[0]
+CONSTRAINT2_c,x == %s<BR>x' == %s,1,0,0,2,0,0,"0,0",,,,,,,"parameters[0],parameters[1]"
+CONVERT,CONVERT<BR>%s<BR>=><BR>%s,1,0,0,1,0,0,"decim,int32",,,,,,,"typeformat(parameters[0]),typeformat(parameters[1])"
+COSBLK_f,,1,0,0,1,0,0,,,,,,,,
+Counter,Counter<BR>%s &#8594; %s,0,0,1,1,0,0,"0,2",,,,,,,"parameters[0],parameters[1]"
+CSCOPE,,1,0,1,0,0,0,,,,(ScilabString[exprs] -> data[8][0]) == 0,,,,
+CSCOPXY,,2,0,1,0,0,0,,,,,,,,
+CSCOPXY3D,,3,0,1,0,0,0,,,,,,,,
+CUMSUM,,1,0,0,1,0,0,,,,,,,,
+CurrentSensor,,0,1,0,1,1,0,,,,,,,,
+CURV_f,,0,0,0,1,0,0,,,,,,,,
+CVS,,1,1,0,0,1,0,,,,,,,,
+DEADBAND,,1,0,0,1,0,0,,,,,,,,
+DEBUG,Debug:<BR>%s,0,0,0,0,0,0,"xcos_debug_gui(flag, block);",,,,,,,parameters[0]
+DELAY_f,,1,0,0,1,0,0,,,,,,,,
+DELAYV_f,,2,0,1,1,0,2,,,,,,,,
+DEMUX,,1,0,0,2,0,0,,,,,ScilabString[exprs] -> data[0][0]],,,
+DEMUX_f,,1,0,0,2,0,0,,,,,ScilabString[exprs] -> data[0][0]],,,
+DERIV,,1,0,0,1,0,0,,,,,,,,
+DFLIPFLOP,,3,0,0,2,0,0,,,,,,,,
+DIFF_f,,1,0,0,1,0,0,,,,,,,,
+Diode,,0,1,0,0,1,0,,,,,,,,
+DLATCH,,2,0,0,2,0,0,,,,,,,,
+DLR,%s<BR><HR>%s,1,0,1,1,0,0,"1,1+z",,,,,,,"parameters[0],parameters[1]"
+DLRADAPT_f,,2,0,1,1,0,0,,,,,,,,
+DLSS,,1,0,1,1,0,0,,,,,,,,
+DOLLAR,,1,0,1,1,0,0,,,,(ScilabString[exprs] -> data[1][0]) == 0,,,,
+DOLLAR_f,,1,0,1,1,0,0,,,,(ScilabString[exprs] -> data[1][0]) == 0,,,,
+DOLLAR_m,,1,0,1,1,0,0,,,,(ScilabString[exprs] -> data[1][0]) == 0,,,,
+EDGE_TRIGGER,,1,0,0,0,0,1,,,,,,,,
+END_c,,0,0,1,0,0,1,,,,,,,,
+ENDBLK,,0,0,0,0,0,0,,,,,,,,
+ESELECT_f,,1,0,1,0,0,2,,,,(ScilabString[exprs] -> data[1][0]) == 0,,,ScilabString[exprs] -> data[0][0]],
+EVTDLY_c,Delay: %s,0,0,1,0,0,1,0.1,,,,,,,parameters[0]
+EVTGEN_f,Event at<BR> time %s,0,0,0,0,0,1,0,,,,,,,parameters[0]
+EVTVARDLY,,1,0,1,0,0,1,,,,,,,,
+EXPBLK_m,%s^u,1,0,0,1,0,0,%e,,,,,,,parameters[0]
+EXPRESSION,Expression:<BR>%s,2,0,0,1,0,0,(u1>0)*sin(u2)^2,,,,,,,parameters[1]
+EXTRACT,,1,0,0,1,0,0,,,,,,,,
+Extract_Activation,,1,0,0,0,0,1,,,,,,,,
+EXTRACTBITS,Extract Bits %s,1,0,0,1,0,0,1,,,,,,,parameters[1]
+EXTRACTOR,,1,0,0,1,0,0,,,,,,,,
+EXTTRI,,1,0,0,1,0,0,,,,,,,,
+Flowmeter,,0,1,0,1,1,0,,,,,,,,
+fortran_block,Fortran block:<BR>%s,1,0,0,1,0,0,forty,,,,,,,parameters[3]
+freq_div,,0,0,1,0,0,1,,,,,,,,
+FROM,%s,0,0,0,1,0,0,A,,,,,,,parameters[0]
+FROMMO,%s,0,0,0,0,1,0,A,,,,,,,parameters[0]
+FROMWSB,From workspace<BR>[ %s ],0,0,0,1,0,0,Z,,,,,,,parameters[0]
+GAIN_f,%s,1,0,0,1,0,0,1,,,,,,,parameters[0]
+GAINBLK,%s,1,0,0,1,0,0,1,,,,,,,parameters[0]
+GAINBLK_f,%s,1,0,0,1,0,0,1,,,,,,,parameters[0]
+GENERAL_f,,1,0,0,0,0,1,,,,,,,ScilabString[exprs] -> data[1][0],
+generic_block3,native block:<BR>%s,1,0,0,1,0,0,sinblk,,,ScilabString[exprs] -> data[6][0],,,ScilabString[exprs] -> data[7][0],parameters[0]
+GENSIN_f,,0,0,0,1,0,0,,,,,,,,
+GENSQR_f,,0,0,1,1,0,0,,,,,,,,
+GOTO,%s,1,0,0,0,0,0,A,,,,,,,parameters[0]
+GOTOMO,%s,0,1,0,0,0,0,A,,,,,,,parameters[0]
+GotoTagVisibility,"<FONT SIZE=\""6\"">{%s}</FONT>",0,0,0,0,0,0,A,,,,,,,parameters[0]
+GotoTagVisibilityMO,"<FONT SIZE=\""6\"">{%s}</FONT>",0,0,0,0,0,0,A,,,,,,,parameters[0]
+Ground,,0,1,0,0,0,0,,,,,,,,
+Gyrator,,0,2,0,0,2,0,,,,,,,,
+HALT_f,,0,0,1,0,0,0,,,,,,,,
+HYSTHERESIS,,1,0,0,1,0,0,,,,,,,,
+IdealTransformer,,0,2,0,0,2,0,,,,,,,,
+IFTHEL_f,,1,0,1,0,0,2,,,,(ScilabString[exprs] -> data[0][0]) == 1,,,,
+IN_f,%s,0,0,0,1,0,0,1,,,,,,,parameters[0]
+Inductor,%sH,0,1,0,0,1,0,10 μ,,,,,,,format(parameters[0])
+INIMPL_f,%s,0,0,0,0,1,0,1,,,,,,,parameters[0]
+INTEGRAL_f,,1,0,0,1,0,0,,,,,,,,
+INTEGRAL_m,,1,0,0,1,0,0,,2 if (ScilabString[exprs] -> data[1][0]) == 1 else 1,,(ScilabString[exprs] -> data[1][0]) == 1,,,,
+INTMUL,,2,0,0,1,0,0,,,,,,,,
+INTRP2BLK_f,,2,0,0,1,0,0,,,,,,,,
+INTRPLBLK_f,,1,0,0,1,0,0,,,,,,,,
+INVBLK,,1,0,0,1,0,0,,,,,,,,
+ISELECT_m,,1,0,2,2,0,0,,,,ScilabString[exprs] -> data[1][0],ScilabString[exprs] -> data[1][0],,,
+JKFLIPFLOP,,3,0,0,2,0,0,,,,,,,,
+LOGBLK_f,,1,0,0,1,0,0,,,,,,,,
+LOGIC,,2,0,1,1,0,0,,log2(ScilabString[exprs] -> data[0][0])),,(ScilabString[exprs] -> data[1][0]) == 0,,,,
+LOGICAL_OP,%s,2,0,0,1,0,0,AND,ScilabString[exprs] -> data[0][0],,,,,,logicalformat(parameters[0])
+LOOKUP_f,,1,0,0,1,0,0,,,,,,,,
+M_freq,,0,0,1,0,0,3,,,,,,,2 ^ len(ScilabString[exprs] -> data[0][0]) - 1 ,
+M_SWITCH,,3,0,0,1,0,0,,ScilabString[exprs] -> data[0][0] + 1,,,,,,
+MATBKSL,,2,0,0,1,0,0,,,,,,,,
+MATCATH,,2,0,0,1,0,0,,ScilabString[exprs] -> data[0][0],,,,,,
+MATCATV,,2,0,0,1,0,0,,ScilabString[exprs] -> data[0][0],,,,,,
+MATDET,,1,0,0,1,0,0,,,,,,,,
+MATDIAG,,1,0,0,1,0,0,,,,,,,,
+MATDIV,,2,0,0,1,0,0,,,,,,,,
+MATEIG,,1,0,0,1,0,0,,,,,ScilabString[exprs] -> data[1][0],,,
+MATEXPM,,1,0,0,1,0,0,,,,,,,,
+MATINV,,1,0,0,1,0,0,,,,,,,,
+MATLU,,1,0,0,2,0,0,,,,,,,,
+MATMAGPHI,,1,0,0,2,0,0,,ScilabString[exprs] -> data[0][0],,,3 - ScilabString[exprs] -> data[0][0],,,
+MATMUL,,2,0,0,1,0,0,,,,,,,,
+MATPINV,,1,0,0,1,0,0,,,,,,,,
+MATRESH,,1,0,0,1,0,0,,,,,,,,
+MATSING,,1,0,0,1,0,0,,,,,3 if (ScilabString[exprs] -> data[0][0]) == '2' else 1,,,
+MATSUM,,1,0,0,1,0,0,,,,,,,,
+MATTRAN,,1,0,0,1,0,0,,,,,,,,
+MATZCONJ,,1,0,0,1,0,0,,,,,,,,
+MATZREIM,,1,0,0,2,0,0,,ScilabString[exprs] -> data[0][0],,,3 - ScilabString[exprs] -> data[0][0],,,
+MAX_f,,1,0,0,1,0,0,,,,,,,,
+MAXMIN,MIN / MAX<BR>%s,2,0,0,1,0,0,MAX,ScilabString[exprs] -> data[1][0],,,,,,maxminformat(parameters[0])
+MBLOCK,,0,1,0,1,1,0,,,,,,,,
+MCLOCK_f,,0,0,0,0,0,2,,,,,,,,
+MFCLCK_f,,0,0,1,0,0,2,,,,,,,,
+MIN_f,,1,0,0,1,0,0,,,,,,,,
+Modulo_Count,Counter<BR>Modulo %s,0,0,1,1,0,0,3,,,,,,,parameters[1]
+MUX,,2,0,0,1,0,0,,ScilabString[exprs] -> data[0][0],,,,,,
+MUX_f,,2,0,0,1,0,0,,ScilabString[exprs] -> data[0][0],,,,,,
+NEGTOPOS_f,,1,0,0,0,0,1,,,,,,,,
+NMOS,,0,1,0,0,3,0,,,,,,,,
+NPN,,0,1,0,0,2,0,,,,,,,,
+NRMSOM_f,,2,0,0,1,0,0,,ScilabString[exprs] -> data[0][0],,,,,,
+OpAmp,,0,2,0,0,1,0,,,,,,,,
+OUT_f,%s,1,0,0,0,0,0,1,,,,,,,parameters[0]
+OUTIMPL_f,%s,0,1,0,0,0,0,1,,,,,,,parameters[0]
+PDE,,5,0,0,2,0,0,,,,,,,,
+PerteDP,,0,1,0,0,1,0,,,,,,,,
+PID,,1,0,0,1,0,0,,,,,,,,
+PMOS,,0,0,0,0,3,0,,,,,,,,
+PNP,,0,1,0,0,2,0,,,,,,,,
+POSTONEG_f,,1,0,0,0,0,1,,,,,,,,
+PotentialSensor,,0,1,0,1,0,0,,,,,,,,
+POWBLK_f,u^%s,1,0,0,1,0,0,1.5,,,,,,,parameters[0]
+PROD_f,,2,0,0,1,0,0,,,,,,,,
+PRODUCT,,2,0,0,1,0,0,,len(ScilabString[exprs] -> data[0][0]),,,,,,
+PuitsP,,0,1,0,0,0,0,,,,,,,,
+PULSE_SC,,0,0,0,1,0,0,,,,,,,,
+QUANT_f,,1,0,0,1,0,0,,,,,,,,
+RAMP,,0,0,0,1,0,0,,,,,,,,
+RAND_m,,0,0,1,1,0,0,,,,,,,,
+RATELIMITER,,1,0,0,1,0,0,,,,,,,,
+READAU_f,,0,0,1,1,0,0,,,,,,,,
+READC_f,,0,0,1,1,0,0,,,,,,,int(ScilabString[exprs] -> data[0][0]) > 0,
+REGISTER,,1,0,1,1,0,0,,,,,,,,
+RELATIONALOP,%s,2,0,0,1,0,0,<,,,,,,,relationalformat(parameters[0])
+RELAY_f,,2,0,2,1,0,0,,ScilabString[exprs] -> data[0][0],,ScilabString[exprs] -> data[0][0],,,,
+Resistor,%sΩ,0,1,0,0,1,0,10 m,,,,,,,format(parameters[0])
+RFILE_f,,0,0,1,1,0,0,,,,,,,int(ScilabString[exprs] -> data[0][0]) > 0,
+RICC,,3,0,0,1,0,0,,,,,,,,
+ROOTCOEF,,1,0,0,1,0,0,,,,,,,,
+SAMPHOLD_m,,1,0,1,1,0,0,,,,,,,,
+SampleCLK,,0,0,0,0,0,1,,,,,,,,
+SATURATION,,1,0,0,1,0,0,,,,,,,,
+SAWTOOTH_f,,0,0,1,1,0,0,,,,,,,,
+SCALAR2VECTOR,,1,0,0,1,0,0,,,,,,,,
+scifunc_block_m,Function:<BR>%s,1,0,0,1,0,0,y1=sin(u1),,,,,,,parameters[10]
+SELECT_m,,2,0,2,1,0,0,,ScilabString[exprs] -> data[1][0],,ScilabString[exprs] -> data[1][0],,,,
+SELF_SWITCH,,1,0,0,1,0,0,,,,,,,,
+SHIFT,Arithmetic<BR>shift %s,1,0,0,1,0,0,0,,,,,,,parameters[1]
+Sigbuilder,,0,0,0,1,0,1,,,,,,,,
+SIGNUM,,1,0,0,1,0,0,,,,,,,,
+SINBLK_f,,1,0,0,1,0,0,,,,,,,,
+SineVoltage,%s V<BR>~ %s,0,1,0,0,1,0,"1,1",,,,,,,"parameters[0],parameters[0]"
+SOM_f,,3,0,0,1,0,0,,,,,,,,
+SourceP,,0,0,0,0,1,0,,,,,,,,
+SQRT,,1,0,0,1,0,0,,,,,,,,
+SRFLIPFLOP,,2,0,0,2,0,0,,,,,,,,
+STEP_FUNCTION,,0,0,0,1,0,0,,,,,,,,
+SUBMAT,,1,0,0,1,0,0,,,,,,,,
+SUM_f,,3,0,0,1,0,0,,,,,,,,
+SUMMATION,,2,0,0,1,0,0,,len(ScilabString[exprs] -> data[1][0]),,,,,,
+SUPER_f,,1,0,0,1,0,0,,,,,,,,
+Switch,,1,1,0,0,1,0,,,,,,,,
+SWITCH_f,Static: %s,2,0,0,1,0,0,1,ScilabString[exprs] -> data[0][0],,,,,,parameters[1]
+SWITCH2_m,,3,0,0,1,0,0,,,,,,,,
+TANBLK_f,,1,0,0,1,0,0,,,,,,,,
+TCLSS,,2,0,1,1,0,0,,,,,,,,
+TEXT_f,<BR>%s,0,0,0,0,0,0,Text,,,,,,,parameters[0]
+TIME_DELAY,,1,0,0,1,0,0,,,,,,,,
+TIME_f,,0,0,0,1,0,0,,,,,,,,
+TKSCALE,,0,0,1,1,0,0,,,,,,,,
+TOWS_c,To workspace<BR>%s [%s],1,0,1,0,0,0,"A,128",,,(ScilabString[exprs] -> data[2][0]) == 0,,,,"parameters[1],parameters[0]"
+TRASH_f,,1,0,1,0,0,0,,,,,,,,
+TrigFun,%s,1,0,0,1,0,0,sin,,,,,,,parameters[0]
+VanneReglante,,1,1,0,0,1,0,,,,,,,,
+VARIABLE_DELAY,,2,0,0,1,0,0,,,,,,,,
+VariableResistor,,1,1,0,0,1,0,,,,,,,,
+VirtualCLK0,,0,0,1,0,0,0,,,,,,,,
+VoltageSensor,,0,1,0,1,1,0,,,,,,,,
+VsourceAC,%s V<BR>~ %s,0,1,0,0,1,0,"220,50",,,,,,,"parameters[0],parameters[1]"
+VVsourceAC,1 V<BR>~ %s,1,1,0,1,0,0,50,,,,,,,parameters[0]
+WRITEAU_f,,1,0,1,0,0,0,,,,,,,,
+WRITEC_f,,1,0,1,0,0,0,,,,,,,,
+ZCROSS_f,,1,0,0,0,0,1,,,,,,,, \ No newline at end of file