diff options
| author | Sunil Shetye | 2024-10-24 12:33:23 +0530 |
|---|---|---|
| committer | Sunil Shetye | 2024-10-24 12:33:23 +0530 |
| commit | 7f635f9b1b0ced9da3ec8f27a9fa2a6d6d33ba23 (patch) | |
| tree | 460349cb3445cb4f2912102acd942fded74fe397 | |
| parent | 1793e2a61df7c5bfdef4efaf43d61627d25614d6 (diff) | |
| download | Common-Interface-Project-7f635f9b1b0ced9da3ec8f27a9fa2a6d6d33ba23.tar.gz Common-Interface-Project-7f635f9b1b0ced9da3ec8f27a9fa2a6d6d33ba23.tar.bz2 Common-Interface-Project-7f635f9b1b0ced9da3ec8f27a9fa2a6d6d33ba23.zip | |
add style to all blocks and ports
247 files changed, 1035 insertions, 505 deletions
diff --git a/blocks/Xcos/blocks/ABS_VALUE.py b/blocks/Xcos/blocks/ABS_VALUE.py index 1f30bbe4..5f84ccda 100644 --- a/blocks/Xcos/blocks/ABS_VALUE.py +++ b/blocks/Xcos/blocks/ABS_VALUE.py @@ -1,13 +1,15 @@ from common.AAAAAA import * -def ABS_VALUE(outroot, attribid, ordering, geometry, parameters, parent=1): +def ABS_VALUE(outroot, attribid, ordering, geometry, parameters, parent=1, style=None): func_name = 'ABS_VALUE' + if style is None: + style = func_name outnode = addOutNode(outroot, BLOCK_BASIC, attribid, ordering, parent, func_name, 'absolute_value', 'C_OR_FORTRAN', - func_name, BLOCKTYPE_C, + style, BLOCKTYPE_C, dependsOnU='1') addExprsNode(outnode, TYPE_STRING, 1, parameters) diff --git a/blocks/Xcos/blocks/AFFICH_m.py b/blocks/Xcos/blocks/AFFICH_m.py index 6ac8c8f8..edbb67eb 100644 --- a/blocks/Xcos/blocks/AFFICH_m.py +++ b/blocks/Xcos/blocks/AFFICH_m.py @@ -1,13 +1,15 @@ from common.AAAAAA import * -def AFFICH_m(outroot, attribid, ordering, geometry, parameters, parent=1): +def AFFICH_m(outroot, attribid, ordering, geometry, parameters, parent=1, style=None): func_name = 'AFFICH_m' + if style is None: + style = func_name outnode = addOutNode(outroot, BLOCK_AFFICHE, attribid, ordering, parent, func_name, 'affich2', 'C_OR_FORTRAN', - func_name, BLOCKTYPE_C, + style, BLOCKTYPE_C, dependsOnU='1') addExprsNode(outnode, TYPE_STRING, 7, parameters) diff --git a/blocks/Xcos/blocks/ANDBLK.py b/blocks/Xcos/blocks/ANDBLK.py index 59bb914b..84b0dac7 100644 --- a/blocks/Xcos/blocks/ANDBLK.py +++ b/blocks/Xcos/blocks/ANDBLK.py @@ -6,13 +6,16 @@ from blocks.CLKSPLIT_f import CLKSPLIT_f from common.AAAAAA import * -def ANDBLK(outroot, attribid, ordering, geometry, parameters, parent=1): +def ANDBLK(outroot, attribid, ordering, geometry, parameters, parent=1, style=None): func_name = 'ANDBLK' + if style is None: + style = func_name + block_id, port_id, link_id = generate_id(8, 13, 6) outnode = addOutNode(outroot, BLOCK_BASIC, attribid, ordering, parent, func_name, 'csuper', 'DEFAULT', - func_name, BLOCKTYPE_H) + style, BLOCKTYPE_H) addExprsNode(outnode, TYPE_DOUBLE, 0, parameters) addTypeNode(outnode, TYPE_DOUBLE, AS_REAL_PARAM, 0, []) diff --git a/blocks/Xcos/blocks/ANDLOG_f.py b/blocks/Xcos/blocks/ANDLOG_f.py index f62c6424..20270cb1 100644 --- a/blocks/Xcos/blocks/ANDLOG_f.py +++ b/blocks/Xcos/blocks/ANDLOG_f.py @@ -1,13 +1,15 @@ from common.AAAAAA import * -def ANDLOG_f(outroot, attribid, ordering, geometry, parameters, parent=1): +def ANDLOG_f(outroot, attribid, ordering, geometry, parameters, parent=1, style=None): func_name = 'ANDLOG_f' + if style is None: + style = func_name outnode = addOutNode(outroot, BLOCK_BASIC, attribid, ordering, parent, func_name, 'andlog', 'DEFAULT', - func_name, BLOCKTYPE_D) + style, BLOCKTYPE_D) addExprsNode(outnode, TYPE_DOUBLE, 0, parameters) addTypeNode(outnode, TYPE_DOUBLE, AS_REAL_PARAM, 0, diff --git a/blocks/Xcos/blocks/AUTOMAT.py b/blocks/Xcos/blocks/AUTOMAT.py index 352f8d58..3ba90df5 100644 --- a/blocks/Xcos/blocks/AUTOMAT.py +++ b/blocks/Xcos/blocks/AUTOMAT.py @@ -1,13 +1,15 @@ from common.AAAAAA import * -def AUTOMAT(outroot, attribid, ordering, geometry, parameters, parent=1): +def AUTOMAT(outroot, attribid, ordering, geometry, parameters, parent=1, style=None): func_name = 'AUTOMAT' + if style is None: + style = func_name outnode = addOutNode(outroot, BLOCK_BASIC, attribid, ordering, parent, func_name, 'automat', 'IMPLICIT_C_OR_FORTRAN', - func_name, BLOCKTYPE_C, + style, BLOCKTYPE_C, dependsOnT='1') addExprsNode(outnode, TYPE_STRING, 7, parameters) diff --git a/blocks/Xcos/blocks/BACKLASH.py b/blocks/Xcos/blocks/BACKLASH.py index f088600e..58d3632c 100644 --- a/blocks/Xcos/blocks/BACKLASH.py +++ b/blocks/Xcos/blocks/BACKLASH.py @@ -1,13 +1,15 @@ from common.AAAAAA import * -def BACKLASH(outroot, attribid, ordering, geometry, parameters, parent=1): +def BACKLASH(outroot, attribid, ordering, geometry, parameters, parent=1, style=None): func_name = 'BACKLASH' + if style is None: + style = func_name outnode = addOutNode(outroot, BLOCK_BASIC, attribid, ordering, parent, func_name, 'backlash', 'C_OR_FORTRAN', - func_name, BLOCKTYPE_C, + style, BLOCKTYPE_C, dependsOnU='1') addExprsNode(outnode, TYPE_STRING, 3, parameters) diff --git a/blocks/Xcos/blocks/BARXY.py b/blocks/Xcos/blocks/BARXY.py index 5982d42f..27821dd6 100644 --- a/blocks/Xcos/blocks/BARXY.py +++ b/blocks/Xcos/blocks/BARXY.py @@ -1,13 +1,15 @@ from common.AAAAAA import * -def BARXY(outroot, attribid, ordering, geometry, parameters, parent=1): +def BARXY(outroot, attribid, ordering, geometry, parameters, parent=1, style=None): func_name = 'BARXY' + if style is None: + style = func_name outnode = addOutNode(outroot, BLOCK_BASIC, attribid, ordering, parent, func_name, 'BARXY_sim', 'SCILAB', - func_name, BLOCKTYPE_D, + style, BLOCKTYPE_D, dependsOnU='1') addExprsNode(outnode, TYPE_STRING, 5, parameters) diff --git a/blocks/Xcos/blocks/BIGSOM_f.py b/blocks/Xcos/blocks/BIGSOM_f.py index 88141442..2233c712 100644 --- a/blocks/Xcos/blocks/BIGSOM_f.py +++ b/blocks/Xcos/blocks/BIGSOM_f.py @@ -1,13 +1,15 @@ from common.AAAAAA import * -def BIGSOM_f(outroot, attribid, ordering, geometry, parameters, parent=1): +def BIGSOM_f(outroot, attribid, ordering, geometry, parameters, parent=1, style=None): func_name = 'BIGSOM_f' + if style is None: + style = func_name outnode = addOutNode(outroot, BLOCK_BIGSOM, attribid, ordering, parent, func_name, 'sum', 'TYPE_2', - func_name, BLOCKTYPE_C, + style, BLOCKTYPE_C, dependsOnU='1', value='+') diff --git a/blocks/Xcos/blocks/BITCLEAR.py b/blocks/Xcos/blocks/BITCLEAR.py index e5adf4b2..2c71dcd9 100644 --- a/blocks/Xcos/blocks/BITCLEAR.py +++ b/blocks/Xcos/blocks/BITCLEAR.py @@ -1,8 +1,10 @@ from common.AAAAAA import * -def BITCLEAR(outroot, attribid, ordering, geometry, parameters, parent=1): +def BITCLEAR(outroot, attribid, ordering, geometry, parameters, parent=1, style=None): func_name = 'BITCLEAR' + if style is None: + style = func_name datatype = ['', '', '', '32', '16', '8', '32', '16', '8'] para1 = int(float(parameters[0])) @@ -12,7 +14,7 @@ def BITCLEAR(outroot, attribid, ordering, geometry, parameters, parent=1): outnode = addOutNode(outroot, BLOCK_BASIC, attribid, ordering, parent, func_name, simulation_func_name, 'C_OR_FORTRAN', - func_name, BLOCKTYPE_C, + style, BLOCKTYPE_C, dependsOnU='1') addExprsNode(outnode, TYPE_STRING, 2, parameters) diff --git a/blocks/Xcos/blocks/BITSET.py b/blocks/Xcos/blocks/BITSET.py index 06954e63..4172453f 100644 --- a/blocks/Xcos/blocks/BITSET.py +++ b/blocks/Xcos/blocks/BITSET.py @@ -1,8 +1,10 @@ from common.AAAAAA import * -def BITSET(outroot, attribid, ordering, geometry, parameters, parent=1): +def BITSET(outroot, attribid, ordering, geometry, parameters, parent=1, style=None): func_name = 'BITSET' + if style is None: + style = func_name datatype = ['', '', '', '32', '16', '8', '32', '16', '8'] para1 = int(float(parameters[0])) @@ -12,7 +14,7 @@ def BITSET(outroot, attribid, ordering, geometry, parameters, parent=1): outnode = addOutNode(outroot, BLOCK_BASIC, attribid, ordering, parent, func_name, simulation_func_name, 'C_OR_FORTRAN', - func_name, BLOCKTYPE_C, + style, BLOCKTYPE_C, dependsOnU='1') addExprsNode(outnode, TYPE_STRING, 2, parameters) diff --git a/blocks/Xcos/blocks/BOUNCE.py b/blocks/Xcos/blocks/BOUNCE.py index 4e820b31..7102f8f5 100644 --- a/blocks/Xcos/blocks/BOUNCE.py +++ b/blocks/Xcos/blocks/BOUNCE.py @@ -1,13 +1,15 @@ from common.AAAAAA import * -def BOUNCE(outroot, attribid, ordering, geometry, parameters, parent=1): +def BOUNCE(outroot, attribid, ordering, geometry, parameters, parent=1, style=None): func_name = 'BOUNCE' + if style is None: + style = func_name outnode = addOutNode(outroot, BLOCK_BASIC, attribid, ordering, parent, func_name, 'bounce_ball', 'C_OR_FORTRAN', - func_name, BLOCKTYPE_C, + style, BLOCKTYPE_C, dependsOnT='1') addExprsNode(outnode, TYPE_STRING, 7, parameters) diff --git a/blocks/Xcos/blocks/BOUNCEXY.py b/blocks/Xcos/blocks/BOUNCEXY.py index ea749629..050846e2 100644 --- a/blocks/Xcos/blocks/BOUNCEXY.py +++ b/blocks/Xcos/blocks/BOUNCEXY.py @@ -1,13 +1,15 @@ from common.AAAAAA import * -def BOUNCEXY(outroot, attribid, ordering, geometry, parameters, parent=1): +def BOUNCEXY(outroot, attribid, ordering, geometry, parameters, parent=1, style=None): func_name = 'BOUNCEXY' + if style is None: + style = func_name outnode = addOutNode(outroot, BLOCK_BASIC, attribid, ordering, parent, func_name, 'bouncexy', 'C_OR_FORTRAN', - func_name, BLOCKTYPE_D) + style, BLOCKTYPE_D) addExprsNode(outnode, TYPE_STRING, 8, parameters) addScilabDNode(outnode, AS_REAL_PARAM, width=4, realParts=[ diff --git a/blocks/Xcos/blocks/BPLATFORM.py b/blocks/Xcos/blocks/BPLATFORM.py index b5644e38..519d425e 100644 --- a/blocks/Xcos/blocks/BPLATFORM.py +++ b/blocks/Xcos/blocks/BPLATFORM.py @@ -1,13 +1,15 @@ from common.AAAAAA import * -def BPLATFORM(outroot, attribid, ordering, geometry, parameters, parent=1): +def BPLATFORM(outroot, attribid, ordering, geometry, parameters, parent=1, style=None): func_name = 'BPLATFORM' + if style is None: + style = func_name outnode = addOutNode(outroot, BLOCK_BASIC, attribid, ordering, parent, func_name, 'bplatform2', 'SCILAB', - func_name, BLOCKTYPE_D) + style, BLOCKTYPE_D) addExprsNode(outnode, TYPE_STRING, 7, parameters) addScilabDNode(outnode, AS_REAL_PARAM, width=7, realParts=[ diff --git a/blocks/Xcos/blocks/Bache.py b/blocks/Xcos/blocks/Bache.py index 307bb07a..4b4ee2d0 100644 --- a/blocks/Xcos/blocks/Bache.py +++ b/blocks/Xcos/blocks/Bache.py @@ -1,13 +1,15 @@ from common.AAAAAA import * -def Bache(outroot, attribid, ordering, geometry, parameters, parent=1): +def Bache(outroot, attribid, ordering, geometry, parameters, parent=1, style=None): func_name = 'Bache' + if style is None: + style = func_name outnode = addOutNode(outroot, BLOCK_BASIC, attribid, ordering, parent, func_name, 'Bache', 'DEFAULT', - func_name, BLOCKTYPE_C, + style, BLOCKTYPE_C, dependsOnU='1') addExprsNode(outnode, TYPE_STRING, 9, parameters) diff --git a/blocks/Xcos/blocks/CANIMXY.py b/blocks/Xcos/blocks/CANIMXY.py index e09f4c4d..05b56404 100644 --- a/blocks/Xcos/blocks/CANIMXY.py +++ b/blocks/Xcos/blocks/CANIMXY.py @@ -1,13 +1,15 @@ from common.AAAAAA import * -def CANIMXY(outroot, attribid, ordering, geometry, parameters, parent=1): +def CANIMXY(outroot, attribid, ordering, geometry, parameters, parent=1, style=None): func_name = 'CANIMXY' + if style is None: + style = func_name outnode = addOutNode(outroot, BLOCK_BASIC, attribid, ordering, parent, func_name, 'canimxy', 'C_OR_FORTRAN', - func_name, BLOCKTYPE_D) + style, BLOCKTYPE_D) addExprsNode(outnode, TYPE_STRING, 11, parameters) addScilabDNode(outnode, AS_REAL_PARAM, width=4, realParts=[ diff --git a/blocks/Xcos/blocks/CANIMXY3D.py b/blocks/Xcos/blocks/CANIMXY3D.py index 6308cbfd..ed335d9e 100644 --- a/blocks/Xcos/blocks/CANIMXY3D.py +++ b/blocks/Xcos/blocks/CANIMXY3D.py @@ -1,13 +1,15 @@ from common.AAAAAA import * -def CANIMXY3D(outroot, attribid, ordering, geometry, parameters, parent=1): +def CANIMXY3D(outroot, attribid, ordering, geometry, parameters, parent=1, style=None): func_name = 'CANIMXY3D' + if style is None: + style = func_name outnode = addOutNode(outroot, BLOCK_BASIC, attribid, ordering, parent, func_name, 'canimxy3d', 'C_OR_FORTRAN', - func_name, BLOCKTYPE_D) + style, BLOCKTYPE_D) addExprsNode(outnode, TYPE_STRING, 11, parameters) para = [] diff --git a/blocks/Xcos/blocks/CBLOCK.py b/blocks/Xcos/blocks/CBLOCK.py index 9d721563..8a5ec374 100644 --- a/blocks/Xcos/blocks/CBLOCK.py +++ b/blocks/Xcos/blocks/CBLOCK.py @@ -1,8 +1,10 @@ from common.AAAAAA import * -def CBLOCK(outroot, attribid, ordering, geometry, parameters, parent=1): +def CBLOCK(outroot, attribid, ordering, geometry, parameters, parent=1, style=None): func_name = 'CBLOCK' + if style is None: + style = func_name if parameters[1] == 'y': type = 'IMPLICIT' @@ -27,7 +29,7 @@ def CBLOCK(outroot, attribid, ordering, geometry, parameters, parent=1): outnode = addOutNode(outroot, BLOCK_BASIC, attribid, ordering, parent, func_name, parameters[0], simulation_func_type, - func_name, BLOCKTYPE_C, + style, BLOCKTYPE_C, dependsOnU=depends_u, dependsOnT=depends_t) diff --git a/blocks/Xcos/blocks/CBLOCK4.py b/blocks/Xcos/blocks/CBLOCK4.py index e0017120..16aff1da 100644 --- a/blocks/Xcos/blocks/CBLOCK4.py +++ b/blocks/Xcos/blocks/CBLOCK4.py @@ -1,8 +1,10 @@ from common.AAAAAA import * -def CBLOCK4(outroot, attribid, ordering, geometry, parameters, parent=1): +def CBLOCK4(outroot, attribid, ordering, geometry, parameters, parent=1, style=None): func_name = 'CBLOCK4' + if style is None: + style = func_name if parameters[1] == 'y': type = 'IMPLICIT' @@ -27,7 +29,7 @@ def CBLOCK4(outroot, attribid, ordering, geometry, parameters, parent=1): outnode = addOutNode(outroot, BLOCK_BASIC, attribid, ordering, parent, func_name, parameters[0], simulation_func_type, - func_name, BLOCKTYPE_C, + style, BLOCKTYPE_C, dependsOnU=depends_u, dependsOnT=depends_t) diff --git a/blocks/Xcos/blocks/CCS.py b/blocks/Xcos/blocks/CCS.py index 753146a1..7d3b8546 100644 --- a/blocks/Xcos/blocks/CCS.py +++ b/blocks/Xcos/blocks/CCS.py @@ -1,13 +1,15 @@ from common.AAAAAA import * -def CCS(outroot, attribid, ordering, geometry, parameters, parent=1): +def CCS(outroot, attribid, ordering, geometry, parameters, parent=1, style=None): func_name = 'CCS' + if style is None: + style = func_name outnode = addOutNode(outroot, BLOCK_BASIC, attribid, ordering, parent, func_name, 'CCS', 'DEFAULT', - func_name, BLOCKTYPE_C, + style, BLOCKTYPE_C, dependsOnT='1') addExprsNode(outnode, TYPE_DOUBLE, 0, parameters) diff --git a/blocks/Xcos/blocks/CEVENTSCOPE.py b/blocks/Xcos/blocks/CEVENTSCOPE.py index 5bf2eb4e..0548b279 100644 --- a/blocks/Xcos/blocks/CEVENTSCOPE.py +++ b/blocks/Xcos/blocks/CEVENTSCOPE.py @@ -1,13 +1,15 @@ from common.AAAAAA import * -def CEVENTSCOPE(outroot, attribid, ordering, geometry, parameters, parent=1): +def CEVENTSCOPE(outroot, attribid, ordering, geometry, parameters, parent=1, style=None): func_name = 'CEVENTSCOPE' + if style is None: + style = func_name outnode = addOutNode(outroot, BLOCK_BASIC, attribid, ordering, parent, func_name, 'cevscpe', 'C_OR_FORTRAN', - func_name, BLOCKTYPE_D) + style, BLOCKTYPE_D) addExprsNode(outnode, TYPE_STRING, 6, parameters) addSciDBNode(outnode, TYPE_DOUBLE, AS_REAL_PARAM, diff --git a/blocks/Xcos/blocks/CFSCOPE.py b/blocks/Xcos/blocks/CFSCOPE.py index 074971b2..f75228b2 100644 --- a/blocks/Xcos/blocks/CFSCOPE.py +++ b/blocks/Xcos/blocks/CFSCOPE.py @@ -1,13 +1,15 @@ from common.AAAAAA import * -def CFSCOPE(outroot, attribid, ordering, geometry, parameters, parent=1): +def CFSCOPE(outroot, attribid, ordering, geometry, parameters, parent=1, style=None): func_name = 'CFSCOPE' + if style is None: + style = func_name outnode = addOutNode(outroot, BLOCK_BASIC, attribid, ordering, parent, func_name, 'cfscope', 'C_OR_FORTRAN', - func_name, BLOCKTYPE_C, + style, BLOCKTYPE_C, dependsOnU='1') addExprsNode(outnode, TYPE_STRING, 9, parameters) diff --git a/blocks/Xcos/blocks/CLINDUMMY_f.py b/blocks/Xcos/blocks/CLINDUMMY_f.py index 5cf5d6cf..76ca0047 100644 --- a/blocks/Xcos/blocks/CLINDUMMY_f.py +++ b/blocks/Xcos/blocks/CLINDUMMY_f.py @@ -1,13 +1,15 @@ from common.AAAAAA import * -def CLINDUMMY_f(outroot, attribid, ordering, geometry, parameters, parent=1): +def CLINDUMMY_f(outroot, attribid, ordering, geometry, parameters, parent=1, style=None): func_name = 'CLINDUMMY_f' + if style is None: + style = func_name outnode = addOutNode(outroot, BLOCK_BASIC, attribid, ordering, parent, func_name, 'cdummy', 'C_OR_FORTRAN', - func_name, BLOCKTYPE_C, + style, BLOCKTYPE_C, dependsOnT='1') addExprsNode(outnode, TYPE_DOUBLE, 0, parameters) diff --git a/blocks/Xcos/blocks/CLKFROM.py b/blocks/Xcos/blocks/CLKFROM.py index 15afdf94..b8b7e67e 100644 --- a/blocks/Xcos/blocks/CLKFROM.py +++ b/blocks/Xcos/blocks/CLKFROM.py @@ -1,13 +1,15 @@ from common.AAAAAA import * -def CLKFROM(outroot, attribid, ordering, geometry, parameters, parent=1): +def CLKFROM(outroot, attribid, ordering, geometry, parameters, parent=1, style=None): func_name = 'CLKFROM' + if style is None: + style = func_name outnode = addOutNode(outroot, BLOCK_BASIC, attribid, ordering, parent, func_name, 'clkfrom', 'DEFAULT', - func_name, BLOCKTYPE_D, + style, BLOCKTYPE_D, value='From') addExprsNode(outnode, TYPE_STRING, 1, parameters) diff --git a/blocks/Xcos/blocks/CLKGOTO.py b/blocks/Xcos/blocks/CLKGOTO.py index 5cff71d0..85a48e99 100644 --- a/blocks/Xcos/blocks/CLKGOTO.py +++ b/blocks/Xcos/blocks/CLKGOTO.py @@ -1,13 +1,15 @@ from common.AAAAAA import * -def CLKGOTO(outroot, attribid, ordering, geometry, parameters, parent=1): +def CLKGOTO(outroot, attribid, ordering, geometry, parameters, parent=1, style=None): func_name = 'CLKGOTO' + if style is None: + style = func_name outnode = addOutNode(outroot, BLOCK_BASIC, attribid, ordering, parent, func_name, 'clkgoto', 'DEFAULT', - func_name, BLOCKTYPE_D, + style, BLOCKTYPE_D, value='Goto') addExprsNode(outnode, TYPE_STRING, 2, parameters) diff --git a/blocks/Xcos/blocks/CLKGotoTagVisibility.py b/blocks/Xcos/blocks/CLKGotoTagVisibility.py index adb19f14..8876c239 100644 --- a/blocks/Xcos/blocks/CLKGotoTagVisibility.py +++ b/blocks/Xcos/blocks/CLKGotoTagVisibility.py @@ -1,13 +1,15 @@ from common.AAAAAA import * -def CLKGotoTagVisibility(outroot, attribid, ordering, geometry, parameters, parent=1): +def CLKGotoTagVisibility(outroot, attribid, ordering, geometry, parameters, parent=1, style=None): func_name = 'CLKGotoTagVisibility' + if style is None: + style = func_name outnode = addOutNode(outroot, BLOCK_BASIC, attribid, ordering, parent, func_name, 'clkgototagvisibility', 'DEFAULT', - func_name, BLOCKTYPE_C) + style, BLOCKTYPE_C) new_parameter = [parameters[0], '1'] addExprsNode(outnode, TYPE_STRING, 2, new_parameter) diff --git a/blocks/Xcos/blocks/CLKINV_f.py b/blocks/Xcos/blocks/CLKINV_f.py index 2a3eb86a..8d75c653 100644 --- a/blocks/Xcos/blocks/CLKINV_f.py +++ b/blocks/Xcos/blocks/CLKINV_f.py @@ -1,13 +1,15 @@ from common.AAAAAA import * -def CLKINV_f(outroot, attribid, ordering, geometry, parameters, parent=1): +def CLKINV_f(outroot, attribid, ordering, geometry, parameters, parent=1, style=None): func_name = 'CLKINV_f' + if style is None: + style = func_name outnode = addOutNode(outroot, BLOCK_EVENT_IN, attribid, ordering, parent, func_name, 'input', 'DEFAULT', - func_name, BLOCKTYPE_D) + style, BLOCKTYPE_D) addExprsNode(outnode, TYPE_STRING, 1, parameters) addTypeNode(outnode, TYPE_DOUBLE, AS_REAL_PARAM, 0, []) diff --git a/blocks/Xcos/blocks/CLKIN_f.py b/blocks/Xcos/blocks/CLKIN_f.py index 61d6d6e4..b03f4c58 100644 --- a/blocks/Xcos/blocks/CLKIN_f.py +++ b/blocks/Xcos/blocks/CLKIN_f.py @@ -1,13 +1,15 @@ from common.AAAAAA import * -def CLKIN_f(outroot, attribid, ordering, geometry, parameters, parent=1): +def CLKIN_f(outroot, attribid, ordering, geometry, parameters, parent=1, style=None): func_name = 'CLKIN_f' + if style is None: + style = func_name outnode = addOutNode(outroot, BLOCK_BASIC, attribid, ordering, parent, func_name, 'input', 'DEFAULT', - func_name, BLOCKTYPE_D) + style, BLOCKTYPE_D) addExprsNode(outnode, TYPE_STRING, 1, parameters) addTypeNode(outnode, TYPE_DOUBLE, AS_REAL_PARAM, 0, []) diff --git a/blocks/Xcos/blocks/CLKOUTV_f.py b/blocks/Xcos/blocks/CLKOUTV_f.py index 8a6ee30a..66229bcd 100644 --- a/blocks/Xcos/blocks/CLKOUTV_f.py +++ b/blocks/Xcos/blocks/CLKOUTV_f.py @@ -4,13 +4,16 @@ from common.AAAAAA import * # '-64ce6d85:145ef6f2b4f:-7f54'] -def CLKOUTV_f(outroot, attribid, ordering, geometry, parameters, parent=1): +def CLKOUTV_f(outroot, attribid, ordering, geometry, parameters, parent=1, style=None): func_name = 'CLKOUTV_f' + if style is None: + style = func_name + block_id, port_id, link_id = generate_id(3, 0, 0) outnode = addOutNode(outroot, BLOCK_EVENT_OUT, attribid, ordering, parent, func_name, 'output', 'DEFAULT', - func_name, BLOCKTYPE_D, dependsOnU="0", dependsOnT="0") + style, BLOCKTYPE_D, dependsOnU="0", dependsOnT="0") addExprsNode(outnode, TYPE_STRING, 1, parameters) addTypeNode(outnode, TYPE_DOUBLE, AS_REAL_PARAM, 0, diff --git a/blocks/Xcos/blocks/CLKOUT_f.py b/blocks/Xcos/blocks/CLKOUT_f.py index 6599b086..e716e3c4 100644 --- a/blocks/Xcos/blocks/CLKOUT_f.py +++ b/blocks/Xcos/blocks/CLKOUT_f.py @@ -1,13 +1,15 @@ from common.AAAAAA import * -def CLKOUT_f(outroot, attribid, ordering, geometry, parameters, parent=1): +def CLKOUT_f(outroot, attribid, ordering, geometry, parameters, parent=1, style=None): func_name = 'CLKOUT_f' + if style is None: + style = func_name outnode = addOutNode(outroot, BLOCK_EVENT_OUT, attribid, ordering, parent, func_name, 'output', 'DEFAULT', - func_name, BLOCKTYPE_D, dependsOnU='0', + style, BLOCKTYPE_D, dependsOnU='0', dependsOnT='0') addExprsNode(outnode, TYPE_STRING, 1, parameters) diff --git a/blocks/Xcos/blocks/CLKSOMV_f.py b/blocks/Xcos/blocks/CLKSOMV_f.py index 5a80d2e2..5fde5818 100644 --- a/blocks/Xcos/blocks/CLKSOMV_f.py +++ b/blocks/Xcos/blocks/CLKSOMV_f.py @@ -1,13 +1,15 @@ from common.AAAAAA import * -def CLKSOMV_f(outroot, attribid, ordering, geometry, parameters, parent=1): +def CLKSOMV_f(outroot, attribid, ordering, geometry, parameters, parent=1, style=None): func_name = 'CLKSOMV_f' + if style is None: + style = func_name outnode = addOutNode(outroot, BLOCK_ROUND, attribid, ordering, parent, func_name, 'sum', 'DEFAULT', - func_name, BLOCKTYPE_D) + style, BLOCKTYPE_D) addExprsNode(outnode, TYPE_DOUBLE, 0, parameters) addTypeNode(outnode, TYPE_DOUBLE, AS_REAL_PARAM, 0, []) diff --git a/blocks/Xcos/blocks/CLKSOM_f.py b/blocks/Xcos/blocks/CLKSOM_f.py index c6c0b264..5e7f2f4a 100644 --- a/blocks/Xcos/blocks/CLKSOM_f.py +++ b/blocks/Xcos/blocks/CLKSOM_f.py @@ -1,13 +1,15 @@ from common.AAAAAA import * -def CLKSOM_f(outroot, attribid, ordering, geometry, parameters, parent=1): +def CLKSOM_f(outroot, attribid, ordering, geometry, parameters, parent=1, style=None): func_name = 'CLKSOM_f' + if style is None: + style = func_name outnode = addOutNode(outroot, BLOCK_ROUND, attribid, ordering, parent, func_name, 'sum', 'DEFAULT', - func_name, BLOCKTYPE_D, dependsOnU="0", dependsOnT="0") + style, BLOCKTYPE_D, dependsOnU="0", dependsOnT="0") new_param = [parameters[0], parameters[0]] addExprsNode(outnode, TYPE_STRING, 2, new_param) diff --git a/blocks/Xcos/blocks/CLKSPLIT_f.py b/blocks/Xcos/blocks/CLKSPLIT_f.py index f75b09da..243b5b44 100644 --- a/blocks/Xcos/blocks/CLKSPLIT_f.py +++ b/blocks/Xcos/blocks/CLKSPLIT_f.py @@ -1,13 +1,15 @@ from common.AAAAAA import * -def CLKSPLIT_f(outroot, attribid, ordering, geometry, parameters, parent=1): +def CLKSPLIT_f(outroot, attribid, ordering, geometry, parameters, parent=1, style=None): func_name = 'CLKSPLIT_f' + if style is None: + style = func_name outnode = addOutNode(outroot, BLOCK_SPLIT, attribid, ordering, parent, func_name, 'split', 'DEFAULT', - func_name, BLOCKTYPE_D) + style, BLOCKTYPE_D) addExprsNode(outnode, TYPE_STRING, 0, []) addTypeNode(outnode, TYPE_DOUBLE, AS_REAL_PARAM, 0, []) diff --git a/blocks/Xcos/blocks/CLOCK_c.py b/blocks/Xcos/blocks/CLOCK_c.py index ea0a2771..dd5b4b90 100644 --- a/blocks/Xcos/blocks/CLOCK_c.py +++ b/blocks/Xcos/blocks/CLOCK_c.py @@ -4,13 +4,16 @@ from blocks.SplitBlock import SplitBlock from common.AAAAAA import * -def CLOCK_c(outroot, attribid, ordering, geometry, parameters, parent=1): +def CLOCK_c(outroot, attribid, ordering, geometry, parameters, parent=1, style=None): func_name = 'CLOCK_c' + if style is None: + style = func_name + block_id, port_id, link_id = generate_id(9, 12, 7) outnode = addOutNode(outroot, BLOCK_BASIC, attribid, ordering, parent, func_name, 'csuper', 'DEFAULT', - func_name, BLOCKTYPE_H, dependsOnU='0', + style, BLOCKTYPE_H, dependsOnU='0', dependsOnT='0') addExprsNode(outnode, TYPE_DOUBLE, 0, []) diff --git a/blocks/Xcos/blocks/CLR.py b/blocks/Xcos/blocks/CLR.py index 2c57e182..5af94567 100644 --- a/blocks/Xcos/blocks/CLR.py +++ b/blocks/Xcos/blocks/CLR.py @@ -1,13 +1,15 @@ from common.AAAAAA import * -def CLR(outroot, attribid, ordering, geometry, parameters, parent=1): +def CLR(outroot, attribid, ordering, geometry, parameters, parent=1, style=None): func_name = 'CLR' + if style is None: + style = func_name outnode = addOutNode(outroot, BLOCK_BASIC, attribid, ordering, parent, func_name, 'csslti4', 'C_OR_FORTRAN', - func_name, BLOCKTYPE_C, + style, BLOCKTYPE_C, dependsOnT='1') addExprsNode(outnode, TYPE_STRING, 2, parameters) diff --git a/blocks/Xcos/blocks/CLSS.py b/blocks/Xcos/blocks/CLSS.py index 23aeb5b1..03044bee 100644 --- a/blocks/Xcos/blocks/CLSS.py +++ b/blocks/Xcos/blocks/CLSS.py @@ -1,8 +1,10 @@ from common.AAAAAA import * -def CLSS(outroot, attribid, ordering, geometry, parameters, parent=1): +def CLSS(outroot, attribid, ordering, geometry, parameters, parent=1, style=None): func_name = 'CLSS' + if style is None: + style = func_name para4 = int(float(parameters[3])) @@ -14,7 +16,7 @@ def CLSS(outroot, attribid, ordering, geometry, parameters, parent=1): outnode = addOutNode(outroot, BLOCK_BASIC, attribid, ordering, parent, func_name, 'csslti4', 'C_OR_FORTRAN', - func_name, BLOCKTYPE_C, + style, BLOCKTYPE_C, dependsOnU=depends_u, dependsOnT='1') diff --git a/blocks/Xcos/blocks/CMAT3D.py b/blocks/Xcos/blocks/CMAT3D.py index e80f564d..08217f1f 100644 --- a/blocks/Xcos/blocks/CMAT3D.py +++ b/blocks/Xcos/blocks/CMAT3D.py @@ -1,13 +1,15 @@ from common.AAAAAA import * -def CMAT3D(outroot, attribid, ordering, geometry, parameters, parent=1): +def CMAT3D(outroot, attribid, ordering, geometry, parameters, parent=1, style=None): func_name = 'CMAT3D' + if style is None: + style = func_name outnode = addOutNode(outroot, BLOCK_BASIC, attribid, ordering, parent, func_name, 'cmat3d', 'C_OR_FORTRAN', - func_name, BLOCKTYPE_C, + style, BLOCKTYPE_C, dependsOnU='1') addExprsNode(outnode, TYPE_STRING, 5, parameters) diff --git a/blocks/Xcos/blocks/CMATVIEW.py b/blocks/Xcos/blocks/CMATVIEW.py index 25b00f74..cb154365 100644 --- a/blocks/Xcos/blocks/CMATVIEW.py +++ b/blocks/Xcos/blocks/CMATVIEW.py @@ -1,13 +1,15 @@ from common.AAAAAA import * -def CMATVIEW(outroot, attribid, ordering, geometry, parameters, parent=1): +def CMATVIEW(outroot, attribid, ordering, geometry, parameters, parent=1, style=None): func_name = 'CMATVIEW' + if style is None: + style = func_name outnode = addOutNode(outroot, BLOCK_BASIC, attribid, ordering, parent, func_name, 'cmatview', 'C_OR_FORTRAN', - func_name, BLOCKTYPE_C, + style, BLOCKTYPE_C, dependsOnU='1') addExprsNode(outnode, TYPE_STRING, 3, parameters) diff --git a/blocks/Xcos/blocks/CMSCOPE.py b/blocks/Xcos/blocks/CMSCOPE.py index d5631c91..6b334339 100644 --- a/blocks/Xcos/blocks/CMSCOPE.py +++ b/blocks/Xcos/blocks/CMSCOPE.py @@ -1,13 +1,15 @@ from common.AAAAAA import * -def CMSCOPE(outroot, attribid, ordering, geometry, parameters, parent=1): +def CMSCOPE(outroot, attribid, ordering, geometry, parameters, parent=1, style=None): func_name = 'CMSCOPE' + if style is None: + style = func_name outnode = addOutNode(outroot, BLOCK_BASIC, attribid, ordering, parent, func_name, 'cmscope', 'C_OR_FORTRAN', - func_name, BLOCKTYPE_C, + style, BLOCKTYPE_C, dependsOnU='1', dependsOnT='0' ) diff --git a/blocks/Xcos/blocks/CONST.py b/blocks/Xcos/blocks/CONST.py index 45e5dc4a..181c835d 100644 --- a/blocks/Xcos/blocks/CONST.py +++ b/blocks/Xcos/blocks/CONST.py @@ -1,13 +1,15 @@ from common.AAAAAA import * -def CONST(outroot, attribid, ordering, geometry, parameters, parent=1): +def CONST(outroot, attribid, ordering, geometry, parameters, parent=1, style=None): func_name = 'CONST' + if style is None: + style = func_name outnode = addOutNode(outroot, BLOCK_BASIC, attribid, ordering, parent, func_name, 'cstblk4', 'C_OR_FORTRAN', - func_name, BLOCKTYPE_D) + style, BLOCKTYPE_D) addExprsNode(outnode, TYPE_STRING, 1, parameters) addSciDBNode(outnode, TYPE_DOUBLE, AS_REAL_PARAM, diff --git a/blocks/Xcos/blocks/CONSTRAINT2_c.py b/blocks/Xcos/blocks/CONSTRAINT2_c.py index 013cd9dc..631b333a 100644 --- a/blocks/Xcos/blocks/CONSTRAINT2_c.py +++ b/blocks/Xcos/blocks/CONSTRAINT2_c.py @@ -1,13 +1,15 @@ from common.AAAAAA import * -def CONSTRAINT2_c(outroot, attribid, ordering, geometry, parameters, parent=1): +def CONSTRAINT2_c(outroot, attribid, ordering, geometry, parameters, parent=1, style=None): func_name = 'CONSTRAINT2_c' + if style is None: + style = func_name outnode = addOutNode(outroot, BLOCK_BASIC, attribid, ordering, parent, func_name, 'constraint_c', 'IMPLICIT_C_OR_FORTRAN', - func_name, BLOCKTYPE_C, + style, BLOCKTYPE_C, dependsOnT='1') addExprsArrayNode(outnode, TYPE_STRING, 1, parameters, [], TYPE_STRING, func_name) diff --git a/blocks/Xcos/blocks/CONSTRAINT_c.py b/blocks/Xcos/blocks/CONSTRAINT_c.py index 117cf921..54a2f632 100644 --- a/blocks/Xcos/blocks/CONSTRAINT_c.py +++ b/blocks/Xcos/blocks/CONSTRAINT_c.py @@ -1,13 +1,15 @@ from common.AAAAAA import * -def CONSTRAINT_c(outroot, attribid, ordering, geometry, parameters, parent=1): +def CONSTRAINT_c(outroot, attribid, ordering, geometry, parameters, parent=1, style=None): func_name = 'CONSTRAINT_c' + if style is None: + style = func_name outnode = addOutNode(outroot, BLOCK_BASIC, attribid, ordering, parent, func_name, 'constraint_c', 'IMPLICIT_C_OR_FORTRAN', - func_name, BLOCKTYPE_C, + style, BLOCKTYPE_C, dependsOnT='1') addExprsNode(outnode, TYPE_STRING, 1, parameters) diff --git a/blocks/Xcos/blocks/CONST_f.py b/blocks/Xcos/blocks/CONST_f.py index 757e2a60..49a43669 100644 --- a/blocks/Xcos/blocks/CONST_f.py +++ b/blocks/Xcos/blocks/CONST_f.py @@ -1,13 +1,15 @@ from common.AAAAAA import * -def CONST_f(outroot, attribid, ordering, geometry, parameters, parent=1): +def CONST_f(outroot, attribid, ordering, geometry, parameters, parent=1, style=None): func_name = 'CONST_f' + if style is None: + style = func_name outnode = addOutNode(outroot, BLOCK_BASIC, attribid, ordering, parent, func_name, 'cstblk', 'TYPE_1', - func_name, BLOCKTYPE_D) + style, BLOCKTYPE_D) addExprsNode(outnode, TYPE_STRING, 1, parameters) addSciDBNode(outnode, TYPE_DOUBLE, AS_REAL_PARAM, diff --git a/blocks/Xcos/blocks/CONST_m.py b/blocks/Xcos/blocks/CONST_m.py index 357fc1a0..7fc0f8c2 100644 --- a/blocks/Xcos/blocks/CONST_m.py +++ b/blocks/Xcos/blocks/CONST_m.py @@ -1,13 +1,15 @@ from common.AAAAAA import * -def CONST_m(outroot, attribid, ordering, geometry, parameters, parent=1): +def CONST_m(outroot, attribid, ordering, geometry, parameters, parent=1, style=None): func_name = 'CONST_m' + if style is None: + style = func_name outnode = addOutNode(outroot, BLOCK_BASIC, attribid, ordering, parent, func_name, 'cstblk4_m', 'C_OR_FORTRAN', - func_name, BLOCKTYPE_D) + style, BLOCKTYPE_D) addExprsNode(outnode, TYPE_STRING, 1, parameters) addSciDBNode(outnode, TYPE_DOUBLE, AS_REAL_PARAM, diff --git a/blocks/Xcos/blocks/CONVERT.py b/blocks/Xcos/blocks/CONVERT.py index 154ce6e4..6a8916ac 100644 --- a/blocks/Xcos/blocks/CONVERT.py +++ b/blocks/Xcos/blocks/CONVERT.py @@ -1,13 +1,15 @@ from common.AAAAAA import * -def CONVERT(outroot, attribid, ordering, geometry, parameters, parent=1): +def CONVERT(outroot, attribid, ordering, geometry, parameters, parent=1, style=None): func_name = 'CONVERT' + if style is None: + style = func_name outnode = addOutNode(outroot, BLOCK_BASIC, attribid, ordering, parent, func_name, 'convert', 'C_OR_FORTRAN', - func_name, BLOCKTYPE_C, + style, BLOCKTYPE_C, dependsOnU='1') addExprsNode(outnode, TYPE_STRING, 3, parameters) diff --git a/blocks/Xcos/blocks/COSBLK_f.py b/blocks/Xcos/blocks/COSBLK_f.py index 5cc9415a..8516cf48 100644 --- a/blocks/Xcos/blocks/COSBLK_f.py +++ b/blocks/Xcos/blocks/COSBLK_f.py @@ -1,13 +1,15 @@ from common.AAAAAA import * -def COSBLK_f(outroot, attribid, ordering, geometry, parameters, parent=1): +def COSBLK_f(outroot, attribid, ordering, geometry, parameters, parent=1, style=None): func_name = 'COSBLK_f' + if style is None: + style = func_name outnode = addOutNode(outroot, BLOCK_BASIC, attribid, ordering, parent, func_name, 'cosblk', 'DEFAULT', - func_name, BLOCKTYPE_C, + style, BLOCKTYPE_C, dependsOnU='1') addExprsNode(outnode, TYPE_DOUBLE, 0, parameters) diff --git a/blocks/Xcos/blocks/CSCOPE.py b/blocks/Xcos/blocks/CSCOPE.py index aaeee9a8..d07c33da 100644 --- a/blocks/Xcos/blocks/CSCOPE.py +++ b/blocks/Xcos/blocks/CSCOPE.py @@ -1,13 +1,15 @@ from common.AAAAAA import * -def CSCOPE(outroot, attribid, ordering, geometry, parameters, parent=1): +def CSCOPE(outroot, attribid, ordering, geometry, parameters, parent=1, style=None): func_name = 'CSCOPE' + if style is None: + style = func_name outnode = addOutNode(outroot, BLOCK_BASIC, attribid, ordering, parent, func_name, 'cscope', 'C_OR_FORTRAN', - func_name, BLOCKTYPE_C, + style, BLOCKTYPE_C, dependsOnU='1') addExprsNode(outnode, TYPE_STRING, 10, parameters) diff --git a/blocks/Xcos/blocks/CSCOPXY.py b/blocks/Xcos/blocks/CSCOPXY.py index e3e2ef40..e701fc6f 100644 --- a/blocks/Xcos/blocks/CSCOPXY.py +++ b/blocks/Xcos/blocks/CSCOPXY.py @@ -1,13 +1,15 @@ from common.AAAAAA import * -def CSCOPXY(outroot, attribid, ordering, geometry, parameters, parent=1): +def CSCOPXY(outroot, attribid, ordering, geometry, parameters, parent=1, style=None): func_name = 'CSCOPXY' + if style is None: + style = func_name outnode = addOutNode(outroot, BLOCK_BASIC, attribid, ordering, parent, func_name, 'cscopxy', 'C_OR_FORTRAN', - func_name, BLOCKTYPE_D) + style, BLOCKTYPE_D) addExprsNode(outnode, TYPE_STRING, 11, parameters) addScilabDNode(outnode, AS_REAL_PARAM, width=4, realParts=[ diff --git a/blocks/Xcos/blocks/CSCOPXY3D.py b/blocks/Xcos/blocks/CSCOPXY3D.py index 5e1948b7..da9840ee 100644 --- a/blocks/Xcos/blocks/CSCOPXY3D.py +++ b/blocks/Xcos/blocks/CSCOPXY3D.py @@ -1,13 +1,15 @@ from common.AAAAAA import * -def CSCOPXY3D(outroot, attribid, ordering, geometry, parameters, parent=1): +def CSCOPXY3D(outroot, attribid, ordering, geometry, parameters, parent=1, style=None): func_name = 'CSCOPXY3D' + if style is None: + style = func_name outnode = addOutNode(outroot, BLOCK_BASIC, attribid, ordering, parent, func_name, 'cscopxy3d', 'C_OR_FORTRAN', - func_name, BLOCKTYPE_D) + style, BLOCKTYPE_D) addExprsNode(outnode, TYPE_STRING, 11, parameters) addSciDBNode(outnode, TYPE_DOUBLE, AS_REAL_PARAM, diff --git a/blocks/Xcos/blocks/CUMSUM.py b/blocks/Xcos/blocks/CUMSUM.py index fca525c2..d784f883 100644 --- a/blocks/Xcos/blocks/CUMSUM.py +++ b/blocks/Xcos/blocks/CUMSUM.py @@ -1,8 +1,10 @@ from common.AAAAAA import * -def CUMSUM(outroot, attribid, ordering, geometry, parameters, parent=1): +def CUMSUM(outroot, attribid, ordering, geometry, parameters, parent=1, style=None): func_name = 'CUMSUM' + if style is None: + style = func_name para1 = int(parameters[0]) para2 = int(parameters[1]) @@ -24,7 +26,7 @@ def CUMSUM(outroot, attribid, ordering, geometry, parameters, parent=1): outnode = addOutNode(outroot, BLOCK_BASIC, attribid, ordering, parent, func_name, simulation_func_name, 'C_OR_FORTRAN', - func_name, BLOCKTYPE_C, + style, BLOCKTYPE_C, dependsOnU='1') addExprsNode(outnode, TYPE_STRING, 2, parameters) diff --git a/blocks/Xcos/blocks/CURVE_c.py b/blocks/Xcos/blocks/CURVE_c.py index 3679e7f9..52ffcb75 100644 --- a/blocks/Xcos/blocks/CURVE_c.py +++ b/blocks/Xcos/blocks/CURVE_c.py @@ -1,13 +1,15 @@ from common.AAAAAA import * -def CURVE_c(outroot, attribid, ordering, geometry, parameters, parent=1): +def CURVE_c(outroot, attribid, ordering, geometry, parameters, parent=1, style=None): func_name = 'CURVE_c' + if style is None: + style = func_name outnode = addOutNode(outroot, BLOCK_BASIC, attribid, ordering, parent, func_name, 'curve_c', 'DEFAULT', - func_name, BLOCKTYPE_D, dependsOnU='0', + style, BLOCKTYPE_D, dependsOnU='0', dependsOnT='1') param = [] diff --git a/blocks/Xcos/blocks/CURV_f.py b/blocks/Xcos/blocks/CURV_f.py index 371289cb..28092896 100644 --- a/blocks/Xcos/blocks/CURV_f.py +++ b/blocks/Xcos/blocks/CURV_f.py @@ -1,13 +1,15 @@ from common.AAAAAA import * -def CURV_f(outroot, attribid, ordering, geometry, parameters, parent=1): +def CURV_f(outroot, attribid, ordering, geometry, parameters, parent=1, style=None): func_name = 'CURV_f' + if style is None: + style = func_name outnode = addOutNode(outroot, BLOCK_BASIC, attribid, ordering, parent, func_name, 'intplt', 'DEFAULT', - func_name, BLOCKTYPE_C, + style, BLOCKTYPE_C, dependsOnT='1') addExprsNode(outnode, TYPE_DOUBLE, 0, parameters) diff --git a/blocks/Xcos/blocks/CVS.py b/blocks/Xcos/blocks/CVS.py index 540d08a5..43d17227 100644 --- a/blocks/Xcos/blocks/CVS.py +++ b/blocks/Xcos/blocks/CVS.py @@ -1,13 +1,15 @@ from common.AAAAAA import * -def CVS(outroot, attribid, ordering, geometry, parameters, parent=1): +def CVS(outroot, attribid, ordering, geometry, parameters, parent=1, style=None): func_name = 'CVS' + if style is None: + style = func_name outnode = addOutNode(outroot, BLOCK_BASIC, attribid, ordering, parent, func_name, 'CVS', 'DEFAULT', - func_name, BLOCKTYPE_C, + style, BLOCKTYPE_C, dependsOnT='1') addExprsNode(outnode, TYPE_DOUBLE, 0, parameters) diff --git a/blocks/Xcos/blocks/Capacitor.py b/blocks/Xcos/blocks/Capacitor.py index 739857b7..987d6f71 100644 --- a/blocks/Xcos/blocks/Capacitor.py +++ b/blocks/Xcos/blocks/Capacitor.py @@ -1,13 +1,15 @@ from common.AAAAAA import * -def Capacitor(outroot, attribid, ordering, geometry, parameters, parent=1): +def Capacitor(outroot, attribid, ordering, geometry, parameters, parent=1, style=None): func_name = 'Capacitor' + if style is None: + style = func_name outnode = addOutNode(outroot, BLOCK_BASIC, attribid, ordering, parent, func_name, 'Capacitor', 'DEFAULT', - func_name, BLOCKTYPE_C, + style, BLOCKTYPE_C, dependsOnU='1') addExprsNode(outnode, TYPE_STRING, 2, parameters) diff --git a/blocks/Xcos/blocks/ConstantVoltage.py b/blocks/Xcos/blocks/ConstantVoltage.py index 9a932885..fa2bf05d 100644 --- a/blocks/Xcos/blocks/ConstantVoltage.py +++ b/blocks/Xcos/blocks/ConstantVoltage.py @@ -1,13 +1,15 @@ from common.AAAAAA import * -def ConstantVoltage(outroot, attribid, ordering, geometry, parameters, parent=1): +def ConstantVoltage(outroot, attribid, ordering, geometry, parameters, parent=1, style=None): func_name = 'ConstantVoltage' + if style is None: + style = func_name outnode = addOutNode(outroot, BLOCK_BASIC, attribid, ordering, parent, func_name, 'ConstantVoltage', 'DEFAULT', - func_name, BLOCKTYPE_C) + style, BLOCKTYPE_C) addExprsNode(outnode, TYPE_STRING, 1, parameters) addTypeNode(outnode, TYPE_DOUBLE, AS_REAL_PARAM, 1, diff --git a/blocks/Xcos/blocks/Counter.py b/blocks/Xcos/blocks/Counter.py index 7909977c..75e02763 100644 --- a/blocks/Xcos/blocks/Counter.py +++ b/blocks/Xcos/blocks/Counter.py @@ -1,13 +1,15 @@ from common.AAAAAA import * -def Counter(outroot, attribid, ordering, geometry, parameters, parent=1): +def Counter(outroot, attribid, ordering, geometry, parameters, parent=1, style=None): func_name = 'Counter' + if style is None: + style = func_name outnode = addOutNode(outroot, BLOCK_BASIC, attribid, ordering, parent, func_name, 'counter', 'C_OR_FORTRAN', - func_name, BLOCKTYPE_C) + style, BLOCKTYPE_C) addExprsNode(outnode, TYPE_STRING, 3, parameters) addTypeNode(outnode, TYPE_DOUBLE, AS_REAL_PARAM, 0, []) diff --git a/blocks/Xcos/blocks/CurrentSensor.py b/blocks/Xcos/blocks/CurrentSensor.py index 4233e2fa..900a6f4c 100644 --- a/blocks/Xcos/blocks/CurrentSensor.py +++ b/blocks/Xcos/blocks/CurrentSensor.py @@ -1,13 +1,15 @@ from common.AAAAAA import * -def CurrentSensor(outroot, attribid, ordering, geometry, parameters, parent=1): +def CurrentSensor(outroot, attribid, ordering, geometry, parameters, parent=1, style=None): func_name = 'CurrentSensor' + if style is None: + style = func_name outnode = addOutNode(outroot, BLOCK_BASIC, attribid, ordering, parent, func_name, 'CurrentSensor', 'DEFAULT', - func_name, BLOCKTYPE_C, + style, BLOCKTYPE_C, dependsOnU='1', dependsOnT='0') addExprsNode(outnode, TYPE_DOUBLE, 0, parameters) diff --git a/blocks/Xcos/blocks/DEADBAND.py b/blocks/Xcos/blocks/DEADBAND.py index 5e1bc65c..ff6ba45e 100644 --- a/blocks/Xcos/blocks/DEADBAND.py +++ b/blocks/Xcos/blocks/DEADBAND.py @@ -1,13 +1,15 @@ from common.AAAAAA import * -def DEADBAND(outroot, attribid, ordering, geometry, parameters, parent=1): +def DEADBAND(outroot, attribid, ordering, geometry, parameters, parent=1, style=None): func_name = 'DEADBAND' + if style is None: + style = func_name outnode = addOutNode(outroot, BLOCK_BASIC, attribid, ordering, parent, func_name, 'deadband', 'C_OR_FORTRAN', - func_name, BLOCKTYPE_C, + style, BLOCKTYPE_C, dependsOnU='1') addExprsNode(outnode, TYPE_STRING, 3, parameters) diff --git a/blocks/Xcos/blocks/DEBUG.py b/blocks/Xcos/blocks/DEBUG.py index 8c87628a..60e1c841 100644 --- a/blocks/Xcos/blocks/DEBUG.py +++ b/blocks/Xcos/blocks/DEBUG.py @@ -1,8 +1,10 @@ from common.AAAAAA import * -def DEBUG(outroot, attribid, ordering, geometry, parameters, parent=1): +def DEBUG(outroot, attribid, ordering, geometry, parameters, parent=1, style=None): func_name = 'DEBUG' + if style is None: + style = func_name code = parameters[0] codeLines = code.split('\n') @@ -10,7 +12,7 @@ def DEBUG(outroot, attribid, ordering, geometry, parameters, parent=1): outnode = addOutNode(outroot, BLOCK_BASIC, attribid, ordering, parent, func_name, '%debug_scicos', 'DEBUG', - func_name, BLOCKTYPE_D) + style, BLOCKTYPE_D) addExprsArrayNode(outnode, TYPE_STRING, 1, [''], codeLines, TYPE_STRING, func_name) addTypeNode(outnode, TYPE_DOUBLE, AS_REAL_PARAM, 0, []) diff --git a/blocks/Xcos/blocks/DELAYV_f.py b/blocks/Xcos/blocks/DELAYV_f.py index 5bad49d3..b7a5b56b 100644 --- a/blocks/Xcos/blocks/DELAYV_f.py +++ b/blocks/Xcos/blocks/DELAYV_f.py @@ -1,13 +1,15 @@ from common.AAAAAA import * -def DELAYV_f(outroot, attribid, ordering, geometry, parameters, parent=1): +def DELAYV_f(outroot, attribid, ordering, geometry, parameters, parent=1, style=None): func_name = 'DELAYV_f' + if style is None: + style = func_name outnode = addOutNode(outroot, BLOCK_BASIC, attribid, ordering, parent, func_name, 'delayv', 'TYPE_1', - func_name, BLOCKTYPE_D, + style, BLOCKTYPE_D, dependsOnU='1') addExprsNode(outnode, TYPE_STRING, 3, parameters) diff --git a/blocks/Xcos/blocks/DELAY_f.py b/blocks/Xcos/blocks/DELAY_f.py index 22683395..ca59301c 100644 --- a/blocks/Xcos/blocks/DELAY_f.py +++ b/blocks/Xcos/blocks/DELAY_f.py @@ -10,13 +10,16 @@ from common.AAAAAA import * # port_id = ['7a86d9c5:18e504d8baa:-7fae'] -def DELAY_f(outroot, attribid, ordering, geometry, parameters, parent=1): +def DELAY_f(outroot, attribid, ordering, geometry, parameters, parent=1, style=None): func_name = 'DELAY_f' + if style is None: + style = func_name + block_id, port_id, link_id = generate_id(6, 1, 0) outnode = addOutNode(outroot, BLOCK_BASIC, attribid, ordering, parent, func_name, 'csuper', 'DEFAULT', - func_name, BLOCKTYPE_H) + style, BLOCKTYPE_H) addExprsNode(outnode, TYPE_DOUBLE, 0, parameters) addSciDBNode(outnode, TYPE_DOUBLE, AS_REAL_PARAM, diff --git a/blocks/Xcos/blocks/DEMUX.py b/blocks/Xcos/blocks/DEMUX.py index e0e26837..61643ad1 100644 --- a/blocks/Xcos/blocks/DEMUX.py +++ b/blocks/Xcos/blocks/DEMUX.py @@ -1,13 +1,15 @@ from common.AAAAAA import * -def DEMUX(outroot, attribid, ordering, geometry, parameters, parent=1): +def DEMUX(outroot, attribid, ordering, geometry, parameters, parent=1, style=None): func_name = 'DEMUX' + if style is None: + style = func_name outnode = addOutNode(outroot, BLOCK_BASIC, attribid, ordering, parent, func_name, 'multiplex', 'C_OR_FORTRAN', - func_name, BLOCKTYPE_C, + style, BLOCKTYPE_C, dependsOnU='1') addExprsNode(outnode, TYPE_STRING, 1, parameters) diff --git a/blocks/Xcos/blocks/DEMUX_f.py b/blocks/Xcos/blocks/DEMUX_f.py index ce428ee3..cc45e5b1 100644 --- a/blocks/Xcos/blocks/DEMUX_f.py +++ b/blocks/Xcos/blocks/DEMUX_f.py @@ -1,13 +1,15 @@ from common.AAAAAA import * -def DEMUX_f(outroot, attribid, ordering, geometry, parameters, parent=1): +def DEMUX_f(outroot, attribid, ordering, geometry, parameters, parent=1, style=None): func_name = 'DEMUX_f' + if style is None: + style = func_name outnode = addOutNode(outroot, BLOCK_BASIC, attribid, ordering, parent, func_name, 'demux', 'TYPE_1', - func_name, BLOCKTYPE_C, + style, BLOCKTYPE_C, dependsOnU='1') addExprsNode(outnode, TYPE_STRING, 1, parameters) diff --git a/blocks/Xcos/blocks/DERIV.py b/blocks/Xcos/blocks/DERIV.py index 8b824027..08120b25 100644 --- a/blocks/Xcos/blocks/DERIV.py +++ b/blocks/Xcos/blocks/DERIV.py @@ -1,13 +1,15 @@ from common.AAAAAA import * -def DERIV(outroot, attribid, ordering, geometry, parameters, parent=1): +def DERIV(outroot, attribid, ordering, geometry, parameters, parent=1, style=None): func_name = 'DERIV' + if style is None: + style = func_name outnode = addOutNode(outroot, BLOCK_BASIC, attribid, ordering, parent, func_name, 'deriv', 'C_OR_FORTRAN', - func_name, BLOCKTYPE_X, + style, BLOCKTYPE_X, dependsOnU='1') addExprsNode(outnode, TYPE_DOUBLE, 0, parameters) diff --git a/blocks/Xcos/blocks/DFLIPFLOP.py b/blocks/Xcos/blocks/DFLIPFLOP.py index 8d125d59..ecf09f02 100644 --- a/blocks/Xcos/blocks/DFLIPFLOP.py +++ b/blocks/Xcos/blocks/DFLIPFLOP.py @@ -13,13 +13,16 @@ from blocks.SELECT_m import SELECT_m from common.AAAAAA import * -def DFLIPFLOP(outroot, attribid, ordering, geometry, parameters, parent=1): +def DFLIPFLOP(outroot, attribid, ordering, geometry, parameters, parent=1, style=None): func_name = 'DFLIPFLOP' + if style is None: + style = func_name + block_id, port_id, link_id = generate_id(21, 52, 24) outnode = addOutNode(outroot, BLOCK_BASIC, attribid, ordering, parent, func_name, 'csuper', 'DEFAULT', - func_name, BLOCKTYPE_H, + style, BLOCKTYPE_H, dependsOnU='1') addExprsNode(outnode, TYPE_DOUBLE, 0, parameters) diff --git a/blocks/Xcos/blocks/DIFF_f.py b/blocks/Xcos/blocks/DIFF_f.py index 6b0f2f1c..879584f9 100644 --- a/blocks/Xcos/blocks/DIFF_f.py +++ b/blocks/Xcos/blocks/DIFF_f.py @@ -1,13 +1,15 @@ from common.AAAAAA import * -def DIFF_f(outroot, attribid, ordering, geometry, parameters, parent=1): +def DIFF_f(outroot, attribid, ordering, geometry, parameters, parent=1, style=None): func_name = 'DIFF_f' + if style is None: + style = func_name outnode = addOutNode(outroot, BLOCK_BASIC, attribid, ordering, parent, func_name, 'diffblk', 'OLDBLOCKS', - func_name, BLOCKTYPE_C, + style, BLOCKTYPE_C, dependsOnT='1') addExprsNode(outnode, TYPE_STRING, 2, parameters) diff --git a/blocks/Xcos/blocks/DLATCH.py b/blocks/Xcos/blocks/DLATCH.py index 305d53ba..98d2d461 100644 --- a/blocks/Xcos/blocks/DLATCH.py +++ b/blocks/Xcos/blocks/DLATCH.py @@ -8,13 +8,16 @@ from blocks.OUT_f import OUT_f from common.AAAAAA import * -def DLATCH(outroot, attribid, ordering, geometry, parameters, parent=1): +def DLATCH(outroot, attribid, ordering, geometry, parameters, parent=1, style=None): func_name = 'DLATCH' + if style is None: + style = func_name + block_id, port_id, link_id = generate_id(12, 20, 9) outnode = addOutNode(outroot, BLOCK_BASIC, attribid, ordering, parent, func_name, 'csuper', 'DEFAULT', - func_name, BLOCKTYPE_H, + style, BLOCKTYPE_H, dependsOnU='1') addExprsNode(outnode, TYPE_DOUBLE, 0, parameters) diff --git a/blocks/Xcos/blocks/DLR.py b/blocks/Xcos/blocks/DLR.py index c007f0d1..24463c14 100644 --- a/blocks/Xcos/blocks/DLR.py +++ b/blocks/Xcos/blocks/DLR.py @@ -1,8 +1,10 @@ from common.AAAAAA import * -def DLR(outroot, attribid, ordering, geometry, parameters, parent=1): +def DLR(outroot, attribid, ordering, geometry, parameters, parent=1, style=None): func_name = 'DLR' + if style is None: + style = func_name depends_on_flag = 0 @@ -41,7 +43,7 @@ def DLR(outroot, attribid, ordering, geometry, parameters, parent=1): outnode = addOutNode(outroot, BLOCK_BASIC, attribid, ordering, parent, func_name, 'dsslti4', 'C_OR_FORTRAN', - func_name, BLOCKTYPE_D, + style, BLOCKTYPE_D, dependsOnU=depends_on_flag) addExprsNode(outnode, TYPE_STRING, 2, parameters) diff --git a/blocks/Xcos/blocks/DLRADAPT_f.py b/blocks/Xcos/blocks/DLRADAPT_f.py index 0932a96f..4352480f 100644 --- a/blocks/Xcos/blocks/DLRADAPT_f.py +++ b/blocks/Xcos/blocks/DLRADAPT_f.py @@ -1,13 +1,15 @@ from common.AAAAAA import * -def DLRADAPT_f(outroot, attribid, ordering, geometry, parameters, parent=1): +def DLRADAPT_f(outroot, attribid, ordering, geometry, parameters, parent=1, style=None): func_name = 'DLRADAPT_f' + if style is None: + style = func_name outnode = addOutNode(outroot, BLOCK_BASIC, attribid, ordering, parent, func_name, 'dlradp', 'DEFAULT', - func_name, BLOCKTYPE_D, + style, BLOCKTYPE_D, dependsOnU='1') addExprsNode(outnode, TYPE_STRING, 6, parameters) diff --git a/blocks/Xcos/blocks/DLSS.py b/blocks/Xcos/blocks/DLSS.py index ce9c2a6c..66ea4b11 100644 --- a/blocks/Xcos/blocks/DLSS.py +++ b/blocks/Xcos/blocks/DLSS.py @@ -1,13 +1,15 @@ from common.AAAAAA import * -def DLSS(outroot, attribid, ordering, geometry, parameters, parent=1): +def DLSS(outroot, attribid, ordering, geometry, parameters, parent=1, style=None): func_name = 'DLSS' + if style is None: + style = func_name outnode = addOutNode(outroot, BLOCK_BASIC, attribid, ordering, parent, func_name, 'dsslti4', 'C_OR_FORTRAN', - func_name, BLOCKTYPE_D) + style, BLOCKTYPE_D) addExprsNode(outnode, TYPE_STRING, 5, parameters) addScilabDNode(outnode, AS_REAL_PARAM, width=4, realParts=[ diff --git a/blocks/Xcos/blocks/DOLLAR.py b/blocks/Xcos/blocks/DOLLAR.py index 188c0953..104b001b 100644 --- a/blocks/Xcos/blocks/DOLLAR.py +++ b/blocks/Xcos/blocks/DOLLAR.py @@ -1,13 +1,15 @@ from common.AAAAAA import * -def DOLLAR(outroot, attribid, ordering, geometry, parameters, parent=1): +def DOLLAR(outroot, attribid, ordering, geometry, parameters, parent=1, style=None): func_name = 'DOLLAR' + if style is None: + style = func_name outnode = addOutNode(outroot, BLOCK_BASIC, attribid, ordering, parent, func_name, 'dollar4', 'C_OR_FORTRAN', - func_name, BLOCKTYPE_D) + style, BLOCKTYPE_D) addExprsNode(outnode, TYPE_STRING, 2, parameters) addSciDBNode(outnode, TYPE_DOUBLE, AS_REAL_PARAM, 0, []) diff --git a/blocks/Xcos/blocks/DOLLAR_f.py b/blocks/Xcos/blocks/DOLLAR_f.py index 010a46da..ed93ed42 100644 --- a/blocks/Xcos/blocks/DOLLAR_f.py +++ b/blocks/Xcos/blocks/DOLLAR_f.py @@ -1,13 +1,15 @@ from common.AAAAAA import * -def DOLLAR_f(outroot, attribid, ordering, geometry, parameters, parent=1): +def DOLLAR_f(outroot, attribid, ordering, geometry, parameters, parent=1, style=None): func_name = 'DOLLAR_f' + if style is None: + style = func_name outnode = addOutNode(outroot, BLOCK_BASIC, attribid, ordering, parent, func_name, 'dollar', 'DEFAULT', - func_name, BLOCKTYPE_D) + style, BLOCKTYPE_D) addExprsNode(outnode, TYPE_STRING, 2, parameters) addTypeNode(outnode, TYPE_DOUBLE, AS_REAL_PARAM, 0, []) diff --git a/blocks/Xcos/blocks/DOLLAR_m.py b/blocks/Xcos/blocks/DOLLAR_m.py index 5e541bb5..838209dc 100644 --- a/blocks/Xcos/blocks/DOLLAR_m.py +++ b/blocks/Xcos/blocks/DOLLAR_m.py @@ -1,13 +1,15 @@ from common.AAAAAA import * -def DOLLAR_m(outroot, attribid, ordering, geometry, parameters, parent=1): +def DOLLAR_m(outroot, attribid, ordering, geometry, parameters, parent=1, style=None): func_name = 'DOLLAR_m' + if style is None: + style = func_name outnode = addOutNode(outroot, BLOCK_BASIC, attribid, ordering, parent, func_name, 'dollar4', 'C_OR_FORTRAN', - func_name, BLOCKTYPE_D) + style, BLOCKTYPE_D) addExprsNode(outnode, TYPE_STRING, 2, parameters) addTypeNode(outnode, TYPE_DOUBLE, AS_REAL_PARAM, 0, []) diff --git a/blocks/Xcos/blocks/Diode.py b/blocks/Xcos/blocks/Diode.py index 0ec6d31c..3fe75597 100644 --- a/blocks/Xcos/blocks/Diode.py +++ b/blocks/Xcos/blocks/Diode.py @@ -1,13 +1,15 @@ from common.AAAAAA import * -def Diode(outroot, attribid, ordering, geometry, parameters, parent=1): +def Diode(outroot, attribid, ordering, geometry, parameters, parent=1, style=None): func_name = 'Diode' + if style is None: + style = func_name outnode = addOutNode(outroot, BLOCK_BASIC, attribid, ordering, parent, func_name, 'Diode', 'DEFAULT', - func_name, BLOCKTYPE_C, + style, BLOCKTYPE_C, dependsOnU='1') addExprsNode(outnode, TYPE_STRING, 4, parameters) diff --git a/blocks/Xcos/blocks/EDGETRIGGER.py b/blocks/Xcos/blocks/EDGETRIGGER.py index 196039f8..82c78bf0 100644 --- a/blocks/Xcos/blocks/EDGETRIGGER.py +++ b/blocks/Xcos/blocks/EDGETRIGGER.py @@ -1,13 +1,15 @@ from common.AAAAAA import * -def EDGETRIGGER(outroot, attribid, ordering, geometry, parameters, parent=1): +def EDGETRIGGER(outroot, attribid, ordering, geometry, parameters, parent=1, style=None): func_name = 'EDGETRIGGER' + if style is None: + style = func_name outnode = addOutNode(outroot, BLOCK_BASIC, attribid, ordering, parent, func_name, 'edgetrig', 'C_OR_FORTRAN', - func_name, BLOCKTYPE_C) + style, BLOCKTYPE_C) addExprsNode(outnode, TYPE_STRING, 1, parameters) addTypeNode(outnode, TYPE_DOUBLE, AS_REAL_PARAM, 0, []) diff --git a/blocks/Xcos/blocks/EDGE_TRIGGER.py b/blocks/Xcos/blocks/EDGE_TRIGGER.py index 9abc4497..0575e8cf 100644 --- a/blocks/Xcos/blocks/EDGE_TRIGGER.py +++ b/blocks/Xcos/blocks/EDGE_TRIGGER.py @@ -5,13 +5,16 @@ from blocks.EDGETRIGGER import EDGETRIGGER from common.AAAAAA import * -def EDGE_TRIGGER(outroot, attribid, ordering, geometry, parameters, parent=1): +def EDGE_TRIGGER(outroot, attribid, ordering, geometry, parameters, parent=1, style=None): func_name = 'EDGE_TRIGGER' + if style is None: + style = func_name + block_id, port_id, link_id = generate_id(6, 7, 4) outnode = addOutNode(outroot, BLOCK_BASIC, attribid, ordering, parent, func_name, 'csuper', 'DEFAULT', - func_name, BLOCKTYPE_C) + style, BLOCKTYPE_C) addExprsNode(outnode, TYPE_DOUBLE, 0, parameters) addTypeNode(outnode, TYPE_DOUBLE, AS_REAL_PARAM, 0, []) diff --git a/blocks/Xcos/blocks/ENDBLK.py b/blocks/Xcos/blocks/ENDBLK.py index a5e6633a..fa84428b 100644 --- a/blocks/Xcos/blocks/ENDBLK.py +++ b/blocks/Xcos/blocks/ENDBLK.py @@ -5,13 +5,16 @@ from common.AAAAAA import * # '-76454188:14e1ef4db88:-7d55'] -def ENDBLK(outroot, attribid, ordering, geometry, parameters, parent=1): +def ENDBLK(outroot, attribid, ordering, geometry, parameters, parent=1, style=None): func_name = 'ENDBLK' + if style is None: + style = func_name + block_id, port_id, link_id = generate_id(3, 0, 0) outnode = addOutNode(outroot, BLOCK_BASIC, attribid, ordering, parent, func_name, 'csuper', 'DEFAULT', - func_name, BLOCKTYPE_H) + style, BLOCKTYPE_H) addExprsNode(outnode, TYPE_DOUBLE, 0, parameters) addTypeNode(outnode, TYPE_DOUBLE, AS_REAL_PARAM, 0, diff --git a/blocks/Xcos/blocks/END_c.py b/blocks/Xcos/blocks/END_c.py index 46ddef50..c8eae112 100644 --- a/blocks/Xcos/blocks/END_c.py +++ b/blocks/Xcos/blocks/END_c.py @@ -1,13 +1,15 @@ from common.AAAAAA import * -def END_c(outroot, attribid, ordering, geometry, parameters, parent=1): +def END_c(outroot, attribid, ordering, geometry, parameters, parent=1, style=None): func_name = 'END_c' + if style is None: + style = func_name outnode = addOutNode(outroot, BLOCK_BASIC, attribid, ordering, parent, func_name, 'scicosexit', 'C_OR_FORTRAN', - func_name, BLOCKTYPE_D) + style, BLOCKTYPE_D) addExprsNode(outnode, TYPE_STRING, 1, parameters) addTypeNode(outnode, TYPE_DOUBLE, AS_REAL_PARAM, 0, []) diff --git a/blocks/Xcos/blocks/ESELECT_f.py b/blocks/Xcos/blocks/ESELECT_f.py index 33e54dc8..b012dbe4 100644 --- a/blocks/Xcos/blocks/ESELECT_f.py +++ b/blocks/Xcos/blocks/ESELECT_f.py @@ -1,13 +1,15 @@ from common.AAAAAA import * -def ESELECT_f(outroot, attribid, ordering, geometry, parameters, parent=1): +def ESELECT_f(outroot, attribid, ordering, geometry, parameters, parent=1, style=None): func_name = 'ESELECT_f' + if style is None: + style = func_name outnode = addOutNode(outroot, BLOCK_BASIC, attribid, ordering, parent, func_name, 'eselect', 'ESELECT', - func_name, BLOCKTYPE_L, + style, BLOCKTYPE_L, dependsOnU='1') addExprsNode(outnode, TYPE_STRING, 3, parameters) diff --git a/blocks/Xcos/blocks/EVTDLY_c.py b/blocks/Xcos/blocks/EVTDLY_c.py index 09847f70..4b492870 100644 --- a/blocks/Xcos/blocks/EVTDLY_c.py +++ b/blocks/Xcos/blocks/EVTDLY_c.py @@ -1,13 +1,15 @@ from common.AAAAAA import * -def EVTDLY_c(outroot, attribid, ordering, geometry, parameters, parent=1): +def EVTDLY_c(outroot, attribid, ordering, geometry, parameters, parent=1, style=None): func_name = 'EVTDLY_c' + if style is None: + style = func_name outnode = addOutNode(outroot, BLOCK_BASIC, attribid, ordering, parent, func_name, 'evtdly4', 'C_OR_FORTRAN', - func_name, BLOCKTYPE_D, dependsOnU='0', + style, BLOCKTYPE_D, dependsOnU='0', dependsOnT='0') addExprsNode(outnode, TYPE_STRING, 2, parameters) diff --git a/blocks/Xcos/blocks/EVTDLY_f.py b/blocks/Xcos/blocks/EVTDLY_f.py index d5073d1b..b59f4318 100644 --- a/blocks/Xcos/blocks/EVTDLY_f.py +++ b/blocks/Xcos/blocks/EVTDLY_f.py @@ -1,13 +1,15 @@ from common.AAAAAA import * -def EVTDLY_f(outroot, attribid, ordering, geometry, parameters, parent=1): +def EVTDLY_f(outroot, attribid, ordering, geometry, parameters, parent=1, style=None): func_name = 'EVTDLY_f' + if style is None: + style = func_name outnode = addOutNode(outroot, BLOCK_BASIC, attribid, ordering, parent, func_name, 'evtdly4', 'C_OR_FORTRAN', - func_name, BLOCKTYPE_D) + style, BLOCKTYPE_D) addExprsNode(outnode, TYPE_STRING, 2, parameters) addSciDBNode(outnode, TYPE_DOUBLE, AS_REAL_PARAM, diff --git a/blocks/Xcos/blocks/EVTGEN_f.py b/blocks/Xcos/blocks/EVTGEN_f.py index 572e6ef9..f570211e 100644 --- a/blocks/Xcos/blocks/EVTGEN_f.py +++ b/blocks/Xcos/blocks/EVTGEN_f.py @@ -1,13 +1,15 @@ from common.AAAAAA import * -def EVTGEN_f(outroot, attribid, ordering, geometry, parameters, parent=1): +def EVTGEN_f(outroot, attribid, ordering, geometry, parameters, parent=1, style=None): func_name = 'EVTGEN_f' + if style is None: + style = func_name outnode = addOutNode(outroot, BLOCK_BASIC, attribid, ordering, parent, func_name, 'trash', 'DEFAULT', - func_name, BLOCKTYPE_D) + style, BLOCKTYPE_D) addExprsNode(outnode, TYPE_STRING, 1, parameters) addTypeNode(outnode, TYPE_DOUBLE, AS_REAL_PARAM, 0, []) diff --git a/blocks/Xcos/blocks/EVTVARDLY.py b/blocks/Xcos/blocks/EVTVARDLY.py index 0ecf38ef..f46ffacd 100644 --- a/blocks/Xcos/blocks/EVTVARDLY.py +++ b/blocks/Xcos/blocks/EVTVARDLY.py @@ -1,13 +1,15 @@ from common.AAAAAA import * -def EVTVARDLY(outroot, attribid, ordering, geometry, parameters, parent=1): +def EVTVARDLY(outroot, attribid, ordering, geometry, parameters, parent=1, style=None): func_name = 'EVTVARDLY' + if style is None: + style = func_name outnode = addOutNode(outroot, BLOCK_BASIC, attribid, ordering, parent, func_name, 'evtvardly', 'C_OR_FORTRAN', - func_name, BLOCKTYPE_C, + style, BLOCKTYPE_C, dependsOnU='1') addExprsNode(outnode, TYPE_STRING, 1, parameters) diff --git a/blocks/Xcos/blocks/EXPBLK_m.py b/blocks/Xcos/blocks/EXPBLK_m.py index 2e9b2807..245bf8c2 100644 --- a/blocks/Xcos/blocks/EXPBLK_m.py +++ b/blocks/Xcos/blocks/EXPBLK_m.py @@ -1,13 +1,15 @@ from common.AAAAAA import * -def EXPBLK_m(outroot, attribid, ordering, geometry, parameters, parent=1): +def EXPBLK_m(outroot, attribid, ordering, geometry, parameters, parent=1, style=None): func_name = 'EXPBLK_m' + if style is None: + style = func_name outnode = addOutNode(outroot, BLOCK_BASIC, attribid, ordering, parent, func_name, 'expblk_m', 'C_OR_FORTRAN', - func_name, BLOCKTYPE_C, + style, BLOCKTYPE_C, dependsOnU='1') addExprsNode(outnode, TYPE_STRING, 1, parameters) diff --git a/blocks/Xcos/blocks/EXPRESSION.py b/blocks/Xcos/blocks/EXPRESSION.py index ef0d72d2..fb5cbd9d 100644 --- a/blocks/Xcos/blocks/EXPRESSION.py +++ b/blocks/Xcos/blocks/EXPRESSION.py @@ -1,13 +1,15 @@ from common.AAAAAA import * -def EXPRESSION(outroot, attribid, ordering, geometry, parameters, parent=1): +def EXPRESSION(outroot, attribid, ordering, geometry, parameters, parent=1, style=None): func_name = 'EXPRESSION' + if style is None: + style = func_name outnode = addOutNode(outroot, BLOCK_BASIC, attribid, ordering, parent, func_name, 'evaluate_expr', 'C_OR_FORTRAN', - func_name, BLOCKTYPE_C, + style, BLOCKTYPE_C, dependsOnU='1') addExprsNode(outnode, TYPE_STRING, 3, parameters) diff --git a/blocks/Xcos/blocks/EXTRACT.py b/blocks/Xcos/blocks/EXTRACT.py index 22151a22..53a40396 100644 --- a/blocks/Xcos/blocks/EXTRACT.py +++ b/blocks/Xcos/blocks/EXTRACT.py @@ -1,8 +1,10 @@ from common.AAAAAA import * -def EXTRACT(outroot, attribid, ordering, geometry, parameters, parent=1): +def EXTRACT(outroot, attribid, ordering, geometry, parameters, parent=1, style=None): func_name = 'EXTRACT' + if style is None: + style = func_name data_type = ['', 'extract', 'extractz'] @@ -11,7 +13,7 @@ def EXTRACT(outroot, attribid, ordering, geometry, parameters, parent=1): outnode = addOutNode(outroot, BLOCK_BASIC, attribid, ordering, parent, func_name, simulation_func_name, 'C_OR_FORTRAN', - func_name, BLOCKTYPE_C, + style, BLOCKTYPE_C, dependsOnU='1') addExprsNode(outnode, TYPE_STRING, 3, parameters) diff --git a/blocks/Xcos/blocks/EXTRACTBITS.py b/blocks/Xcos/blocks/EXTRACTBITS.py index 0766e963..eda1dcd7 100644 --- a/blocks/Xcos/blocks/EXTRACTBITS.py +++ b/blocks/Xcos/blocks/EXTRACTBITS.py @@ -1,8 +1,10 @@ from common.AAAAAA import * -def EXTRACTBITS(outroot, attribid, ordering, geometry, parameters, parent=1): +def EXTRACTBITS(outroot, attribid, ordering, geometry, parameters, parent=1, style=None): func_name = 'EXTRACTBITS' + if style is None: + style = func_name d_type = ['', 'UH', 'LH', 'MSB', 'LSB', 'RB'] type1 = ['', '', '', '32', '16', '8', 'u32', 'u16', 'u8'] @@ -27,7 +29,7 @@ def EXTRACTBITS(outroot, attribid, ordering, geometry, parameters, parent=1): outnode = addOutNode(outroot, BLOCK_BASIC, attribid, ordering, parent, func_name, simulation_func_name, 'C_OR_FORTRAN', - func_name, BLOCKTYPE_C, + style, BLOCKTYPE_C, dependsOnU='1') addExprsNode(outnode, TYPE_STRING, 4, parameters) diff --git a/blocks/Xcos/blocks/EXTRACTOR.py b/blocks/Xcos/blocks/EXTRACTOR.py index ca020255..59f347de 100644 --- a/blocks/Xcos/blocks/EXTRACTOR.py +++ b/blocks/Xcos/blocks/EXTRACTOR.py @@ -1,13 +1,15 @@ from common.AAAAAA import * -def EXTRACTOR(outroot, attribid, ordering, geometry, parameters, parent=1): +def EXTRACTOR(outroot, attribid, ordering, geometry, parameters, parent=1, style=None): func_name = 'EXTRACTOR' + if style is None: + style = func_name outnode = addOutNode(outroot, BLOCK_BASIC, attribid, ordering, parent, func_name, 'extractor', 'C_OR_FORTRAN', - func_name, BLOCKTYPE_C, + style, BLOCKTYPE_C, dependsOnU='1') addExprsNode(outnode, TYPE_STRING, 1, parameters) diff --git a/blocks/Xcos/blocks/EXTTRI.py b/blocks/Xcos/blocks/EXTTRI.py index 8a89f4fa..2f9e3ec2 100644 --- a/blocks/Xcos/blocks/EXTTRI.py +++ b/blocks/Xcos/blocks/EXTTRI.py @@ -1,8 +1,10 @@ from common.AAAAAA import * -def EXTTRI(outroot, attribid, ordering, geometry, parameters, parent=1): +def EXTTRI(outroot, attribid, ordering, geometry, parameters, parent=1, style=None): func_name = 'EXTTRI' + if style is None: + style = func_name extration_type = ['', 'exttril', 'exttriu', 'extdiag'] data_type = ['', '', 'z'] @@ -14,7 +16,7 @@ def EXTTRI(outroot, attribid, ordering, geometry, parameters, parent=1): outnode = addOutNode(outroot, BLOCK_BASIC, attribid, ordering, parent, func_name, simulation_func_name, 'C_OR_FORTRAN', - func_name, BLOCKTYPE_C, + style, BLOCKTYPE_C, dependsOnU='1') addExprsNode(outnode, TYPE_STRING, 2, parameters) diff --git a/blocks/Xcos/blocks/Extract_Activation.py b/blocks/Xcos/blocks/Extract_Activation.py index d8049c5e..32566456 100644 --- a/blocks/Xcos/blocks/Extract_Activation.py +++ b/blocks/Xcos/blocks/Extract_Activation.py @@ -5,13 +5,16 @@ from blocks.CLKOUTV_f import CLKOUTV_f from common.AAAAAA import * -def Extract_Activation(outroot, attribid, ordering, geometry, parameters, parent=1): +def Extract_Activation(outroot, attribid, ordering, geometry, parameters, parent=1, style=None): func_name = 'Extract_Activation' + if style is None: + style = func_name + block_id, port_id, link_id = generate_id(6, 9, 4) outnode = addOutNode(outroot, BLOCK_BASIC, attribid, ordering, parent, func_name, 'csuper', 'DEFAULT', - func_name, BLOCKTYPE_C) + style, BLOCKTYPE_C) addExprsNode(outnode, TYPE_DOUBLE, 0, parameters) addTypeNode(outnode, TYPE_DOUBLE, AS_REAL_PARAM, 0, diff --git a/blocks/Xcos/blocks/FROM.py b/blocks/Xcos/blocks/FROM.py index 61f323f4..cdeba387 100644 --- a/blocks/Xcos/blocks/FROM.py +++ b/blocks/Xcos/blocks/FROM.py @@ -1,13 +1,15 @@ from common.AAAAAA import * -def FROM(outroot, attribid, ordering, geometry, parameters, parent=1): +def FROM(outroot, attribid, ordering, geometry, parameters, parent=1, style=None): func_name = 'FROM' + if style is None: + style = func_name outnode = addOutNode(outroot, BLOCK_BASIC, attribid, ordering, parent, func_name, 'from', 'DEFAULT', - func_name, BLOCKTYPE_C) + style, BLOCKTYPE_C) addExprsNode(outnode, TYPE_STRING, 1, parameters) addTypeNode(outnode, TYPE_DOUBLE, AS_REAL_PARAM, 0, []) diff --git a/blocks/Xcos/blocks/FROMMO.py b/blocks/Xcos/blocks/FROMMO.py index 3fc06975..a0fa3fbe 100644 --- a/blocks/Xcos/blocks/FROMMO.py +++ b/blocks/Xcos/blocks/FROMMO.py @@ -1,13 +1,15 @@ from common.AAAAAA import * -def FROMMO(outroot, attribid, ordering, geometry, parameters, parent=1): +def FROMMO(outroot, attribid, ordering, geometry, parameters, parent=1, style=None): func_name = 'FROMMO' + if style is None: + style = func_name outnode = addOutNode(outroot, BLOCK_BASIC, attribid, ordering, parent, func_name, 'frommo', 'DEFAULT', - func_name, BLOCKTYPE_C) + style, BLOCKTYPE_C) addExprsNode(outnode, TYPE_STRING, 1, parameters) addSciDBNode(outnode, TYPE_DOUBLE, AS_REAL_PARAM, 0, []) diff --git a/blocks/Xcos/blocks/FROMWSB.py b/blocks/Xcos/blocks/FROMWSB.py index dd801cee..d8d7f897 100644 --- a/blocks/Xcos/blocks/FROMWSB.py +++ b/blocks/Xcos/blocks/FROMWSB.py @@ -11,13 +11,16 @@ from common.AAAAAA import * # link_id = ['5631d1e9:18ea7a6d774:-7fed', '5631d1e9:18ea7a6d774:-7fec'] -def FROMWSB(outroot, attribid, ordering, geometry, parameters, parent=1): +def FROMWSB(outroot, attribid, ordering, geometry, parameters, parent=1, style=None): func_name = 'FROMWSB' + if style is None: + style = func_name + block_id, port_id, link_id = generate_id(4, 4, 2) outnode = addOutNode(outroot, BLOCK_BASIC, attribid, ordering, parent, func_name, 'csuper', 'DEFAULT', - func_name, BLOCKTYPE_H) + style, BLOCKTYPE_H) addExprsNode(outnode, TYPE_DOUBLE, 0, parameters) addTypeNode(outnode, TYPE_DOUBLE, AS_REAL_PARAM, 0, []) diff --git a/blocks/Xcos/blocks/FROMWS_c.py b/blocks/Xcos/blocks/FROMWS_c.py index 5894dd51..0f95bcfa 100644 --- a/blocks/Xcos/blocks/FROMWS_c.py +++ b/blocks/Xcos/blocks/FROMWS_c.py @@ -1,13 +1,15 @@ from common.AAAAAA import * -def FROMWS_c(outroot, attribid, ordering, geometry, parameters, parent=1): +def FROMWS_c(outroot, attribid, ordering, geometry, parameters, parent=1, style=None): func_name = 'FROMWS_c' + if style is None: + style = func_name outnode = addOutNode(outroot, BLOCK_BASIC, attribid, ordering, parent, func_name, 'fromws_c', 'C_OR_FORTRAN', - func_name, BLOCKTYPE_D) + style, BLOCKTYPE_D) addExprsNode(outnode, TYPE_STRING, 4, parameters) addTypeNode(outnode, TYPE_DOUBLE, AS_REAL_PARAM, 0, diff --git a/blocks/Xcos/blocks/Flowmeter.py b/blocks/Xcos/blocks/Flowmeter.py index 076c3d69..9d19c207 100644 --- a/blocks/Xcos/blocks/Flowmeter.py +++ b/blocks/Xcos/blocks/Flowmeter.py @@ -1,14 +1,17 @@ from common.AAAAAA import * -def Flowmeter(outroot, attribid, ordering, geometry, parameters, parent=1): +def Flowmeter(outroot, attribid, ordering, geometry, parameters, parent=1, style=None): func_name = 'Flowmeter' + if style is None: + style = func_name + parameters = ['1'] outnode = addOutNode(outroot, BLOCK_BASIC, attribid, ordering, parent, func_name, 'Flowmeter', 'DEFAULT', - func_name, BLOCKTYPE_C, + style, BLOCKTYPE_C, dependsOnT='1') addExprsNode(outnode, TYPE_STRING, 1, parameters) diff --git a/blocks/Xcos/blocks/GAINBLK.py b/blocks/Xcos/blocks/GAINBLK.py index 2034c8d8..0fd54212 100644 --- a/blocks/Xcos/blocks/GAINBLK.py +++ b/blocks/Xcos/blocks/GAINBLK.py @@ -1,13 +1,15 @@ from common.AAAAAA import * -def GAINBLK(outroot, attribid, ordering, geometry, parameters, parent=1): +def GAINBLK(outroot, attribid, ordering, geometry, parameters, parent=1, style=None): func_name = 'GAINBLK' + if style is None: + style = func_name outnode = addOutNode(outroot, BLOCK_BASIC, attribid, ordering, parent, func_name, 'gainblk', 'C_OR_FORTRAN', - func_name, BLOCKTYPE_C, + style, BLOCKTYPE_C, dependsOnU='1') addExprsNode(outnode, TYPE_STRING, 2, parameters) diff --git a/blocks/Xcos/blocks/GAINBLK_f.py b/blocks/Xcos/blocks/GAINBLK_f.py index 07860960..0e6721f3 100644 --- a/blocks/Xcos/blocks/GAINBLK_f.py +++ b/blocks/Xcos/blocks/GAINBLK_f.py @@ -1,13 +1,15 @@ from common.AAAAAA import * -def GAINBLK_f(outroot, attribid, ordering, geometry, parameters, parent=1): +def GAINBLK_f(outroot, attribid, ordering, geometry, parameters, parent=1, style=None): func_name = 'GAINBLK_f' + if style is None: + style = func_name outnode = addOutNode(outroot, BLOCK_BASIC, attribid, ordering, parent, func_name, 'gain', 'DEFAULT', - func_name, BLOCKTYPE_C, + style, BLOCKTYPE_C, dependsOnU='1') addExprsNode(outnode, TYPE_STRING, 1, parameters) diff --git a/blocks/Xcos/blocks/GAIN_f.py b/blocks/Xcos/blocks/GAIN_f.py index 83c41aac..6b56e1bb 100644 --- a/blocks/Xcos/blocks/GAIN_f.py +++ b/blocks/Xcos/blocks/GAIN_f.py @@ -1,13 +1,15 @@ from common.AAAAAA import * -def GAIN_f(outroot, attribid, ordering, geometry, parameters, parent=1): +def GAIN_f(outroot, attribid, ordering, geometry, parameters, parent=1, style=None): func_name = 'GAIN_f' + if style is None: + style = func_name outnode = addOutNode(outroot, BLOCK_BASIC, attribid, ordering, parent, func_name, 'gain', 'DEFAULT', - func_name, BLOCKTYPE_C, + style, BLOCKTYPE_C, dependsOnU='1') addExprsNode(outnode, TYPE_STRING, 1, parameters) diff --git a/blocks/Xcos/blocks/GENERAL_f.py b/blocks/Xcos/blocks/GENERAL_f.py index bd65cb5b..79ce97ed 100644 --- a/blocks/Xcos/blocks/GENERAL_f.py +++ b/blocks/Xcos/blocks/GENERAL_f.py @@ -1,13 +1,15 @@ from common.AAAAAA import * -def GENERAL_f(outroot, attribid, ordering, geometry, parameters, parent=1): +def GENERAL_f(outroot, attribid, ordering, geometry, parameters, parent=1, style=None): func_name = 'GENERAL_f' + if style is None: + style = func_name outnode = addOutNode(outroot, BLOCK_BASIC, attribid, ordering, parent, func_name, 'zcross', 'TYPE_1', - func_name, BLOCKTYPE_Z, + style, BLOCKTYPE_Z, dependsOnU='1') addExprsNode(outnode, TYPE_STRING, 2, parameters) diff --git a/blocks/Xcos/blocks/GENSIN_f.py b/blocks/Xcos/blocks/GENSIN_f.py index acb36fb8..28748cf5 100644 --- a/blocks/Xcos/blocks/GENSIN_f.py +++ b/blocks/Xcos/blocks/GENSIN_f.py @@ -1,13 +1,15 @@ from common.AAAAAA import * -def GENSIN_f(outroot, attribid, ordering, geometry, parameters, parent=1): +def GENSIN_f(outroot, attribid, ordering, geometry, parameters, parent=1, style=None): func_name = 'GENSIN_f' + if style is None: + style = func_name outnode = addOutNode(outroot, BLOCK_BASIC, attribid, ordering, parent, func_name, 'gensin', 'DEFAULT', - func_name, BLOCKTYPE_C, + style, BLOCKTYPE_C, dependsOnT='1') addExprsNode(outnode, TYPE_STRING, 3, parameters) diff --git a/blocks/Xcos/blocks/GENSQR_f.py b/blocks/Xcos/blocks/GENSQR_f.py index 62342394..22daff2b 100644 --- a/blocks/Xcos/blocks/GENSQR_f.py +++ b/blocks/Xcos/blocks/GENSQR_f.py @@ -1,13 +1,15 @@ from common.AAAAAA import * -def GENSQR_f(outroot, attribid, ordering, geometry, parameters, parent=1): +def GENSQR_f(outroot, attribid, ordering, geometry, parameters, parent=1, style=None): func_name = 'GENSQR_f' + if style is None: + style = func_name outnode = addOutNode(outroot, BLOCK_BASIC, attribid, ordering, parent, func_name, 'gensqr', 'DEFAULT', - func_name, BLOCKTYPE_D) + style, BLOCKTYPE_D) addExprsNode(outnode, TYPE_STRING, 1, parameters) addTypeNode(outnode, TYPE_DOUBLE, AS_REAL_PARAM, 0, diff --git a/blocks/Xcos/blocks/GOTO.py b/blocks/Xcos/blocks/GOTO.py index a9bad292..0e648141 100644 --- a/blocks/Xcos/blocks/GOTO.py +++ b/blocks/Xcos/blocks/GOTO.py @@ -1,13 +1,15 @@ from common.AAAAAA import * -def GOTO(outroot, attribid, ordering, geometry, parameters, parent=1): +def GOTO(outroot, attribid, ordering, geometry, parameters, parent=1, style=None): func_name = 'GOTO' + if style is None: + style = func_name outnode = addOutNode(outroot, BLOCK_BASIC, attribid, ordering, parent, func_name, 'goto', 'DEFAULT', - func_name, BLOCKTYPE_C) + style, BLOCKTYPE_C) addExprsNode(outnode, TYPE_STRING, 2, parameters) addTypeNode(outnode, TYPE_DOUBLE, AS_REAL_PARAM, 0, []) diff --git a/blocks/Xcos/blocks/GOTOMO.py b/blocks/Xcos/blocks/GOTOMO.py index 9945b7be..a7263a77 100644 --- a/blocks/Xcos/blocks/GOTOMO.py +++ b/blocks/Xcos/blocks/GOTOMO.py @@ -1,13 +1,15 @@ from common.AAAAAA import * -def GOTOMO(outroot, attribid, ordering, geometry, parameters, parent=1): +def GOTOMO(outroot, attribid, ordering, geometry, parameters, parent=1, style=None): func_name = 'GOTOMO' + if style is None: + style = func_name outnode = addOutNode(outroot, BLOCK_BASIC, attribid, ordering, parent, func_name, 'gotomo', 'DEFAULT', - func_name, BLOCKTYPE_C) + style, BLOCKTYPE_C) addExprsNode(outnode, TYPE_STRING, 2, parameters) addSciDBNode(outnode, TYPE_DOUBLE, AS_REAL_PARAM, 0, []) diff --git a/blocks/Xcos/blocks/GotoTagVisibility.py b/blocks/Xcos/blocks/GotoTagVisibility.py index 68290943..bbb3311e 100644 --- a/blocks/Xcos/blocks/GotoTagVisibility.py +++ b/blocks/Xcos/blocks/GotoTagVisibility.py @@ -1,13 +1,15 @@ from common.AAAAAA import * -def GotoTagVisibility(outroot, attribid, ordering, geometry, parameters, parent=1): +def GotoTagVisibility(outroot, attribid, ordering, geometry, parameters, parent=1, style=None): func_name = 'GotoTagVisibility' + if style is None: + style = func_name outnode = addOutNode(outroot, BLOCK_BASIC, attribid, ordering, parent, func_name, 'gototagvisibility', 'DEFAULT', - func_name, BLOCKTYPE_C) + style, BLOCKTYPE_C) addExprsNode(outnode, TYPE_STRING, 1, parameters) addSciDBNode(outnode, TYPE_DOUBLE, AS_REAL_PARAM, 0, []) diff --git a/blocks/Xcos/blocks/GotoTagVisibilityMO.py b/blocks/Xcos/blocks/GotoTagVisibilityMO.py index b046c887..adb63145 100644 --- a/blocks/Xcos/blocks/GotoTagVisibilityMO.py +++ b/blocks/Xcos/blocks/GotoTagVisibilityMO.py @@ -1,13 +1,15 @@ from common.AAAAAA import * -def GotoTagVisibilityMO(outroot, attribid, ordering, geometry, parameters, parent=1): +def GotoTagVisibilityMO(outroot, attribid, ordering, geometry, parameters, parent=1, style=None): func_name = 'GotoTagVisibilityMO' + if style is None: + style = func_name outnode = addOutNode(outroot, BLOCK_BASIC, attribid, ordering, parent, func_name, 'gototagvisibilitymo', 'DEFAULT', - func_name, BLOCKTYPE_C) + style, BLOCKTYPE_C) addExprsNode(outnode, TYPE_STRING, 1, parameters) addSciDBNode(outnode, TYPE_DOUBLE, AS_REAL_PARAM, 0, []) diff --git a/blocks/Xcos/blocks/Ground.py b/blocks/Xcos/blocks/Ground.py index 002f354b..01481f11 100644 --- a/blocks/Xcos/blocks/Ground.py +++ b/blocks/Xcos/blocks/Ground.py @@ -1,13 +1,16 @@ from common.AAAAAA import * -def Ground(outroot, attribid, ordering, geometry, parameters, parent=1): +def Ground(outroot, attribid, ordering, geometry, parameters, parent=1, style=None): func_name = 'Ground' + if style is None: + style = func_name + parameters = [""] outnode = addOutNode(outroot, BLOCK_GROUND, attribid, ordering, parent, func_name, 'Ground', 'DEFAULT', - func_name, BLOCKTYPE_C, + style, BLOCKTYPE_C, dependsOnU='1', dependsOnT='0') addExprsNode(outnode, TYPE_STRING, 1, parameters) diff --git a/blocks/Xcos/blocks/Ground_g.py b/blocks/Xcos/blocks/Ground_g.py index aa6c1bb1..e73745e0 100644 --- a/blocks/Xcos/blocks/Ground_g.py +++ b/blocks/Xcos/blocks/Ground_g.py @@ -1,13 +1,15 @@ from common.AAAAAA import * -def Ground_g(outroot, attribid, ordering, geometry, parameters, parent=1): +def Ground_g(outroot, attribid, ordering, geometry, parameters, parent=1, style=None): func_name = 'Ground_g' + if style is None: + style = func_name outnode = addOutNode(outroot, BLOCK_BASIC, attribid, ordering, parent, func_name, 'cstblk4_m', 'C_OR_FORTRAN', - func_name, BLOCKTYPE_D) + style, BLOCKTYPE_D) addExprsNode(outnode, TYPE_STRING, 0, []) addTypeNode(outnode, TYPE_DOUBLE, AS_REAL_PARAM, 0, diff --git a/blocks/Xcos/blocks/Gyrator.py b/blocks/Xcos/blocks/Gyrator.py index fa7d44c7..732f9b75 100644 --- a/blocks/Xcos/blocks/Gyrator.py +++ b/blocks/Xcos/blocks/Gyrator.py @@ -1,13 +1,15 @@ from common.AAAAAA import * -def Gyrator(outroot, attribid, ordering, geometry, parameters, parent=1): +def Gyrator(outroot, attribid, ordering, geometry, parameters, parent=1, style=None): func_name = 'Gyrator' + if style is None: + style = func_name outnode = addOutNode(outroot, BLOCK_BASIC, attribid, ordering, parent, func_name, 'Gyrator', 'DEFAULT', - func_name, BLOCKTYPE_C, + style, BLOCKTYPE_C, dependsOnT='1') addExprsNode(outnode, TYPE_STRING, 2, parameters) diff --git a/blocks/Xcos/blocks/HALT_f.py b/blocks/Xcos/blocks/HALT_f.py index 3dcb1c50..182273d0 100644 --- a/blocks/Xcos/blocks/HALT_f.py +++ b/blocks/Xcos/blocks/HALT_f.py @@ -1,13 +1,15 @@ from common.AAAAAA import * -def HALT_f(outroot, attribid, ordering, geometry, parameters, parent=1): +def HALT_f(outroot, attribid, ordering, geometry, parameters, parent=1, style=None): func_name = 'HALT_f' + if style is None: + style = func_name outnode = addOutNode(outroot, BLOCK_BASIC, attribid, ordering, parent, func_name, 'hltblk', 'DEFAULT', - func_name, BLOCKTYPE_D) + style, BLOCKTYPE_D) addExprsNode(outnode, TYPE_STRING, 1, parameters) addTypeNode(outnode, TYPE_DOUBLE, AS_REAL_PARAM, 0, []) diff --git a/blocks/Xcos/blocks/HYSTHERESIS.py b/blocks/Xcos/blocks/HYSTHERESIS.py index ca57d44b..1f528c18 100644 --- a/blocks/Xcos/blocks/HYSTHERESIS.py +++ b/blocks/Xcos/blocks/HYSTHERESIS.py @@ -1,13 +1,15 @@ from common.AAAAAA import * -def HYSTHERESIS(outroot, attribid, ordering, geometry, parameters, parent=1): +def HYSTHERESIS(outroot, attribid, ordering, geometry, parameters, parent=1, style=None): func_name = 'HYSTHERESIS' + if style is None: + style = func_name outnode = addOutNode(outroot, BLOCK_BASIC, attribid, ordering, parent, func_name, 'hystheresis', 'C_OR_FORTRAN', - func_name, BLOCKTYPE_C, + style, BLOCKTYPE_C, dependsOnU='1') addExprsNode(outnode, TYPE_STRING, 5, parameters) diff --git a/blocks/Xcos/blocks/IFTHEL_f.py b/blocks/Xcos/blocks/IFTHEL_f.py index 1181ecf2..1945202e 100644 --- a/blocks/Xcos/blocks/IFTHEL_f.py +++ b/blocks/Xcos/blocks/IFTHEL_f.py @@ -1,13 +1,15 @@ from common.AAAAAA import * -def IFTHEL_f(outroot, attribid, ordering, geometry, parameters, parent=1): +def IFTHEL_f(outroot, attribid, ordering, geometry, parameters, parent=1, style=None): func_name = 'IFTHEL_f' + if style is None: + style = func_name outnode = addOutNode(outroot, BLOCK_BASIC, attribid, ordering, parent, func_name, 'ifthel', 'IFTHENELSE', - func_name, BLOCKTYPE_L, + style, BLOCKTYPE_L, dependsOnU='1') addExprsNode(outnode, TYPE_STRING, 2, parameters) diff --git a/blocks/Xcos/blocks/IMPSPLIT_f.py b/blocks/Xcos/blocks/IMPSPLIT_f.py index dd530d8c..6cc4d853 100644 --- a/blocks/Xcos/blocks/IMPSPLIT_f.py +++ b/blocks/Xcos/blocks/IMPSPLIT_f.py @@ -1,13 +1,15 @@ from common.AAAAAA import * -def IMPSPLIT_f(outroot, attribid, ordering, geometry, parameters, parent=1): +def IMPSPLIT_f(outroot, attribid, ordering, geometry, parameters, parent=1, style=None): func_name = 'IMPSPLIT_f' + if style is None: + style = func_name outnode = addOutNode(outroot, BLOCK_SPLIT, attribid, ordering, parent, func_name, '', 'DEFAULT', - func_name, BLOCKTYPE_C) + style, BLOCKTYPE_C) addExprsNode(outnode, TYPE_STRING, 0, []) addTypeNode(outnode, TYPE_DOUBLE, AS_REAL_PARAM, 0, []) diff --git a/blocks/Xcos/blocks/INIMPL_f.py b/blocks/Xcos/blocks/INIMPL_f.py index f4eb8f0c..3b18f2ed 100644 --- a/blocks/Xcos/blocks/INIMPL_f.py +++ b/blocks/Xcos/blocks/INIMPL_f.py @@ -1,13 +1,15 @@ from common.AAAAAA import * -def INIMPL_f(outroot, attribid, ordering, geometry, parameters, parent=1): +def INIMPL_f(outroot, attribid, ordering, geometry, parameters, parent=1, style=None): func_name = 'INIMPL_f' + if style is None: + style = func_name outnode = addOutNode(outroot, BLOCK_IMPLICIT_IN, attribid, ordering, parent, func_name, 'inimpl', 'DEFAULT', - func_name, BLOCKTYPE_C) + style, BLOCKTYPE_C) addExprsNode(outnode, TYPE_STRING, 1, parameters) addSciDBNode(outnode, TYPE_DOUBLE, AS_REAL_PARAM, 0, []) diff --git a/blocks/Xcos/blocks/INTEGRAL_f.py b/blocks/Xcos/blocks/INTEGRAL_f.py index 93d6c6dc..e2581e50 100644 --- a/blocks/Xcos/blocks/INTEGRAL_f.py +++ b/blocks/Xcos/blocks/INTEGRAL_f.py @@ -1,13 +1,15 @@ from common.AAAAAA import * -def INTEGRAL_f(outroot, attribid, ordering, geometry, parameters, parent=1): +def INTEGRAL_f(outroot, attribid, ordering, geometry, parameters, parent=1, style=None): func_name = 'INTEGRAL_f' + if style is None: + style = func_name outnode = addOutNode(outroot, BLOCK_BASIC, attribid, ordering, parent, func_name, 'integr', 'DEFAULT', - func_name, BLOCKTYPE_C, + style, BLOCKTYPE_C, dependsOnT='1') addExprsNode(outnode, TYPE_STRING, 1, parameters) diff --git a/blocks/Xcos/blocks/INTEGRAL_m.py b/blocks/Xcos/blocks/INTEGRAL_m.py index 903a8d31..ec9eb88d 100644 --- a/blocks/Xcos/blocks/INTEGRAL_m.py +++ b/blocks/Xcos/blocks/INTEGRAL_m.py @@ -1,13 +1,15 @@ from common.AAAAAA import * -def INTEGRAL_m(outroot, attribid, ordering, geometry, parameters, parent=1): +def INTEGRAL_m(outroot, attribid, ordering, geometry, parameters, parent=1, style=None): func_name = 'INTEGRAL_m' + if style is None: + style = func_name outnode = addOutNode(outroot, BLOCK_BASIC, attribid, ordering, parent, func_name, 'integral_func', 'C_OR_FORTRAN', - func_name, BLOCKTYPE_C, + style, BLOCKTYPE_C, dependsOnT='1') addExprsNode(outnode, TYPE_STRING, 5, parameters) diff --git a/blocks/Xcos/blocks/INTMUL.py b/blocks/Xcos/blocks/INTMUL.py index 3f8a6d83..ecff8e69 100644 --- a/blocks/Xcos/blocks/INTMUL.py +++ b/blocks/Xcos/blocks/INTMUL.py @@ -1,8 +1,10 @@ from common.AAAAAA import * -def INTMUL(outroot, attribid, ordering, geometry, parameters, parent=1): +def INTMUL(outroot, attribid, ordering, geometry, parameters, parent=1, style=None): func_name = 'INTMUL' + if style is None: + style = func_name datatype = ['', '', '', 'i32', 'i16', 'i8', 'ui32', 'ui16', 'ui8'] para1 = int(float(parameters[0])) @@ -20,7 +22,7 @@ def INTMUL(outroot, attribid, ordering, geometry, parameters, parent=1): outnode = addOutNode(outroot, BLOCK_BASIC, attribid, ordering, parent, func_name, simulation_func_name, 'C_OR_FORTRAN', - func_name, BLOCKTYPE_C, + style, BLOCKTYPE_C, dependsOnU='1') addExprsNode(outnode, TYPE_STRING, 2, parameters) diff --git a/blocks/Xcos/blocks/INTRP2BLK_f.py b/blocks/Xcos/blocks/INTRP2BLK_f.py index beabb170..ff1dcfcf 100644 --- a/blocks/Xcos/blocks/INTRP2BLK_f.py +++ b/blocks/Xcos/blocks/INTRP2BLK_f.py @@ -1,13 +1,15 @@ from common.AAAAAA import * -def INTRP2BLK_f(outroot, attribid, ordering, geometry, parameters, parent=1): +def INTRP2BLK_f(outroot, attribid, ordering, geometry, parameters, parent=1, style=None): func_name = 'INTRP2BLK_f' + if style is None: + style = func_name outnode = addOutNode(outroot, BLOCK_BASIC, attribid, ordering, parent, func_name, 'intrp2', 'TYPE_1', - func_name, BLOCKTYPE_C, + style, BLOCKTYPE_C, dependsOnU='1') def extract_elements(item): diff --git a/blocks/Xcos/blocks/INTRPLBLK_f.py b/blocks/Xcos/blocks/INTRPLBLK_f.py index 1c3a1715..d5bff8bd 100644 --- a/blocks/Xcos/blocks/INTRPLBLK_f.py +++ b/blocks/Xcos/blocks/INTRPLBLK_f.py @@ -1,13 +1,15 @@ from common.AAAAAA import * -def INTRPLBLK_f(outroot, attribid, ordering, geometry, parameters, parent=1): +def INTRPLBLK_f(outroot, attribid, ordering, geometry, parameters, parent=1, style=None): func_name = 'INTRPLBLK_f' + if style is None: + style = func_name outnode = addOutNode(outroot, BLOCK_BASIC, attribid, ordering, parent, func_name, 'intrpl', 'DEFAULT', - func_name, BLOCKTYPE_C, + style, BLOCKTYPE_C, dependsOnU='1') def extract_values(item): diff --git a/blocks/Xcos/blocks/INVBLK.py b/blocks/Xcos/blocks/INVBLK.py index ae3cc396..a13f7fc8 100644 --- a/blocks/Xcos/blocks/INVBLK.py +++ b/blocks/Xcos/blocks/INVBLK.py @@ -1,13 +1,15 @@ from common.AAAAAA import * -def INVBLK(outroot, attribid, ordering, geometry, parameters, parent=1): +def INVBLK(outroot, attribid, ordering, geometry, parameters, parent=1, style=None): func_name = 'INVBLK' + if style is None: + style = func_name outnode = addOutNode(outroot, BLOCK_BASIC, attribid, ordering, parent, func_name, 'invblk4', 'C_OR_FORTRAN', - func_name, BLOCKTYPE_C, + style, BLOCKTYPE_C, dependsOnU='1') addExprsNode(outnode, TYPE_STRING, 1, parameters) diff --git a/blocks/Xcos/blocks/IN_f.py b/blocks/Xcos/blocks/IN_f.py index a5183dc0..cc42b7d5 100644 --- a/blocks/Xcos/blocks/IN_f.py +++ b/blocks/Xcos/blocks/IN_f.py @@ -1,13 +1,15 @@ from common.AAAAAA import * -def IN_f(outroot, attribid, ordering, geometry, parameters, parent=1): +def IN_f(outroot, attribid, ordering, geometry, parameters, parent=1, style=None): func_name = 'IN_f' + if style is None: + style = func_name outnode = addOutNode(outroot, BLOCK_EXPLICIT_IN, attribid, ordering, parent, func_name, 'input', 'DEFAULT', - func_name, BLOCKTYPE_C) + style, BLOCKTYPE_C) addExprsNode(outnode, TYPE_STRING, 2, parameters) addTypeNode(outnode, TYPE_DOUBLE, AS_REAL_PARAM, 0, []) diff --git a/blocks/Xcos/blocks/ISELECT_m.py b/blocks/Xcos/blocks/ISELECT_m.py index 7415a7ec..38d3590c 100644 --- a/blocks/Xcos/blocks/ISELECT_m.py +++ b/blocks/Xcos/blocks/ISELECT_m.py @@ -1,13 +1,15 @@ from common.AAAAAA import * -def ISELECT_m(outroot, attribid, ordering, geometry, parameters, parent=1): +def ISELECT_m(outroot, attribid, ordering, geometry, parameters, parent=1, style=None): func_name = 'ISELECT_m' + if style is None: + style = func_name outnode = addOutNode(outroot, BLOCK_BASIC, attribid, ordering, parent, func_name, 'selector_m', 'C_OR_FORTRAN', - func_name, BLOCKTYPE_C, + style, BLOCKTYPE_C, dependsOnU='1') addExprsNode(outnode, TYPE_STRING, 3, parameters) diff --git a/blocks/Xcos/blocks/IdealTransformer.py b/blocks/Xcos/blocks/IdealTransformer.py index f278798a..37354f30 100644 --- a/blocks/Xcos/blocks/IdealTransformer.py +++ b/blocks/Xcos/blocks/IdealTransformer.py @@ -1,13 +1,15 @@ from common.AAAAAA import * -def IdealTransformer(outroot, attribid, ordering, geometry, parameters, parent=1): +def IdealTransformer(outroot, attribid, ordering, geometry, parameters, parent=1, style=None): func_name = 'IdealTransformer' + if style is None: + style = func_name outnode = addOutNode(outroot, BLOCK_BASIC, attribid, ordering, parent, func_name, 'IdealTransformer', 'DEFAULT', - func_name, BLOCKTYPE_C, + style, BLOCKTYPE_C, dependsOnT='1') addExprsNode(outnode, TYPE_STRING, 1, parameters) diff --git a/blocks/Xcos/blocks/Inductor.py b/blocks/Xcos/blocks/Inductor.py index 5c633eac..29e0e78a 100644 --- a/blocks/Xcos/blocks/Inductor.py +++ b/blocks/Xcos/blocks/Inductor.py @@ -1,13 +1,15 @@ from common.AAAAAA import * -def Inductor(outroot, attribid, ordering, geometry, parameters, parent=1): +def Inductor(outroot, attribid, ordering, geometry, parameters, parent=1, style=None): func_name = 'Inductor' + if style is None: + style = func_name outnode = addOutNode(outroot, BLOCK_BASIC, attribid, ordering, parent, func_name, 'Inductor', 'DEFAULT', - func_name, BLOCKTYPE_C, + style, BLOCKTYPE_C, dependsOnU='1', dependsOnT='0') addExprsNode(outnode, TYPE_STRING, 1, parameters) diff --git a/blocks/Xcos/blocks/JKFLIPFLOP.py b/blocks/Xcos/blocks/JKFLIPFLOP.py index 865c8a87..0b78f3b8 100644 --- a/blocks/Xcos/blocks/JKFLIPFLOP.py +++ b/blocks/Xcos/blocks/JKFLIPFLOP.py @@ -8,13 +8,16 @@ from blocks.OUT_f import OUT_f from common.AAAAAA import * -def JKFLIPFLOP(outroot, attribid, ordering, geometry, parameters, parent=1): +def JKFLIPFLOP(outroot, attribid, ordering, geometry, parameters, parent=1, style=None): func_name = 'JKFLIPFLOP' + if style is None: + style = func_name + block_id, port_id, link_id = generate_id(13, 24, 11) outnode = addOutNode(outroot, BLOCK_BASIC, attribid, ordering, parent, func_name, 'csuper', 'DEFAULT', - func_name, BLOCKTYPE_H, + style, BLOCKTYPE_H, dependsOnU='1') addExprsNode(outnode, TYPE_DOUBLE, 0, parameters) diff --git a/blocks/Xcos/blocks/LOGBLK_f.py b/blocks/Xcos/blocks/LOGBLK_f.py index 341d94ee..0b734039 100644 --- a/blocks/Xcos/blocks/LOGBLK_f.py +++ b/blocks/Xcos/blocks/LOGBLK_f.py @@ -1,13 +1,15 @@ from common.AAAAAA import * -def LOGBLK_f(outroot, attribid, ordering, geometry, parameters, parent=1): +def LOGBLK_f(outroot, attribid, ordering, geometry, parameters, parent=1, style=None): func_name = 'LOGBLK_f' + if style is None: + style = func_name outnode = addOutNode(outroot, BLOCK_BASIC, attribid, ordering, parent, func_name, 'logblk', 'DEFAULT', - func_name, BLOCKTYPE_C, + style, BLOCKTYPE_C, dependsOnU='1') addExprsNode(outnode, TYPE_STRING, 1, parameters) diff --git a/blocks/Xcos/blocks/LOGIC.py b/blocks/Xcos/blocks/LOGIC.py index 25f56346..95a895d3 100644 --- a/blocks/Xcos/blocks/LOGIC.py +++ b/blocks/Xcos/blocks/LOGIC.py @@ -1,13 +1,15 @@ from common.AAAAAA import * -def LOGIC(outroot, attribid, ordering, geometry, parameters, parent=1): +def LOGIC(outroot, attribid, ordering, geometry, parameters, parent=1, style=None): func_name = 'LOGIC' + if style is None: + style = func_name outnode = addOutNode(outroot, BLOCK_BASIC, attribid, ordering, parent, func_name, 'logic', 'C_OR_FORTRAN', - func_name, BLOCKTYPE_C, + style, BLOCKTYPE_C, dependsOnU='1') addExprsNode(outnode, TYPE_STRING, 2, parameters) addTypeNode(outnode, TYPE_DOUBLE, AS_REAL_PARAM, 0, []) diff --git a/blocks/Xcos/blocks/LOGICAL_OP.py b/blocks/Xcos/blocks/LOGICAL_OP.py index fe55504f..8a5a67ec 100644 --- a/blocks/Xcos/blocks/LOGICAL_OP.py +++ b/blocks/Xcos/blocks/LOGICAL_OP.py @@ -1,8 +1,10 @@ from common.AAAAAA import * -def LOGICAL_OP(outroot, attribid, ordering, geometry, parameters, parent=1): +def LOGICAL_OP(outroot, attribid, ordering, geometry, parameters, parent=1, style=None): func_name = 'LOGICAL_OP' + if style is None: + style = func_name d_type = ['', '', '', 'i32', 'i16', 'i8', 'ui32', 'ui16', 'ui8'] @@ -18,7 +20,7 @@ def LOGICAL_OP(outroot, attribid, ordering, geometry, parameters, parent=1): outnode = addOutNode(outroot, BLOCK_BASIC, attribid, ordering, parent, func_name, simulation_func_name, 'C_OR_FORTRAN', - func_name, BLOCKTYPE_C, + style, BLOCKTYPE_C, dependsOnU='1') addExprsNode(outnode, TYPE_STRING, 4, parameters) diff --git a/blocks/Xcos/blocks/LOOKUP_f.py b/blocks/Xcos/blocks/LOOKUP_f.py index cc5e4a9d..34117c0e 100644 --- a/blocks/Xcos/blocks/LOOKUP_f.py +++ b/blocks/Xcos/blocks/LOOKUP_f.py @@ -1,13 +1,15 @@ from common.AAAAAA import * -def LOOKUP_f(outroot, attribid, ordering, geometry, parameters, parent=1): +def LOOKUP_f(outroot, attribid, ordering, geometry, parameters, parent=1, style=None): func_name = 'LOOKUP_f' + if style is None: + style = func_name outnode = addOutNode(outroot, BLOCK_BASIC, attribid, ordering, parent, func_name, 'lookup', 'DEFAULT', - func_name, BLOCKTYPE_C, + style, BLOCKTYPE_C, dependsOnU='1') addExprsNode(outnode, TYPE_DOUBLE, 0, parameters) diff --git a/blocks/Xcos/blocks/MATBKSL.py b/blocks/Xcos/blocks/MATBKSL.py index 437658fc..9122273e 100644 --- a/blocks/Xcos/blocks/MATBKSL.py +++ b/blocks/Xcos/blocks/MATBKSL.py @@ -1,8 +1,10 @@ from common.AAAAAA import * -def MATBKSL(outroot, attribid, ordering, geometry, parameters, parent=1): +def MATBKSL(outroot, attribid, ordering, geometry, parameters, parent=1, style=None): func_name = 'MATBKSL' + if style is None: + style = func_name data_type = ['', 'mat_bksl', 'matz_bksl'] @@ -11,7 +13,7 @@ def MATBKSL(outroot, attribid, ordering, geometry, parameters, parent=1): outnode = addOutNode(outroot, BLOCK_BASIC, attribid, ordering, parent, func_name, simulation_func_name, 'C_OR_FORTRAN', - func_name, BLOCKTYPE_C, + style, BLOCKTYPE_C, dependsOnU='1') addExprsNode(outnode, TYPE_STRING, 1, parameters) diff --git a/blocks/Xcos/blocks/MATCATH.py b/blocks/Xcos/blocks/MATCATH.py index 41f15ab6..3b42317a 100644 --- a/blocks/Xcos/blocks/MATCATH.py +++ b/blocks/Xcos/blocks/MATCATH.py @@ -1,13 +1,15 @@ from common.AAAAAA import * -def MATCATH(outroot, attribid, ordering, geometry, parameters, parent=1): +def MATCATH(outroot, attribid, ordering, geometry, parameters, parent=1, style=None): func_name = 'MATCATH' + if style is None: + style = func_name outnode = addOutNode(outroot, BLOCK_BASIC, attribid, ordering, parent, func_name, 'mat_cath', 'C_OR_FORTRAN', - func_name, BLOCKTYPE_C, + style, BLOCKTYPE_C, dependsOnU='1') addExprsNode(outnode, TYPE_STRING, 1, parameters) diff --git a/blocks/Xcos/blocks/MATCATV.py b/blocks/Xcos/blocks/MATCATV.py index b58cd006..24564d11 100644 --- a/blocks/Xcos/blocks/MATCATV.py +++ b/blocks/Xcos/blocks/MATCATV.py @@ -1,13 +1,15 @@ from common.AAAAAA import * -def MATCATV(outroot, attribid, ordering, geometry, parameters, parent=1): +def MATCATV(outroot, attribid, ordering, geometry, parameters, parent=1, style=None): func_name = 'MATCATV' + if style is None: + style = func_name outnode = addOutNode(outroot, BLOCK_BASIC, attribid, ordering, parent, func_name, 'mat_catv', 'C_OR_FORTRAN', - func_name, BLOCKTYPE_C, + style, BLOCKTYPE_C, dependsOnU='1') addExprsNode(outnode, TYPE_STRING, 1, parameters) diff --git a/blocks/Xcos/blocks/MATDET.py b/blocks/Xcos/blocks/MATDET.py index 631fbe38..7ca7a41c 100644 --- a/blocks/Xcos/blocks/MATDET.py +++ b/blocks/Xcos/blocks/MATDET.py @@ -1,8 +1,10 @@ from common.AAAAAA import * -def MATDET(outroot, attribid, ordering, geometry, parameters, parent=1): +def MATDET(outroot, attribid, ordering, geometry, parameters, parent=1, style=None): func_name = 'MATDET' + if style is None: + style = func_name data_type = ['', 'mat_det', 'matz_det'] @@ -11,7 +13,7 @@ def MATDET(outroot, attribid, ordering, geometry, parameters, parent=1): outnode = addOutNode(outroot, BLOCK_BASIC, attribid, ordering, parent, func_name, simulation_func_name, 'C_OR_FORTRAN', - func_name, BLOCKTYPE_C, + style, BLOCKTYPE_C, dependsOnU='1') addExprsNode(outnode, TYPE_STRING, 1, parameters) diff --git a/blocks/Xcos/blocks/MATDIAG.py b/blocks/Xcos/blocks/MATDIAG.py index 2f224d12..d3903cec 100644 --- a/blocks/Xcos/blocks/MATDIAG.py +++ b/blocks/Xcos/blocks/MATDIAG.py @@ -1,8 +1,10 @@ from common.AAAAAA import * -def MATDIAG(outroot, attribid, ordering, geometry, parameters, parent=1): +def MATDIAG(outroot, attribid, ordering, geometry, parameters, parent=1, style=None): func_name = 'MATDIAG' + if style is None: + style = func_name data_type = ['', 'mat_diag', 'matz_diag'] @@ -11,7 +13,7 @@ def MATDIAG(outroot, attribid, ordering, geometry, parameters, parent=1): outnode = addOutNode(outroot, BLOCK_BASIC, attribid, ordering, parent, func_name, simulation_func_name, 'C_OR_FORTRAN', - func_name, BLOCKTYPE_C, + style, BLOCKTYPE_C, dependsOnU='1') addExprsNode(outnode, TYPE_STRING, 1, parameters) diff --git a/blocks/Xcos/blocks/MATDIV.py b/blocks/Xcos/blocks/MATDIV.py index ce977481..69d2bc51 100644 --- a/blocks/Xcos/blocks/MATDIV.py +++ b/blocks/Xcos/blocks/MATDIV.py @@ -1,8 +1,10 @@ from common.AAAAAA import * -def MATDIV(outroot, attribid, ordering, geometry, parameters, parent=1): +def MATDIV(outroot, attribid, ordering, geometry, parameters, parent=1, style=None): func_name = 'MATDIV' + if style is None: + style = func_name data_type = ['', 'mat_div', 'matz_div'] @@ -11,7 +13,7 @@ def MATDIV(outroot, attribid, ordering, geometry, parameters, parent=1): outnode = addOutNode(outroot, BLOCK_BASIC, attribid, ordering, parent, func_name, simulation_func_name, 'C_OR_FORTRAN', - func_name, BLOCKTYPE_C, + style, BLOCKTYPE_C, dependsOnU='1') addExprsNode(outnode, TYPE_STRING, 1, parameters) diff --git a/blocks/Xcos/blocks/MATEIG.py b/blocks/Xcos/blocks/MATEIG.py index 49957b33..c6a387f5 100644 --- a/blocks/Xcos/blocks/MATEIG.py +++ b/blocks/Xcos/blocks/MATEIG.py @@ -1,8 +1,10 @@ from common.AAAAAA import * -def MATEIG(outroot, attribid, ordering, geometry, parameters, parent=1): +def MATEIG(outroot, attribid, ordering, geometry, parameters, parent=1, style=None): func_name = 'MATEIG' + if style is None: + style = func_name data_type = ['', 'mat_', 'matz_'] decomposition_type = ['', 'vps', 'vpv'] @@ -14,7 +16,7 @@ def MATEIG(outroot, attribid, ordering, geometry, parameters, parent=1): outnode = addOutNode(outroot, BLOCK_BASIC, attribid, ordering, parent, func_name, simulation_func_name, 'C_OR_FORTRAN', - func_name, BLOCKTYPE_C, + style, BLOCKTYPE_C, dependsOnU='1') addExprsNode(outnode, TYPE_STRING, 2, parameters) diff --git a/blocks/Xcos/blocks/MATEXPM.py b/blocks/Xcos/blocks/MATEXPM.py index 52322903..88ec4117 100644 --- a/blocks/Xcos/blocks/MATEXPM.py +++ b/blocks/Xcos/blocks/MATEXPM.py @@ -1,8 +1,10 @@ from common.AAAAAA import * -def MATEXPM(outroot, attribid, ordering, geometry, parameters, parent=1): +def MATEXPM(outroot, attribid, ordering, geometry, parameters, parent=1, style=None): func_name = 'MATEXPM' + if style is None: + style = func_name data_type = ['', 'mat_expm', 'matz_expm'] @@ -11,7 +13,7 @@ def MATEXPM(outroot, attribid, ordering, geometry, parameters, parent=1): outnode = addOutNode(outroot, BLOCK_BASIC, attribid, ordering, parent, func_name, simulation_func_name, 'C_OR_FORTRAN', - func_name, BLOCKTYPE_C, + style, BLOCKTYPE_C, dependsOnU='1') addExprsNode(outnode, TYPE_STRING, 1, parameters) diff --git a/blocks/Xcos/blocks/MATINV.py b/blocks/Xcos/blocks/MATINV.py index 8da86a0e..b4e9a1be 100644 --- a/blocks/Xcos/blocks/MATINV.py +++ b/blocks/Xcos/blocks/MATINV.py @@ -1,8 +1,10 @@ from common.AAAAAA import * -def MATINV(outroot, attribid, ordering, geometry, parameters, parent=1): +def MATINV(outroot, attribid, ordering, geometry, parameters, parent=1, style=None): func_name = 'MATINV' + if style is None: + style = func_name data_type = ['', 'mat_inv', 'matz_inv'] @@ -11,7 +13,7 @@ def MATINV(outroot, attribid, ordering, geometry, parameters, parent=1): outnode = addOutNode(outroot, BLOCK_BASIC, attribid, ordering, parent, func_name, simulation_func_name, 'C_OR_FORTRAN', - func_name, BLOCKTYPE_C, + style, BLOCKTYPE_C, dependsOnU='1') addExprsNode(outnode, TYPE_STRING, 1, parameters) diff --git a/blocks/Xcos/blocks/MATLU.py b/blocks/Xcos/blocks/MATLU.py index 9c8dfae8..b3825b50 100644 --- a/blocks/Xcos/blocks/MATLU.py +++ b/blocks/Xcos/blocks/MATLU.py @@ -1,8 +1,10 @@ from common.AAAAAA import * -def MATLU(outroot, attribid, ordering, geometry, parameters, parent=1): +def MATLU(outroot, attribid, ordering, geometry, parameters, parent=1, style=None): func_name = 'MATLU' + if style is None: + style = func_name data_type = ['', 'mat_lu', 'matz_lu'] @@ -11,7 +13,7 @@ def MATLU(outroot, attribid, ordering, geometry, parameters, parent=1): outnode = addOutNode(outroot, BLOCK_BASIC, attribid, ordering, parent, func_name, simulation_func_name, 'C_OR_FORTRAN', - func_name, BLOCKTYPE_C, + style, BLOCKTYPE_C, dependsOnU='1') addExprsNode(outnode, TYPE_STRING, 1, parameters) diff --git a/blocks/Xcos/blocks/MATMAGPHI.py b/blocks/Xcos/blocks/MATMAGPHI.py index 464f1cfb..448867df 100644 --- a/blocks/Xcos/blocks/MATMAGPHI.py +++ b/blocks/Xcos/blocks/MATMAGPHI.py @@ -1,8 +1,10 @@ from common.AAAAAA import * -def MATMAGPHI(outroot, attribid, ordering, geometry, parameters, parent=1): +def MATMAGPHI(outroot, attribid, ordering, geometry, parameters, parent=1, style=None): func_name = 'MATMAGPHI' + if style is None: + style = func_name data_type = ['', 'matz_abs', 'matz_absc'] @@ -11,7 +13,7 @@ def MATMAGPHI(outroot, attribid, ordering, geometry, parameters, parent=1): outnode = addOutNode(outroot, BLOCK_BASIC, attribid, ordering, parent, func_name, simulation_func_name, 'C_OR_FORTRAN', - func_name, BLOCKTYPE_C, + style, BLOCKTYPE_C, dependsOnU='1') addExprsNode(outnode, TYPE_STRING, 1, parameters) diff --git a/blocks/Xcos/blocks/MATMUL.py b/blocks/Xcos/blocks/MATMUL.py index 69eb1f1f..53d3bfaf 100644 --- a/blocks/Xcos/blocks/MATMUL.py +++ b/blocks/Xcos/blocks/MATMUL.py @@ -1,8 +1,10 @@ from common.AAAAAA import * -def MATMUL(outroot, attribid, ordering, geometry, parameters, parent=1): +def MATMUL(outroot, attribid, ordering, geometry, parameters, parent=1, style=None): func_name = 'MATMUL' + if style is None: + style = func_name data_type = ['', 'matmul_m', 'matzmul_m', 'matmul_i32', 'matmul_i16', 'matmul_i8', @@ -42,7 +44,7 @@ def MATMUL(outroot, attribid, ordering, geometry, parameters, parent=1): outnode = addOutNode(outroot, BLOCK_BASIC, attribid, ordering, parent, func_name, simulation_func_name, 'C_OR_FORTRAN', - func_name, BLOCKTYPE_C, + style, BLOCKTYPE_C, dependsOnU='1') addExprsNode(outnode, TYPE_STRING, 3, parameters) diff --git a/blocks/Xcos/blocks/MATPINV.py b/blocks/Xcos/blocks/MATPINV.py index 28577bd3..a7ab329a 100644 --- a/blocks/Xcos/blocks/MATPINV.py +++ b/blocks/Xcos/blocks/MATPINV.py @@ -1,8 +1,10 @@ from common.AAAAAA import * -def MATPINV(outroot, attribid, ordering, geometry, parameters, parent=1): +def MATPINV(outroot, attribid, ordering, geometry, parameters, parent=1, style=None): func_name = 'MATPINV' + if style is None: + style = func_name data_type = ['', 'mat_pinv', 'matz_pinv'] @@ -11,7 +13,7 @@ def MATPINV(outroot, attribid, ordering, geometry, parameters, parent=1): outnode = addOutNode(outroot, BLOCK_BASIC, attribid, ordering, parent, func_name, simulation_func_name, 'C_OR_FORTRAN', - func_name, BLOCKTYPE_C, + style, BLOCKTYPE_C, dependsOnU='1') addExprsNode(outnode, TYPE_STRING, 1, parameters) diff --git a/blocks/Xcos/blocks/MATRESH.py b/blocks/Xcos/blocks/MATRESH.py index 377992dd..9369e9dc 100644 --- a/blocks/Xcos/blocks/MATRESH.py +++ b/blocks/Xcos/blocks/MATRESH.py @@ -1,8 +1,10 @@ from common.AAAAAA import * -def MATRESH(outroot, attribid, ordering, geometry, parameters, parent=1): +def MATRESH(outroot, attribid, ordering, geometry, parameters, parent=1, style=None): func_name = 'MATRESH' + if style is None: + style = func_name data_type = ['', 'mat_reshape', 'matz_reshape'] @@ -11,7 +13,7 @@ def MATRESH(outroot, attribid, ordering, geometry, parameters, parent=1): outnode = addOutNode(outroot, BLOCK_BASIC, attribid, ordering, parent, func_name, simulation_func_name, 'C_OR_FORTRAN', - func_name, BLOCKTYPE_C, + style, BLOCKTYPE_C, dependsOnU='1') addExprsNode(outnode, TYPE_STRING, 3, parameters) diff --git a/blocks/Xcos/blocks/MATSING.py b/blocks/Xcos/blocks/MATSING.py index 5ad4be6a..8ad42662 100644 --- a/blocks/Xcos/blocks/MATSING.py +++ b/blocks/Xcos/blocks/MATSING.py @@ -1,8 +1,10 @@ from common.AAAAAA import * -def MATSING(outroot, attribid, ordering, geometry, parameters, parent=1): +def MATSING(outroot, attribid, ordering, geometry, parameters, parent=1, style=None): func_name = 'MATSING' + if style is None: + style = func_name data_type = ['', 'mat_', 'matz_'] decomposition_type = ['', 'sing', 'svd'] @@ -14,7 +16,7 @@ def MATSING(outroot, attribid, ordering, geometry, parameters, parent=1): outnode = addOutNode(outroot, BLOCK_BASIC, attribid, ordering, parent, func_name, simulation_func_name, 'C_OR_FORTRAN', - func_name, BLOCKTYPE_C, + style, BLOCKTYPE_C, dependsOnU='1') addExprsNode(outnode, TYPE_STRING, 2, parameters) diff --git a/blocks/Xcos/blocks/MATSUM.py b/blocks/Xcos/blocks/MATSUM.py index 8d628a89..a296830e 100644 --- a/blocks/Xcos/blocks/MATSUM.py +++ b/blocks/Xcos/blocks/MATSUM.py @@ -1,8 +1,10 @@ from common.AAAAAA import * -def MATSUM(outroot, attribid, ordering, geometry, parameters, parent=1): +def MATSUM(outroot, attribid, ordering, geometry, parameters, parent=1, style=None): func_name = 'MATSUM' + if style is None: + style = func_name data_type = ['', 'mat_', 'matz_'] sum_along = ['sum', 'sumc', 'suml'] @@ -14,7 +16,7 @@ def MATSUM(outroot, attribid, ordering, geometry, parameters, parent=1): outnode = addOutNode(outroot, BLOCK_BASIC, attribid, ordering, parent, func_name, simulation_func_name, 'C_OR_FORTRAN', - func_name, BLOCKTYPE_C, + style, BLOCKTYPE_C, dependsOnU='1') addExprsNode(outnode, TYPE_STRING, 2, parameters) diff --git a/blocks/Xcos/blocks/MATTRAN.py b/blocks/Xcos/blocks/MATTRAN.py index 45481c46..9355b175 100644 --- a/blocks/Xcos/blocks/MATTRAN.py +++ b/blocks/Xcos/blocks/MATTRAN.py @@ -1,8 +1,10 @@ from common.AAAAAA import * -def MATTRAN(outroot, attribid, ordering, geometry, parameters, parent=1): +def MATTRAN(outroot, attribid, ordering, geometry, parameters, parent=1, style=None): func_name = 'MATTRAN' + if style is None: + style = func_name data_type = ['', 'mattran_m', 'matztran_m'] @@ -17,7 +19,7 @@ def MATTRAN(outroot, attribid, ordering, geometry, parameters, parent=1): outnode = addOutNode(outroot, BLOCK_BASIC, attribid, ordering, parent, func_name, simulation_func_name, 'C_OR_FORTRAN', - func_name, BLOCKTYPE_C, + style, BLOCKTYPE_C, dependsOnU='1') addExprsNode(outnode, TYPE_STRING, 1, parameters) diff --git a/blocks/Xcos/blocks/MATZCONJ.py b/blocks/Xcos/blocks/MATZCONJ.py index 8db6729a..42115dba 100644 --- a/blocks/Xcos/blocks/MATZCONJ.py +++ b/blocks/Xcos/blocks/MATZCONJ.py @@ -1,13 +1,15 @@ from common.AAAAAA import * -def MATZCONJ(outroot, attribid, ordering, geometry, parameters, parent=1): +def MATZCONJ(outroot, attribid, ordering, geometry, parameters, parent=1, style=None): func_name = 'MATZCONJ' + if style is None: + style = func_name outnode = addOutNode(outroot, BLOCK_BASIC, attribid, ordering, parent, func_name, 'matz_conj', 'C_OR_FORTRAN', - func_name, BLOCKTYPE_C, + style, BLOCKTYPE_C, dependsOnU='1') addExprsNode(outnode, TYPE_DOUBLE, 0, parameters) diff --git a/blocks/Xcos/blocks/MATZREIM.py b/blocks/Xcos/blocks/MATZREIM.py index 8783c44d..e74ea7e2 100644 --- a/blocks/Xcos/blocks/MATZREIM.py +++ b/blocks/Xcos/blocks/MATZREIM.py @@ -1,8 +1,10 @@ from common.AAAAAA import * -def MATZREIM(outroot, attribid, ordering, geometry, parameters, parent=1): +def MATZREIM(outroot, attribid, ordering, geometry, parameters, parent=1, style=None): func_name = 'MATZREIM' + if style is None: + style = func_name data_type = ['', 'matz_reim', 'matz_reimc'] @@ -11,7 +13,7 @@ def MATZREIM(outroot, attribid, ordering, geometry, parameters, parent=1): outnode = addOutNode(outroot, BLOCK_BASIC, attribid, ordering, parent, func_name, simulation_func_name, 'C_OR_FORTRAN', - func_name, BLOCKTYPE_C, + style, BLOCKTYPE_C, dependsOnU='1') addExprsNode(outnode, TYPE_STRING, 1, parameters) diff --git a/blocks/Xcos/blocks/MAXMIN.py b/blocks/Xcos/blocks/MAXMIN.py index 0dcd22dc..601224b8 100644 --- a/blocks/Xcos/blocks/MAXMIN.py +++ b/blocks/Xcos/blocks/MAXMIN.py @@ -1,13 +1,15 @@ from common.AAAAAA import * -def MAXMIN(outroot, attribid, ordering, geometry, parameters, parent=1): +def MAXMIN(outroot, attribid, ordering, geometry, parameters, parent=1, style=None): func_name = 'MAXMIN' + if style is None: + style = func_name outnode = addOutNode(outroot, BLOCK_BASIC, attribid, ordering, parent, func_name, 'minmax', 'C_OR_FORTRAN', - func_name, BLOCKTYPE_C, + style, BLOCKTYPE_C, dependsOnU='1') addExprsNode(outnode, TYPE_STRING, 3, parameters) diff --git a/blocks/Xcos/blocks/MAX_f.py b/blocks/Xcos/blocks/MAX_f.py index f4bea0e5..e26dd33f 100644 --- a/blocks/Xcos/blocks/MAX_f.py +++ b/blocks/Xcos/blocks/MAX_f.py @@ -1,14 +1,17 @@ from common.AAAAAA import * -def MAX_f(outroot, attribid, ordering, geometry, parameters, parent=1): +def MAX_f(outroot, attribid, ordering, geometry, parameters, parent=1, style=None): func_name = 'MAX_f' + if style is None: + style = func_name + parameters = [' '] outnode = addOutNode(outroot, BLOCK_BASIC, attribid, ordering, parent, func_name, 'maxblk', 'DEFAULT', - func_name, BLOCKTYPE_C, + style, BLOCKTYPE_C, dependsOnU='1') addExprsNode(outnode, TYPE_STRING, 1, parameters) diff --git a/blocks/Xcos/blocks/MBLOCK.py b/blocks/Xcos/blocks/MBLOCK.py index 7226d173..628e42d8 100644 --- a/blocks/Xcos/blocks/MBLOCK.py +++ b/blocks/Xcos/blocks/MBLOCK.py @@ -1,13 +1,15 @@ from common.AAAAAA import * -def MBLOCK(outroot, attribid, ordering, geometry, parameters, parent=1): +def MBLOCK(outroot, attribid, ordering, geometry, parameters, parent=1, style=None): func_name = 'MBLOCK' + if style is None: + style = func_name outnode = addOutNode(outroot, BLOCK_BASIC, attribid, ordering, parent, func_name, 'Ball_Platform', 'MODELICA', - func_name, BLOCKTYPE_C) + style, BLOCKTYPE_C) arrayNode = addObjNode(outnode, TYPE_ARRAY, CLASS_TLIST, AS_EXPRS, parameters) scilabStringParameters = ["MBLOCK", "in", diff --git a/blocks/Xcos/blocks/MCLOCK_f.py b/blocks/Xcos/blocks/MCLOCK_f.py index 9b28070e..d3268d86 100644 --- a/blocks/Xcos/blocks/MCLOCK_f.py +++ b/blocks/Xcos/blocks/MCLOCK_f.py @@ -24,13 +24,16 @@ from common.AAAAAA import * # ] -def MCLOCK_f(outroot, attribid, ordering, geometry, parameters, parent=1): +def MCLOCK_f(outroot, attribid, ordering, geometry, parameters, parent=1, style=None): func_name = 'MCLOCK_f' + if style is None: + style = func_name + block_id, port_id, link_id = generate_id(8, 15, 7) outnode = addOutNode(outroot, BLOCK_BASIC, attribid, ordering, parent, func_name, 'csuper', 'DEFAULT', - func_name, BLOCKTYPE_H, dependsOnU="0", dependsOnT="0") + style, BLOCKTYPE_H, dependsOnU="0", dependsOnT="0") addExprsNode(outnode, TYPE_DOUBLE, 0, parameters) addSciDBNode(outnode, TYPE_DOUBLE, AS_REAL_PARAM, 0, []) diff --git a/blocks/Xcos/blocks/MFCLCK_f.py b/blocks/Xcos/blocks/MFCLCK_f.py index 461ec32a..60b57204 100644 --- a/blocks/Xcos/blocks/MFCLCK_f.py +++ b/blocks/Xcos/blocks/MFCLCK_f.py @@ -1,13 +1,15 @@ from common.AAAAAA import * -def MFCLCK_f(outroot, attribid, ordering, geometry, parameters, parent=1): +def MFCLCK_f(outroot, attribid, ordering, geometry, parameters, parent=1, style=None): func_name = 'MFCLCK_f' + if style is None: + style = func_name outnode = addOutNode(outroot, BLOCK_BASIC, attribid, ordering, parent, func_name, 'mfclck', 'DEFAULT', - func_name, BLOCKTYPE_D, dependsOnU="0", dependsOnT="0") + style, BLOCKTYPE_D, dependsOnU="0", dependsOnT="0") addExprsNode(outnode, TYPE_STRING, 2, parameters) addScilabDNode(outnode, AS_REAL_PARAM, width=1, realParts=["0.1"]) diff --git a/blocks/Xcos/blocks/MIN_f.py b/blocks/Xcos/blocks/MIN_f.py index 5ca836bc..763234cd 100644 --- a/blocks/Xcos/blocks/MIN_f.py +++ b/blocks/Xcos/blocks/MIN_f.py @@ -1,14 +1,17 @@ from common.AAAAAA import * -def MIN_f(outroot, attribid, ordering, geometry, parameters, parent=1): +def MIN_f(outroot, attribid, ordering, geometry, parameters, parent=1, style=None): func_name = 'MIN_f' + if style is None: + style = func_name + parameters = ['-1'] outnode = addOutNode(outroot, BLOCK_BASIC, attribid, ordering, parent, func_name, 'minblk', 'DEFAULT', - func_name, BLOCKTYPE_C, + style, BLOCKTYPE_C, dependsOnU='1') addExprsNode(outnode, TYPE_STRING, 1, parameters) diff --git a/blocks/Xcos/blocks/MUX.py b/blocks/Xcos/blocks/MUX.py index c300d976..09132ae7 100644 --- a/blocks/Xcos/blocks/MUX.py +++ b/blocks/Xcos/blocks/MUX.py @@ -1,13 +1,15 @@ from common.AAAAAA import * -def MUX(outroot, attribid, ordering, geometry, parameters, parent=1): +def MUX(outroot, attribid, ordering, geometry, parameters, parent=1, style=None): func_name = 'MUX' + if style is None: + style = func_name outnode = addOutNode(outroot, BLOCK_BASIC, attribid, ordering, parent, func_name, 'multiplex', 'C_OR_FORTRAN', - func_name, BLOCKTYPE_C, + style, BLOCKTYPE_C, dependsOnU='1') addExprsNode(outnode, TYPE_STRING, 1, parameters) diff --git a/blocks/Xcos/blocks/MUX_f.py b/blocks/Xcos/blocks/MUX_f.py index 8531370e..417fd99e 100644 --- a/blocks/Xcos/blocks/MUX_f.py +++ b/blocks/Xcos/blocks/MUX_f.py @@ -1,13 +1,15 @@ from common.AAAAAA import * -def MUX_f(outroot, attribid, ordering, geometry, parameters, parent=1): +def MUX_f(outroot, attribid, ordering, geometry, parameters, parent=1, style=None): func_name = 'MUX_f' + if style is None: + style = func_name outnode = addOutNode(outroot, BLOCK_BASIC, attribid, ordering, parent, func_name, 'mux', 'TYPE_1', - func_name, BLOCKTYPE_C, + style, BLOCKTYPE_C, dependsOnU='1') addExprsNode(outnode, TYPE_STRING, 1, parameters) diff --git a/blocks/Xcos/blocks/M_SWITCH.py b/blocks/Xcos/blocks/M_SWITCH.py index a9463e0d..73ddf1e9 100644 --- a/blocks/Xcos/blocks/M_SWITCH.py +++ b/blocks/Xcos/blocks/M_SWITCH.py @@ -1,13 +1,15 @@ from common.AAAAAA import * -def M_SWITCH(outroot, attribid, ordering, geometry, parameters, parent=1): +def M_SWITCH(outroot, attribid, ordering, geometry, parameters, parent=1, style=None): func_name = 'M_SWITCH' + if style is None: + style = func_name outnode = addOutNode(outroot, BLOCK_BASIC, attribid, ordering, parent, func_name, 'mswitch', 'C_OR_FORTRAN', - func_name, BLOCKTYPE_C, + style, BLOCKTYPE_C, dependsOnU='1') addExprsNode(outnode, TYPE_STRING, 3, parameters) diff --git a/blocks/Xcos/blocks/M_freq.py b/blocks/Xcos/blocks/M_freq.py index 2d7a2036..22355382 100644 --- a/blocks/Xcos/blocks/M_freq.py +++ b/blocks/Xcos/blocks/M_freq.py @@ -1,13 +1,15 @@ from common.AAAAAA import * -def M_freq(outroot, attribid, ordering, geometry, parameters, parent=1): +def M_freq(outroot, attribid, ordering, geometry, parameters, parent=1, style=None): func_name = 'M_freq' + if style is None: + style = func_name outnode = addOutNode(outroot, BLOCK_BASIC, attribid, ordering, parent, func_name, 'm_frequ', 'C_OR_FORTRAN', - func_name, BLOCKTYPE_D) + style, BLOCKTYPE_D) addExprsNode(outnode, TYPE_STRING, 2, parameters) addTypeNode(outnode, TYPE_DOUBLE, AS_REAL_PARAM, 0, []) diff --git a/blocks/Xcos/blocks/Modulo_Count.py b/blocks/Xcos/blocks/Modulo_Count.py index 4786cbda..f7b2fb73 100644 --- a/blocks/Xcos/blocks/Modulo_Count.py +++ b/blocks/Xcos/blocks/Modulo_Count.py @@ -1,13 +1,15 @@ from common.AAAAAA import * -def Modulo_Count(outroot, attribid, ordering, geometry, parameters, parent=1): +def Modulo_Count(outroot, attribid, ordering, geometry, parameters, parent=1, style=None): func_name = 'Modulo_Count' + if style is None: + style = func_name outnode = addOutNode(outroot, BLOCK_BASIC, attribid, ordering, parent, func_name, 'modulo_count', 'C_OR_FORTRAN', - func_name, BLOCKTYPE_C) + style, BLOCKTYPE_C) addExprsNode(outnode, TYPE_STRING, 2, parameters) addTypeNode(outnode, TYPE_DOUBLE, AS_REAL_PARAM, 0, []) diff --git a/blocks/Xcos/blocks/NEGTOPOS_f.py b/blocks/Xcos/blocks/NEGTOPOS_f.py index bdf924b6..b9706fdb 100644 --- a/blocks/Xcos/blocks/NEGTOPOS_f.py +++ b/blocks/Xcos/blocks/NEGTOPOS_f.py @@ -1,13 +1,15 @@ from common.AAAAAA import * -def NEGTOPOS_f(outroot, attribid, ordering, geometry, parameters, parent=1): +def NEGTOPOS_f(outroot, attribid, ordering, geometry, parameters, parent=1, style=None): func_name = 'NEGTOPOS_f' + if style is None: + style = func_name outnode = addOutNode(outroot, BLOCK_BASIC, attribid, ordering, parent, func_name, 'zcross', 'TYPE_1', - func_name, BLOCKTYPE_Z, + style, BLOCKTYPE_Z, dependsOnU='1') addExprsNode(outnode, TYPE_DOUBLE, 0, parameters) diff --git a/blocks/Xcos/blocks/NMOS.py b/blocks/Xcos/blocks/NMOS.py index 073c42ec..26acfb9d 100644 --- a/blocks/Xcos/blocks/NMOS.py +++ b/blocks/Xcos/blocks/NMOS.py @@ -1,13 +1,15 @@ from common.AAAAAA import * -def NMOS(outroot, attribid, ordering, geometry, parameters, parent=1): +def NMOS(outroot, attribid, ordering, geometry, parameters, parent=1, style=None): func_name = 'NMOS' + if style is None: + style = func_name outnode = addOutNode(outroot, BLOCK_BASIC, attribid, ordering, parent, func_name, 'NMOS', 'DEFAULT', - func_name, BLOCKTYPE_C, + style, BLOCKTYPE_C, dependsOnU='1') addExprsNode(outnode, TYPE_STRING, 9, parameters) diff --git a/blocks/Xcos/blocks/NPN.py b/blocks/Xcos/blocks/NPN.py index df69cccf..fd7d5f9c 100644 --- a/blocks/Xcos/blocks/NPN.py +++ b/blocks/Xcos/blocks/NPN.py @@ -1,13 +1,15 @@ from common.AAAAAA import * -def NPN(outroot, attribid, ordering, geometry, parameters, parent=1): +def NPN(outroot, attribid, ordering, geometry, parameters, parent=1, style=None): func_name = 'NPN' + if style is None: + style = func_name outnode = addOutNode(outroot, BLOCK_BASIC, attribid, ordering, parent, func_name, 'NPN', 'DEFAULT', - func_name, BLOCKTYPE_C, + style, BLOCKTYPE_C, dependsOnT='1') addExprsNode(outnode, TYPE_STRING, 17, parameters) diff --git a/blocks/Xcos/blocks/NRMSOM_f.py b/blocks/Xcos/blocks/NRMSOM_f.py index 4f27b7cd..40b1c4ed 100644 --- a/blocks/Xcos/blocks/NRMSOM_f.py +++ b/blocks/Xcos/blocks/NRMSOM_f.py @@ -1,13 +1,15 @@ from common.AAAAAA import * -def NRMSOM_f(outroot, attribid, ordering, geometry, parameters, parent=1): +def NRMSOM_f(outroot, attribid, ordering, geometry, parameters, parent=1, style=None): func_name = 'NRMSOM_f' + if style is None: + style = func_name outnode = addOutNode(outroot, BLOCK_BASIC, attribid, ordering, parent, func_name, 'junk', 'DEFAULT', - func_name, BLOCKTYPE_C, + style, BLOCKTYPE_C, dependsOnU='1') addExprsNode(outnode, TYPE_STRING, 1, parameters) diff --git a/blocks/Xcos/blocks/OUTIMPL_f.py b/blocks/Xcos/blocks/OUTIMPL_f.py index 84567c73..f2ebdff0 100644 --- a/blocks/Xcos/blocks/OUTIMPL_f.py +++ b/blocks/Xcos/blocks/OUTIMPL_f.py @@ -1,13 +1,15 @@ from common.AAAAAA import * -def OUTIMPL_f(outroot, attribid, ordering, geometry, parameters, parent=1): +def OUTIMPL_f(outroot, attribid, ordering, geometry, parameters, parent=1, style=None): func_name = 'OUTIMPL_f' + if style is None: + style = func_name outnode = addOutNode(outroot, BLOCK_IMPLICIT_OUT, attribid, ordering, parent, func_name, 'outimpl', 'DEFAULT', - func_name, BLOCKTYPE_C) + style, BLOCKTYPE_C) addExprsNode(outnode, TYPE_STRING, 1, parameters) addSciDBNode(outnode, TYPE_DOUBLE, AS_REAL_PARAM, 0, []) diff --git a/blocks/Xcos/blocks/OUT_f.py b/blocks/Xcos/blocks/OUT_f.py index ae615072..55f6f742 100644 --- a/blocks/Xcos/blocks/OUT_f.py +++ b/blocks/Xcos/blocks/OUT_f.py @@ -1,13 +1,15 @@ from common.AAAAAA import * -def OUT_f(outroot, attribid, ordering, geometry, parameters, parent=1): +def OUT_f(outroot, attribid, ordering, geometry, parameters, parent=1, style=None): func_name = 'OUT_f' + if style is None: + style = func_name outnode = addOutNode(outroot, BLOCK_EXPLICIT_OUT, attribid, ordering, parent, func_name, 'output', 'DEFAULT', - func_name, BLOCKTYPE_C, dependsOnU='0', + style, BLOCKTYPE_C, dependsOnU='0', dependsOnT='0') addExprsNode(outnode, TYPE_STRING, 1, parameters[0]) diff --git a/blocks/Xcos/blocks/OpAmp.py b/blocks/Xcos/blocks/OpAmp.py index 44a81966..e4426010 100644 --- a/blocks/Xcos/blocks/OpAmp.py +++ b/blocks/Xcos/blocks/OpAmp.py @@ -1,13 +1,15 @@ from common.AAAAAA import * -def OpAmp(outroot, attribid, ordering, geometry, parameters, parent=1): +def OpAmp(outroot, attribid, ordering, geometry, parameters, parent=1, style=None): func_name = 'OpAmp' + if style is None: + style = func_name outnode = addOutNode(outroot, BLOCK_BASIC, attribid, ordering, parent, func_name, 'OpAmp', 'DEFAULT', - func_name, BLOCKTYPE_C, + style, BLOCKTYPE_C, dependsOnU='1') addExprsNode(outnode, TYPE_DOUBLE, 0, parameters) diff --git a/blocks/Xcos/blocks/PDE.py b/blocks/Xcos/blocks/PDE.py index 53ba4590..4fb3b771 100644 --- a/blocks/Xcos/blocks/PDE.py +++ b/blocks/Xcos/blocks/PDE.py @@ -1,13 +1,15 @@ from common.AAAAAA import * -def PDE(outroot, attribid, ordering, geometry, parameters, parent=1): +def PDE(outroot, attribid, ordering, geometry, parameters, parent=1, style=None): func_name = 'PDE' + if style is None: + style = func_name outnode = addOutNode(outroot, BLOCK_BASIC, attribid, ordering, parent, func_name, 'cscope', 'C_OR_FORTRAN', - func_name, BLOCKTYPE_C) + style, BLOCKTYPE_C) addTypeNode(outnode, TYPE_DOUBLE, AS_REAL_PARAM, 0, []) addTypeNode(outnode, TYPE_DOUBLE, AS_INT_PARAM, 0, []) diff --git a/blocks/Xcos/blocks/PID.py b/blocks/Xcos/blocks/PID.py index 8bbaa0b1..d22ae213 100644 --- a/blocks/Xcos/blocks/PID.py +++ b/blocks/Xcos/blocks/PID.py @@ -8,13 +8,16 @@ from blocks.IN_f import IN_f from common.AAAAAA import * -def PID(outroot, attribid, ordering, geometry, parameters, parent=1): +def PID(outroot, attribid, ordering, geometry, parameters, parent=1, style=None): func_name = 'PID' + if style is None: + style = func_name + block_id, port_id, link_id = generate_id(12, 24, 11) outnode = addOutNode(outroot, BLOCK_BASIC, attribid, ordering, parent, func_name, 'csuper', 'DEFAULT', - func_name, BLOCKTYPE_H) + style, BLOCKTYPE_H) addExprsNode(outnode, TYPE_DOUBLE, 0, parameters) addTypeNode(outnode, TYPE_DOUBLE, AS_REAL_PARAM, 0, []) diff --git a/blocks/Xcos/blocks/PMOS.py b/blocks/Xcos/blocks/PMOS.py index d96e09a5..483e9120 100644 --- a/blocks/Xcos/blocks/PMOS.py +++ b/blocks/Xcos/blocks/PMOS.py @@ -1,13 +1,15 @@ from common.AAAAAA import * -def PMOS(outroot, attribid, ordering, geometry, parameters, parent=1): +def PMOS(outroot, attribid, ordering, geometry, parameters, parent=1, style=None): func_name = 'PMOS' + if style is None: + style = func_name outnode = addOutNode(outroot, BLOCK_BASIC, attribid, ordering, parent, func_name, 'PMOS', 'DEFAULT', - func_name, BLOCKTYPE_C, + style, BLOCKTYPE_C, dependsOnU='1') addExprsNode(outnode, TYPE_STRING, 9, parameters) diff --git a/blocks/Xcos/blocks/PNP.py b/blocks/Xcos/blocks/PNP.py index 903429ab..69fed00d 100644 --- a/blocks/Xcos/blocks/PNP.py +++ b/blocks/Xcos/blocks/PNP.py @@ -1,13 +1,15 @@ from common.AAAAAA import * -def PNP(outroot, attribid, ordering, geometry, parameters, parent=1): +def PNP(outroot, attribid, ordering, geometry, parameters, parent=1, style=None): func_name = 'PNP' + if style is None: + style = func_name outnode = addOutNode(outroot, BLOCK_BASIC, attribid, ordering, parent, func_name, 'PNP', 'DEFAULT', - func_name, BLOCKTYPE_C, + style, BLOCKTYPE_C, dependsOnT='1') addExprsNode(outnode, TYPE_STRING, 17, parameters) diff --git a/blocks/Xcos/blocks/POSTONEG_f.py b/blocks/Xcos/blocks/POSTONEG_f.py index aa2228cd..71f46368 100644 --- a/blocks/Xcos/blocks/POSTONEG_f.py +++ b/blocks/Xcos/blocks/POSTONEG_f.py @@ -1,13 +1,15 @@ from common.AAAAAA import * -def POSTONEG_f(outroot, attribid, ordering, geometry, parameters, parent=1): +def POSTONEG_f(outroot, attribid, ordering, geometry, parameters, parent=1, style=None): func_name = 'POSTONEG_f' + if style is None: + style = func_name outnode = addOutNode(outroot, BLOCK_BASIC, attribid, ordering, parent, func_name, 'zcross', 'TYPE_1', - func_name, BLOCKTYPE_Z, + style, BLOCKTYPE_Z, dependsOnU='1') addExprsNode(outnode, TYPE_DOUBLE, 0, parameters) diff --git a/blocks/Xcos/blocks/POWBLK_f.py b/blocks/Xcos/blocks/POWBLK_f.py index 4b2ee0a2..305572a4 100644 --- a/blocks/Xcos/blocks/POWBLK_f.py +++ b/blocks/Xcos/blocks/POWBLK_f.py @@ -1,13 +1,15 @@ from common.AAAAAA import * -def POWBLK_f(outroot, attribid, ordering, geometry, parameters, parent=1): +def POWBLK_f(outroot, attribid, ordering, geometry, parameters, parent=1, style=None): func_name = 'POWBLK_f' + if style is None: + style = func_name outnode = addOutNode(outroot, BLOCK_BASIC, attribid, ordering, parent, func_name, 'powblk', 'DEFAULT', - func_name, BLOCKTYPE_C, + style, BLOCKTYPE_C, dependsOnU='1') addExprsNode(outnode, TYPE_STRING, 1, parameters) diff --git a/blocks/Xcos/blocks/PRODUCT.py b/blocks/Xcos/blocks/PRODUCT.py index 53cd8566..5cce28ab 100644 --- a/blocks/Xcos/blocks/PRODUCT.py +++ b/blocks/Xcos/blocks/PRODUCT.py @@ -1,13 +1,15 @@ from common.AAAAAA import * -def PRODUCT(outroot, attribid, ordering, geometry, parameters, parent=1): +def PRODUCT(outroot, attribid, ordering, geometry, parameters, parent=1, style=None): func_name = 'PRODUCT' + if style is None: + style = func_name outnode = addOutNode(outroot, BLOCK_PRODUCT, attribid, ordering, parent, func_name, 'product', 'C_OR_FORTRAN', - func_name, BLOCKTYPE_C, + style, BLOCKTYPE_C, dependsOnU='1') addExprsNode(outnode, TYPE_STRING, 1, parameters) diff --git a/blocks/Xcos/blocks/PROD_f.py b/blocks/Xcos/blocks/PROD_f.py index 3c142637..babfe542 100644 --- a/blocks/Xcos/blocks/PROD_f.py +++ b/blocks/Xcos/blocks/PROD_f.py @@ -1,13 +1,15 @@ from common.AAAAAA import * -def PROD_f(outroot, attribid, ordering, geometry, parameters, parent=1): +def PROD_f(outroot, attribid, ordering, geometry, parameters, parent=1, style=None): func_name = 'PROD_f' + if style is None: + style = func_name outnode = addOutNode(outroot, BLOCK_ROUND, attribid, ordering, parent, func_name, 'prod', 'TYPE_2', - func_name, BLOCKTYPE_C, + style, BLOCKTYPE_C, dependsOnU='1') addExprsNode(outnode, TYPE_DOUBLE, 0, parameters) diff --git a/blocks/Xcos/blocks/PULSE_SC.py b/blocks/Xcos/blocks/PULSE_SC.py index e4a75079..88e1d859 100644 --- a/blocks/Xcos/blocks/PULSE_SC.py +++ b/blocks/Xcos/blocks/PULSE_SC.py @@ -21,13 +21,16 @@ from common.AAAAAA import * # '5631d1e9:18ea7a6d774:-7fbf'] -def PULSE_SC(outroot, attribid, ordering, geometry, parameters, parent=1): +def PULSE_SC(outroot, attribid, ordering, geometry, parameters, parent=1, style=None): func_name = 'PULSE_SC' + if style is None: + style = func_name + block_id, port_id, link_id = generate_id(8, 10, 5) outnode = addOutNode(outroot, BLOCK_BASIC, attribid, ordering, parent, func_name, 'csuper', 'DEFAULT', - func_name, BLOCKTYPE_H) + style, BLOCKTYPE_H) addExprsNode(outnode, TYPE_STRING, 4, parameters) addTypeNode(outnode, TYPE_DOUBLE, AS_REAL_PARAM, 0, []) diff --git a/blocks/Xcos/blocks/PerteDP.py b/blocks/Xcos/blocks/PerteDP.py index 021498f2..7d370730 100644 --- a/blocks/Xcos/blocks/PerteDP.py +++ b/blocks/Xcos/blocks/PerteDP.py @@ -1,13 +1,15 @@ from common.AAAAAA import * -def PerteDP(outroot, attribid, ordering, geometry, parameters, parent=1): +def PerteDP(outroot, attribid, ordering, geometry, parameters, parent=1, style=None): func_name = 'PerteDP' + if style is None: + style = func_name outnode = addOutNode(outroot, BLOCK_BASIC, attribid, ordering, parent, func_name, 'PerteDP', 'DEFAULT', - func_name, BLOCKTYPE_C, + style, BLOCKTYPE_C, dependsOnU='1') addExprsNode(outnode, TYPE_STRING, 6, parameters) diff --git a/blocks/Xcos/blocks/PotentialSensor.py b/blocks/Xcos/blocks/PotentialSensor.py index 2a0f6db2..d89c13f9 100644 --- a/blocks/Xcos/blocks/PotentialSensor.py +++ b/blocks/Xcos/blocks/PotentialSensor.py @@ -1,14 +1,17 @@ from common.AAAAAA import * -def PotentialSensor(outroot, attribid, ordering, geometry, parameters, parent=1): +def PotentialSensor(outroot, attribid, ordering, geometry, parameters, parent=1, style=None): func_name = 'PotentialSensor' + if style is None: + style = func_name + parameters = [''] outnode = addOutNode(outroot, BLOCK_BASIC, attribid, ordering, parent, func_name, 'PotentialSensor', 'DEFAULT', - func_name, BLOCKTYPE_C, + style, BLOCKTYPE_C, dependsOnU='1') addExprsNode(outnode, TYPE_STRING, 1, parameters) diff --git a/blocks/Xcos/blocks/PuitsP.py b/blocks/Xcos/blocks/PuitsP.py index 064a0e7b..50a460c6 100644 --- a/blocks/Xcos/blocks/PuitsP.py +++ b/blocks/Xcos/blocks/PuitsP.py @@ -1,13 +1,15 @@ from common.AAAAAA import * -def PuitsP(outroot, attribid, ordering, geometry, parameters, parent=1): +def PuitsP(outroot, attribid, ordering, geometry, parameters, parent=1, style=None): func_name = 'PuitsP' + if style is None: + style = func_name outnode = addOutNode(outroot, BLOCK_BASIC, attribid, ordering, parent, func_name, 'Puits', 'DEFAULT', - func_name, BLOCKTYPE_C, + style, BLOCKTYPE_C, dependsOnU='1') addExprsNode(outnode, TYPE_STRING, 4, parameters) diff --git a/blocks/Xcos/blocks/QUANT_f.py b/blocks/Xcos/blocks/QUANT_f.py index 76d20c9e..b3175bc8 100644 --- a/blocks/Xcos/blocks/QUANT_f.py +++ b/blocks/Xcos/blocks/QUANT_f.py @@ -1,8 +1,10 @@ from common.AAAAAA import * -def QUANT_f(outroot, attribid, ordering, geometry, parameters, parent=1): +def QUANT_f(outroot, attribid, ordering, geometry, parameters, parent=1, style=None): func_name = 'QUANT_f' + if style is None: + style = func_name data_type = ['', 'qzrnd', 'qztrn', 'qzflr', 'qzcel'] @@ -11,7 +13,7 @@ def QUANT_f(outroot, attribid, ordering, geometry, parameters, parent=1): outnode = addOutNode(outroot, BLOCK_BASIC, attribid, ordering, parent, func_name, simulation_func_name, 'DEFAULT', - func_name, BLOCKTYPE_C, + style, BLOCKTYPE_C, dependsOnU='1') addExprsNode(outnode, TYPE_STRING, 2, parameters) diff --git a/blocks/Xcos/blocks/RAMP.py b/blocks/Xcos/blocks/RAMP.py index 73371e13..1f056f79 100644 --- a/blocks/Xcos/blocks/RAMP.py +++ b/blocks/Xcos/blocks/RAMP.py @@ -1,13 +1,15 @@ from common.AAAAAA import * -def RAMP(outroot, attribid, ordering, geometry, parameters, parent=1): +def RAMP(outroot, attribid, ordering, geometry, parameters, parent=1, style=None): func_name = 'RAMP' + if style is None: + style = func_name outnode = addOutNode(outroot, BLOCK_BASIC, attribid, ordering, parent, func_name, 'ramp', 'C_OR_FORTRAN', - func_name, BLOCKTYPE_C, + style, BLOCKTYPE_C, dependsOnT='1') addExprsNode(outnode, TYPE_STRING, 3, parameters) diff --git a/blocks/Xcos/blocks/RAND_m.py b/blocks/Xcos/blocks/RAND_m.py index 68df7e53..df7dfe5a 100644 --- a/blocks/Xcos/blocks/RAND_m.py +++ b/blocks/Xcos/blocks/RAND_m.py @@ -1,8 +1,10 @@ from common.AAAAAA import * -def RAND_m(outroot, attribid, ordering, geometry, parameters, parent=1): +def RAND_m(outroot, attribid, ordering, geometry, parameters, parent=1, style=None): func_name = 'RAND_m' + if style is None: + style = func_name data_type = ['', 'rndblk_m', 'rndblkz_m'] @@ -11,7 +13,7 @@ def RAND_m(outroot, attribid, ordering, geometry, parameters, parent=1): outnode = addOutNode(outroot, BLOCK_BASIC, attribid, ordering, parent, func_name, simulation_func_name, 'C_OR_FORTRAN', - func_name, BLOCKTYPE_D) + style, BLOCKTYPE_D) addExprsNode(outnode, TYPE_STRING, 5, parameters) addSciDBNode(outnode, TYPE_DOUBLE, AS_REAL_PARAM, diff --git a/blocks/Xcos/blocks/RATELIMITER.py b/blocks/Xcos/blocks/RATELIMITER.py index 7ef476fe..7fec0a58 100644 --- a/blocks/Xcos/blocks/RATELIMITER.py +++ b/blocks/Xcos/blocks/RATELIMITER.py @@ -1,13 +1,15 @@ from common.AAAAAA import * -def RATELIMITER(outroot, attribid, ordering, geometry, parameters, parent=1): +def RATELIMITER(outroot, attribid, ordering, geometry, parameters, parent=1, style=None): func_name = 'RATELIMITER' + if style is None: + style = func_name outnode = addOutNode(outroot, BLOCK_BASIC, attribid, ordering, parent, func_name, 'ratelimiter', 'C_OR_FORTRAN', - func_name, BLOCKTYPE_C, + style, BLOCKTYPE_C, dependsOnU='1') addExprsNode(outnode, TYPE_STRING, 2, parameters) diff --git a/blocks/Xcos/blocks/READAU_f.py b/blocks/Xcos/blocks/READAU_f.py index 3d3d60c0..892ba708 100644 --- a/blocks/Xcos/blocks/READAU_f.py +++ b/blocks/Xcos/blocks/READAU_f.py @@ -1,13 +1,15 @@ from common.AAAAAA import * -def READAU_f(outroot, attribid, ordering, geometry, parameters, parent=1): +def READAU_f(outroot, attribid, ordering, geometry, parameters, parent=1, style=None): func_name = 'READAU_f' + if style is None: + style = func_name outnode = addOutNode(outroot, BLOCK_BASIC, attribid, ordering, parent, func_name, 'readau', 'TYPE_2', - func_name, BLOCKTYPE_D) + style, BLOCKTYPE_D) addExprsNode(outnode, TYPE_STRING, 3, parameters) addSciDBNode(outnode, TYPE_DOUBLE, AS_REAL_PARAM, 0, []) diff --git a/blocks/Xcos/blocks/READC_f.py b/blocks/Xcos/blocks/READC_f.py index 797cff8f..7475e85f 100644 --- a/blocks/Xcos/blocks/READC_f.py +++ b/blocks/Xcos/blocks/READC_f.py @@ -1,13 +1,15 @@ from common.AAAAAA import * -def READC_f(outroot, attribid, ordering, geometry, parameters, parent=1): +def READC_f(outroot, attribid, ordering, geometry, parameters, parent=1, style=None): func_name = 'READC_f' + if style is None: + style = func_name outnode = addOutNode(outroot, BLOCK_BASIC, attribid, ordering, parent, func_name, 'readc', 'TYPE_2', - func_name, BLOCKTYPE_D) + style, BLOCKTYPE_D) addExprsNode(outnode, TYPE_STRING, 8, parameters) addSciDBNode(outnode, TYPE_DOUBLE, AS_REAL_PARAM, 0, []) diff --git a/blocks/Xcos/blocks/REGISTER.py b/blocks/Xcos/blocks/REGISTER.py index 0de5976b..a935bcf5 100644 --- a/blocks/Xcos/blocks/REGISTER.py +++ b/blocks/Xcos/blocks/REGISTER.py @@ -1,8 +1,10 @@ from common.AAAAAA import * -def REGISTER(outroot, attribid, ordering, geometry, parameters, parent=1): +def REGISTER(outroot, attribid, ordering, geometry, parameters, parent=1, style=None): func_name = 'REGISTER' + if style is None: + style = func_name data_type = ['', '', '', '_i32', '_i16', '_i8', '_ui32', '_ui16', '_ui8'] @@ -16,7 +18,7 @@ def REGISTER(outroot, attribid, ordering, geometry, parameters, parent=1): outnode = addOutNode(outroot, BLOCK_BASIC, attribid, ordering, parent, func_name, simulation_func_name, 'C_OR_FORTRAN', - func_name, BLOCKTYPE_D) + style, BLOCKTYPE_D) addExprsNode(outnode, TYPE_STRING, 2, parameters) addTypeNode(outnode, TYPE_DOUBLE, AS_REAL_PARAM, 0, diff --git a/blocks/Xcos/blocks/REGISTER_f.py b/blocks/Xcos/blocks/REGISTER_f.py index 7dc4ea40..4ff77a20 100644 --- a/blocks/Xcos/blocks/REGISTER_f.py +++ b/blocks/Xcos/blocks/REGISTER_f.py @@ -1,13 +1,15 @@ from common.AAAAAA import * -def REGISTER_f(outroot, attribid, ordering, geometry, parameters, parent=1): +def REGISTER_f(outroot, attribid, ordering, geometry, parameters, parent=1, style=None): func_name = 'REGISTER_f' + if style is None: + style = func_name outnode = addOutNode(outroot, BLOCK_EXPLICIT_OUT, attribid, ordering, parent, func_name, 'output', 'DEFAULT', - func_name, BLOCKTYPE_C) + style, BLOCKTYPE_C) addExprsNode(outnode, TYPE_STRING, 1, parameters) addTypeNode(outnode, TYPE_DOUBLE, AS_REAL_PARAM, 0, diff --git a/blocks/Xcos/blocks/RELATIONALOP.py b/blocks/Xcos/blocks/RELATIONALOP.py index 1f4f3a5c..b01466b4 100644 --- a/blocks/Xcos/blocks/RELATIONALOP.py +++ b/blocks/Xcos/blocks/RELATIONALOP.py @@ -1,8 +1,10 @@ from common.AAAAAA import * -def RELATIONALOP(outroot, attribid, ordering, geometry, parameters, parent=1): +def RELATIONALOP(outroot, attribid, ordering, geometry, parameters, parent=1, style=None): func_name = 'RELATIONALOP' + if style is None: + style = func_name data_type = ['', '', '', '_i32', '_i16', '_i8', '_ui32', '_ui16', '_ui8'] @@ -16,7 +18,7 @@ def RELATIONALOP(outroot, attribid, ordering, geometry, parameters, parent=1): outnode = addOutNode(outroot, BLOCK_BASIC, attribid, ordering, parent, func_name, simulation_func_name, 'C_OR_FORTRAN', - func_name, BLOCKTYPE_C, + style, BLOCKTYPE_C, dependsOnU='1') addExprsNode(outnode, TYPE_STRING, 3, parameters) diff --git a/blocks/Xcos/blocks/RELAY_f.py b/blocks/Xcos/blocks/RELAY_f.py index b9392073..21007a3f 100644 --- a/blocks/Xcos/blocks/RELAY_f.py +++ b/blocks/Xcos/blocks/RELAY_f.py @@ -1,13 +1,15 @@ from common.AAAAAA import * -def RELAY_f(outroot, attribid, ordering, geometry, parameters, parent=1): +def RELAY_f(outroot, attribid, ordering, geometry, parameters, parent=1, style=None): func_name = 'RELAY_f' + if style is None: + style = func_name outnode = addOutNode(outroot, BLOCK_BASIC, attribid, ordering, parent, func_name, 'relay', 'TYPE_2', - func_name, BLOCKTYPE_C, + style, BLOCKTYPE_C, dependsOnU='1', dependsOnT='1') diff --git a/blocks/Xcos/blocks/RFILE_f.py b/blocks/Xcos/blocks/RFILE_f.py index 4fff5458..14d97e03 100644 --- a/blocks/Xcos/blocks/RFILE_f.py +++ b/blocks/Xcos/blocks/RFILE_f.py @@ -1,13 +1,15 @@ from common.AAAAAA import * -def RFILE_f(outroot, attribid, ordering, geometry, parameters, parent=1): +def RFILE_f(outroot, attribid, ordering, geometry, parameters, parent=1, style=None): func_name = 'RFILE_f' + if style is None: + style = func_name outnode = addOutNode(outroot, BLOCK_BASIC, attribid, ordering, parent, func_name, 'readf', 'DEFAULT', - func_name, BLOCKTYPE_D) + style, BLOCKTYPE_D) addExprsNode(outnode, TYPE_STRING, 5, parameters) addSciDBNode(outnode, TYPE_DOUBLE, AS_REAL_PARAM, 0, []) diff --git a/blocks/Xcos/blocks/RICC.py b/blocks/Xcos/blocks/RICC.py index 587253b2..a5a7a5fd 100644 --- a/blocks/Xcos/blocks/RICC.py +++ b/blocks/Xcos/blocks/RICC.py @@ -1,13 +1,15 @@ from common.AAAAAA import * -def RICC(outroot, attribid, ordering, geometry, parameters, parent=1): +def RICC(outroot, attribid, ordering, geometry, parameters, parent=1, style=None): func_name = 'RICC' + if style is None: + style = func_name outnode = addOutNode(outroot, BLOCK_BASIC, attribid, ordering, parent, func_name, 'ricc_m', 'C_OR_FORTRAN', - func_name, BLOCKTYPE_C, + style, BLOCKTYPE_C, dependsOnU='1') addExprsNode(outnode, TYPE_STRING, 2, parameters) diff --git a/blocks/Xcos/blocks/ROOTCOEF.py b/blocks/Xcos/blocks/ROOTCOEF.py index 20bef5c2..665dbc5d 100644 --- a/blocks/Xcos/blocks/ROOTCOEF.py +++ b/blocks/Xcos/blocks/ROOTCOEF.py @@ -1,8 +1,10 @@ from common.AAAAAA import * -def ROOTCOEF(outroot, attribid, ordering, geometry, parameters, parent=1): +def ROOTCOEF(outroot, attribid, ordering, geometry, parameters, parent=1, style=None): func_name = 'ROOTCOEF' + if style is None: + style = func_name data_type = ['', 'root_coef', 'rootz_coef'] @@ -11,7 +13,7 @@ def ROOTCOEF(outroot, attribid, ordering, geometry, parameters, parent=1): outnode = addOutNode(outroot, BLOCK_BASIC, attribid, ordering, parent, func_name, simulation_func_name, 'C_OR_FORTRAN', - func_name, BLOCKTYPE_C, + style, BLOCKTYPE_C, dependsOnU='1') addExprsNode(outnode, TYPE_STRING, 2, parameters) diff --git a/blocks/Xcos/blocks/Resistor.py b/blocks/Xcos/blocks/Resistor.py index 9baae37e..f74162fe 100644 --- a/blocks/Xcos/blocks/Resistor.py +++ b/blocks/Xcos/blocks/Resistor.py @@ -1,13 +1,15 @@ from common.AAAAAA import * -def Resistor(outroot, attribid, ordering, geometry, parameters, parent=1): +def Resistor(outroot, attribid, ordering, geometry, parameters, parent=1, style=None): func_name = 'Resistor' + if style is None: + style = func_name outnode = addOutNode(outroot, BLOCK_BASIC, attribid, ordering, parent, func_name, 'resistor', 'DEFAULT', - func_name, BLOCKTYPE_C, + style, BLOCKTYPE_C, dependsOnU='1') addExprsNode(outnode, TYPE_STRING, 1, parameters) diff --git a/blocks/Xcos/blocks/SAMPHOLD_m.py b/blocks/Xcos/blocks/SAMPHOLD_m.py index 0b3246e5..f1d492a4 100644 --- a/blocks/Xcos/blocks/SAMPHOLD_m.py +++ b/blocks/Xcos/blocks/SAMPHOLD_m.py @@ -1,13 +1,15 @@ from common.AAAAAA import * -def SAMPHOLD_m(outroot, attribid, ordering, geometry, parameters, parent=1): +def SAMPHOLD_m(outroot, attribid, ordering, geometry, parameters, parent=1, style=None): func_name = 'SAMPHOLD_m' + if style is None: + style = func_name outnode = addOutNode(outroot, BLOCK_BASIC, attribid, ordering, parent, func_name, 'samphold4_m', 'C_OR_FORTRAN', - func_name, BLOCKTYPE_D, + style, BLOCKTYPE_D, dependsOnU='1') addExprsNode(outnode, TYPE_STRING, 1, parameters) diff --git a/blocks/Xcos/blocks/SATURATION.py b/blocks/Xcos/blocks/SATURATION.py index 0996b45c..50c5e7d1 100644 --- a/blocks/Xcos/blocks/SATURATION.py +++ b/blocks/Xcos/blocks/SATURATION.py @@ -3,13 +3,16 @@ from common.AAAAAA import * # block_id = ['4a338342:14e1ed0625e:-7c24#identifier'] -def SATURATION(outroot, attribid, ordering, geometry, parameters, parent=1): +def SATURATION(outroot, attribid, ordering, geometry, parameters, parent=1, style=None): func_name = 'SATURATION' + if style is None: + style = func_name + block_id, port_id, link_id = generate_id(1, 0, 0) outnode = addOutNode(outroot, BLOCK_BASIC, attribid, ordering, parent, func_name, 'satur', 'C_OR_FORTRAN', - func_name, BLOCKTYPE_C, + style, BLOCKTYPE_C, dependsOnU='1') addExprsNode(outnode, TYPE_STRING, 3, parameters) diff --git a/blocks/Xcos/blocks/SAWTOOTH_f.py b/blocks/Xcos/blocks/SAWTOOTH_f.py index 6796bd35..314d554e 100644 --- a/blocks/Xcos/blocks/SAWTOOTH_f.py +++ b/blocks/Xcos/blocks/SAWTOOTH_f.py @@ -1,14 +1,17 @@ from common.AAAAAA import * -def SAWTOOTH_f(outroot, attribid, ordering, geometry, parameters, parent=1): +def SAWTOOTH_f(outroot, attribid, ordering, geometry, parameters, parent=1, style=None): func_name = 'SAWTOOTH_f' + if style is None: + style = func_name + parameters = [' '] outnode = addOutNode(outroot, BLOCK_BASIC, attribid, ordering, parent, func_name, 'sawtth', 'DEFAULT', - func_name, BLOCKTYPE_C, + style, BLOCKTYPE_C, dependsOnT='1') addExprsNode(outnode, TYPE_STRING, 1, parameters) diff --git a/blocks/Xcos/blocks/SCALAR2VECTOR.py b/blocks/Xcos/blocks/SCALAR2VECTOR.py index e3fb2a1d..2d57d34a 100644 --- a/blocks/Xcos/blocks/SCALAR2VECTOR.py +++ b/blocks/Xcos/blocks/SCALAR2VECTOR.py @@ -1,13 +1,15 @@ from common.AAAAAA import * -def SCALAR2VECTOR(outroot, attribid, ordering, geometry, parameters, parent=1): +def SCALAR2VECTOR(outroot, attribid, ordering, geometry, parameters, parent=1, style=None): func_name = 'SCALAR2VECTOR' + if style is None: + style = func_name outnode = addOutNode(outroot, BLOCK_BASIC, attribid, ordering, parent, func_name, 'scalar2vector', 'C_OR_FORTRAN', - func_name, BLOCKTYPE_C, + style, BLOCKTYPE_C, dependsOnU='1') addExprsNode(outnode, TYPE_STRING, 1, parameters) diff --git a/blocks/Xcos/blocks/SELECT_m.py b/blocks/Xcos/blocks/SELECT_m.py index e1006de2..2e6fc51a 100644 --- a/blocks/Xcos/blocks/SELECT_m.py +++ b/blocks/Xcos/blocks/SELECT_m.py @@ -1,13 +1,15 @@ from common.AAAAAA import * -def SELECT_m(outroot, attribid, ordering, geometry, parameters, parent=1): +def SELECT_m(outroot, attribid, ordering, geometry, parameters, parent=1, style=None): func_name = 'SELECT_m' + if style is None: + style = func_name outnode = addOutNode(outroot, BLOCK_BASIC, attribid, ordering, parent, func_name, 'selector_m', 'C_OR_FORTRAN', - func_name, BLOCKTYPE_C, + style, BLOCKTYPE_C, dependsOnU='1') addExprsNode(outnode, TYPE_STRING, 3, parameters) diff --git a/blocks/Xcos/blocks/SELF_SWITCH.py b/blocks/Xcos/blocks/SELF_SWITCH.py index d8602d3d..a2f3c7e8 100644 --- a/blocks/Xcos/blocks/SELF_SWITCH.py +++ b/blocks/Xcos/blocks/SELF_SWITCH.py @@ -5,8 +5,11 @@ from blocks.SWITCH_f import SWITCH_f from common.AAAAAA import * -def SELF_SWITCH(outroot, attribid, ordering, geometry, parameters, parent=1): +def SELF_SWITCH(outroot, attribid, ordering, geometry, parameters, parent=1, style=None): func_name = 'SELF_SWITCH' + if style is None: + style = func_name + if parameters[0] == 'on': style = func_name + '_ON' else: diff --git a/blocks/Xcos/blocks/SHIFT.py b/blocks/Xcos/blocks/SHIFT.py index 36378aeb..27056148 100644 --- a/blocks/Xcos/blocks/SHIFT.py +++ b/blocks/Xcos/blocks/SHIFT.py @@ -1,8 +1,10 @@ from common.AAAAAA import * -def SHIFT(outroot, attribid, ordering, geometry, parameters, parent=1): +def SHIFT(outroot, attribid, ordering, geometry, parameters, parent=1, style=None): func_name = 'SHIFT' + if style is None: + style = func_name data_type = ['', '', '', 'shift_32_', 'shift_16_', 'shift_8_', @@ -24,7 +26,7 @@ def SHIFT(outroot, attribid, ordering, geometry, parameters, parent=1): outnode = addOutNode(outroot, BLOCK_BASIC, attribid, ordering, parent, func_name, simulation_func_name, 'C_OR_FORTRAN', - func_name, BLOCKTYPE_C, + style, BLOCKTYPE_C, dependsOnU='1') addExprsNode(outnode, TYPE_STRING, 3, parameters) diff --git a/blocks/Xcos/blocks/SIGNUM.py b/blocks/Xcos/blocks/SIGNUM.py index d76e7b0e..577c7836 100644 --- a/blocks/Xcos/blocks/SIGNUM.py +++ b/blocks/Xcos/blocks/SIGNUM.py @@ -1,13 +1,15 @@ from common.AAAAAA import * -def SIGNUM(outroot, attribid, ordering, geometry, parameters, parent=1): +def SIGNUM(outroot, attribid, ordering, geometry, parameters, parent=1, style=None): func_name = 'SIGNUM' + if style is None: + style = func_name outnode = addOutNode(outroot, BLOCK_BASIC, attribid, ordering, parent, func_name, 'signum', 'C_OR_FORTRAN', - func_name, BLOCKTYPE_C, + style, BLOCKTYPE_C, dependsOnU='1') addExprsNode(outnode, TYPE_STRING, 1, parameters) diff --git a/blocks/Xcos/blocks/SINBLK_f.py b/blocks/Xcos/blocks/SINBLK_f.py index 8826d975..7cf71065 100644 --- a/blocks/Xcos/blocks/SINBLK_f.py +++ b/blocks/Xcos/blocks/SINBLK_f.py @@ -1,14 +1,17 @@ from common.AAAAAA import * -def SINBLK_f(outroot, attribid, ordering, geometry, parameters, parent=1): +def SINBLK_f(outroot, attribid, ordering, geometry, parameters, parent=1, style=None): func_name = 'SINBLK_f' + if style is None: + style = func_name + parameters = [' '] outnode = addOutNode(outroot, BLOCK_BASIC, attribid, ordering, parent, func_name, 'sinblk', 'DEFAULT', - func_name, BLOCKTYPE_C, + style, BLOCKTYPE_C, dependsOnU='1') addExprsNode(outnode, TYPE_STRING, 1, parameters) diff --git a/blocks/Xcos/blocks/SOM_f.py b/blocks/Xcos/blocks/SOM_f.py index 1038b78e..c0faabb0 100644 --- a/blocks/Xcos/blocks/SOM_f.py +++ b/blocks/Xcos/blocks/SOM_f.py @@ -1,14 +1,17 @@ from common.AAAAAA import * -def SOM_f(outroot, attribid, ordering, geometry, parameters, parent=1): +def SOM_f(outroot, attribid, ordering, geometry, parameters, parent=1, style=None): func_name = 'SOM_f' + if style is None: + style = func_name + parameters = ['1', '[1;1;1]'] outnode = addOutNode(outroot, BLOCK_BASIC, attribid, ordering, parent, func_name, 'sum', 'TYPE_2', - func_name, BLOCKTYPE_C, + style, BLOCKTYPE_C, dependsOnU='1') addExprsNode(outnode, TYPE_STRING, 2, parameters) diff --git a/blocks/Xcos/blocks/SPLIT_f.py b/blocks/Xcos/blocks/SPLIT_f.py index 64d02336..5cd9002d 100644 --- a/blocks/Xcos/blocks/SPLIT_f.py +++ b/blocks/Xcos/blocks/SPLIT_f.py @@ -1,13 +1,15 @@ from common.AAAAAA import * -def SPLIT_f(outroot, attribid, ordering, geometry, parameters, parent=1): +def SPLIT_f(outroot, attribid, ordering, geometry, parameters, parent=1, style=None): func_name = 'SPLIT_f' + if style is None: + style = func_name outnode = addOutNode(outroot, BLOCK_SPLIT, attribid, ordering, parent, func_name, 'lsplit', 'DEFAULT', - func_name, BLOCKTYPE_C) + style, BLOCKTYPE_C) addExprsNode(outnode, TYPE_STRING, 0, []) addTypeNode(outnode, TYPE_DOUBLE, AS_REAL_PARAM, 0, []) diff --git a/blocks/Xcos/blocks/SQRT.py b/blocks/Xcos/blocks/SQRT.py index 668988ab..32e21e48 100644 --- a/blocks/Xcos/blocks/SQRT.py +++ b/blocks/Xcos/blocks/SQRT.py @@ -1,8 +1,10 @@ from common.AAAAAA import * -def SQRT(outroot, attribid, ordering, geometry, parameters, parent=1): +def SQRT(outroot, attribid, ordering, geometry, parameters, parent=1, style=None): func_name = 'SQRT' + if style is None: + style = func_name data_type = ['', 'mat_sqrt', 'matz_sqrt'] @@ -11,7 +13,7 @@ def SQRT(outroot, attribid, ordering, geometry, parameters, parent=1): outnode = addOutNode(outroot, BLOCK_BASIC, attribid, ordering, parent, func_name, simulation_func_name, 'C_OR_FORTRAN', - func_name, BLOCKTYPE_C, + style, BLOCKTYPE_C, dependsOnU='1') addExprsNode(outnode, TYPE_STRING, 1, parameters) diff --git a/blocks/Xcos/blocks/SRFLIPFLOP.py b/blocks/Xcos/blocks/SRFLIPFLOP.py index 2aad4e29..effb126e 100644 --- a/blocks/Xcos/blocks/SRFLIPFLOP.py +++ b/blocks/Xcos/blocks/SRFLIPFLOP.py @@ -6,13 +6,16 @@ from blocks.IN_f import IN_f from common.AAAAAA import * -def SRFLIPFLOP(outroot, attribid, ordering, geometry, parameters, parent=1): +def SRFLIPFLOP(outroot, attribid, ordering, geometry, parameters, parent=1, style=None): func_name = 'SRFLIPFLOP' + if style is None: + style = func_name + block_id, port_id, link_id = generate_id(9, 15, 7) outnode = addOutNode(outroot, BLOCK_BASIC, attribid, ordering, parent, func_name, 'csuper', 'DEFAULT', - func_name, BLOCKTYPE_H, + style, BLOCKTYPE_H, dependsOnU='1') addExprsNode(outnode, TYPE_DOUBLE, 0, parameters) diff --git a/blocks/Xcos/blocks/STEP.py b/blocks/Xcos/blocks/STEP.py index 8a77e1d5..58b6ff98 100644 --- a/blocks/Xcos/blocks/STEP.py +++ b/blocks/Xcos/blocks/STEP.py @@ -1,13 +1,15 @@ from common.AAAAAA import * -def STEP(outroot, attribid, ordering, geometry, parameters, parent=1): +def STEP(outroot, attribid, ordering, geometry, parameters, parent=1, style=None): func_name = 'STEP' + if style is None: + style = func_name outnode = addOutNode(outroot, BLOCK_BASIC, attribid, ordering, parent, func_name, 'step_func', 'C_OR_FORTRAN', - func_name, BLOCKTYPE_C, dependsOnU='0', + style, BLOCKTYPE_C, dependsOnU='0', dependsOnT='0') addExprsNode(outnode, TYPE_STRING, 3, parameters) diff --git a/blocks/Xcos/blocks/STEP_FUNCTION.py b/blocks/Xcos/blocks/STEP_FUNCTION.py index 9e53bd4e..9506feaf 100644 --- a/blocks/Xcos/blocks/STEP_FUNCTION.py +++ b/blocks/Xcos/blocks/STEP_FUNCTION.py @@ -16,13 +16,16 @@ from common.AAAAAA import * # '-6f1a4b5d:18f04c0dca9:-7fea', '-6f1a4b5d:18f04c0dca9:-7fe9'] -def STEP_FUNCTION(outroot, attribid, ordering, geometry, parameters, parent=1): +def STEP_FUNCTION(outroot, attribid, ordering, geometry, parameters, parent=1, style=None): func_name = 'STEP_FUNCTION' + if style is None: + style = func_name + block_id, port_id, link_id = generate_id(9, 8, 4) outnode = addOutNode(outroot, BLOCK_BASIC, attribid, ordering, parent, func_name, 'csuper', 'DEFAULT', - func_name, BLOCKTYPE_H, dependsOnU='0', + style, BLOCKTYPE_H, dependsOnU='0', dependsOnT='0') addExprsNode(outnode, TYPE_DOUBLE, 0, parameters) diff --git a/blocks/Xcos/blocks/SUBMAT.py b/blocks/Xcos/blocks/SUBMAT.py index fb8635b5..1d3a319b 100644 --- a/blocks/Xcos/blocks/SUBMAT.py +++ b/blocks/Xcos/blocks/SUBMAT.py @@ -1,8 +1,10 @@ from common.AAAAAA import * -def SUBMAT(outroot, attribid, ordering, geometry, parameters, parent=1): +def SUBMAT(outroot, attribid, ordering, geometry, parameters, parent=1, style=None): func_name = 'SUBMAT' + if style is None: + style = func_name data_type = ['', 'submat', 'submatz'] @@ -11,7 +13,7 @@ def SUBMAT(outroot, attribid, ordering, geometry, parameters, parent=1): outnode = addOutNode(outroot, BLOCK_BASIC, attribid, ordering, parent, func_name, simulation_func_name, 'C_OR_FORTRAN', - func_name, BLOCKTYPE_C, + style, BLOCKTYPE_C, dependsOnU='1') addExprsNode(outnode, TYPE_STRING, 6, parameters) diff --git a/blocks/Xcos/blocks/SUMMATION.py b/blocks/Xcos/blocks/SUMMATION.py index fcf2002b..87021702 100644 --- a/blocks/Xcos/blocks/SUMMATION.py +++ b/blocks/Xcos/blocks/SUMMATION.py @@ -1,8 +1,10 @@ from common.AAAAAA import * -def SUMMATION(outroot, attribid, ordering, geometry, parameters, parent=1): +def SUMMATION(outroot, attribid, ordering, geometry, parameters, parent=1, style=None): func_name = 'SUMMATION' + if style is None: + style = func_name data_type = ['', '', '_z', '_i32', '_i16', '_i8', '_ui32', '_ui16', '_ui8'] overflow = ['n', 's', 'e'] @@ -18,7 +20,7 @@ def SUMMATION(outroot, attribid, ordering, geometry, parameters, parent=1): outnode = addOutNode(outroot, BLOCK_SUMMATION, attribid, ordering, parent, func_name, simulation_func_name, 'C_OR_FORTRAN', - func_name, BLOCKTYPE_C, + style, BLOCKTYPE_C, dependsOnU='1') if len(parameters) == 1: diff --git a/blocks/Xcos/blocks/SUM_f.py b/blocks/Xcos/blocks/SUM_f.py index 014df8a6..9d6b4660 100644 --- a/blocks/Xcos/blocks/SUM_f.py +++ b/blocks/Xcos/blocks/SUM_f.py @@ -1,13 +1,15 @@ from common.AAAAAA import * -def SUM_f(outroot, attribid, ordering, geometry, parameters, parent=1): +def SUM_f(outroot, attribid, ordering, geometry, parameters, parent=1, style=None): func_name = 'SUM_f' + if style is None: + style = func_name outnode = addOutNode(outroot, BLOCK_ROUND, attribid, ordering, parent, func_name, 'plusblk', 'TYPE_2', - func_name, BLOCKTYPE_C, + style, BLOCKTYPE_C, dependsOnU='1') addExprsNode(outnode, TYPE_DOUBLE, 0, parameters) diff --git a/blocks/Xcos/blocks/SUPER_f.py b/blocks/Xcos/blocks/SUPER_f.py index ad162c6d..7f5dbce2 100644 --- a/blocks/Xcos/blocks/SUPER_f.py +++ b/blocks/Xcos/blocks/SUPER_f.py @@ -6,13 +6,16 @@ from common.AAAAAA import * # '-64ce6d85:145ef6f2b4f:-7f54'] -def SUPER_f(outroot, attribid, ordering, geometry, parameters, parent=1): +def SUPER_f(outroot, attribid, ordering, geometry, parameters, parent=1, style=None): func_name = 'SUPER_f' + if style is None: + style = func_name + block_id, port_id, link_id = generate_id(3, 0, 0) outnode = addOutNode(outroot, BLOCK_SUPER, attribid, ordering, parent, func_name, 'cscope', 'C_OR_FORTRAN', - func_name, BLOCKTYPE_C) + style, BLOCKTYPE_C) addExprsNode(outnode, TYPE_STRING, 0, parameters) addSciDBNode(outnode, TYPE_DOUBLE, AS_REAL_PARAM, diff --git a/blocks/Xcos/blocks/SWITCH2_m.py b/blocks/Xcos/blocks/SWITCH2_m.py index b87483ff..e1ace53a 100644 --- a/blocks/Xcos/blocks/SWITCH2_m.py +++ b/blocks/Xcos/blocks/SWITCH2_m.py @@ -1,13 +1,15 @@ from common.AAAAAA import * -def SWITCH2_m(outroot, attribid, ordering, geometry, parameters, parent=1): +def SWITCH2_m(outroot, attribid, ordering, geometry, parameters, parent=1, style=None): func_name = 'SWITCH2_m' + if style is None: + style = func_name outnode = addOutNode(outroot, BLOCK_BASIC, attribid, ordering, parent, func_name, 'switch2_m', 'C_OR_FORTRAN', - func_name, BLOCKTYPE_C, + style, BLOCKTYPE_C, dependsOnU='1') addExprsNode(outnode, TYPE_STRING, 4, parameters) diff --git a/blocks/Xcos/blocks/SWITCH_f.py b/blocks/Xcos/blocks/SWITCH_f.py index 7f97dd9d..26992ca1 100644 --- a/blocks/Xcos/blocks/SWITCH_f.py +++ b/blocks/Xcos/blocks/SWITCH_f.py @@ -1,13 +1,15 @@ from common.AAAAAA import * -def SWITCH_f(outroot, attribid, ordering, geometry, parameters, parent=1): +def SWITCH_f(outroot, attribid, ordering, geometry, parameters, parent=1, style=None): func_name = 'SWITCH_f' + if style is None: + style = func_name outnode = addOutNode(outroot, BLOCK_BASIC, attribid, ordering, parent, func_name, 'switchn', 'TYPE_2', - func_name, BLOCKTYPE_C, + style, BLOCKTYPE_C, dependsOnU='1', dependsOnT='1') diff --git a/blocks/Xcos/blocks/SampleCLK.py b/blocks/Xcos/blocks/SampleCLK.py index 9fc393a8..84bf987c 100644 --- a/blocks/Xcos/blocks/SampleCLK.py +++ b/blocks/Xcos/blocks/SampleCLK.py @@ -1,13 +1,15 @@ from common.AAAAAA import * -def SampleCLK(outroot, attribid, ordering, geometry, parameters, parent=1): +def SampleCLK(outroot, attribid, ordering, geometry, parameters, parent=1, style=None): func_name = 'SampleCLK' + if style is None: + style = func_name outnode = addOutNode(outroot, BLOCK_BASIC, attribid, ordering, parent, func_name, 'sampleclk', 'DEFAULT', - func_name, BLOCKTYPE_D) + style, BLOCKTYPE_D) addExprsNode(outnode, TYPE_STRING, 2, parameters) addScilabDNode(outnode, AS_REAL_PARAM, width=2, realParts=[ diff --git a/blocks/Xcos/blocks/Sigbuilder.py b/blocks/Xcos/blocks/Sigbuilder.py index 6f7a0abe..c1e3c2df 100644 --- a/blocks/Xcos/blocks/Sigbuilder.py +++ b/blocks/Xcos/blocks/Sigbuilder.py @@ -17,13 +17,16 @@ from common.AAAAAA import * # ] -def Sigbuilder(outroot, attribid, ordering, geometry, parameters, parent=1): +def Sigbuilder(outroot, attribid, ordering, geometry, parameters, parent=1, style=None): func_name = 'Sigbuilder' + if style is None: + style = func_name + block_id, port_id, link_id = generate_id(6, 8, 4) outnode = addOutNode(outroot, BLOCK_BASIC, attribid, ordering, parent, func_name, 'csuper', 'DEFAULT', - func_name, BLOCKTYPE_H, dependsOnU="0", dependsOnT="0") + style, BLOCKTYPE_H, dependsOnU="0", dependsOnT="0") addExprsNode(outnode, TYPE_DOUBLE, 0, parameters) addSciDBNode(outnode, TYPE_DOUBLE, AS_REAL_PARAM, 0, []) diff --git a/blocks/Xcos/blocks/SineVoltage.py b/blocks/Xcos/blocks/SineVoltage.py index 7468edb1..9362afc4 100644 --- a/blocks/Xcos/blocks/SineVoltage.py +++ b/blocks/Xcos/blocks/SineVoltage.py @@ -1,13 +1,15 @@ from common.AAAAAA import * -def SineVoltage(outroot, attribid, ordering, geometry, parameters, parent=1): +def SineVoltage(outroot, attribid, ordering, geometry, parameters, parent=1, style=None): func_name = 'SineVoltage' + if style is None: + style = func_name outnode = addOutNode(outroot, BLOCK_BASIC, attribid, ordering, parent, func_name, 'SineVoltage', 'DEFAULT', - func_name, BLOCKTYPE_C, + style, BLOCKTYPE_C, dependsOnU='1', dependsOnT='0') addExprsNode(outnode, TYPE_STRING, 5, parameters) diff --git a/blocks/Xcos/blocks/SourceP.py b/blocks/Xcos/blocks/SourceP.py index 9bd2bdc8..b78f3371 100644 --- a/blocks/Xcos/blocks/SourceP.py +++ b/blocks/Xcos/blocks/SourceP.py @@ -1,13 +1,15 @@ from common.AAAAAA import * -def SourceP(outroot, attribid, ordering, geometry, parameters, parent=1): +def SourceP(outroot, attribid, ordering, geometry, parameters, parent=1, style=None): func_name = 'SourceP' + if style is None: + style = func_name outnode = addOutNode(outroot, BLOCK_BASIC, attribid, ordering, parent, func_name, 'Source', 'DEFAULT', - func_name, BLOCKTYPE_C, + style, BLOCKTYPE_C, dependsOnU='1') addExprsNode(outnode, TYPE_STRING, 4, parameters) diff --git a/blocks/Xcos/blocks/SplitBlock.py b/blocks/Xcos/blocks/SplitBlock.py index aea0bda5..3dd48a46 100644 --- a/blocks/Xcos/blocks/SplitBlock.py +++ b/blocks/Xcos/blocks/SplitBlock.py @@ -1,12 +1,15 @@ from common.AAAAAA import * -def SplitBlock(outroot, attribid, ordering, geometry, parent=1): +def SplitBlock(outroot, attribid, ordering, geometry, parent=1, style=None): func_name = 'CLKSPLIT_f' + if style is None: + style = func_name + outnode = addOutNode(outroot, BLOCK_SPLIT, attribid, ordering, parent, func_name, 'split', 'DEFAULT', - func_name, BLOCKTYPE_D, dependsOnU='0', + style, BLOCKTYPE_D, dependsOnU='0', dependsOnT='0') addExprsNode(outnode, TYPE_DOUBLE, 0, []) addTypeNode(outnode, TYPE_DOUBLE, AS_REAL_PARAM, 0, diff --git a/blocks/Xcos/blocks/Switch.py b/blocks/Xcos/blocks/Switch.py index f21295ca..7c6ce3b6 100644 --- a/blocks/Xcos/blocks/Switch.py +++ b/blocks/Xcos/blocks/Switch.py @@ -1,13 +1,15 @@ from common.AAAAAA import * -def Switch(outroot, attribid, ordering, geometry, parameters, parent=1): +def Switch(outroot, attribid, ordering, geometry, parameters, parent=1, style=None): func_name = 'Switch' + if style is None: + style = func_name outnode = addOutNode(outroot, BLOCK_BASIC, attribid, ordering, parent, func_name, 'Switch', 'DEFAULT', - func_name, BLOCKTYPE_C, + style, BLOCKTYPE_C, dependsOnU='1', dependsOnT='0') addExprsNode(outnode, TYPE_STRING, 2, parameters) diff --git a/blocks/Xcos/blocks/TANBLK_f.py b/blocks/Xcos/blocks/TANBLK_f.py index da3fd611..87a27e69 100644 --- a/blocks/Xcos/blocks/TANBLK_f.py +++ b/blocks/Xcos/blocks/TANBLK_f.py @@ -1,14 +1,17 @@ from common.AAAAAA import * -def TANBLK_f(outroot, attribid, ordering, geometry, parameters, parent=1): +def TANBLK_f(outroot, attribid, ordering, geometry, parameters, parent=1, style=None): func_name = 'TANBLK_f' + if style is None: + style = func_name + parameters = ['-1'] outnode = addOutNode(outroot, BLOCK_BASIC, attribid, ordering, parent, func_name, 'tanblk', 'DEFAULT', - func_name, BLOCKTYPE_C, + style, BLOCKTYPE_C, dependsOnU='1') addExprsNode(outnode, TYPE_STRING, 1, parameters) diff --git a/blocks/Xcos/blocks/TCLSS.py b/blocks/Xcos/blocks/TCLSS.py index e8bb3b49..cde39325 100644 --- a/blocks/Xcos/blocks/TCLSS.py +++ b/blocks/Xcos/blocks/TCLSS.py @@ -1,13 +1,15 @@ from common.AAAAAA import * -def TCLSS(outroot, attribid, ordering, geometry, parameters, parent=1): +def TCLSS(outroot, attribid, ordering, geometry, parameters, parent=1, style=None): func_name = 'TCLSS' + if style is None: + style = func_name outnode = addOutNode(outroot, BLOCK_BASIC, attribid, ordering, parent, func_name, 'tcslti4', 'C_OR_FORTRAN', - func_name, BLOCKTYPE_C, + style, BLOCKTYPE_C, dependsOnT='1') addExprsNode(outnode, TYPE_STRING, 5, parameters) diff --git a/blocks/Xcos/blocks/TEXT_f.py b/blocks/Xcos/blocks/TEXT_f.py index 92b25842..fbe7f4e6 100644 --- a/blocks/Xcos/blocks/TEXT_f.py +++ b/blocks/Xcos/blocks/TEXT_f.py @@ -1,13 +1,15 @@ from common.AAAAAA import * -def TEXT_f(outroot, attribid, ordering, geometry, parameters, parent=1): +def TEXT_f(outroot, attribid, ordering, geometry, parameters, parent=1, style=None): func_name = 'TEXT_f' + if style is None: + style = func_name outnode = addOutNode(outroot, BLOCK_TEXT, attribid, ordering, parent, func_name, None, None, - func_name, None, + style, None, value=parameters[0]) addgeometryNode(outnode, GEOMETRY, geometry['height'], diff --git a/blocks/Xcos/blocks/TIME_DELAY.py b/blocks/Xcos/blocks/TIME_DELAY.py index 438c5f3c..95e7ad84 100644 --- a/blocks/Xcos/blocks/TIME_DELAY.py +++ b/blocks/Xcos/blocks/TIME_DELAY.py @@ -1,13 +1,15 @@ from common.AAAAAA import * -def TIME_DELAY(outroot, attribid, ordering, geometry, parameters, parent=1): +def TIME_DELAY(outroot, attribid, ordering, geometry, parameters, parent=1, style=None): func_name = 'TIME_DELAY' + if style is None: + style = func_name outnode = addOutNode(outroot, BLOCK_BASIC, attribid, ordering, parent, func_name, 'time_delay', 'C_OR_FORTRAN', - func_name, BLOCKTYPE_X, + style, BLOCKTYPE_X, dependsOnT='1') addExprsNode(outnode, TYPE_STRING, 3, parameters) diff --git a/blocks/Xcos/blocks/TIME_f.py b/blocks/Xcos/blocks/TIME_f.py index 8c003127..8afbef22 100644 --- a/blocks/Xcos/blocks/TIME_f.py +++ b/blocks/Xcos/blocks/TIME_f.py @@ -1,13 +1,15 @@ from common.AAAAAA import * -def TIME_f(outroot, attribid, ordering, geometry, parameters, parent=1): +def TIME_f(outroot, attribid, ordering, geometry, parameters, parent=1, style=None): func_name = 'TIME_f' + if style is None: + style = func_name outnode = addOutNode(outroot, BLOCK_BASIC, attribid, ordering, parent, func_name, 'timblk', 'DEFAULT', - func_name, BLOCKTYPE_C, + style, BLOCKTYPE_C, dependsOnT='1') addExprsNode(outnode, TYPE_DOUBLE, 0, parameters) diff --git a/blocks/Xcos/blocks/TKSCALE.py b/blocks/Xcos/blocks/TKSCALE.py index ba1fcded..2ef26e3f 100644 --- a/blocks/Xcos/blocks/TKSCALE.py +++ b/blocks/Xcos/blocks/TKSCALE.py @@ -1,13 +1,15 @@ from common.AAAAAA import * -def TKSCALE(outroot, attribid, ordering, geometry, parameters, parent=1): +def TKSCALE(outroot, attribid, ordering, geometry, parameters, parent=1, style=None): func_name = 'TKSCALE' + if style is None: + style = func_name outnode = addOutNode(outroot, BLOCK_BASIC, attribid, ordering, parent, func_name, 'tkscaleblk', 'SCILAB', - func_name, BLOCKTYPE_D) + style, BLOCKTYPE_D) addExprsNode(outnode, TYPE_STRING, 3, parameters) addScilabDNode(outnode, AS_REAL_PARAM, width=3, realParts=[ diff --git a/blocks/Xcos/blocks/TOWS_c.py b/blocks/Xcos/blocks/TOWS_c.py index 1d7e3a22..7919f61f 100644 --- a/blocks/Xcos/blocks/TOWS_c.py +++ b/blocks/Xcos/blocks/TOWS_c.py @@ -1,20 +1,22 @@ from common.AAAAAA import * -def TOWS_c(outroot, attribid, ordering, geometry, parameters, parent=1): +def TOWS_c(outroot, attribid, ordering, geometry, parameters, parent=1, style=None): func_name = 'TOWS_c' + if style is None: + style = func_name para3 = int(parameters[2]) if para3 == 1: - b_type = BLOCKTYPE_X + blocktype = BLOCKTYPE_X else: - b_type = BLOCKTYPE_D + blocktype = BLOCKTYPE_D outnode = addOutNode(outroot, BLOCK_BASIC, attribid, ordering, parent, func_name, 'tows_c', 'C_OR_FORTRAN', - func_name, b_type) + style, blocktype) addExprsNode(outnode, TYPE_STRING, 3, parameters) addSciDBNode(outnode, TYPE_DOUBLE, AS_REAL_PARAM, diff --git a/blocks/Xcos/blocks/TRASH_f.py b/blocks/Xcos/blocks/TRASH_f.py index 24c423af..82d085c8 100644 --- a/blocks/Xcos/blocks/TRASH_f.py +++ b/blocks/Xcos/blocks/TRASH_f.py @@ -1,13 +1,15 @@ from common.AAAAAA import * -def TRASH_f(outroot, attribid, ordering, geometry, parameters, parent=1): +def TRASH_f(outroot, attribid, ordering, geometry, parameters, parent=1, style=None): func_name = 'TRASH_f' + if style is None: + style = func_name outnode = addOutNode(outroot, BLOCK_BASIC, attribid, ordering, parent, func_name, 'trash', 'DEFAULT', - func_name, BLOCKTYPE_D) + style, BLOCKTYPE_D) addExprsNode(outnode, TYPE_STRING, 1, parameters) addTypeNode(outnode, TYPE_DOUBLE, AS_REAL_PARAM, 0, []) diff --git a/blocks/Xcos/blocks/TrigFun.py b/blocks/Xcos/blocks/TrigFun.py index 4e78b478..7339a7f2 100644 --- a/blocks/Xcos/blocks/TrigFun.py +++ b/blocks/Xcos/blocks/TrigFun.py @@ -1,15 +1,17 @@ from common.AAAAAA import * -def TrigFun(outroot, attribid, ordering, geometry, parameters, parent=1): +def TrigFun(outroot, attribid, ordering, geometry, parameters, parent=1, style=None): func_name = 'TrigFun' + if style is None: + style = func_name simulation_func_name = str(parameters[0]) + '_blk' outnode = addOutNode(outroot, BLOCK_BASIC, attribid, ordering, parent, func_name, simulation_func_name, 'C_OR_FORTRAN', - func_name, BLOCKTYPE_C, + style, BLOCKTYPE_C, dependsOnU='1') addExprsNode(outnode, TYPE_STRING, 1, parameters) diff --git a/blocks/Xcos/blocks/VARIABLE_DELAY.py b/blocks/Xcos/blocks/VARIABLE_DELAY.py index 310e6d4d..ae622752 100644 --- a/blocks/Xcos/blocks/VARIABLE_DELAY.py +++ b/blocks/Xcos/blocks/VARIABLE_DELAY.py @@ -1,13 +1,15 @@ from common.AAAAAA import * -def VARIABLE_DELAY(outroot, attribid, ordering, geometry, parameters, parent=1): +def VARIABLE_DELAY(outroot, attribid, ordering, geometry, parameters, parent=1, style=None): func_name = 'VARIABLE_DELAY' + if style is None: + style = func_name outnode = addOutNode(outroot, BLOCK_BASIC, attribid, ordering, parent, func_name, 'variable_delay', 'C_OR_FORTRAN', - func_name, BLOCKTYPE_D) + style, BLOCKTYPE_D) addExprsNode(outnode, TYPE_STRING, 3, parameters) addScilabDNode(outnode, AS_REAL_PARAM, width=2, realParts=[ diff --git a/blocks/Xcos/blocks/VVsourceAC.py b/blocks/Xcos/blocks/VVsourceAC.py index 601ec838..328da2cf 100644 --- a/blocks/Xcos/blocks/VVsourceAC.py +++ b/blocks/Xcos/blocks/VVsourceAC.py @@ -1,13 +1,15 @@ from common.AAAAAA import * -def VVsourceAC(outroot, attribid, ordering, geometry, parameters, parent=1): +def VVsourceAC(outroot, attribid, ordering, geometry, parameters, parent=1, style=None): func_name = 'VVsourceAC' + if style is None: + style = func_name outnode = addOutNode(outroot, BLOCK_BASIC, attribid, ordering, parent, func_name, 'VVsourceAC', 'DEFAULT', - func_name, BLOCKTYPE_C, + style, BLOCKTYPE_C, dependsOnU='1') addExprsNode(outnode, TYPE_STRING, 1, parameters) diff --git a/blocks/Xcos/blocks/VanneReglante.py b/blocks/Xcos/blocks/VanneReglante.py index c1c3a25e..ea34a4b8 100644 --- a/blocks/Xcos/blocks/VanneReglante.py +++ b/blocks/Xcos/blocks/VanneReglante.py @@ -1,13 +1,15 @@ from common.AAAAAA import * -def VanneReglante(outroot, attribid, ordering, geometry, parameters, parent=1): +def VanneReglante(outroot, attribid, ordering, geometry, parameters, parent=1, style=None): func_name = 'VanneReglante' + if style is None: + style = func_name outnode = addOutNode(outroot, BLOCK_BASIC, attribid, ordering, parent, func_name, 'VanneReglante', 'DEFAULT', - func_name, BLOCKTYPE_C, + style, BLOCKTYPE_C, dependsOnU='1') addExprsNode(outnode, TYPE_STRING, 2, parameters) diff --git a/blocks/Xcos/blocks/VariableResistor.py b/blocks/Xcos/blocks/VariableResistor.py index e6d06790..4bfd7b3d 100644 --- a/blocks/Xcos/blocks/VariableResistor.py +++ b/blocks/Xcos/blocks/VariableResistor.py @@ -1,13 +1,15 @@ from common.AAAAAA import * -def VariableResistor(outroot, attribid, ordering, geometry, parameters, parent=1): +def VariableResistor(outroot, attribid, ordering, geometry, parameters, parent=1, style=None): func_name = 'VariableResistor' + if style is None: + style = func_name outnode = addOutNode(outroot, BLOCK_BASIC, attribid, ordering, parent, func_name, 'VariableResistor', 'DEFAULT', - func_name, BLOCKTYPE_C, + style, BLOCKTYPE_C, dependsOnU='1') addExprsNode(outnode, TYPE_DOUBLE, 0, parameters) diff --git a/blocks/Xcos/blocks/VirtualCLK0.py b/blocks/Xcos/blocks/VirtualCLK0.py index 3f0ab6d7..2a27bf42 100644 --- a/blocks/Xcos/blocks/VirtualCLK0.py +++ b/blocks/Xcos/blocks/VirtualCLK0.py @@ -1,13 +1,15 @@ from common.AAAAAA import * -def VirtualCLK0(outroot, attribid, ordering, geometry, parameters, parent=1): +def VirtualCLK0(outroot, attribid, ordering, geometry, parameters, parent=1, style=None): func_name = 'VirtualCLK0' + if style is None: + style = func_name outnode = addOutNode(outroot, BLOCK_BASIC, attribid, ordering, parent, func_name, 'vrtclk0', 'DEFAULT', - func_name, BLOCKTYPE_D) + style, BLOCKTYPE_D) addExprsNode(outnode, TYPE_DOUBLE, 0, parameters) addTypeNode(outnode, TYPE_DOUBLE, AS_REAL_PARAM, 0, []) diff --git a/blocks/Xcos/blocks/VoltageSensor.py b/blocks/Xcos/blocks/VoltageSensor.py index 81151a48..ed923c68 100644 --- a/blocks/Xcos/blocks/VoltageSensor.py +++ b/blocks/Xcos/blocks/VoltageSensor.py @@ -1,13 +1,15 @@ from common.AAAAAA import * -def VoltageSensor(outroot, attribid, ordering, geometry, parameters, parent=1): +def VoltageSensor(outroot, attribid, ordering, geometry, parameters, parent=1, style=None): func_name = 'VoltageSensor' + if style is None: + style = func_name outnode = addOutNode(outroot, BLOCK_VOLTAGESENSOR, attribid, ordering, parent, func_name, 'VoltageSensor', 'DEFAULT', - func_name, BLOCKTYPE_C) + style, BLOCKTYPE_C) addExprsNode(outnode, TYPE_DOUBLE, 0, parameters) addTypeNode(outnode, TYPE_DOUBLE, AS_REAL_PARAM, 0, diff --git a/blocks/Xcos/blocks/VsourceAC.py b/blocks/Xcos/blocks/VsourceAC.py index 92b59f5a..c9751756 100644 --- a/blocks/Xcos/blocks/VsourceAC.py +++ b/blocks/Xcos/blocks/VsourceAC.py @@ -1,13 +1,15 @@ from common.AAAAAA import * -def VsourceAC(outroot, attribid, ordering, geometry, parameters, parent=1): +def VsourceAC(outroot, attribid, ordering, geometry, parameters, parent=1, style=None): func_name = 'VsourceAC' + if style is None: + style = func_name outnode = addOutNode(outroot, BLOCK_BASIC, attribid, ordering, parent, func_name, 'VsourceAC', 'DEFAULT', - func_name, BLOCKTYPE_C, + style, BLOCKTYPE_C, dependsOnU='1') addExprsNode(outnode, TYPE_STRING, 2, parameters) diff --git a/blocks/Xcos/blocks/WRITEAU_f.py b/blocks/Xcos/blocks/WRITEAU_f.py index 6fb7cfd7..a709d0cb 100644 --- a/blocks/Xcos/blocks/WRITEAU_f.py +++ b/blocks/Xcos/blocks/WRITEAU_f.py @@ -1,13 +1,15 @@ from common.AAAAAA import * -def WRITEAU_f(outroot, attribid, ordering, geometry, parameters, parent=1): +def WRITEAU_f(outroot, attribid, ordering, geometry, parameters, parent=1, style=None): func_name = 'WRITEAU_f' + if style is None: + style = func_name outnode = addOutNode(outroot, BLOCK_BASIC, attribid, ordering, parent, func_name, 'writeau', 'TYPE_2', - func_name, BLOCKTYPE_D, + style, BLOCKTYPE_D, dependsOnU='1') addExprsNode(outnode, TYPE_STRING, 2, parameters) diff --git a/blocks/Xcos/blocks/WRITEC_f.py b/blocks/Xcos/blocks/WRITEC_f.py index d46b5abc..2541d374 100644 --- a/blocks/Xcos/blocks/WRITEC_f.py +++ b/blocks/Xcos/blocks/WRITEC_f.py @@ -1,13 +1,15 @@ from common.AAAAAA import * -def WRITEC_f(outroot, attribid, ordering, geometry, parameters, parent=1): +def WRITEC_f(outroot, attribid, ordering, geometry, parameters, parent=1, style=None): func_name = 'WRITEC_f' + if style is None: + style = func_name outnode = addOutNode(outroot, BLOCK_BASIC, attribid, ordering, parent, func_name, 'writec', 'TYPE_2', - func_name, BLOCKTYPE_D, + style, BLOCKTYPE_D, dependsOnU='1') addExprsNode(outnode, TYPE_STRING, 5, parameters) diff --git a/blocks/Xcos/blocks/ZCROSS_f.py b/blocks/Xcos/blocks/ZCROSS_f.py index 98a6b8ac..962363ac 100644 --- a/blocks/Xcos/blocks/ZCROSS_f.py +++ b/blocks/Xcos/blocks/ZCROSS_f.py @@ -1,13 +1,15 @@ from common.AAAAAA import * -def ZCROSS_f(outroot, attribid, ordering, geometry, parameters, parent=1): +def ZCROSS_f(outroot, attribid, ordering, geometry, parameters, parent=1, style=None): func_name = 'ZCROSS_f' + if style is None: + style = func_name outnode = addOutNode(outroot, BLOCK_BASIC, attribid, ordering, parent, func_name, 'zcross', 'TYPE_1', - func_name, BLOCKTYPE_Z, + style, BLOCKTYPE_Z, dependsOnU='1') addExprsNode(outnode, TYPE_STRING, 1, parameters) diff --git a/blocks/Xcos/blocks/c_block.py b/blocks/Xcos/blocks/c_block.py index 98c46c98..b27ad5d7 100644 --- a/blocks/Xcos/blocks/c_block.py +++ b/blocks/Xcos/blocks/c_block.py @@ -1,8 +1,10 @@ from common.AAAAAA import * -def c_block(outroot, attribid, ordering, geometry, parameters, parent=1): +def c_block(outroot, attribid, ordering, geometry, parameters, parent=1, style=None): func_name = 'c_block' + if style is None: + style = func_name code = parameters[3] codeLines = code.split('\n') @@ -10,7 +12,7 @@ def c_block(outroot, attribid, ordering, geometry, parameters, parent=1): outnode = addOutNode(outroot, BLOCK_BASIC, attribid, ordering, parent, func_name, parameters[3], 'DYNAMIC_C_1', - func_name, BLOCKTYPE_C, + style, BLOCKTYPE_C, dependsOnU='1') addExprsArrayNode(outnode, TYPE_STRING, 4, parameters, codeLines, TYPE_ARRAY, func_name) diff --git a/blocks/Xcos/blocks/fortran_block.py b/blocks/Xcos/blocks/fortran_block.py index f8d25d78..51eff7d6 100644 --- a/blocks/Xcos/blocks/fortran_block.py +++ b/blocks/Xcos/blocks/fortran_block.py @@ -1,8 +1,10 @@ from common.AAAAAA import * -def fortran_block(outroot, attribid, ordering, geometry, parameters, parent=1): +def fortran_block(outroot, attribid, ordering, geometry, parameters, parent=1, style=None): func_name = 'fortran_block' + if style is None: + style = func_name code = parameters[3] codeLines = code.split('\n') @@ -10,7 +12,7 @@ def fortran_block(outroot, attribid, ordering, geometry, parameters, parent=1): outnode = addOutNode(outroot, BLOCK_BASIC, attribid, ordering, parent, func_name, parameters[3], 'DYNAMIC_FORTRAN_1', - func_name, BLOCKTYPE_C, + style, BLOCKTYPE_C, dependsOnU='1') addExprsArrayNode(outnode, TYPE_STRING, 4, parameters, codeLines, TYPE_ARRAY, func_name) diff --git a/blocks/Xcos/blocks/freq_div.py b/blocks/Xcos/blocks/freq_div.py index 134e1a34..4188262a 100644 --- a/blocks/Xcos/blocks/freq_div.py +++ b/blocks/Xcos/blocks/freq_div.py @@ -1,13 +1,15 @@ from common.AAAAAA import * -def freq_div(outroot, attribid, ordering, geometry, parameters, parent=1): +def freq_div(outroot, attribid, ordering, geometry, parameters, parent=1, style=None): func_name = 'freq_div' + if style is None: + style = func_name outnode = addOutNode(outroot, BLOCK_BASIC, attribid, ordering, parent, func_name, 'csuper', 'DEFAULT', - func_name, BLOCKTYPE_C) + style, BLOCKTYPE_C) addExprsNode(outnode, TYPE_DOUBLE, 0, parameters) addTypeNode(outnode, TYPE_DOUBLE, AS_REAL_PARAM, 0, []) diff --git a/blocks/Xcos/blocks/generic_block3.py b/blocks/Xcos/blocks/generic_block3.py index a0cfc151..60558f45 100644 --- a/blocks/Xcos/blocks/generic_block3.py +++ b/blocks/Xcos/blocks/generic_block3.py @@ -1,8 +1,10 @@ from common.AAAAAA import * -def generic_block3(outroot, attribid, ordering, geometry, parameters, parent=1): +def generic_block3(outroot, attribid, ordering, geometry, parameters, parent=1, style=None): func_name = 'generic_block3' + if style is None: + style = func_name if parameters[17] == 'y': depends_u = '1' @@ -17,7 +19,7 @@ def generic_block3(outroot, attribid, ordering, geometry, parameters, parent=1): outnode = addOutNode(outroot, BLOCK_BASIC, attribid, ordering, parent, func_name, parameters[0], 'C_OR_FORTRAN', - func_name, BLOCKTYPE_C, + style, BLOCKTYPE_C, dependsOnU=depends_u, dependsOnT=depends_t) diff --git a/blocks/Xcos/blocks/scifunc_block_m.py b/blocks/Xcos/blocks/scifunc_block_m.py index ce216724..3b28eb42 100644 --- a/blocks/Xcos/blocks/scifunc_block_m.py +++ b/blocks/Xcos/blocks/scifunc_block_m.py @@ -1,13 +1,15 @@ from common.AAAAAA import * -def scifunc_block_m(outroot, attribid, ordering, geometry, parameters, parent=1): +def scifunc_block_m(outroot, attribid, ordering, geometry, parameters, parent=1, style=None): func_name = 'scifunc_block_m' + if style is None: + style = func_name outnode = addOutNode(outroot, BLOCK_BASIC, attribid, ordering, parent, func_name, 'cscope', 'C_OR_FORTRAN', - func_name, BLOCKTYPE_C) + style, BLOCKTYPE_C) ArrayNode = addObjNode(outnode, TYPE_ARRAY, CLASS_LIST, AS_EXPRS, parameters) diff --git a/blocks/Xcos/ports/CommandPort.py b/blocks/Xcos/ports/CommandPort.py index 63c1b0b9..e708037c 100644 --- a/blocks/Xcos/ports/CommandPort.py +++ b/blocks/Xcos/ports/CommandPort.py @@ -2,19 +2,22 @@ from common.AAAAAA import * def CommandPort(outroot, attribid, parentattribid, ordering, geometry, - value='', forSplitBlock=False): + value='', forSplitBlock=False, + style=None): func_name = 'CommandPort' + if style is None: + style = func_name if forSplitBlock: outnode = addNode(outroot, func_name, connectable=0, dataType='UNKNOW_TYPE', **{'id': attribid}, ordering=ordering, parent=parentattribid, - style=func_name, visible=0) + style=style, visible=0) else: outnode = addNode(outroot, func_name, **{'id': attribid}, parent=parentattribid, ordering=ordering, initialState="-1.0", - style=func_name, value=value) + style=style, value=value) return outnode diff --git a/blocks/Xcos/ports/ControlPort.py b/blocks/Xcos/ports/ControlPort.py index f1f664bc..eccb3ecf 100644 --- a/blocks/Xcos/ports/ControlPort.py +++ b/blocks/Xcos/ports/ControlPort.py @@ -2,19 +2,22 @@ from common.AAAAAA import * def ControlPort(outroot, attribid, parentattribid, ordering, geometry, - value='', forSplitBlock=False): + value='', forSplitBlock=False, + style=None): func_name = 'ControlPort' + if style is None: + style = func_name if forSplitBlock: outnode = addNode(outroot, func_name, connectable=0, dataType='UNKNOW_TYPE', **{'id': attribid}, ordering=ordering, parent=parentattribid, - style=func_name, visible=0) + style=style, visible=0) else: outnode = addNode(outroot, func_name, **{'id': attribid}, parent=parentattribid, ordering=ordering, initialState="-1.0", - style=func_name, value=value) + style=style, value=value) return outnode diff --git a/blocks/Xcos/ports/ExplicitInputPort.py b/blocks/Xcos/ports/ExplicitInputPort.py index 0eb5d61e..a38423ed 100644 --- a/blocks/Xcos/ports/ExplicitInputPort.py +++ b/blocks/Xcos/ports/ExplicitInputPort.py @@ -2,24 +2,27 @@ from common.AAAAAA import * def ExplicitInputPort(outroot, attribid, parentattribid, ordering, geometry, - addDataLines=False, value='', forSplitBlock=False): + addDataLines=False, value='', forSplitBlock=False, + style=None): func_name = 'ExplicitInputPort' + if style is None: + style = func_name if forSplitBlock: outnode = addNode(outroot, func_name, connectable=0, dataType='UNKNOW_TYPE', **{'id': attribid}, ordering=ordering, parent=parentattribid, - style=func_name, visible=0) + style=style, visible=0) elif addDataLines: outnode = addNode(outroot, func_name, **{'id': attribid}, parent=parentattribid, ordering=ordering, dataType='REAL_MATRIX', dataColumns=1, dataLines=1, - style=func_name, value=value) + style=style, value=value) else: outnode = addNode(outroot, func_name, **{'id': attribid}, parent=parentattribid, ordering=ordering, dataType='REAL_MATRIX', dataColumns=1, - initialState="-1.0", style=func_name, value=value) + initialState="-1.0", style=style, value=value) return outnode diff --git a/blocks/Xcos/ports/ExplicitOutputPort.py b/blocks/Xcos/ports/ExplicitOutputPort.py index 516792e8..123089ab 100644 --- a/blocks/Xcos/ports/ExplicitOutputPort.py +++ b/blocks/Xcos/ports/ExplicitOutputPort.py @@ -2,24 +2,27 @@ from common.AAAAAA import * def ExplicitOutputPort(outroot, attribid, parentattribid, ordering, geometry, - addDataLines=False, value='', forSplitBlock=False): + addDataLines=False, value='', forSplitBlock=False, + style=None): func_name = 'ExplicitOutputPort' + if style is None: + style = func_name if forSplitBlock: outnode = addNode(outroot, func_name, connectable=0, dataType='UNKNOW_TYPE', **{'id': attribid}, ordering=ordering, parent=parentattribid, - style=func_name, visible=0) + style=style, visible=0) elif addDataLines: outnode = addNode(outroot, func_name, **{'id': attribid}, parent=parentattribid, ordering=ordering, dataType='REAL_MATRIX', dataColumns=1, - dataLines=1, style=func_name, value=value) + dataLines=1, style=style, value=value) else: outnode = addNode(outroot, func_name, **{'id': attribid}, parent=parentattribid, ordering=ordering, dataType='REAL_MATRIX', dataColumns=1, - initialState="-1.0", style=func_name, + initialState="-1.0", style=style, value=value) return outnode diff --git a/blocks/Xcos/ports/ImplicitInputPort.py b/blocks/Xcos/ports/ImplicitInputPort.py index 41740c25..1c0de46b 100644 --- a/blocks/Xcos/ports/ImplicitInputPort.py +++ b/blocks/Xcos/ports/ImplicitInputPort.py @@ -2,25 +2,28 @@ from common.AAAAAA import * def ImplicitInputPort(outroot, attribid, parentattribid, ordering, geometry, - addDataLines=False, value='', forSplitBlock=False): + addDataLines=False, value='', forSplitBlock=False, + style=None): func_name = 'ImplicitInputPort' + if style is None: + style = func_name if forSplitBlock: outnode = addNode(outroot, func_name, connectable=0, dataType='UNKNOW_TYPE', **{'id': attribid}, ordering=ordering, parent=parentattribid, - style=func_name, visible=0) + style=style, visible=0) elif addDataLines: outnode = addNode(outroot, func_name, **{'id': attribid}, parent=parentattribid, ordering=ordering, dataType='REAL_MATRIX', dataColumns=1, - dataLines=1, style=func_name, + dataLines=1, style=style, value=value) else: outnode = addNode(outroot, func_name, **{'id': attribid}, parent=parentattribid, ordering=ordering, dataType='REAL_MATRIX', dataColumns=1, - initialState="-1.0", style=func_name, + initialState="-1.0", style=style, value=value) return outnode diff --git a/blocks/Xcos/ports/ImplicitOutputPort.py b/blocks/Xcos/ports/ImplicitOutputPort.py index 41c8a39c..bc7b68b0 100644 --- a/blocks/Xcos/ports/ImplicitOutputPort.py +++ b/blocks/Xcos/ports/ImplicitOutputPort.py @@ -2,25 +2,28 @@ from common.AAAAAA import * def ImplicitOutputPort(outroot, attribid, parentattribid, ordering, geometry, - addDataLines=False, value='', forSplitBlock=False): + addDataLines=False, value='', forSplitBlock=False, + style=None): func_name = 'ImplicitOutputPort' + if style is None: + style = func_name if forSplitBlock: outnode = addNode(outroot, func_name, connectable=0, dataType='UNKNOW_TYPE', **{'id': attribid}, ordering=ordering, parent=parentattribid, - style=func_name, visible=0) + style=style, visible=0) elif addDataLines: outnode = addNode(outroot, func_name, **{'id': attribid}, parent=parentattribid, ordering=ordering, dataType='REAL_MATRIX', dataColumns=1, - dataLines=1, style=func_name, + dataLines=1, style=style, value=value) else: outnode = addNode(outroot, func_name, **{'id': attribid}, parent=parentattribid, ordering=ordering, dataType='REAL_MATRIX', dataColumns=1, - initialState="-1.0", style=func_name, + initialState="-1.0", style=style, value=value) return outnode |