save xml and not json

10 files changed, 68 insertions, 15 deletions

diff --git a/blocks/blocks/xcosblocks/serializers.py b/blocks/blocks/xcosblocks/serializers.py
index b6b62da8..73429b7f 100644
--- a/blocks/blocks/xcosblocks/serializers.py
+++ b/blocks/blocks/xcosblocks/serializers.py
@@ -180,3 +180,47 @@ class BlockParameterSerializer(serializers.ModelSerializer):
             'p039',
             'p039_type',
         ]
+
+
+class SetBlockParameterSerializer(serializers.Serializer):
+    block_id = serializers.IntegerField()
+    p000_value = serializers.CharField(max_length=100, allow_blank=True, trim_whitespace=True)
+    p001_value = serializers.CharField(max_length=100, allow_blank=True, trim_whitespace=True)
+    p002_value = serializers.CharField(max_length=100, allow_blank=True, trim_whitespace=True)
+    p003_value = serializers.CharField(max_length=100, allow_blank=True, trim_whitespace=True)
+    p004_value = serializers.CharField(max_length=100, allow_blank=True, trim_whitespace=True)
+    p005_value = serializers.CharField(max_length=100, allow_blank=True, trim_whitespace=True)
+    p006_value = serializers.CharField(max_length=100, allow_blank=True, trim_whitespace=True)
+    p007_value = serializers.CharField(max_length=100, allow_blank=True, trim_whitespace=True)
+    p008_value = serializers.CharField(max_length=100, allow_blank=True, trim_whitespace=True)
+    p009_value = serializers.CharField(max_length=100, allow_blank=True, trim_whitespace=True)
+    p010_value = serializers.CharField(max_length=100, allow_blank=True, trim_whitespace=True)
+    p011_value = serializers.CharField(max_length=100, allow_blank=True, trim_whitespace=True)
+    p012_value = serializers.CharField(max_length=100, allow_blank=True, trim_whitespace=True)
+    p013_value = serializers.CharField(max_length=100, allow_blank=True, trim_whitespace=True)
+    p014_value = serializers.CharField(max_length=100, allow_blank=True, trim_whitespace=True)
+    p015_value = serializers.CharField(max_length=100, allow_blank=True, trim_whitespace=True)
+    p016_value = serializers.CharField(max_length=100, allow_blank=True, trim_whitespace=True)
+    p017_value = serializers.CharField(max_length=100, allow_blank=True, trim_whitespace=True)
+    p018_value = serializers.CharField(max_length=100, allow_blank=True, trim_whitespace=True)
+    p019_value = serializers.CharField(max_length=100, allow_blank=True, trim_whitespace=True)
+    p020_value = serializers.CharField(max_length=100, allow_blank=True, trim_whitespace=True)
+    p021_value = serializers.CharField(max_length=100, allow_blank=True, trim_whitespace=True)
+    p022_value = serializers.CharField(max_length=100, allow_blank=True, trim_whitespace=True)
+    p023_value = serializers.CharField(max_length=100, allow_blank=True, trim_whitespace=True)
+    p024_value = serializers.CharField(max_length=100, allow_blank=True, trim_whitespace=True)
+    p025_value = serializers.CharField(max_length=100, allow_blank=True, trim_whitespace=True)
+    p026_value = serializers.CharField(max_length=100, allow_blank=True, trim_whitespace=True)
+    p027_value = serializers.CharField(max_length=100, allow_blank=True, trim_whitespace=True)
+    p028_value = serializers.CharField(max_length=100, allow_blank=True, trim_whitespace=True)
+    p029_value = serializers.CharField(max_length=100, allow_blank=True, trim_whitespace=True)
+    p030_value = serializers.CharField(max_length=100, allow_blank=True, trim_whitespace=True)
+    p031_value = serializers.CharField(max_length=100, allow_blank=True, trim_whitespace=True)
+    p032_value = serializers.CharField(max_length=100, allow_blank=True, trim_whitespace=True)
+    p033_value = serializers.CharField(max_length=100, allow_blank=True, trim_whitespace=True)
+    p034_value = serializers.CharField(max_length=100, allow_blank=True, trim_whitespace=True)
+    p035_value = serializers.CharField(max_length=100, allow_blank=True, trim_whitespace=True)
+    p036_value = serializers.CharField(max_length=100, allow_blank=True, trim_whitespace=True)
+    p037_value = serializers.CharField(max_length=100, allow_blank=True, trim_whitespace=True)
+    p038_value = serializers.CharField(max_length=100, allow_blank=True, trim_whitespace=True)
+    p039_value = serializers.CharField(max_length=100, allow_blank=True, trim_whitespace=True)
diff --git a/blocks/eda-frontend/package-lock.json b/blocks/eda-frontend/package-lock.json
index ef883fb2..dd78ff02 100644
--- a/blocks/eda-frontend/package-lock.json
+++ b/blocks/eda-frontend/package-lock.json
@@ -14594,6 +14594,14 @@
         "async-limiter": "~1.0.0"
       }
     },
+    "xml-beautifier": {
+      "version": "0.4.3",
+      "resolved": "https://registry.npmjs.org/xml-beautifier/-/xml-beautifier-0.4.3.tgz",
+      "integrity": "sha512-jtqVgG2mXX+mZYSq80tPWBcrtPGL3JwCtcME52c7Aau1R34quuJw86R9A+KFO7F6EQAaagUmMXGhDRKGV3UXhw==",
+      "requires": {
+        "repeat-string": "1.6.1"
+      }
+    },
     "xml-name-validator": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/xml-name-validator/-/xml-name-validator-3.0.0.tgz",
diff --git a/blocks/eda-frontend/package.json b/blocks/eda-frontend/package.json
index c6af0418..8ab292c2 100644
--- a/blocks/eda-frontend/package.json
+++ b/blocks/eda-frontend/package.json
@@ -31,7 +31,8 @@
     "redux": "^4.0.5",
     "redux-logger": "^3.0.6",
     "redux-thunk": "^2.3.0",
-    "typescript": "^3.9.3"
+    "typescript": "^3.9.3",
+    "xml-beautifier": "^0.4.3"
   },
   "scripts": {
     "start": "react-scripts start",
diff --git a/blocks/eda-frontend/public/favicon.ico b/blocks/eda-frontend/public/favicon.ico
deleted file mode 100644
index a1869b60..00000000
--- a/blocks/eda-frontend/public/favicon.ico
+++ /dev/null
diff --git a/blocks/eda-frontend/src/components/SchematicEditor/Header.js b/blocks/eda-frontend/src/components/SchematicEditor/Header.js
index aade6cb3..c13c9c05 100644
--- a/blocks/eda-frontend/src/components/SchematicEditor/Header.js
+++ b/blocks/eda-frontend/src/components/SchematicEditor/Header.js
@@ -29,7 +29,7 @@ import CloseIcon from '@material-ui/icons/Close'
 import { makeStyles } from '@material-ui/core/styles'
 import { deepPurple } from '@material-ui/core/colors'
 
-import logo from '../../static/logo.png'
+import logo from '../../static/favicon.ico'
 import { setTitle, logout, setSchTitle, setSchShared } from '../../redux/actions/index'
 import store from '../../redux/store'
 
diff --git a/blocks/eda-frontend/src/components/SchematicEditor/SchematicToolbar.js b/blocks/eda-frontend/src/components/SchematicEditor/SchematicToolbar.js
index c5899a24..ecb8cde5 100644
--- a/blocks/eda-frontend/src/components/SchematicEditor/SchematicToolbar.js
+++ b/blocks/eda-frontend/src/components/SchematicEditor/SchematicToolbar.js
@@ -23,6 +23,7 @@ import CreateNewFolderOutlinedIcon from '@material-ui/icons/CreateNewFolderOutli
 import ImageOutlinedIcon from '@material-ui/icons/ImageOutlined'
 import SystemUpdateAltOutlinedIcon from '@material-ui/icons/SystemUpdateAltOutlined'
 import { Link as RouterLink } from 'react-router-dom'
+import beautify from 'xml-beautifier';
 
 import { NetlistModal, HelpScreen, ImageExportDialog, OpenSchDialog } from './ToolbarExtension'
 import { ZoomIn, ZoomOut, ZoomAct, DeleteComp, PrintPreview, Rotate, GenerateNetList, Undo, Redo, Save, ClearGrid } from './Helper/ToolbarTools'
@@ -280,19 +281,14 @@ export default function SchematicToolbar ({ mobileClose, gridRef }) {
 
   // Save Schematics Locally
   const handelLocalSchSave = () => {
-    var saveLocalData = {}
-    saveLocalData.data_dump = Save()
-    saveLocalData.title = schSave.title
-    saveLocalData.description = schSave.description
-    var json = JSON.stringify(saveLocalData)
-    const blob = new Blob([json], { type: 'octet/stream' })
+    const blob = new Blob([beautify(Save())], { type: 'application/xml' })
     const evt = new MouseEvent('click', {
       view: window,
       bubbles: false,
       cancelable: true
     })
     const a = document.createElement('a')
-    a.setAttribute('download', schSave.title + '_Xcos_on_Cloud.json')
+    a.setAttribute('download', schSave.title + '_Xcos_on_Cloud.xml')
     a.href = URL.createObjectURL(blob)
     a.target = '_blank'
     a.setAttribute('target', '_blank')
diff --git a/blocks/eda-frontend/src/components/Shared/Navbar.js b/blocks/eda-frontend/src/components/Shared/Navbar.js
index 96bbb60a..ff11927e 100644
--- a/blocks/eda-frontend/src/components/Shared/Navbar.js
+++ b/blocks/eda-frontend/src/components/Shared/Navbar.js
@@ -8,7 +8,7 @@ import {
 import { makeStyles } from '@material-ui/core/styles'
 import { deepPurple } from '@material-ui/core/colors'
 import { Link as RouterLink, useHistory } from 'react-router-dom'
-import logo from '../../static/logo.png'
+import logo from '../../static/favicon.ico'
 import store from '../../redux/store'
 import { logout } from '../../redux/actions/index'
 
diff --git a/blocks/eda-frontend/src/pages/Home.js b/blocks/eda-frontend/src/pages/Home.js
index 5e85f610..8a7000dd 100644
--- a/blocks/eda-frontend/src/pages/Home.js
+++ b/blocks/eda-frontend/src/pages/Home.js
@@ -6,7 +6,7 @@ import Typography from '@material-ui/core/Typography'
 import { makeStyles } from '@material-ui/core/styles'
 import Container from '@material-ui/core/Container'
 import { Link as RouterLink } from 'react-router-dom'
-import logo from '../static/logo.png'
+import logo from '../static/favicon.ico'
 
 const useStyles = makeStyles((theme) => ({
   header: {
@@ -41,7 +41,7 @@ export default function Home () {
         color="textSecondary"
         component="p"
       >
-        Online Circuit Simulator
+        Online Xcos Simulator
         <br></br>
         <br></br>
         <Button
diff --git a/blocks/frontend/src/favicon.ico b/blocks/eda-frontend/src/static/favicon.ico
index eb34764a..eb34764a 100644
--- a/blocks/frontend/src/favicon.ico
+++ b/blocks/eda-frontend/src/static/favicon.ico
diff --git a/docs/api2.txt b/docs/api2.txt
index 280a2c13..400f3c3f 100644
--- a/docs/api2.txt
+++ b/docs/api2.txt
@@ -3,8 +3,10 @@ POST /function/{block_id}/
 Input JSON - Map of
 
 Time
-Input Values (one for each port)
-Parameter Values
+Explicit Input Port Values (one for each port)
+Implicit Input Port Values (one for each port)
+Command Port Values (one for each port)
+Block Parameter Values
 
 Response JSON - function_execution_id
 
@@ -26,4 +28,6 @@ Status Code
 
 Response JSON - Array of
 
-value
+Explicit Output Port Values (one for each port)
+Implicit Output Port Values (one for each port)
+Control Port Values (one for each port)