React17

.gitignore

@@ -13,8 +13,13 @@ blocks/env*/
 scilab-log-*.txt
 tags
 blocks/U*.sci
+blocks/*.xcos
 blocks/*.xml
+blocks/*.xsl
 blocks/xcosblocks.py
 blocks/Xcos/xcosblocks.py
 blocks/blocks/xcosblocks/xcosblocks.py
+blocks/eda-frontend/public/xcos2xml.xsl
 blocks/eda-frontend/src/static/xcos2xml.xsl
+file_storage/
+uploads/

blocks/.flake8

@@ -1,3 +1,9 @@
 [flake8]
+# default pep8 list
+#ignore = E121,E123,E126,E133,E226,E241,E242,E704,W503,W504,W505
+# default flake8 list
+#ignore = E121,E123,E126,E226,E24,E704,W503,W504
+ignore = F401,F403,W504
 extend-exclude = docs,env*,migrations,node_modules,Xcos
+max-complexity = 13
 max-line-length = 100

blocks/Dockerfile

@@ -19,7 +19,7 @@ SHELL ["/bin/bash", "-o", "pipefail", "-c"]
 RUN apt-get update -qq && \
   apt-get install -qq --no-install-recommends gcc g++ libgfortran5 make nginx openjdk-8-jre python3 redis sqlite3 tzdata && \
   apt-get clean -qq && \
-  rm -f /var/lib/apt/lists/*_*
+  rm -rf /var/lib/apt/lists/*
 
 # Set timezone info
 RUN ln -sf /usr/share/zoneinfo/Asia/Kolkata /etc/localtime && \
@@ -91,12 +91,9 @@ RUN find . -mindepth 1 -type d -empty -print0 | xargs -0 rmdir -p 2> /dev/null |
 # Cleanup
 RUN find /usr/local/share/scilab -depth -type d \( -name demos -o -name examples -o -name tests \) -print0 | \
   xargs -0 rm -rf
-RUN ls /usr/local/share/locale | grep _ | grep -v en_US | \
-  while read -r d; do \
-    find . -type d -name "$d" -print0 | xargs -r0 rm -rf; \
-  done
+RUN find /usr/local/share/locale -mindepth 1 -maxdepth 1 -type d -name \*_\* ! -name en_US -print0 | xargs -r0 rm -rf
 RUN apt-get clean -qq
-RUN rm -f /var/lib/apt/lists/*_*
+RUN rm -rf /var/lib/apt/lists/*
 RUN rm -f /etc/{passwd,shadow,group,gshadow}-
 
 # Comparison
@@ -126,7 +123,7 @@ RUN ./install.sh
 # Cleanup
 RUN apt-get autoremove -qq --purge gawk python3-pip python3-venv wget xz-utils
 RUN apt-get clean -qq
-RUN rm -f /var/lib/apt/lists/*_*
+RUN rm -rf /var/lib/apt/lists/*
 RUN rm -rf ${HOME}/.cache
 RUN rm -rf ${HOME}/.npm
 

blocks/Dockerfile.patch

@@ -1,6 +1,6 @@
---- blocks/Dockerfile	2024-03-22 13:29:04.368574427 +0530
-+++ blocks/Dockerfile.1	2024-03-22 20:47:14.630043479 +0530
-@@ -121,7 +121,7 @@
+--- blocks/Dockerfile	2024-05-21 17:16:25.937563973 +0530
++++ blocks/Dockerfile.1	2024-05-21 17:17:14.925514110 +0530
+@@ -118,7 +118,7 @@
  COPY . .
 
  # Configure venv and sqlite3
@@ -9,7 +9,7 @@
 
  # Cleanup
  RUN apt-get autoremove -qq --purge gawk python3-pip python3-venv wget xz-utils
-@@ -172,4 +172,4 @@
+@@ -169,4 +169,4 @@
 
  WORKDIR ${XCOS_DIR}
 

blocks/Makefile

@@ -9,14 +9,14 @@ SRCFILES += $(sort $(wildcard Xcos/links/*.py))
 
 XCOS2XMLFILES := $(sort $(wildcard xcos2xml/head.xsl))
 XCOS2XMLFILES += $(sort $(wildcard xcos2xml/blocks/*.xsl))
-#XCOS2XMLFILES += $(sort $(wildcard xcos2xml/ports/*.xsl))
-#XCOS2XMLFILES += $(sort $(wildcard xcos2xml/links/*.xsl))
+XCOS2XMLFILES += $(sort $(wildcard xcos2xml/ports/*.xsl))
+XCOS2XMLFILES += $(sort $(wildcard xcos2xml/links/*.xsl))
 XCOS2XMLFILES += $(sort $(wildcard xcos2xml/foot.xsl))
 
 IMPORT := Xcos/xcosblocks.py
 TARGET := xcosblocks.py
 TARGET2 := $(BLOCKDIR)/$(TARGET)
-TARGET3 := eda-frontend/src/static/xcos2xml.xsl
+TARGET3 := eda-frontend/public/xcos2xml.xsl
 
 all : $(IMPORT) $(TARGET) $(TARGET2) $(TARGET3)
 

blocks/Xcos/MxGraphParser.py

@@ -145,13 +145,11 @@
                 IDLIST[attribid] = style
                 globals()[style](outroot, attribid, ParentComponent, ordering, geometry)
             elif 'edge' in attrib:
-
                 sourceVertex = attrib['sourceVertex']
                 targetVertex = attrib['targetVertex']
                 sourceType = IDLIST[sourceVertex]
                 targetType = IDLIST[targetVertex]
 
-
                 # switch vertices if required
                 if sourceType in ['ExplicitInputPort', 'ImplicitInputPort', 'ControlPort'] and targetType in ['ExplicitOutputPort', 'ExplicitLink', 'ImplicitOutputPort', 'ImplicitLink', 'CommandPort', 'CommandControlLink']:
                     (sourceVertex, targetVertex) = (targetVertex, sourceVertex)
@@ -185,7 +183,7 @@
                     edgeDict[attribid] = (style, sourceVertex, targetVertex, sourceType, targetType)
                     edgeDict2[attribid] = (style, sourceVertex, targetVertex, sourceType, targetType)
                     IDLIST[attribid] = style
-                    
+
                 if addSplit:
                     mxGeometry = cell.find('mxGeometry')
                     if mxGeometry is not None:
@@ -196,7 +194,7 @@
                             geometry['height'] = mxPoint.attrib.get('height', '7')
                             geometry['x'] = mxPoint.attrib.get('x', '0')
                             geometry['y'] = mxPoint.attrib.get('y', '0')
-                            
+
                             splitList.append((attribid, sourceVertex, targetVertex, sourceType, targetType, geometry))
                             try:
                                 del edgeDict[sourceVertex]

blocks/Xcos/blocks/BARXY.py

@@ -11,11 +11,10 @@ def BARXY(outroot, attribid, ordering, geometry, parameters):
 
     addExprsNode(outnode, TYPE_STRING, 5, parameters)
     addScilabDNode(outnode, AS_REAL_PARAM, width=4, realParts=[
-                  format_real_number(parameters[0]),
-                  format_real_number(parameters[1]),
-                  format_real_number(parameters[2]),
-                  format_real_number(parameters[3])]
-                  )
+        format_real_number(parameters[0]),
+        format_real_number(parameters[1]),
+        format_real_number(parameters[2]),
+        format_real_number(parameters[3])])
     param = [parameters[4]]
     addPrecNode(outnode, TYPE_INTEGER, AS_INT_PARAM, 1, param)
     addObjNode(outnode, TYPE_ARRAY, CLASS_LIST, AS_OBJ_PARAM, parameters)

blocks/Xcos/blocks/BPLATFORM.py

@@ -10,14 +10,13 @@ def BPLATFORM(outroot, attribid, ordering, geometry, parameters):
 
     addExprsNode(outnode, TYPE_STRING, 7, parameters)
     addScilabDNode(outnode, AS_REAL_PARAM, width=7, realParts=[
-                  format_real_number(parameters[0]),
-                  format_real_number(parameters[1]),
-                  format_real_number(parameters[2]),
-                  format_real_number(parameters[3]),
-                  format_real_number(parameters[4]),
-                  format_real_number(parameters[5]),
-                  format_real_number(parameters[6])]
-                  )
+        format_real_number(parameters[0]),
+        format_real_number(parameters[1]),
+        format_real_number(parameters[2]),
+        format_real_number(parameters[3]),
+        format_real_number(parameters[4]),
+        format_real_number(parameters[5]),
+        format_real_number(parameters[6])])
     addTypeNode(outnode, TYPE_DOUBLE, AS_INT_PARAM, 0, [])
     addObjNode(outnode, TYPE_ARRAY, CLASS_LIST, AS_OBJ_PARAM, parameters)
     array = ['0']

blocks/Xcos/blocks/CLKOUT_f.py

@@ -9,10 +9,7 @@ def CLKOUT_f(outroot, attribid, ordering, geometry, parameters, parent=1):
                          func_name, BLOCKTYPE_D, dependsOnU='0',
                          dependsOnT='0')
 
-    input_list = parameters
-    output_list = [str(int(float(num)) + 1) for num in input_list]
-
-    addExprsNode(outnode, TYPE_STRING, 1, output_list)
+    addExprsNode(outnode, TYPE_STRING, 1, parameters)
     addTypeNode(outnode, TYPE_DOUBLE, AS_REAL_PARAM, 0,
                 [])
     array = ['1']

blocks/Xcos/blocks/CLOCK_c.py

@@ -30,7 +30,7 @@ def CLOCK_c(outroot, attribid, ordering, geometry, parameters):
                          func_name, 'csuper', 'DEFAULT',
                          func_name, BLOCKTYPE_H)
 
-    addExprsNode(outnode, TYPE_DOUBLE, 0, parameters)
+    addExprsNode(outnode, TYPE_DOUBLE, 0, [])
     addTypeNode(outnode, TYPE_DOUBLE, AS_REAL_PARAM, 0,
                 [])
     addTypeNode(outnode, TYPE_DOUBLE, AS_INT_PARAM, 0, [])

blocks/Xcos/blocks/CONVERT.py

@@ -36,8 +36,8 @@ def get_from_CONVERT(cell):
     input_t = int(float(parameters[0]))
     output_t = int(float(parameters[1]))
 
-    input_type = types[input_t-1]
-    output_type = types[output_t-1]
+    input_type = types[input_t - 1]
+    output_type = types[output_t - 1]
 
     display_parameter = input_type + ',' + output_type
 

blocks/Xcos/blocks/CSCOPE.py

@@ -11,11 +11,10 @@ def CSCOPE(outroot, attribid, ordering, geometry, parameters):
 
     addExprsNode(outnode, TYPE_STRING, 10, parameters)
     addScilabDNode(outnode, AS_REAL_PARAM, width=4, realParts=[
-                  format_real_number(parameters[8]),
-                  format_real_number(parameters[4]),
-                  format_real_number(parameters[5]),
-                  format_real_number(parameters[6])]
-                  )
+        format_real_number(parameters[8]),
+        format_real_number(parameters[4]),
+        format_real_number(parameters[5]),
+        format_real_number(parameters[6])])
     param = strarray(parameters)
     addPrecNode(outnode, TYPE_INTEGER, AS_INT_PARAM, 15, param)
     addObjNode(outnode, TYPE_ARRAY, CLASS_LIST, AS_OBJ_PARAM, parameters)

blocks/Xcos/blocks/DOLLAR_f.py

@@ -18,7 +18,7 @@ def DOLLAR_f(outroot, attribid, ordering, geometry, parameters):
     addTypeNode(outnode, TYPE_DOUBLE, AS_STATE, 0, [])
     # addTypeNode(outnode, TYPE_DOUBLE, AS_DSTATE, 1, parameters[0])
     addScilabDNode(outnode, AS_DSTATE, width=4, realParts=[
-                  format_real_number(parameters[0])])
+        format_real_number(parameters[0])])
     addObjNode(outnode, TYPE_ARRAY, CLASS_LIST, AS_ODSTATE, [])
     addObjNode(outnode, TYPE_ARRAY,
                CLASS_LIST, AS_EQUATIONS, parameters)

blocks/Xcos/blocks/Gyrator.py

@@ -11,8 +11,8 @@ def Gyrator(outroot, attribid, ordering, geometry, parameters):
 
     addExprsNode(outnode, TYPE_STRING, 2, parameters)
     addScilabDNode(outnode, AS_REAL_PARAM, width=2, realParts=[
-                  format_real_number(parameters[0]),
-                  format_real_number(parameters[1])])
+        format_real_number(parameters[0]),
+        format_real_number(parameters[1])])
     addTypeNode(outnode, TYPE_DOUBLE, AS_INT_PARAM, 0, [])
     addObjNode(outnode, TYPE_ARRAY, CLASS_LIST, AS_OBJ_PARAM, [])
     array = ['0']
@@ -61,11 +61,11 @@ def Gyrator(outroot, attribid, ordering, geometry, parameters):
         addDataData(additionalStringNode, param)
 
     addNodeScilabDouble(innerArrayNode, height=2, realParts=[
-                  format_real_number(parameters[0]),
-                  format_real_number(parameters[1])])
+        format_real_number(parameters[0]),
+        format_real_number(parameters[1])])
     addNodeScilabDouble(innerArrayNode, height=2, realParts=[
-                  format_real_number('0'),
-                  format_real_number('0')])
+        format_real_number('0'),
+        format_real_number('0')])
     addgeometryNode(outnode, GEOMETRY, geometry['height'],
                     geometry['width'], geometry['x'], geometry['y'])
 

blocks/Xcos/blocks/INTEGRAL_m.py

@@ -18,7 +18,7 @@ def INTEGRAL_m(outroot, attribid, ordering, geometry, parameters):
     addPrecisionNode(outnode, TYPE_INTEGER, AS_NBZERO, 1, array)
     addPrecisionNode(outnode, TYPE_INTEGER, AS_NMODE, 1, array)
     addScilabDNode(outnode, AS_STATE, width=1, realParts=[
-                  format_real_number(parameters[0])])
+        format_real_number(parameters[0])])
     addTypeNode(outnode, TYPE_DOUBLE, AS_DSTATE, 0, [])
     addObjNode(outnode, TYPE_ARRAY, CLASS_LIST, AS_ODSTATE, parameters)
     # Create the outer Array node for equations

blocks/Xcos/blocks/MAX_f.py

@@ -19,7 +19,7 @@ def MAX_f(outroot, attribid, ordering, geometry, parameters):
     addPrecisionNode(outnode, TYPE_INTEGER, AS_NMODE, 1, array)
     addTypeNode(outnode, TYPE_DOUBLE, AS_STATE, 0, [])
     addScilabDNode(outnode, AS_DSTATE, width=2, realParts=[
-                  0.0, 0.0])
+        0.0, 0.0])
     addObjNode(outnode, TYPE_ARRAY, CLASS_LIST, AS_ODSTATE, parameters)
     addObjNode(outnode, TYPE_ARRAY,
                CLASS_LIST, AS_EQUATIONS, parameters)

blocks/Xcos/blocks/MIN_f.py

@@ -19,7 +19,7 @@ def MIN_f(outroot, attribid, ordering, geometry, parameters):
     addPrecisionNode(outnode, TYPE_INTEGER, AS_NMODE, 1, array)
     addTypeNode(outnode, TYPE_DOUBLE, AS_STATE, 0, [])
     addScilabDNode(outnode, AS_DSTATE, width=2, realParts=[
-                  0.0, 0.0])
+        0.0, 0.0])
     addObjNode(outnode, TYPE_ARRAY, CLASS_LIST, AS_ODSTATE, parameters)
     addObjNode(outnode, TYPE_ARRAY,
                CLASS_LIST, AS_EQUATIONS, parameters)

blocks/Xcos/blocks/M_freq.py

@@ -39,7 +39,7 @@ def get_from_M_freq(cell):
     con = ''
     eov = ''
     iov = ''
-    com = (len(inputs)**2)-1
+    com = (len(inputs)**2) - 1
 
     ports = [eiv, iiv, con, eov, iov, com]
 

blocks/Xcos/blocks/OUT_f.py

@@ -9,7 +9,7 @@ def OUT_f(outroot, attribid, ordering, geometry, parameters, parent=1):
                          func_name, BLOCKTYPE_C, dependsOnU='0',
                          dependsOnT='0')
 
-    addExprsNode(outnode, TYPE_STRING, 1, parameters[2])
+    addExprsNode(outnode, TYPE_STRING, 1, parameters[1:2])
     addTypeNode(outnode, TYPE_DOUBLE, AS_REAL_PARAM, 0,
                 [])
     array = ['1']

blocks/Xcos/blocks/RELAY_f.py

@@ -19,7 +19,7 @@ def RELAY_f(outroot, attribid, ordering, geometry, parameters):
     addPrecisionNode(outnode, TYPE_INTEGER, AS_NMODE, 1, array)
     addTypeNode(outnode, TYPE_DOUBLE, AS_STATE, 0, [])
     addScilabDNode(outnode, AS_DSTATE, width=1, realParts=[
-                  0.0])
+        0.0])
     addObjNode(outnode, TYPE_ARRAY, CLASS_LIST, AS_ODSTATE, [])
     addObjNode(outnode, TYPE_ARRAY,
                CLASS_LIST, AS_EQUATIONS, [])

blocks/Xcos/blocks/SELECT_m.py

@@ -18,7 +18,7 @@ def SELECT_m(outroot, attribid, ordering, geometry, parameters):
     addPrecisionNode(outnode, TYPE_INTEGER, AS_NMODE, 1, array)
     addTypeNode(outnode, TYPE_DOUBLE, AS_STATE, 0, [])
     addScilabDNode(outnode, AS_DSTATE, width=1, realParts=[
-                  format_real_number(parameters[0])])
+        format_real_number(parameters[0])])
     addObjNode(outnode, TYPE_ARRAY, CLASS_LIST, AS_ODSTATE, parameters)
     addObjNode(outnode, TYPE_ARRAY,
                CLASS_LIST, AS_EQUATIONS, parameters)

blocks/Xcos/blocks/STEP_FUNCTION.py

@@ -144,4 +144,4 @@ def get_from_STEP_FUNCTION(cell):
 
     ports = [eiv, iiv, con, eov, iov, com]
 
-    return (parameters, display_parameter, ports)
+    return (parameters, display_parameter, ports)

blocks/Xcos/blocks/SUMMATION.py

@@ -20,18 +20,22 @@ def SUMMATION(outroot, attribid, ordering, geometry, parameters):
                          func_name, BLOCKTYPE_C,
                          dependsOnU='1')
 
-    addExprsNode(outnode, TYPE_STRING, 1, parameters[1:])
+    if len(parameters) == 1:
+        new_parameters = [1, parameters[0], 0]
+    else:
+        new_parameters = parameters
+    addExprsNode(outnode, TYPE_STRING, 3, new_parameters)
     addSciDBNode(outnode, TYPE_DOUBLE, AS_REAL_PARAM,
                  0, [])
     array = ['1', '-1']
     addPrecNode(outnode, TYPE_INTEGER, AS_INT_PARAM, 2, array)
-    addObjNode(outnode, TYPE_ARRAY, CLASS_LIST, AS_OBJ_PARAM, parameters)
+    addObjNode(outnode, TYPE_ARRAY, CLASS_LIST, AS_OBJ_PARAM, [])
     array = ['0']
     addPrecisionNode(outnode, TYPE_INTEGER, AS_NBZERO, 1, array)
     addPrecisionNode(outnode, TYPE_INTEGER, AS_NMODE, 1, array)
     addTypeNode(outnode, TYPE_DOUBLE, AS_STATE, 0, [])
     addTypeNode(outnode, TYPE_DOUBLE, AS_DSTATE, 0, [])
-    addObjNode(outnode, TYPE_ARRAY, CLASS_LIST, AS_ODSTATE, parameters)
+    addObjNode(outnode, TYPE_ARRAY, CLASS_LIST, AS_ODSTATE, [])
     addArrayNode(outnode, scilabClass="ScilabList",
                                       **{'as': 'equations'})
 

blocks/Xcos/blocks/SampleCLK.py

@@ -10,9 +10,8 @@ def SampleCLK(outroot, attribid, ordering, geometry, parameters):
 
     addExprsNode(outnode, TYPE_STRING, 2, parameters)
     addScilabDNode(outnode, AS_REAL_PARAM, width=2, realParts=[
-                  format_real_number(parameters[0]),
-                  format_real_number(parameters[1])]
-                  )
+        format_real_number(parameters[0]),
+        format_real_number(parameters[1])])
     addTypeNode(outnode, TYPE_DOUBLE, AS_INT_PARAM, 0, [])
     addObjNode(outnode, TYPE_ARRAY, CLASS_LIST, AS_OBJ_PARAM, [])
     array = ['0']

blocks/Xcos/blocks/Switch.py

@@ -57,7 +57,7 @@ def Switch(outroot, attribid, ordering, geometry, parameters):
                                        'ScilabDouble',
                                        height=2, width=1)
     for i, realPart in enumerate(realParts):
-        addDData(additionalStringNode, realPart, line=i, column=0)
+        addDData(additionalStringNode, column=0, line=i, realPart=realPart)
 
     addgeometryNode(outnode, GEOMETRY, geometry['height'],
                     geometry['width'], geometry['x'], geometry['y'])

blocks/Xcos/blocks/TCLSS.py

@@ -11,18 +11,17 @@ def TCLSS(outroot, attribid, ordering, geometry, parameters):
 
     addExprsNode(outnode, TYPE_STRING, 5, parameters)
     addScilabDNode(outnode, AS_REAL_PARAM, width=4, realParts=[
-                  format_real_number(parameters[0]),
-                  format_real_number(parameters[1]),
-                  format_real_number(parameters[2]),
-                  format_real_number(parameters[3])]
-                  )
+        format_real_number(parameters[0]),
+        format_real_number(parameters[1]),
+        format_real_number(parameters[2]),
+        format_real_number(parameters[3])])
     addTypeNode(outnode, TYPE_DOUBLE, AS_INT_PARAM, 0, [])
     addObjNode(outnode, TYPE_ARRAY, CLASS_LIST, AS_OBJ_PARAM, parameters)
     array = ['0']
     addPrecisionNode(outnode, TYPE_INTEGER, AS_NBZERO, 1, array)
     addPrecisionNode(outnode, TYPE_INTEGER, AS_NMODE, 1, array)
     addScilabDNode(outnode, AS_STATE, width=1, realParts=[
-                  format_real_number(parameters[0])])
+        format_real_number(parameters[0])])
     addTypeNode(outnode, TYPE_DOUBLE, AS_DSTATE, 0, [])
     addObjNode(outnode, TYPE_ARRAY, CLASS_LIST, AS_ODSTATE, parameters)
     addObjNode(outnode, TYPE_ARRAY,