From 86bdc23661cd41bd7365f08349e43dc915a7b66d Mon Sep 17 00:00:00 2001 From: Fabien Marteau Date: Fri, 2 Dec 2016 13:46:05 +0100 Subject: [PATCH 001/169] french translation --- app/resources/locale/fr_FR/fr_FR.po | 44 ++++++++++++++++------------- 1 file changed, 25 insertions(+), 19 deletions(-) diff --git a/app/resources/locale/fr_FR/fr_FR.po b/app/resources/locale/fr_FR/fr_FR.po index 78a656161..90de44b13 100644 --- a/app/resources/locale/fr_FR/fr_FR.po +++ b/app/resources/locale/fr_FR/fr_FR.po @@ -133,6 +133,9 @@ msgid "" "Default toolchain not found. Toolchain will be downloaded. This operation " "requires Internet connection. Do you want to continue?" msgstr "" +"La toolchain par default n'a pas été trouvée. La toolchain va être " +"téléchargée. Cette operation nécessite une connexion internet." +"Voulez-vous continuer ?" #: app/views/menu.html:245 msgid "Disable" @@ -204,7 +207,7 @@ msgstr "Entrer le hostname distant user@host (experimentale)" #: app/scripts/services/tools.service.js:317 msgid "Error: default toolchain not found in '{{dir}}'" -msgstr "" +msgstr "Erreur: La toolchaine par défaut n'a pas été trouvée dans '{{dir}}'" #: app/scripts/services/utils.service.js:610 msgid "Error: {{error}}" @@ -228,15 +231,15 @@ msgstr "Exporter un bloc" #: app/scripts/services/tools.service.js:449 msgid "Extract default apio files..." -msgstr "" +msgstr "Extraction des fichiers apio par défaut..." #: app/scripts/services/tools.service.js:459 msgid "Extract default apio packages..." -msgstr "" +msgstr "Extraction des packets apio par défaut" #: app/scripts/services/tools.service.js:437 msgid "Extract virtual env files..." -msgstr "" +msgstr "Extraction des fichiers d'environnement virtuels" #: app/scripts/services/tools.service.js:211 #: app/scripts/services/tools.service.js:214 @@ -251,6 +254,8 @@ msgstr "Fichier" msgid "" "File {{file}} already exists in the project path. Do you want to replace it?" msgstr "" +"Le Fichier {{file}} existe déjà dans le chemin du projet. Voulez vous le" +"remplacer ?" #: app/scripts/services/tools.service.js:148 msgid "File {{file}} does not exist" @@ -286,7 +291,7 @@ msgstr "Chemin image" #: app/scripts/controllers/menu.js:322 msgid "Image {{name}} saved" -msgstr "" +msgstr "Image {{name}} sauvée" #: app/views/menu.html:73 msgid "Import block" @@ -302,11 +307,11 @@ msgstr "Entrée" #: app/views/menu.html:215 msgid "Install" -msgstr "" +msgstr "Installation" #: app/scripts/services/tools.service.js:454 msgid "Install default apio..." -msgstr "" +msgstr "Installer l'apio par défaut..." #: app/scripts/services/tools.service.js:503 msgid "Installation completed" @@ -324,15 +329,15 @@ msgstr "Une connexion internet est requise" #: app/scripts/services/graph.service.js:134 msgid "Invalid Pull up connection:
block already connected" -msgstr "" +msgstr "Connexion de Pull up invalide:
Le bloc est déjà connecté" #: app/scripts/services/graph.service.js:150 msgid "Invalid Pull up connection:
only Input blocks allowed" -msgstr "" +msgstr "Connexion de Pull up invalide:
Une seule entrée autorisée" #: app/scripts/services/graph.service.js:141 msgid "Invalid block connection:
Pull up already connected" -msgstr "" +msgstr "Connexion de bloc invalide:
Pull up déjà connectée" #: app/scripts/services/graph.service.js:113 msgid "Invalid connection" @@ -340,7 +345,7 @@ msgstr "Connexion invalide" #: app/scripts/services/graph.service.js:127 msgid "Invalid multiple input connections" -msgstr "" +msgstr "Connexions de multiples entrées invalides" #: app/scripts/services/graph.service.js:298 msgid "Label updated" @@ -352,7 +357,7 @@ msgstr "Langage" #: app/scripts/services/tools.service.js:442 msgid "Make virtual env..." -msgstr "" +msgstr "Faire l'environnement virtuel..." #: app/views/menu.html:27 msgid "New project" @@ -372,7 +377,7 @@ msgstr "Ouvrir un projet" #: app/scripts/services/common.service.js:156 msgid "Original file {{file}} does not exist" -msgstr "" +msgstr "Le fichier originel {{file}} n'éxiste pas" #: app/views/menu.html:291 msgid "Output" @@ -412,7 +417,7 @@ msgstr "Hostname distant" #: app/views/menu.html:223 msgid "Remove" -msgstr "" +msgstr "Supprimer" #: app/views/menu.html:110 msgid "Remove selected" @@ -420,7 +425,7 @@ msgstr "Supprimer la selection" #: app/views/menu.html:228 msgid "Reset default" -msgstr "" +msgstr "Réinitialiser avec les paramètres par défaut" #: app/views/menu.html:103 msgid "Reset view" @@ -474,13 +479,12 @@ msgstr "Le projet actuel sera supprimé. Continuer de charger le projet?" #: app/scripts/services/tools.service.js:322 msgid "The toolchain will be removed. Do you want to continue?" -msgstr "" -"Les répertoires de configuration d'Icestudio et apio vont être supprimés. " +msgstr "Les répertoires de configuration d'Icestudio et apio vont être supprimés. " "Voulez-vous continuer?" #: app/scripts/services/tools.service.js:310 msgid "The toolchain will be restored to default. Do you want to continue?" -msgstr "" +msgstr "La toolchain va être restaurée par défaut. Voulez vous continuer ?" #: app/scripts/services/tools.service.js:302 msgid "" @@ -493,6 +497,8 @@ msgid "" "This import operation requires a project path. You need to save the current " "project. Do you want to continue?" msgstr "" +"Cette opération d'import requière un chemin de projet (path). Vous devez" +" sauvez le projet actuel. Voulez vous continuer ?" #: app/views/menu.html:211 msgid "Toolchain" @@ -575,7 +581,7 @@ msgstr "Et" #: app/views/project.html:4 msgid "back" -msgstr "" +msgstr "retour" #. Bit #: app/resources/blocks/labels.js:4 From fbd6a969a034b19ca0750ba548d1dfc3d5cfa1c4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jes=C3=BAs=20Arroyo=20Torrens?= Date: Fri, 2 Dec 2016 16:59:16 +0100 Subject: [PATCH 002/169] Update languages percentage in Readme --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 99fd33c85..36757d02c 100644 --- a/README.md +++ b/README.md @@ -77,7 +77,7 @@ NOTE: in Mac OS X this command also generates a **dmg** package. |:----------:|:------------------------------------------:| | English | ![Progress](http://progressed.io/bar/100) | | Spanish | ![Progress](http://progressed.io/bar/100) | -| French | ![Progress](http://progressed.io/bar/84) | +| French | ![Progress](http://progressed.io/bar/96) | | Basque | ![Progress](http://progressed.io/bar/69) | | Galician | ![Progress](http://progressed.io/bar/67) | From 531cc9df4184c7d9db9959b7e98f8e5ec9c44220 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jes=C3=BAs=20Arroyo=20Torrens?= Date: Sat, 3 Dec 2016 11:42:56 +0100 Subject: [PATCH 003/169] Fix iCE40-HX8K pinout --- app/resources/boards/iCE40-HX8K/pinout.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/resources/boards/iCE40-HX8K/pinout.json b/app/resources/boards/iCE40-HX8K/pinout.json index ab7f19a63..4fd6ff653 100644 --- a/app/resources/boards/iCE40-HX8K/pinout.json +++ b/app/resources/boards/iCE40-HX8K/pinout.json @@ -1 +1 @@ -{"pinout": [{"name": "LED0", "value": "B5"}, {"name": "LED1", "value": "B4"}, {"name": "LED2", "value": "A2"}, {"name": "LED3", "value": "A1"}, {"name": "LED4", "value": "C5"}, {"name": "LED5", "value": "C4"}, {"name": "LED6", "value": "B3"}, {"name": "LED7", "value": "C3"}, {"name": "CLK", "value": "J3"}, {"name": "MISO", "value": "P12"}, {"name": "MOSI", "value": "P11"}, {"name": "SCK", "value": "R11"}, {"name": "SS", "value": "R12"}, {"name": "RTS", "value": "B13"}, {"name": "RESET", "value": "N11"}, {"name": "DONE", "value": "M10"}, {"name": "TX", "value": "B12"}, {"name": "RX", "value": "B10"}, {"name": "DCD", "value": "B15"}, {"name": "DSR", "value": "B14"}, {"name": "DTR", "value": "A16"}, {"name": "CTS", "value": "A15"}, {"name": "A16", "value": "A16"}, {"name": "A15", "value": "A15"}, {"name": "B15", "value": "B15"}, {"name": "B13", "value": "B13"}, {"name": "B14", "value": "B14"}, {"name": "B12", "value": "B12"}, {"name": "B11", "value": "B11"}, {"name": "A11", "value": "A11"}, {"name": "B10", "value": "B10"}, {"name": "A10", "value": "A10"}, {"name": "C9", "value": "C9"}, {"name": "A9", "value": "A9"}, {"name": "B9", "value": "B9"}, {"name": "B8", "value": "B8"}, {"name": "A7", "value": "A7"}, {"name": "B7", "value": "B7"}, {"name": "C7", "value": "C7"}, {"name": "A6", "value": "A6"}, {"name": "C6", "value": "C6"}, {"name": "B6", "value": "B6"}, {"name": "C5", "value": "C5"}, {"name": "A5", "value": "A5"}, {"name": "C4", "value": "C4"}, {"name": "B5", "value": "B5"}, {"name": "C3", "value": "C3"}, {"name": "B4", "value": "B4"}, {"name": "B3", "value": "B3"}, {"name": "A2", "value": "A2"}, {"name": "A1", "value": "A1"}, {"name": "R15", "value": "R15"}, {"name": "P16", "value": "P16"}, {"name": "P15", "value": "P15"}, {"name": "N16", "value": "N16"}, {"name": "M15", "value": "M15"}, {"name": "M16", "value": "M16"}, {"name": "L16", "value": "L16"}, {"name": "K15", "value": "K15"}, {"name": "K16", "value": "K16"}, {"name": "K14", "value": "K14"}, {"name": "J14", "value": "J14"}, {"name": "G14", "value": "G14"}, {"name": "F14", "value": "F14"}, {"name": "J15", "value": "J15"}, {"name": "H14", "value": "H14"}, {"name": "H16", "value": "H16"}, {"name": "G15", "value": "G15"}, {"name": "G16", "value": "G16"}, {"name": "F15", "value": "F15"}, {"name": "F16", "value": "F16"}, {"name": "E14", "value": "E14"}, {"name": "E16", "value": "E16"}, {"name": "D15", "value": "D15"}, {"name": "D14", "value": "D14"}, {"name": "B16", "value": "B16"}, {"name": "C16", "value": "C16"}, {"name": "B16", "value": "B16"}, {"name": "R16", "value": "R16"}, {"name": "T15", "value": "T15"}, {"name": "T16", "value": "T16"}, {"name": "T13", "value": "T13"}, {"name": "T14", "value": "T14"}, {"name": "N12", "value": "N12"}, {"name": "P13", "value": "P13"}, {"name": "N10", "value": "N10"}, {"name": "M11", "value": "M11"}, {"name": "T11", "value": "T11"}, {"name": "P10", "value": "P10"}, {"name": "T10", "value": "T10"}, {"name": "R10", "value": "R10"}, {"name": "P8", "value": "P8"}, {"name": "P9", "value": "P9"}, {"name": "T9", "value": "T9"}, {"name": "R9", "value": "R9"}, {"name": "T7", "value": "T7"}, {"name": "T8", "value": "T8"}, {"name": "T6", "value": "T6"}, {"name": "R6", "value": "R6"}, {"name": "T5", "value": "T5"}, {"name": "R5", "value": "R5"}, {"name": "R3", "value": "R3"}, {"name": "R4", "value": "R4"}, {"name": "R2", "value": "R2"}, {"name": "T3", "value": "T3"}, {"name": "T1", "value": "T1"}, {"name": "T2", "value": "T2"}, {"name": "R1", "value": "R1"}, {"name": "P1", "value": "P1"}, {"name": "P2", "value": "P2"}, {"name": "N3", "value": "N3"}, {"name": "N2", "value": "N2"}, {"name": "M2", "value": "M2"}, {"name": "M1", "value": "M1"}, {"name": "L3", "value": "L3"}, {"name": "L1", "value": "L1"}, {"name": "K3", "value": "K3"}, {"name": "K1", "value": "K1"}, {"name": "J2", "value": "J2"}, {"name": "J1", "value": "J1"}, {"name": "H2", "value": "H2"}, {"name": "J3", "value": "J3"}, {"name": "G2", "value": "G2"}, {"name": "H1", "value": "H1"}, {"name": "F2", "value": "F2"}, {"name": "G1", "value": "G1"}, {"name": "E2", "value": "E2"}, {"name": "F1", "value": "F1"}, {"name": "D1", "value": "D1"}, {"name": "D2", "value": "D2"}, {"name": "C1", "value": "C1"}, {"name": "C2", "value": "C2"}, {"name": "B2", "value": "B2"}, {"name": "B1", "value": ""}], "label": "iCE40-HX8K"} \ No newline at end of file +[{"name": "LED0", "value": "B5"}, {"name": "LED1", "value": "B4"}, {"name": "LED2", "value": "A2"}, {"name": "LED3", "value": "A1"}, {"name": "LED4", "value": "C5"}, {"name": "LED5", "value": "C4"}, {"name": "LED6", "value": "B3"}, {"name": "LED7", "value": "C3"}, {"name": "CLK", "value": "J3"}, {"name": "MISO", "value": "P12"}, {"name": "MOSI", "value": "P11"}, {"name": "SCK", "value": "R11"}, {"name": "SS", "value": "R12"}, {"name": "RTS", "value": "B13"}, {"name": "RESET", "value": "N11"}, {"name": "DONE", "value": "M10"}, {"name": "TX", "value": "B12"}, {"name": "RX", "value": "B10"}, {"name": "DCD", "value": "B15"}, {"name": "DSR", "value": "B14"}, {"name": "DTR", "value": "A16"}, {"name": "CTS", "value": "A15"}, {"name": "A16", "value": "A16"}, {"name": "A15", "value": "A15"}, {"name": "B15", "value": "B15"}, {"name": "B13", "value": "B13"}, {"name": "B14", "value": "B14"}, {"name": "B12", "value": "B12"}, {"name": "B11", "value": "B11"}, {"name": "A11", "value": "A11"}, {"name": "B10", "value": "B10"}, {"name": "A10", "value": "A10"}, {"name": "C9", "value": "C9"}, {"name": "A9", "value": "A9"}, {"name": "B9", "value": "B9"}, {"name": "B8", "value": "B8"}, {"name": "A7", "value": "A7"}, {"name": "B7", "value": "B7"}, {"name": "C7", "value": "C7"}, {"name": "A6", "value": "A6"}, {"name": "C6", "value": "C6"}, {"name": "B6", "value": "B6"}, {"name": "C5", "value": "C5"}, {"name": "A5", "value": "A5"}, {"name": "C4", "value": "C4"}, {"name": "B5", "value": "B5"}, {"name": "C3", "value": "C3"}, {"name": "B4", "value": "B4"}, {"name": "B3", "value": "B3"}, {"name": "A2", "value": "A2"}, {"name": "A1", "value": "A1"}, {"name": "R15", "value": "R15"}, {"name": "P16", "value": "P16"}, {"name": "P15", "value": "P15"}, {"name": "N16", "value": "N16"}, {"name": "M15", "value": "M15"}, {"name": "M16", "value": "M16"}, {"name": "L16", "value": "L16"}, {"name": "K15", "value": "K15"}, {"name": "K16", "value": "K16"}, {"name": "K14", "value": "K14"}, {"name": "J14", "value": "J14"}, {"name": "G14", "value": "G14"}, {"name": "F14", "value": "F14"}, {"name": "J15", "value": "J15"}, {"name": "H14", "value": "H14"}, {"name": "H16", "value": "H16"}, {"name": "G15", "value": "G15"}, {"name": "G16", "value": "G16"}, {"name": "F15", "value": "F15"}, {"name": "F16", "value": "F16"}, {"name": "E14", "value": "E14"}, {"name": "E16", "value": "E16"}, {"name": "D15", "value": "D15"}, {"name": "D14", "value": "D14"}, {"name": "B16", "value": "B16"}, {"name": "C16", "value": "C16"}, {"name": "B16", "value": "B16"}, {"name": "R16", "value": "R16"}, {"name": "T15", "value": "T15"}, {"name": "T16", "value": "T16"}, {"name": "T13", "value": "T13"}, {"name": "T14", "value": "T14"}, {"name": "N12", "value": "N12"}, {"name": "P13", "value": "P13"}, {"name": "N10", "value": "N10"}, {"name": "M11", "value": "M11"}, {"name": "T11", "value": "T11"}, {"name": "P10", "value": "P10"}, {"name": "T10", "value": "T10"}, {"name": "R10", "value": "R10"}, {"name": "P8", "value": "P8"}, {"name": "P9", "value": "P9"}, {"name": "T9", "value": "T9"}, {"name": "R9", "value": "R9"}, {"name": "T7", "value": "T7"}, {"name": "T8", "value": "T8"}, {"name": "T6", "value": "T6"}, {"name": "R6", "value": "R6"}, {"name": "T5", "value": "T5"}, {"name": "R5", "value": "R5"}, {"name": "R3", "value": "R3"}, {"name": "R4", "value": "R4"}, {"name": "R2", "value": "R2"}, {"name": "T3", "value": "T3"}, {"name": "T1", "value": "T1"}, {"name": "T2", "value": "T2"}, {"name": "R1", "value": "R1"}, {"name": "P1", "value": "P1"}, {"name": "P2", "value": "P2"}, {"name": "N3", "value": "N3"}, {"name": "N2", "value": "N2"}, {"name": "M2", "value": "M2"}, {"name": "M1", "value": "M1"}, {"name": "L3", "value": "L3"}, {"name": "L1", "value": "L1"}, {"name": "K3", "value": "K3"}, {"name": "K1", "value": "K1"}, {"name": "J2", "value": "J2"}, {"name": "J1", "value": "J1"}, {"name": "H2", "value": "H2"}, {"name": "J3", "value": "J3"}, {"name": "G2", "value": "G2"}, {"name": "H1", "value": "H1"}, {"name": "F2", "value": "F2"}, {"name": "G1", "value": "G1"}, {"name": "E2", "value": "E2"}, {"name": "F1", "value": "F1"}, {"name": "D1", "value": "D1"}, {"name": "D2", "value": "D2"}, {"name": "C1", "value": "C1"}, {"name": "C2", "value": "C2"}, {"name": "B2", "value": "B2"}, {"name": "B1", "value": "B1"}] \ No newline at end of file From a1adbf0988108f6ccaf405a6830b0903659318ad Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jes=C3=BAs=20Arroyo=20Torrens?= Date: Sun, 4 Dec 2016 22:38:46 +0100 Subject: [PATCH 004/169] Fix 8K missing D16 pin --- app/resources/boards/iCE40-HX8K/pinout.json | 2 +- app/resources/boards/iCE40-HX8K/pinout.pcf | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/resources/boards/iCE40-HX8K/pinout.json b/app/resources/boards/iCE40-HX8K/pinout.json index 4fd6ff653..a537f2df7 100644 --- a/app/resources/boards/iCE40-HX8K/pinout.json +++ b/app/resources/boards/iCE40-HX8K/pinout.json @@ -1 +1 @@ -[{"name": "LED0", "value": "B5"}, {"name": "LED1", "value": "B4"}, {"name": "LED2", "value": "A2"}, {"name": "LED3", "value": "A1"}, {"name": "LED4", "value": "C5"}, {"name": "LED5", "value": "C4"}, {"name": "LED6", "value": "B3"}, {"name": "LED7", "value": "C3"}, {"name": "CLK", "value": "J3"}, {"name": "MISO", "value": "P12"}, {"name": "MOSI", "value": "P11"}, {"name": "SCK", "value": "R11"}, {"name": "SS", "value": "R12"}, {"name": "RTS", "value": "B13"}, {"name": "RESET", "value": "N11"}, {"name": "DONE", "value": "M10"}, {"name": "TX", "value": "B12"}, {"name": "RX", "value": "B10"}, {"name": "DCD", "value": "B15"}, {"name": "DSR", "value": "B14"}, {"name": "DTR", "value": "A16"}, {"name": "CTS", "value": "A15"}, {"name": "A16", "value": "A16"}, {"name": "A15", "value": "A15"}, {"name": "B15", "value": "B15"}, {"name": "B13", "value": "B13"}, {"name": "B14", "value": "B14"}, {"name": "B12", "value": "B12"}, {"name": "B11", "value": "B11"}, {"name": "A11", "value": "A11"}, {"name": "B10", "value": "B10"}, {"name": "A10", "value": "A10"}, {"name": "C9", "value": "C9"}, {"name": "A9", "value": "A9"}, {"name": "B9", "value": "B9"}, {"name": "B8", "value": "B8"}, {"name": "A7", "value": "A7"}, {"name": "B7", "value": "B7"}, {"name": "C7", "value": "C7"}, {"name": "A6", "value": "A6"}, {"name": "C6", "value": "C6"}, {"name": "B6", "value": "B6"}, {"name": "C5", "value": "C5"}, {"name": "A5", "value": "A5"}, {"name": "C4", "value": "C4"}, {"name": "B5", "value": "B5"}, {"name": "C3", "value": "C3"}, {"name": "B4", "value": "B4"}, {"name": "B3", "value": "B3"}, {"name": "A2", "value": "A2"}, {"name": "A1", "value": "A1"}, {"name": "R15", "value": "R15"}, {"name": "P16", "value": "P16"}, {"name": "P15", "value": "P15"}, {"name": "N16", "value": "N16"}, {"name": "M15", "value": "M15"}, {"name": "M16", "value": "M16"}, {"name": "L16", "value": "L16"}, {"name": "K15", "value": "K15"}, {"name": "K16", "value": "K16"}, {"name": "K14", "value": "K14"}, {"name": "J14", "value": "J14"}, {"name": "G14", "value": "G14"}, {"name": "F14", "value": "F14"}, {"name": "J15", "value": "J15"}, {"name": "H14", "value": "H14"}, {"name": "H16", "value": "H16"}, {"name": "G15", "value": "G15"}, {"name": "G16", "value": "G16"}, {"name": "F15", "value": "F15"}, {"name": "F16", "value": "F16"}, {"name": "E14", "value": "E14"}, {"name": "E16", "value": "E16"}, {"name": "D15", "value": "D15"}, {"name": "D14", "value": "D14"}, {"name": "B16", "value": "B16"}, {"name": "C16", "value": "C16"}, {"name": "B16", "value": "B16"}, {"name": "R16", "value": "R16"}, {"name": "T15", "value": "T15"}, {"name": "T16", "value": "T16"}, {"name": "T13", "value": "T13"}, {"name": "T14", "value": "T14"}, {"name": "N12", "value": "N12"}, {"name": "P13", "value": "P13"}, {"name": "N10", "value": "N10"}, {"name": "M11", "value": "M11"}, {"name": "T11", "value": "T11"}, {"name": "P10", "value": "P10"}, {"name": "T10", "value": "T10"}, {"name": "R10", "value": "R10"}, {"name": "P8", "value": "P8"}, {"name": "P9", "value": "P9"}, {"name": "T9", "value": "T9"}, {"name": "R9", "value": "R9"}, {"name": "T7", "value": "T7"}, {"name": "T8", "value": "T8"}, {"name": "T6", "value": "T6"}, {"name": "R6", "value": "R6"}, {"name": "T5", "value": "T5"}, {"name": "R5", "value": "R5"}, {"name": "R3", "value": "R3"}, {"name": "R4", "value": "R4"}, {"name": "R2", "value": "R2"}, {"name": "T3", "value": "T3"}, {"name": "T1", "value": "T1"}, {"name": "T2", "value": "T2"}, {"name": "R1", "value": "R1"}, {"name": "P1", "value": "P1"}, {"name": "P2", "value": "P2"}, {"name": "N3", "value": "N3"}, {"name": "N2", "value": "N2"}, {"name": "M2", "value": "M2"}, {"name": "M1", "value": "M1"}, {"name": "L3", "value": "L3"}, {"name": "L1", "value": "L1"}, {"name": "K3", "value": "K3"}, {"name": "K1", "value": "K1"}, {"name": "J2", "value": "J2"}, {"name": "J1", "value": "J1"}, {"name": "H2", "value": "H2"}, {"name": "J3", "value": "J3"}, {"name": "G2", "value": "G2"}, {"name": "H1", "value": "H1"}, {"name": "F2", "value": "F2"}, {"name": "G1", "value": "G1"}, {"name": "E2", "value": "E2"}, {"name": "F1", "value": "F1"}, {"name": "D1", "value": "D1"}, {"name": "D2", "value": "D2"}, {"name": "C1", "value": "C1"}, {"name": "C2", "value": "C2"}, {"name": "B2", "value": "B2"}, {"name": "B1", "value": "B1"}] \ No newline at end of file +[{"name": "LED0", "value": "B5"}, {"name": "LED1", "value": "B4"}, {"name": "LED2", "value": "A2"}, {"name": "LED3", "value": "A1"}, {"name": "LED4", "value": "C5"}, {"name": "LED5", "value": "C4"}, {"name": "LED6", "value": "B3"}, {"name": "LED7", "value": "C3"}, {"name": "CLK", "value": "J3"}, {"name": "MISO", "value": "P12"}, {"name": "MOSI", "value": "P11"}, {"name": "SCK", "value": "R11"}, {"name": "SS", "value": "R12"}, {"name": "RTS", "value": "B13"}, {"name": "RESET", "value": "N11"}, {"name": "DONE", "value": "M10"}, {"name": "TX", "value": "B12"}, {"name": "RX", "value": "B10"}, {"name": "DCD", "value": "B15"}, {"name": "DSR", "value": "B14"}, {"name": "DTR", "value": "A16"}, {"name": "CTS", "value": "A15"}, {"name": "A16", "value": "A16"}, {"name": "A15", "value": "A15"}, {"name": "B15", "value": "B15"}, {"name": "B13", "value": "B13"}, {"name": "B14", "value": "B14"}, {"name": "B12", "value": "B12"}, {"name": "B11", "value": "B11"}, {"name": "A11", "value": "A11"}, {"name": "B10", "value": "B10"}, {"name": "A10", "value": "A10"}, {"name": "C9", "value": "C9"}, {"name": "A9", "value": "A9"}, {"name": "B9", "value": "B9"}, {"name": "B8", "value": "B8"}, {"name": "A7", "value": "A7"}, {"name": "B7", "value": "B7"}, {"name": "C7", "value": "C7"}, {"name": "A6", "value": "A6"}, {"name": "C6", "value": "C6"}, {"name": "B6", "value": "B6"}, {"name": "C5", "value": "C5"}, {"name": "A5", "value": "A5"}, {"name": "C4", "value": "C4"}, {"name": "B5", "value": "B5"}, {"name": "C3", "value": "C3"}, {"name": "B4", "value": "B4"}, {"name": "B3", "value": "B3"}, {"name": "A2", "value": "A2"}, {"name": "A1", "value": "A1"}, {"name": "R15", "value": "R15"}, {"name": "P16", "value": "P16"}, {"name": "P15", "value": "P15"}, {"name": "N16", "value": "N16"}, {"name": "M15", "value": "M15"}, {"name": "M16", "value": "M16"}, {"name": "L16", "value": "L16"}, {"name": "K15", "value": "K15"}, {"name": "K16", "value": "K16"}, {"name": "K14", "value": "K14"}, {"name": "J14", "value": "J14"}, {"name": "G14", "value": "G14"}, {"name": "F14", "value": "F14"}, {"name": "J15", "value": "J15"}, {"name": "H14", "value": "H14"}, {"name": "H16", "value": "H16"}, {"name": "G15", "value": "G15"}, {"name": "G16", "value": "G16"}, {"name": "F15", "value": "F15"}, {"name": "F16", "value": "F16"}, {"name": "E14", "value": "E14"}, {"name": "E16", "value": "E16"}, {"name": "D15", "value": "D15"}, {"name": "D16", "value": "D16"}, {"name": "D14", "value": "D14"}, {"name": "C16", "value": "C16"}, {"name": "B16", "value": "B16"}, {"name": "R16", "value": "R16"}, {"name": "T15", "value": "T15"}, {"name": "T16", "value": "T16"}, {"name": "T13", "value": "T13"}, {"name": "T14", "value": "T14"}, {"name": "N12", "value": "N12"}, {"name": "P13", "value": "P13"}, {"name": "N10", "value": "N10"}, {"name": "M11", "value": "M11"}, {"name": "T11", "value": "T11"}, {"name": "P10", "value": "P10"}, {"name": "T10", "value": "T10"}, {"name": "R10", "value": "R10"}, {"name": "P8", "value": "P8"}, {"name": "P9", "value": "P9"}, {"name": "T9", "value": "T9"}, {"name": "R9", "value": "R9"}, {"name": "T7", "value": "T7"}, {"name": "T8", "value": "T8"}, {"name": "T6", "value": "T6"}, {"name": "R6", "value": "R6"}, {"name": "T5", "value": "T5"}, {"name": "R5", "value": "R5"}, {"name": "R3", "value": "R3"}, {"name": "R4", "value": "R4"}, {"name": "R2", "value": "R2"}, {"name": "T3", "value": "T3"}, {"name": "T1", "value": "T1"}, {"name": "T2", "value": "T2"}, {"name": "R1", "value": "R1"}, {"name": "P1", "value": "P1"}, {"name": "P2", "value": "P2"}, {"name": "N3", "value": "N3"}, {"name": "N2", "value": "N2"}, {"name": "M2", "value": "M2"}, {"name": "M1", "value": "M1"}, {"name": "L3", "value": "L3"}, {"name": "L1", "value": "L1"}, {"name": "K3", "value": "K3"}, {"name": "K1", "value": "K1"}, {"name": "J2", "value": "J2"}, {"name": "J1", "value": "J1"}, {"name": "H2", "value": "H2"}, {"name": "J3", "value": "J3"}, {"name": "G2", "value": "G2"}, {"name": "H1", "value": "H1"}, {"name": "F2", "value": "F2"}, {"name": "G1", "value": "G1"}, {"name": "E2", "value": "E2"}, {"name": "F1", "value": "F1"}, {"name": "D1", "value": "D1"}, {"name": "D2", "value": "D2"}, {"name": "C1", "value": "C1"}, {"name": "C2", "value": "C2"}, {"name": "B1", "value": "B1"}, {"name": "B2", "value": "B2"}] \ No newline at end of file diff --git a/app/resources/boards/iCE40-HX8K/pinout.pcf b/app/resources/boards/iCE40-HX8K/pinout.pcf index 177ea7be5..4e5bb62b8 100644 --- a/app/resources/boards/iCE40-HX8K/pinout.pcf +++ b/app/resources/boards/iCE40-HX8K/pinout.pcf @@ -167,8 +167,8 @@ set_io --warn-no-port F16 F16 set_io --warn-no-port E14 E14 set_io --warn-no-port E16 E16 set_io --warn-no-port D15 D15 +set_io --warn-no-port D16 D16 set_io --warn-no-port D14 D14 -set_io --warn-no-port B16 B16 set_io --warn-no-port C16 C16 set_io --warn-no-port B16 B16 @@ -296,5 +296,5 @@ set_io --warn-no-port D1 D1 set_io --warn-no-port D2 D2 set_io --warn-no-port C1 C1 set_io --warn-no-port C2 C2 -set_io --warn-no-port B2 B2 set_io --warn-no-port B1 B1 +set_io --warn-no-port B2 B2 From fc8fab030f484c4a81c2fc0026b825edc2e18224 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jes=C3=BAs=20Arroyo=20Torrens?= Date: Mon, 5 Dec 2016 12:49:43 +0100 Subject: [PATCH 005/169] Add constant block --- app/scripts/plugins/shapes/joint.shapes.js | 61 ++++++++++++++++++++++ app/scripts/services/graph.service.js | 59 ++++++++++++++++++++- app/styles/project.css | 31 ++++++++++- app/views/menu.html | 5 +- 4 files changed, 150 insertions(+), 6 deletions(-) diff --git a/app/scripts/plugins/shapes/joint.shapes.js b/app/scripts/plugins/shapes/joint.shapes.js index 434d99d7d..e7720cec9 100644 --- a/app/scripts/plugins/shapes/joint.shapes.js +++ b/app/scripts/plugins/shapes/joint.shapes.js @@ -313,6 +313,67 @@ joint.shapes.ice.InputView = joint.shapes.ice.IOView; joint.shapes.ice.OutputView = joint.shapes.ice.IOView; +// Constant blocks + +joint.shapes.ice.Constant = joint.shapes.ice.Model.extend({ + defaults: joint.util.deepSupplement({ + type: 'ice.Constant', + outPorts: [{ + id: "out", + label: "", + gridUnits: 8 + }], + size: { + width: 96, + height: 64 + } + }, joint.shapes.ice.Model.prototype.defaults) +}); + + +joint.shapes.ice.ConstantView = joint.shapes.ice.ModelView.extend({ + + template: '\ +
\ + \ + \ +
\ + ', + + initialize: function() { + joint.shapes.ice.ModelView.prototype.initialize.apply(this, arguments); + + // Prevent paper from handling pointerdown. + this.$box.find('.constant-input').on('mousedown click', function(evt) { evt.stopPropagation(); }); + + this.$box.find('.constant-input').on('change', _.bind(function(evt) { + this.model.attributes.data.value = $(evt.target).val(); + }, this)); + }, + renderLabel: function () { + var name = this.model.attributes.data.label; + this.$box.find('label').text(name); + }, + renderValue: function() { + if (this.model.get('disabled')) { + this.$box.find('.constant-input').css({'display': 'none'}); + } + else { + this.$box.find('.constant-input').val(this.model.get('data').value); + } + }, + clearValue: function () { + this.$box.find('.constant-input').val(''); + }, + update: function () { + this.renderLabel(); + this.renderPorts(); + this.renderValue(); + joint.dia.ElementView.prototype.update.apply(this, arguments); + } +}); + + // Code block joint.shapes.ice.Code = joint.shapes.ice.Model.extend({ diff --git a/app/scripts/services/graph.service.js b/app/scripts/services/graph.service.js index d643ef509..259c1bb2c 100644 --- a/app/scripts/services/graph.service.js +++ b/app/scripts/services/graph.service.js @@ -300,6 +300,19 @@ angular.module('icestudio') }); } } + else if (data.blockType == 'basic.constant') { + if (paper.options.enabled) { + alertify.prompt(gettextCatalog.getString('Update the block label'), data.data.label ? ' ' + data.data.label + ' ' : '', + function(evt, label) { + label = label.replace(/ /g, ''); + if (data.data.label != label) { + data.data.label = label; + cellView.renderLabel(); + alertify.success(gettextCatalog.getString('Label updated')); + } + }); + } + } else if (data.blockType == 'basic.code') { if (paper.options.enabled) { var block = { @@ -464,6 +477,7 @@ angular.module('icestudio') blockInstance.data.ports.out.push(outPorts[o]); } blockInstance.position.x = 31 * gridsize; + blockInstance.position.y = 18 * gridsize; if (block) { blockInstance.data.code = block.data.code; @@ -484,8 +498,7 @@ angular.module('icestudio') blockInstance.data = { info: '' }; - blockInstance.position.x = 31 * gridsize; - blockInstance.position.y = 26 * gridsize; + blockInstance.position.y = 30 * gridsize; var cell = addBasicInfoBlock(blockInstance); var cellView = paper.findViewByModel(cell); if (cellView.$box.css('z-index') < zIndex) { @@ -574,6 +587,31 @@ angular.module('icestudio') } }); } + else if (type == 'basic.constant') { + alertify.prompt(gettextCatalog.getString('Enter the constant blocks'), ' C ', + function(evt, name) { + if (name) { + var names = name.replace(/ /g, '').split(','); + blockInstance.position.x = 20 * gridsize; + for (var n in names) { + if (names[n]) { + blockInstance.data = { + label: names[n], + value: '' + }; + var cell = addBasicConstantBlock(blockInstance); + var cellView = paper.findViewByModel(cell); + if (cellView.$box.css('z-index') < zIndex) { + cellView.$box.css('z-index', ++zIndex); + } + blockInstance.position.x += 15 * gridsize; + } + } + } + else { + } + }); + } else { if (block && block.graph && @@ -719,6 +757,9 @@ angular.module('icestudio') else if (blockInstance.type == 'basic.output') { addBasicOutputBlock(blockInstance, disabled); } + else if (blockInstance.type == 'basic.constant') { + addBasicConstantBlock(blockInstance, disabled); + } else { addGenericBlock(blockInstance, deps[blockInstance.type]); } @@ -778,6 +819,20 @@ angular.module('icestudio') return cell; }; + function addBasicConstantBlock(blockInstances, disabled) { + var cell = new joint.shapes.ice.Constant({ + id: blockInstances.id, + blockType: blockInstances.type, + data: blockInstances.data, + label: blockInstances.data.label, + position: blockInstances.position, + disabled: disabled + }); + + addCell(cell); + return cell; + }; + function addBasicCodeBlock(blockInstances, disabled) { var inPorts = []; var outPorts = []; diff --git a/app/styles/project.css b/app/styles/project.css index 8b1986549..412156755 100644 --- a/app/styles/project.css +++ b/app/styles/project.css @@ -82,7 +82,7 @@ } .config-block { - background: #FAFAD2; + background: #fafacd; } .generic-block img { @@ -105,7 +105,7 @@ .io-block { position: absolute; - background: #FAFAD2; + background: #fafacd; border-radius: 5px; border: 2px solid #888; pointer-events: none; @@ -129,6 +129,33 @@ pointer-events: auto; } +.constant-block { + position: absolute; + background: #faeaaf; + border-radius: 5px; + border: 2px solid #888; + pointer-events: none; + -webkit-user-select: none; + z-index: 0; +} + +.constant-block label { + display: block; + margin-top: 4px; + text-align: center; + font-size: 1em; + color: #444; +} + +.constant-block input { + position: absolute; + text-align: center; + left: 5px; + bottom: 5px; + width: 82px; + pointer-events: auto; +} + .code-block { position: absolute; background: #C0DFEB; diff --git a/app/views/menu.html b/app/views/menu.html index a9c61b2f4..a80198e72 100644 --- a/app/views/menu.html +++ b/app/views/menu.html @@ -285,10 +285,11 @@ {{ 'Basic' | translate }} From 44541503d309ba90c946f09dce7b52d3e77ef4df Mon Sep 17 00:00:00 2001 From: obijuan Date: Tue, 6 Dec 2016 13:29:29 +0100 Subject: [PATCH 006/169] Simple switch debouncer added in Logic/Sequential --- .../blocks/logic/sequential/debouncer.iceb | 100 ++++++++++++++++++ app/resources/images/debouncer.svg | 60 +++++++++++ 2 files changed, 160 insertions(+) create mode 100644 app/resources/blocks/logic/sequential/debouncer.iceb create mode 100644 app/resources/images/debouncer.svg diff --git a/app/resources/blocks/logic/sequential/debouncer.iceb b/app/resources/blocks/logic/sequential/debouncer.iceb new file mode 100644 index 000000000..251ca22b1 --- /dev/null +++ b/app/resources/blocks/logic/sequential/debouncer.iceb @@ -0,0 +1,100 @@ +{ + "image": "resources/images/debouncer.svg", + "state": { + "pan": { + "x": 0, + "y": 0 + }, + "zoom": 1 + }, + "graph": { + "blocks": [ + { + "id": "980b1169-a2fe-411d-9678-c8ad64a801a6", + "type": "basic.code", + "data": { + "code": "//-- Debouncer Circuit\n//-- It produces a stable output when the\n//-- input signal is bouncing\n\nreg btn_prev = 0;\nreg btn_out_r = 0;\n\nreg [16:0] counter = 0;\n\n\nalways @(posedge clk) begin\n\n //-- If btn_prev and btn_in are differents\n if (btn_prev ^ btn_in == 1'b1) begin\n \n //-- Reset the counter\n counter <= 0;\n \n //-- Capture the button status\n btn_prev <= btn_in;\n end\n \n //-- If no timeout, increase the counter\n else if (counter[16] == 1'b0)\n counter <= counter + 1;\n \n else\n //-- Set the output to the stable value\n btn_out_r <= btn_prev;\n\nend\n\nassign btn_out = btn_out_r;\n", + "ports": { + "in": [ + "clk", + "btn_in" + ], + "out": [ + "btn_out" + ] + } + }, + "position": { + "x": 368, + "y": 120 + } + }, + { + "id": "4bf41c17-a2da-4140-95f7-2a80d51b1e1a", + "type": "basic.input", + "data": { + "label": "clk" + }, + "position": { + "x": 152, + "y": 152 + } + }, + { + "id": "c9e1af2a-6f09-4cf6-a5b3-fdf7ec2c6530", + "type": "basic.input", + "data": { + "label": "btn_in" + }, + "position": { + "x": 152, + "y": 280 + } + }, + { + "id": "22ff3fa1-943b-4d1a-bd89-36e1c054d077", + "type": "basic.output", + "data": { + "label": "btn_out" + }, + "position": { + "x": 872, + "y": 216 + } + } + ], + "wires": [ + { + "source": { + "block": "4bf41c17-a2da-4140-95f7-2a80d51b1e1a", + "port": "out" + }, + "target": { + "block": "980b1169-a2fe-411d-9678-c8ad64a801a6", + "port": "clk" + } + }, + { + "source": { + "block": "c9e1af2a-6f09-4cf6-a5b3-fdf7ec2c6530", + "port": "out" + }, + "target": { + "block": "980b1169-a2fe-411d-9678-c8ad64a801a6", + "port": "btn_in" + } + }, + { + "source": { + "block": "980b1169-a2fe-411d-9678-c8ad64a801a6", + "port": "btn_out" + }, + "target": { + "block": "22ff3fa1-943b-4d1a-bd89-36e1c054d077", + "port": "in" + } + } + ] + }, + "deps": {} +} diff --git a/app/resources/images/debouncer.svg b/app/resources/images/debouncer.svg new file mode 100644 index 000000000..0a5def855 --- /dev/null +++ b/app/resources/images/debouncer.svg @@ -0,0 +1,60 @@ + + + +image/svg+xml \ No newline at end of file From d1da861a8fc74d44a48a29ab4408d8e8533331bb Mon Sep 17 00:00:00 2001 From: obijuan Date: Tue, 6 Dec 2016 13:55:52 +0100 Subject: [PATCH 007/169] Tranlation for the debouncer component --- app/resources/blocks/labels.js | 3 +++ app/resources/locale/en/en.po | 5 +++++ app/resources/locale/es_ES/es_ES.po | 5 +++++ app/resources/locale/template.pot | 5 +++++ 4 files changed, 18 insertions(+) diff --git a/app/resources/blocks/labels.js b/app/resources/blocks/labels.js index f7209d3f2..8c70e2216 100644 --- a/app/resources/blocks/labels.js +++ b/app/resources/blocks/labels.js @@ -54,3 +54,6 @@ gettext('dff_sr') gettext('tff_ar') /// T flip-flop gettext('tff_sr') +/// Debouncer +gettext('debouncer') + diff --git a/app/resources/locale/en/en.po b/app/resources/locale/en/en.po index 3d116c84f..d05c5ec61 100644 --- a/app/resources/locale/en/en.po +++ b/app/resources/locale/en/en.po @@ -598,6 +598,11 @@ msgstr "Combinational" msgid "config" msgstr "Config" +#. Debouncer +#: app/resources/blocks/labels.js:57 +msgid "debouncer" +msgstr "Debouncer" + #. Demux 1:2 #: app/resources/blocks/labels.js:18 msgid "demux_1_2" diff --git a/app/resources/locale/es_ES/es_ES.po b/app/resources/locale/es_ES/es_ES.po index 803984574..e325c9edc 100644 --- a/app/resources/locale/es_ES/es_ES.po +++ b/app/resources/locale/es_ES/es_ES.po @@ -601,6 +601,11 @@ msgstr "Combinacional" msgid "config" msgstr "Config" +#. Debouncer +#: app/resources/blocks/labels.js:57 +msgid "debouncer" +msgstr "Antirrebotes" + #. Demux 1:2 #: app/resources/blocks/labels.js:18 msgid "demux_1_2" diff --git a/app/resources/locale/template.pot b/app/resources/locale/template.pot index 5cbd1d24c..6a5a25ca1 100644 --- a/app/resources/locale/template.pot +++ b/app/resources/locale/template.pot @@ -560,6 +560,11 @@ msgstr "" msgid "config" msgstr "" +#. Debouncer +#: app/resources/blocks/labels.js:57 +msgid "debouncer" +msgstr "" + #. Demux 1:2 #: app/resources/blocks/labels.js:18 msgid "demux_1_2" From e3811371dbe0f3ff6956464655a7e6e146e222ab Mon Sep 17 00:00:00 2001 From: obijuan Date: Tue, 6 Dec 2016 15:35:42 +0100 Subject: [PATCH 008/169] Debouncer: change the pins names to in and out (instead of btn_in, btn_out) --- .../blocks/logic/sequential/debouncer.iceb | 64 +++++++++---------- 1 file changed, 32 insertions(+), 32 deletions(-) diff --git a/app/resources/blocks/logic/sequential/debouncer.iceb b/app/resources/blocks/logic/sequential/debouncer.iceb index 251ca22b1..ca7aca8a9 100644 --- a/app/resources/blocks/logic/sequential/debouncer.iceb +++ b/app/resources/blocks/logic/sequential/debouncer.iceb @@ -9,26 +9,6 @@ }, "graph": { "blocks": [ - { - "id": "980b1169-a2fe-411d-9678-c8ad64a801a6", - "type": "basic.code", - "data": { - "code": "//-- Debouncer Circuit\n//-- It produces a stable output when the\n//-- input signal is bouncing\n\nreg btn_prev = 0;\nreg btn_out_r = 0;\n\nreg [16:0] counter = 0;\n\n\nalways @(posedge clk) begin\n\n //-- If btn_prev and btn_in are differents\n if (btn_prev ^ btn_in == 1'b1) begin\n \n //-- Reset the counter\n counter <= 0;\n \n //-- Capture the button status\n btn_prev <= btn_in;\n end\n \n //-- If no timeout, increase the counter\n else if (counter[16] == 1'b0)\n counter <= counter + 1;\n \n else\n //-- Set the output to the stable value\n btn_out_r <= btn_prev;\n\nend\n\nassign btn_out = btn_out_r;\n", - "ports": { - "in": [ - "clk", - "btn_in" - ], - "out": [ - "btn_out" - ] - } - }, - "position": { - "x": 368, - "y": 120 - } - }, { "id": "4bf41c17-a2da-4140-95f7-2a80d51b1e1a", "type": "basic.input", @@ -44,7 +24,7 @@ "id": "c9e1af2a-6f09-4cf6-a5b3-fdf7ec2c6530", "type": "basic.input", "data": { - "label": "btn_in" + "label": "in" }, "position": { "x": 152, @@ -55,46 +35,66 @@ "id": "22ff3fa1-943b-4d1a-bd89-36e1c054d077", "type": "basic.output", "data": { - "label": "btn_out" + "label": "out" }, "position": { "x": 872, "y": 216 } + }, + { + "id": "92490e7e-c3ba-4e9c-a917-2a771d99f1ef", + "type": "basic.code", + "data": { + "code": "//-- Debouncer Circuit\n//-- It produces a stable output when the\n//-- input signal is bouncing\n\nreg btn_prev = 0;\nreg btn_out_r = 0;\n\nreg [16:0] counter = 0;\n\n\nalways @(posedge clk) begin\n\n //-- If btn_prev and btn_in are differents\n if (btn_prev ^ in == 1'b1) begin\n \n //-- Reset the counter\n counter <= 0;\n \n //-- Capture the button status\n btn_prev <= in;\n end\n \n //-- If no timeout, increase the counter\n else if (counter[16] == 1'b0)\n counter <= counter + 1;\n \n else\n //-- Set the output to the stable value\n btn_out_r <= btn_prev;\n\nend\n\nassign out = btn_out_r;\n", + "ports": { + "in": [ + "clk", + "in" + ], + "out": [ + "out" + ] + } + }, + "position": { + "x": 368, + "y": 120 + } } ], "wires": [ { "source": { - "block": "4bf41c17-a2da-4140-95f7-2a80d51b1e1a", + "block": "92490e7e-c3ba-4e9c-a917-2a771d99f1ef", "port": "out" }, "target": { - "block": "980b1169-a2fe-411d-9678-c8ad64a801a6", - "port": "clk" + "block": "22ff3fa1-943b-4d1a-bd89-36e1c054d077", + "port": "in" } }, { "source": { - "block": "c9e1af2a-6f09-4cf6-a5b3-fdf7ec2c6530", + "block": "4bf41c17-a2da-4140-95f7-2a80d51b1e1a", "port": "out" }, "target": { - "block": "980b1169-a2fe-411d-9678-c8ad64a801a6", - "port": "btn_in" + "block": "92490e7e-c3ba-4e9c-a917-2a771d99f1ef", + "port": "clk" } }, { "source": { - "block": "980b1169-a2fe-411d-9678-c8ad64a801a6", - "port": "btn_out" + "block": "c9e1af2a-6f09-4cf6-a5b3-fdf7ec2c6530", + "port": "out" }, "target": { - "block": "22ff3fa1-943b-4d1a-bd89-36e1c054d077", + "block": "92490e7e-c3ba-4e9c-a917-2a771d99f1ef", "port": "in" } } ] }, "deps": {} -} +} \ No newline at end of file From 7900832f3f6a21d934664a64b00700e4ada439ce Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jes=C3=BAs=20Arroyo=20Torrens?= Date: Tue, 6 Dec 2016 17:11:31 +0100 Subject: [PATCH 009/169] Manage top and bottom ports --- app/scripts/plugins/routers/joint.routers.js | 4 +- app/scripts/plugins/shapes/joint.shapes.js | 175 +++++++++++++------ app/scripts/services/graph.service.js | 44 ++--- 3 files changed, 146 insertions(+), 77 deletions(-) diff --git a/app/scripts/plugins/routers/joint.routers.js b/app/scripts/plugins/routers/joint.routers.js index c1591d61d..f09b3ab63 100644 --- a/app/scripts/plugins/routers/joint.routers.js +++ b/app/scripts/plugins/routers/joint.routers.js @@ -22,10 +22,10 @@ joint.routers.ice = (function(g, _, joint) { maximumLoops: 2000, // possible starting directions from an element - startDirections: ['right'], + startDirections: ['right', 'top', 'bottom'], // possible ending directions to an element - endDirections: ['left'], + endDirections: ['left', 'top', 'bottom'], // specify directions above directionMap: { diff --git a/app/scripts/plugins/shapes/joint.shapes.js b/app/scripts/plugins/shapes/joint.shapes.js index e7720cec9..d231a83b0 100644 --- a/app/scripts/plugins/shapes/joint.shapes.js +++ b/app/scripts/plugins/shapes/joint.shapes.js @@ -15,9 +15,9 @@ else { // Model element joint.shapes.ice = {}; -joint.shapes.ice.Model = joint.shapes.basic.Generic.extend(_.extend({}, joint.shapes.basic.PortsModelInterface, { +joint.shapes.ice.Model = joint.shapes.basic.Generic.extend({ - markup: '', + markup: '', portMarkup: '', defaults: joint.util.deepSupplement({ @@ -26,8 +26,10 @@ joint.shapes.ice.Model = joint.shapes.basic.Generic.extend(_.extend({}, joint.sh width: 1, height: 1 }, - inPorts: [], - outPorts: [], + leftPorts: [], + rightPorts: [], + topPorts: [], + bottomPorts: [], attrs: { gridUnits: 1, '.': { @@ -43,24 +45,23 @@ joint.shapes.ice.Model = joint.shapes.basic.Generic.extend(_.extend({}, joint.sh r: 16, opacity: 0 }, - '.inPorts .port-body': { + '.leftPorts .port-body': { type: 'input', magnet: false }, - '.outPorts .port-body': { + '.rightPorts .port-body': { type: 'output', magnet: true }, - '.inPorts .port-label': { - x: 12, - y: -10, - 'text-anchor': 'end', - fill: '#888' + '.topPorts .port-body': { + type: 'input', + magnet: false }, - '.outPorts .port-label': { - x: -12, - y: -10, - 'text-anchor': 'start', + '.bottomPorts .port-body': { + type: 'output', + magnet: true + }, + '.port-label': { fill: '#888' }, '.port-wire': { @@ -70,6 +71,35 @@ joint.shapes.ice.Model = joint.shapes.basic.Generic.extend(_.extend({}, joint.sh } }, joint.shapes.basic.Generic.prototype.defaults), + + initialize: function() { + this.updatePortsAttrs(); + this.on('change:leftPorts change:rightPorts change:topPorts change:bottomPorts', this.updatePortsAttrs, this); + this.constructor.__super__.constructor.__super__.initialize.apply(this, arguments); + }, + + updatePortsAttrs: function(eventName) { + if (this._portSelectors) { + var newAttrs = _.omit(this.get('attrs'), this._portSelectors); + this.set('attrs', newAttrs, { silent: true }); + } + this._portSelectors = []; + var attrs = {}; + + _.each(['left', 'right', 'top', 'bottom'], function(type) { + var port = type + 'Ports'; + _.each(this.get(port), function(portName, index, ports) { + var portAttributes = this.getPortAttrs(portName, index, ports.length, '.' + port, type); + this._portSelectors = this._portSelectors.concat(_.keys(portAttributes)); + _.extend(attrs, portAttributes); + }, this); + }, this); + + this.attr(attrs, { silent: true }); + this.processPorts(); + this.trigger('process:ports'); + }, + getPortAttrs: function(port, index, total, selector, type) { var attrs = {}; @@ -80,10 +110,16 @@ joint.shapes.ice.Model = joint.shapes.basic.Generic.extend(_.extend({}, joint.sh var portWireSelector = portSelector + '>.port-wire'; var portBodySelector = portSelector + '>.port-body'; + attrs[portSelector] = { + ref: '.body' + }; + attrs[portLabelSelector] = { text: port.label }; + attrs[portWireSelector] = {}; + attrs[portBodySelector] = { port: { id: port.id, @@ -91,33 +127,56 @@ joint.shapes.ice.Model = joint.shapes.basic.Generic.extend(_.extend({}, joint.sh } }; - var portY = (index + 0.5) / total; - - portY = Math.round(portY * port.gridUnits) / port.gridUnits; - - attrs[portSelector] = { - ref: '.body', - 'ref-y': portY - }; - - attrs[portWireSelector] = { - y: portY - }; - - if (type === 'in') { - attrs[portSelector]['ref-x'] = -16; - attrs[portWireSelector]['d'] = 'M 0 0 L 32 0'; + if ((type === 'leftPorts') || (type === 'topPorts')) { attrs[portSelector]['pointer-events'] = 'none'; attrs[portWireSelector]['pointer-events'] = 'none'; } - else { - attrs[portSelector]['ref-dx'] = 16; - attrs[portWireSelector]['d'] = 'M 0 0 L -32 0'; + + var gridUnits = 8; + var pos = Math.round((index + 0.5) / total * gridUnits) / gridUnits; + + switch (type) { + case 'left': + attrs[portSelector]['ref-x'] = -16; + attrs[portSelector]['ref-y'] = pos; + attrs[portLabelSelector]['dx'] = 10; + attrs[portLabelSelector]['y'] = -10; + attrs[portLabelSelector]['text-anchor'] = 'end'; + attrs[portWireSelector]['y'] = pos; + attrs[portWireSelector]['d'] = 'M 0 0 L 32 0'; + break; + case 'right': + attrs[portSelector]['ref-dx'] = 16; + attrs[portSelector]['ref-y'] = pos; + attrs[portLabelSelector]['dx'] = -10; + attrs[portLabelSelector]['y'] = -10; + attrs[portLabelSelector]['text-anchor'] = 'start'; + attrs[portWireSelector]['y'] = pos; + attrs[portWireSelector]['d'] = 'M 0 0 L -32 0'; + break; + case 'top': + attrs[portSelector]['ref-y'] = -16; + attrs[portSelector]['ref-x'] = pos; + attrs[portLabelSelector]['dx'] = 10; + attrs[portLabelSelector]['dy'] = 0; + attrs[portLabelSelector]['text-anchor'] = 'start'; + attrs[portWireSelector]['x'] = pos; + attrs[portWireSelector]['d'] = 'M 0 0 L 0 32'; + break; + case 'bottom': + attrs[portSelector]['ref-dy'] = 16; + attrs[portSelector]['ref-x'] = pos; + attrs[portLabelSelector]['dx'] = 10; + attrs[portLabelSelector]['y'] = 0; + attrs[portLabelSelector]['text-anchor'] = 'start'; + attrs[portWireSelector]['x'] = pos; + attrs[portWireSelector]['d'] = 'M 0 0 L 0 -32'; + break; } return attrs; } -})); +}); joint.shapes.ice.ModelView = joint.dia.ElementView.extend({ @@ -137,28 +196,40 @@ joint.shapes.ice.ModelView = joint.dia.ElementView.extend({ this.listenTo(this.model, 'process:ports', this.update); joint.dia.ElementView.prototype.initialize.apply(this, arguments); }, + render: function() { joint.dia.ElementView.prototype.render.apply(this, arguments); this.paper.$el.append(this.$box); this.updateBox(); return this; }, + renderPorts: function() { - var $inPorts = this.$('.inPorts').empty(); - var $outPorts = this.$('.outPorts').empty(); + var $leftPorts = this.$('.leftPorts').empty(); + var $rightPorts = this.$('.rightPorts').empty(); + var $topPorts = this.$('.topPorts').empty(); + var $bottomPorts = this.$('.bottomPorts').empty(); var portTemplate = _.template(this.model.portMarkup); - _.each(_.filter(this.model.ports, function (p) { return p.type === 'in' }), function (port, index) { - $inPorts.append(V(portTemplate({ id: index, port: port })).node); + _.each(_.filter(this.model.ports, function (p) { return p.type === 'left' }), function (port, index) { + $leftPorts.append(V(portTemplate({ id: index, port: port })).node); + }); + _.each(_.filter(this.model.ports, function (p) { return p.type === 'right' }), function (port, index) { + $rightPorts.append(V(portTemplate({ id: index, port: port })).node); }); - _.each(_.filter(this.model.ports, function (p) { return p.type === 'out' }), function (port, index) { - $outPorts.append(V(portTemplate({ id: index, port: port })).node); + _.each(_.filter(this.model.ports, function (p) { return p.type === 'top' }), function (port, index) { + $topPorts.append(V(portTemplate({ id: index, port: port })).node); + }); + _.each(_.filter(this.model.ports, function (p) { return p.type === 'bottom' }), function (port, index) { + $bottomPorts.append(V(portTemplate({ id: index, port: port })).node); }); }, + update: function() { this.renderPorts(); joint.dia.ElementView.prototype.update.apply(this, arguments); }, + updateBox: function() { var bbox = this.model.getBBox(); var state = this.model.attributes.state; @@ -173,6 +244,7 @@ joint.shapes.ice.ModelView = joint.dia.ElementView.extend({ transform: 'scale(' + state.zoom + ')' }); }, + removeBox: function(evt) { this.$box.remove(); } @@ -221,10 +293,9 @@ joint.shapes.ice.Input = joint.shapes.ice.Model.extend({ defaults: joint.util.deepSupplement({ type: 'ice.Input', choices: [], - outPorts: [{ - id: "out", - label: "", - gridUnits: 8 + rightPorts: [{ + id: 'out', + label: '' }], size: { width: 96, @@ -237,10 +308,9 @@ joint.shapes.ice.Output = joint.shapes.ice.Model.extend({ defaults: joint.util.deepSupplement({ type: 'ice.Output', choices: [], - inPorts: [{ - id: "in", - label: "", - gridUnits: 8 + leftPorts: [{ + id: 'in', + label: '' }], size: { width: 96, @@ -318,10 +388,9 @@ joint.shapes.ice.OutputView = joint.shapes.ice.IOView; joint.shapes.ice.Constant = joint.shapes.ice.Model.extend({ defaults: joint.util.deepSupplement({ type: 'ice.Constant', - outPorts: [{ - id: "out", - label: "", - gridUnits: 8 + bottomPorts: [{ + id: 'out', + label: '' }], size: { width: 96, diff --git a/app/scripts/services/graph.service.js b/app/scripts/services/graph.service.js index 259c1bb2c..75ffd9c19 100644 --- a/app/scripts/services/graph.service.js +++ b/app/scripts/services/graph.service.js @@ -477,7 +477,7 @@ angular.module('icestudio') blockInstance.data.ports.out.push(outPorts[o]); } blockInstance.position.x = 31 * gridsize; - blockInstance.position.y = 18 * gridsize; + blockInstance.position.y = 20 * gridsize; if (block) { blockInstance.data.code = block.data.code; @@ -834,11 +834,11 @@ angular.module('icestudio') }; function addBasicCodeBlock(blockInstances, disabled) { - var inPorts = []; - var outPorts = []; + var leftPorts = []; + var rightPorts = []; for (var i in blockInstances.data.ports.in) { - inPorts.push({ + leftPorts.push({ id: blockInstances.data.ports.in[i], label: blockInstances.data.ports.in[i], gridUnits: 32 @@ -846,7 +846,7 @@ angular.module('icestudio') } for (var o in blockInstances.data.ports.out) { - outPorts.push({ + rightPorts.push({ id: blockInstances.data.ports.out[o], label: blockInstances.data.ports.out[o], gridUnits: 32 @@ -859,8 +859,8 @@ angular.module('icestudio') data: blockInstances.data, position: blockInstances.position, disabled: disabled, - inPorts: inPorts, - outPorts: outPorts + leftPorts: leftPorts, + rightPorts: rightPorts }); addCell(cell); @@ -881,35 +881,35 @@ angular.module('icestudio') }; function addGenericBlock(blockInstance, block) { - var inPorts = []; - var outPorts = []; + var leftPorts = []; + var rightPorts = []; for (var i in block.graph.blocks) { var item = block.graph.blocks[i]; if (item.type == 'basic.input') { - inPorts.push({ + leftPorts.push({ id: item.id, label: item.data.label }); } else if (item.type == 'basic.output') { - outPorts.push({ + rightPorts.push({ id: item.id, label: item.data.label }); } } - var numPorts = Math.max(inPorts.length, outPorts.length); + var numPorts = Math.max(leftPorts.length, rightPorts.length); var height = Math.max(4 * gridsize * numPorts, 8 * gridsize); var gridUnits = height / gridsize; - for (var i in inPorts) { - inPorts[i].gridUnits = gridUnits; + for (var i in leftPorts) { + leftPorts[i].gridUnits = gridUnits; } - for (var o in outPorts) { - outPorts[o].gridUnits = gridUnits; + for (var o in rightPorts) { + rightPorts[o].gridUnits = gridUnits; } @@ -934,8 +934,8 @@ angular.module('icestudio') image: blockImage, label: blockLabel, position: blockInstance.position, - inPorts: inPorts, - outPorts: outPorts, + leftPorts: leftPorts, + rightPorts: rightPorts, size: { width: width, height: height @@ -957,14 +957,14 @@ angular.module('icestudio') // Find selectors var sourceSelector, targetSelector; - for (var _out = 0; _out < source.attributes.outPorts.length; _out++) { - if (source.attributes.outPorts[_out] == wire.source.port) { + for (var _out = 0; _out < source.attributes.rightPorts.length; _out++) { + if (source.attributes.rightPorts[_out] == wire.source.port) { sourcePort = _out; break; } } - for (var _in = 0; _in < source.attributes.inPorts.length; _in++) { - if (target.attributes.inPorts[_in] == wire.target.port) { + for (var _in = 0; _in < source.attributes.leftPorts.length; _in++) { + if (target.attributes.leftPorts[_in] == wire.target.port) { targetPort = _in; break; } From b478e84c54c71a24045ba6f783966d378d8f6ca0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jes=C3=BAs=20Arroyo=20Torrens?= Date: Wed, 7 Dec 2016 09:39:28 +0100 Subject: [PATCH 010/169] Add parameters in code blocks --- app/scripts/plugins/shapes/joint.shapes.js | 7 +++--- app/scripts/services/common.service.js | 3 ++- app/scripts/services/graph.service.js | 29 +++++++++++++++++++--- app/views/menu.html | 2 +- 4 files changed, 32 insertions(+), 9 deletions(-) diff --git a/app/scripts/plugins/shapes/joint.shapes.js b/app/scripts/plugins/shapes/joint.shapes.js index d231a83b0..f02e91d14 100644 --- a/app/scripts/plugins/shapes/joint.shapes.js +++ b/app/scripts/plugins/shapes/joint.shapes.js @@ -415,7 +415,7 @@ joint.shapes.ice.ConstantView = joint.shapes.ice.ModelView.extend({ // Prevent paper from handling pointerdown. this.$box.find('.constant-input').on('mousedown click', function(evt) { evt.stopPropagation(); }); - this.$box.find('.constant-input').on('change', _.bind(function(evt) { + this.$box.find('.constant-input').on('input', _.bind(function(evt) { this.model.attributes.data.value = $(evt.target).val(); }, this)); }, @@ -444,17 +444,18 @@ joint.shapes.ice.ConstantView = joint.shapes.ice.ModelView.extend({ // Code block +// Size: 64 * x joint.shapes.ice.Code = joint.shapes.ice.Model.extend({ defaults: joint.util.deepSupplement({ type: 'ice.Code', size: { - width: 400, + width: 384, height: 256 }, attrs: { '.body': { - width: 400, + width: 384, height: 256 } } diff --git a/app/scripts/services/common.service.js b/app/scripts/services/common.service.js index b9a201263..dfe18f33b 100644 --- a/app/scripts/services/common.service.js +++ b/app/scripts/services/common.service.js @@ -237,7 +237,8 @@ angular.module('icestudio') cell.type == 'ice.Input' || cell.type == 'ice.Output' || cell.type == 'ice.Code' || - cell.type == 'ice.Info') { + cell.type == 'ice.Info' || + cell.type == 'ice.Constant') { var block = {}; block.id = cell.id; block.type = cell.blockType; diff --git a/app/scripts/services/graph.service.js b/app/scripts/services/graph.service.js index 75ffd9c19..c37d67537 100644 --- a/app/scripts/services/graph.service.js +++ b/app/scripts/services/graph.service.js @@ -449,24 +449,31 @@ angular.module('icestudio') if (type == 'basic.code') { utils.multiprompt( [ gettextCatalog.getString('Enter the input ports'), - gettextCatalog.getString('Enter the output ports') ], + gettextCatalog.getString('Enter the output ports'), + gettextCatalog.getString('Enter the parameters') ], [ ' a , b ', - ' c , d ' ], + ' c , d ', + '' ], function(evt, ports) { if (ports && (ports[0].length || ports[1].length)) { blockInstance.data = { code: '', + params: [], ports: { in: [], out: [] } }; // Parse ports var inPorts = []; var outPorts = []; + var params = []; if (ports.length > 0) { inPorts = ports[0].replace(/ /g, '').split(','); } if (ports.length > 1) { outPorts = ports[1].replace(/ /g, '').split(','); } + if (ports.length > 2) { + params = ports[2].replace(/ /g, '').split(','); + } for (var i in inPorts) { if (inPorts[i]) @@ -476,8 +483,12 @@ angular.module('icestudio') if (outPorts[o]) blockInstance.data.ports.out.push(outPorts[o]); } + for (var p in params) { + if (params[p]) + blockInstance.data.params.push(params[p]); + } blockInstance.position.x = 31 * gridsize; - blockInstance.position.y = 20 * gridsize; + blockInstance.position.y = 24 * gridsize; if (block) { blockInstance.data.code = block.data.code; @@ -836,6 +847,7 @@ angular.module('icestudio') function addBasicCodeBlock(blockInstances, disabled) { var leftPorts = []; var rightPorts = []; + var topPorts = []; for (var i in blockInstances.data.ports.in) { leftPorts.push({ @@ -853,6 +865,14 @@ angular.module('icestudio') }); } + for (var p in blockInstances.data.params) { + topPorts.push({ + id: blockInstances.data.params[p], + label: blockInstances.data.params[p], + gridUnits: 32 + }); + } + var cell = new joint.shapes.ice.Code({ id: blockInstances.id, blockType: blockInstances.type, @@ -860,7 +880,8 @@ angular.module('icestudio') position: blockInstances.position, disabled: disabled, leftPorts: leftPorts, - rightPorts: rightPorts + rightPorts: rightPorts, + topPorts: topPorts }); addCell(cell); diff --git a/app/views/menu.html b/app/views/menu.html index a80198e72..d68d985e6 100644 --- a/app/views/menu.html +++ b/app/views/menu.html @@ -287,9 +287,9 @@
  • {{ 'Input' | translate }} {{ 'Output' | translate }} - {{ 'Constant' | translate }} {{ 'Code' | translate }} {{ 'Info' | translate }} + {{ 'Constant' | translate }}
    • From c21799eabbb5a7bca1781d9ff19c895cceb2d509 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jes=C3=BAs=20Arroyo=20Torrens?= Date: Wed, 7 Dec 2016 12:01:02 +0100 Subject: [PATCH 011/169] Add constant module parameters to the compiler --- app/scripts/plugins/shapes/joint.shapes.js | 2 +- app/scripts/services/compiler.service.js | 662 ++++++++++++--------- 2 files changed, 366 insertions(+), 298 deletions(-) diff --git a/app/scripts/plugins/shapes/joint.shapes.js b/app/scripts/plugins/shapes/joint.shapes.js index f02e91d14..4a3e14e9a 100644 --- a/app/scripts/plugins/shapes/joint.shapes.js +++ b/app/scripts/plugins/shapes/joint.shapes.js @@ -389,7 +389,7 @@ joint.shapes.ice.Constant = joint.shapes.ice.Model.extend({ defaults: joint.util.deepSupplement({ type: 'ice.Constant', bottomPorts: [{ - id: 'out', + id: 'constant-out', label: '' }], size: { diff --git a/app/scripts/services/compiler.service.js b/app/scripts/services/compiler.service.js index 9e1a4a565..1b7b22312 100644 --- a/app/scripts/services/compiler.service.js +++ b/app/scripts/services/compiler.service.js @@ -1,394 +1,462 @@ 'use strict'; angular.module('icestudio') - .service('compiler', ['nodeSha1', '_package', - function(nodeSha1, _package) { - - this.generateVerilog = function(project) { - var code = header('//'); - code += '`default_nettype none\n\n'; - code += verilogCompiler('main', project); - return code; - }; + .service('compiler', ['nodeSha1', '_package', + function(nodeSha1, _package) { + + this.generateVerilog = function(project) { + var code = header('//'); + code += '`default_nettype none\n\n'; + code += verilogCompiler('main', project); + return code; + }; + + this.generatePCF = function(project) { + var code = header('#'); + code += pcfCompiler(project); + return code; + }; + + this.generateTestbench = function(project) { + var code = header('//'); + code += testbenchCompiler(project); + return code; + }; + + this.generateGTKWave = function(project) { + var code = header('[*]'); + code += gtkwaveCompiler(project); + return code; + }; + + function header(comment) { + var header = ''; + var date = new Date(); + header += comment + ' Code generated by Icestudio ' + _package.version + '\n'; + header += comment + ' ' + date.toUTCString() + '\n'; + header += '\n'; + return header; + } + + function digestId(id, force) { + if (id.indexOf('-') != -1) { + return 'v' + nodeSha1(id).toString().substring(0, 6); + } + else { + return id.replace('.', '_'); + } + } - this.generatePCF = function(project) { - var code = header('#'); - code += pcfCompiler(project); - return code; - }; + function module(data) { + var code = ''; - this.generateTestbench = function(project) { - var code = header('//'); - code += testbenchCompiler(project); - return code; - }; + if (data && data.name && data.ports) { - this.generateGTKWave = function(project) { - var code = header('[*]'); - code += gtkwaveCompiler(project); - return code; - }; + // Header - function header(comment) { - var header = ''; - var date = new Date(); - header += comment + ' Code generated by Icestudio ' + _package.version + '\n'; - header += comment + ' ' + date.toUTCString() + '\n'; - header += '\n'; - return header; - } + code += 'module ' + data.name; - function digestId(id, force) { - if (id.indexOf('-') != -1) { - return 'v' + nodeSha1(id).toString().substring(0, 6); - } - else { - return id.replace('.', '_'); - } - } + //-- Parameters - function module(data) { - var code = ''; + if (data.params) { - if (data && - data.name && - data.ports) { + var params = []; + for (var p in data.params) { + params.push(' parameter ' + data.params[p] + '=0'); + } - // Header + code += ' #(\n'; + code += params.join(',\n'); + code += '\n)'; + } - code += 'module '; - code += data.name; - code += ' ('; + //-- Ports - var params = []; - var paramsSpace = 10 + data.name.length; + var ports = []; + for (var i in data.ports.in) { + ports.push(' input ' + data.ports.in[i]); + } + for (var o in data.ports.out) { + ports.push(' output ' + data.ports.out[o]); + } - for (var i in data.ports.in) { - params.push('input ' + data.ports.in[i]); - } - for (var o in data.ports.out) { - params.push('output ' + data.ports.out[o]); - } + code += ' (\n'; + code += ports.join(',\n'); + code += '\n);\n'; - code += params.join(',\n' + new Array(paramsSpace).join(' ')); + // Content - code += ');\n'; + if (data.content) { - // Content + var content = data.content.split('\n'); - if (data.content) { + content.forEach(function (element, index, array) { + array[index] = ' ' + element; + }); - var content = data.content.split('\n'); + code += content.join('\n'); + } - content.forEach(function (element, index, array) { - array[index] = ' ' + element; - }); + // Footer - code += content.join('\n'); - } + code += '\nendmodule\n\n'; + } + + return code; + } - // Footer + function getPorts(project) { + var ports = { + in: [], + out: [] + }; + var graph = project.graph; - code += '\nendmodule\n\n'; + for (var i in graph.blocks) { + var block = graph.blocks[i]; + if (block.type == 'basic.input') { + ports.in.push(digestId(block.id)); } + else if (block.type == 'basic.output') { + ports.out.push(digestId(block.id)); + } + } + + return ports; + } - return code; + function getContent(name, project) { + var content = []; + var graph = project.graph; + + // Wires + + for (var w in graph.wires) { + content.push('wire w' + w + ';'); } - function getPorts(project) { - var ports = { - in: [], - out: [] - }; - var graph = project.graph; + // I/O connections + for (var w in graph.wires) { + var wire = graph.wires[w]; for (var i in graph.blocks) { var block = graph.blocks[i]; if (block.type == 'basic.input') { - ports.in.push(digestId(block.id)); + if (wire.source.block == block.id) { + content.push('assign w' + w + ' = ' + digestId(block.id) + ';'); + } } else if (block.type == 'basic.output') { - ports.out.push(digestId(block.id)); + if (wire.target.block == block.id) { + content.push('assign ' + digestId(block.id) + ' = w' + w + ';'); + } } } - - return ports; } - function getContent(name, project) { - var content = ''; - var graph = project.graph; - - // Wires + // Wires Connections - for (var w in graph.wires) { - content += 'wire w' + w + ';\n' + var numWires = graph.wires.length; + for (var i = 1; i < numWires; i++) { + for (var j = 0; j < i; j++) { + var wi = graph.wires[i]; + var wj = graph.wires[j]; + if (wi.source.block == wj.source.block && + wi.source.port == wj.source.port) { + content.push('assign w' + i + ' = w' + j + ';'); + } } + } - // I/O connections + // Block instances - for (var w in graph.wires) { - var wire = graph.wires[w]; - for (var i in graph.blocks) { - var block = graph.blocks[i]; - if (block.type == 'basic.input') { - if (wire.source.block == block.id) { - content += 'assign w' + w + ' = ' + digestId(block.id) + ';\n'; - } - } - else if (block.type == 'basic.output') { - if (wire.target.block == block.id) { - content += 'assign ' + digestId(block.id) + ' = w' + w + ';\n'; - } - } - } - } + content = content.concat(getInstances(name, project.graph)); - // Wires Connections + return content.join('\n'); + } - var numWires = graph.wires.length; - for (var i = 1; i < numWires; i++) { - for (var j = 0; j < i; j++) { - var wi = graph.wires[i]; - var wj = graph.wires[j]; - if (wi.source.block == wj.source.block && - wi.source.port == wj.source.port) { - content += 'assign w' + i + ' = w' + j + ';\n'; - } - } - } + function getInstances(name, graph) { + var instances = []; + var blocks = graph.blocks; + var allWires = graph.wires; - // Block instances + for (var b in blocks) { + var instance = ''; + var block = blocks[b]; - var instances = [] - for (var b in graph.blocks) { - var block = graph.blocks[b]; - if (block.type != 'basic.input' && - block.type != 'basic.output' && - block.type != 'basic.info') { + if (block.type != 'basic.input' && + block.type != 'basic.output' && + block.type != 'basic.constant' && + block.type != 'basic.info') { - var id = digestId(block.type, true); - if (block.type == 'basic.code') { - id += '_' + digestId(block.id); - } - instances.push(name + '_' + digestId(id) + ' ' + digestId(block.id) + ' ('); + // Header - // Parameters + var id = digestId(block.type, true); + if (block.type == 'basic.code') { + id += '_' + digestId(block.id); + } + instance += name + '_' + digestId(id); + + //-- Parameters + + if (block.data.params) { var params = []; - var paramsNames = []; - for (var w in graph.wires) { - var param = ''; - var paramName = ''; - var wire = graph.wires[w]; - if (block.id == wire.source.block) { - paramName = digestId(wire.source.port); - } - else if (block.id == wire.target.block) { - paramName = digestId(wire.target.port); - } - if (paramName && paramsNames.indexOf(paramName) == -1) { - paramsNames.push(paramName); - param += ' .' + paramName; - param += '(w' + w + ')'; - params.push(param); + for (var p in block.data.params) { + var paramName = block.data.params[p]; + for (var w in allWires) { + var wire = allWires[w]; + if ((block.id == wire.target.block) && + (paramName == wire.target.port)) { + var constantBlock = findBlock(wire.source.block, graph); + var paramValue = constantBlock.data.value; + if (paramValue) { + var param = ''; + param += ' .' + paramName; + param += '(' + paramValue + ')'; + params.push(param); + } + break; + } } } - instances.push(params.join(',\n') + '\n);'); + instance += ' #(\n' + params.join(',\n') + '\n)'; } - } - content += instances.join('\n'); - return content; - } + //-- Instance name - function verilogCompiler(name, project) { - var code = ''; + instance += ' ' + digestId(block.id); - if (project && - project.graph) { + //-- Ports - // Scape dot in name + var ports = []; + var portsNames = []; + for (var w in graph.wires) { + var portName = ''; + var isConstant = false; + var wire = graph.wires[w]; + if (block.id == wire.source.block) { + portName = digestId(wire.source.port); + } + else if (block.id == wire.target.block) { + portName = digestId(wire.target.port); + isConstant = wire.source.port == 'constant-out'; + } + if (portName && !isConstant && + portsNames.indexOf(portName) == -1) { + portsNames.push(portName); + var port = ''; + port += ' .' + portName; + port += '(w' + w + ')'; + ports.push(port); + } + } - name = digestId(name); + instance += ' (\n' + ports.join(',\n') + '\n);'; + } - // Main module + if (instance) + instances.push(instance); + } + return instances; + } - if (name) { - var data = { - name: name, - ports: getPorts(project), - content: getContent(name, project) - }; - code += module(data); - } + function findBlock(id, graph) { + for (var b in graph.blocks) { + if (graph.blocks[b].id == id) + return graph.blocks[b]; + } + return null; + } - // Dependencies modules + function verilogCompiler(name, project) { + var code = ''; - for (var d in project.deps) { - code += verilogCompiler(name + '_' + digestId(d, true), project.deps[d]); - } + if (project && + project.graph) { - // Code modules + // Scape dot in name - for (var i in project.graph.blocks) { - var block = project.graph.blocks[i]; - if (block) { - if (block.type == 'basic.code') { - var data = { - name: name + '_' + digestId(block.type, true) + '_' + digestId(block.id), - ports: block.data.ports, - content: block.data.code - } - code += module(data); - } - } - } + name = digestId(name); + + // Main module + + if (name) { + var data = { + name: name, + ports: getPorts(project), + content: getContent(name, project) + }; + code += module(data); } - return code; - } + // Dependencies modules + + for (var d in project.deps) { + code += verilogCompiler(name + '_' + digestId(d, true), project.deps[d]); + } - function pcfCompiler(project) { - var code = ''; + // Code modules for (var i in project.graph.blocks) { var block = project.graph.blocks[i]; - if (block.type == 'basic.input' || - block.type == 'basic.output') { - code += 'set_io '; - code += digestId(block.id); - code += ' '; - code += block.data.pin.value; - code += '\n'; + if (block) { + if (block.type == 'basic.code') { + var data = { + name: name + '_' + digestId(block.type, true) + '_' + digestId(block.id), + params: block.data.params, + ports: block.data.ports, + content: block.data.code + } + code += module(data); + } } } + } - return code; + return code; + } + + function pcfCompiler(project) { + var code = ''; + + for (var i in project.graph.blocks) { + var block = project.graph.blocks[i]; + if (block.type == 'basic.input' || + block.type == 'basic.output') { + code += 'set_io '; + code += digestId(block.id); + code += ' '; + code += block.data.pin.value; + code += '\n'; + } } - function testbenchCompiler(project) { - var code = ''; + return code; + } - code += '// Testbench template\n\n' + function testbenchCompiler(project) { + var code = ''; - code += '`default_nettype none\n'; - code += '`define DUMPSTR(x) `"x.vcd`"\n'; - code += '`timescale 10 ns / 1 ns\n\n'; + code += '// Testbench template\n\n' - var ports = { in: [], out: [] }; - var content = '\n'; + code += '`default_nettype none\n'; + code += '`define DUMPSTR(x) `"x.vcd`"\n'; + code += '`timescale 10 ns / 1 ns\n\n'; - content += '// Simulation time: 100ns (10 * 10ns)\n'; - content += 'parameter DURATION = 10;\n\n'; + var ports = { in: [], out: [] }; + var content = '\n'; - var io = mainIO(project); - var input = io[0]; - var output = io[1]; + content += '// Simulation time: 100ns (10 * 10ns)\n'; + content += 'parameter DURATION = 10;\n\n'; - // Input/Output - content += '// Input/Output\n'; - for (var i in input) { - content += 'reg ' + input[i].label + ';\n'; - } - for (var o in output) { - content += 'wire ' + output[o].label + ';\n'; - } + var io = mainIO(project); + var input = io[0]; + var output = io[1]; - var wires = input.concat(output); + // Input/Output + content += '// Input/Output\n'; + for (var i in input) { + content += 'reg ' + input[i].label + ';\n'; + } + for (var o in output) { + content += 'wire ' + output[o].label + ';\n'; + } - // Module instance - content += '\n// Module instance\n'; - content += 'main MAIN (\n'; - var connections = []; - for (var w in wires) { - connections.push(' .' + wires[w].id + '(' + wires[w].label + ')'); - } - content += connections.join(',\n'); - content += '\n);\n'; - - // Clock signal - var hasClk = false; - for (var i in input) { - if (input[i].label.toLowerCase() == 'input_clk') { - hasClk = true; - break; - } - } - if (hasClk) { - content += '\n// Clock signal\n'; - content += 'always #0.5 input_clk = ~input_clk;\n'; - } + var wires = input.concat(output); - content += '\ninitial begin\n'; - content += ' // File were to store the simulation results\n'; - content += ' $dumpfile(`DUMPSTR(`VCD_OUTPUT));\n'; - content += ' $dumpvars(0, main_tb);\n\n'; - content += ' // TODO: initialize the registers here\n'; - content += ' // e.g. input_value = 1;\n'; - content += ' // e.g. #2 input_value = 0;\n'; - for (var i in input) { - content += ' ' + input[i].label + ' = 0;\n'; + // Module instance + content += '\n// Module instance\n'; + content += 'main MAIN (\n'; + var connections = []; + for (var w in wires) { + connections.push(' .' + wires[w].id + '(' + wires[w].label + ')'); + } + content += connections.join(',\n'); + content += '\n);\n'; + + // Clock signal + var hasClk = false; + for (var i in input) { + if (input[i].label.toLowerCase() == 'input_clk') { + hasClk = true; + break; } - content += '\n'; - content += ' #(DURATION) $display("End of simulation");\n'; - content += ' $finish;\n'; - content += 'end\n'; - - var data = { - name: 'main_tb', - ports: ports, - content: content - }; - code += module(data); - - return code; } + if (hasClk) { + content += '\n// Clock signal\n'; + content += 'always #0.5 input_clk = ~input_clk;\n'; + } + + content += '\ninitial begin\n'; + content += ' // File were to store the simulation results\n'; + content += ' $dumpfile(`DUMPSTR(`VCD_OUTPUT));\n'; + content += ' $dumpvars(0, main_tb);\n\n'; + content += ' // TODO: initialize the registers here\n'; + content += ' // e.g. input_value = 1;\n'; + content += ' // e.g. #2 input_value = 0;\n'; + for (var i in input) { + content += ' ' + input[i].label + ' = 0;\n'; + } + content += '\n'; + content += ' #(DURATION) $display("End of simulation");\n'; + content += ' $finish;\n'; + content += 'end\n'; + + var data = { + name: 'main_tb', + ports: ports, + content: content + }; + code += module(data); - function gtkwaveCompiler(project) { - var code = ''; + return code; + } - var io = mainIO(project); - var input = io[0]; - var output = io[1]; + function gtkwaveCompiler(project) { + var code = ''; - var wires = input.concat(output); - for (var w in wires) { - code += 'main_tb.' + wires[w].label + '\n'; - } + var io = mainIO(project); + var input = io[0]; + var output = io[1]; - return code; + var wires = input.concat(output); + for (var w in wires) { + code += 'main_tb.' + wires[w].label + '\n'; } - function mainIO(project) { - var input = []; - var output = []; - var input_unnamed = 0; - var output_unnamed = 0; - for (var i in project.graph.blocks) { - var block = project.graph.blocks[i]; - if (block.type == 'basic.input') { - if (block.data.label) { - input.push({ id: digestId(block.id), label: 'input_' + block.data.label.replace(' ', '_') }); - } - else { - input.push({ id: digestId(block.id), label: 'input_' + input_unnamed.toString() }); - input_unnamed += 1; - } + return code; + } + + function mainIO(project) { + var input = []; + var output = []; + var input_unnamed = 0; + var output_unnamed = 0; + for (var i in project.graph.blocks) { + var block = project.graph.blocks[i]; + if (block.type == 'basic.input') { + if (block.data.label) { + input.push({ id: digestId(block.id), label: 'input_' + block.data.label.replace(' ', '_') }); } - else if (block.type == 'basic.output') { - if (block.data.label) { - output.push({ id: digestId(block.id), label: 'output_' + block.data.label.replace(' ', '_') }); - } - else { - output.push({ id: digestId(block.id), label: 'output_' + output_unnamed.toString() }); - output_unnamed += 1; - } + else { + input.push({ id: digestId(block.id), label: 'input_' + input_unnamed.toString() }); + input_unnamed += 1; + } + } + else if (block.type == 'basic.output') { + if (block.data.label) { + output.push({ id: digestId(block.id), label: 'output_' + block.data.label.replace(' ', '_') }); + } + else { + output.push({ id: digestId(block.id), label: 'output_' + output_unnamed.toString() }); + output_unnamed += 1; } } - - return [input, output]; } - }]); + return [input, output]; + } + + }]); From 9457848b850a4687ac8551ad667845be3d30c328 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jes=C3=BAs=20Arroyo=20Torrens?= Date: Wed, 7 Dec 2016 17:45:23 +0100 Subject: [PATCH 012/169] Export block with parameters --- app/scripts/plugins/shapes/joint.shapes.js | 18 +++++----- app/scripts/services/compiler.service.js | 15 ++++++++ app/scripts/services/graph.service.js | 42 ++++++++++++++++------ 3 files changed, 56 insertions(+), 19 deletions(-) diff --git a/app/scripts/plugins/shapes/joint.shapes.js b/app/scripts/plugins/shapes/joint.shapes.js index 4a3e14e9a..e6f1ef72f 100644 --- a/app/scripts/plugins/shapes/joint.shapes.js +++ b/app/scripts/plugins/shapes/joint.shapes.js @@ -132,8 +132,7 @@ joint.shapes.ice.Model = joint.shapes.basic.Generic.extend({ attrs[portWireSelector]['pointer-events'] = 'none'; } - var gridUnits = 8; - var pos = Math.round((index + 0.5) / total * gridUnits) / gridUnits; + var pos = Math.round((index + 0.5) / total * port.gridUnits) / port.gridUnits; switch (type) { case 'left': @@ -295,7 +294,8 @@ joint.shapes.ice.Input = joint.shapes.ice.Model.extend({ choices: [], rightPorts: [{ id: 'out', - label: '' + label: '', + gridUnits: 8 }], size: { width: 96, @@ -310,7 +310,8 @@ joint.shapes.ice.Output = joint.shapes.ice.Model.extend({ choices: [], leftPorts: [{ id: 'in', - label: '' + label: '', + gridUnits: 8 }], size: { width: 96, @@ -390,7 +391,8 @@ joint.shapes.ice.Constant = joint.shapes.ice.Model.extend({ type: 'ice.Constant', bottomPorts: [{ id: 'constant-out', - label: '' + label: '', + gridUnits: 8 }], size: { width: 96, @@ -425,11 +427,9 @@ joint.shapes.ice.ConstantView = joint.shapes.ice.ModelView.extend({ }, renderValue: function() { if (this.model.get('disabled')) { - this.$box.find('.constant-input').css({'display': 'none'}); - } - else { - this.$box.find('.constant-input').val(this.model.get('data').value); + this.$box.find('.constant-input').css({'pointer-events': 'none'}); } + this.$box.find('.constant-input').val(this.model.get('data').value); }, clearValue: function () { this.$box.find('.constant-input').val(''); diff --git a/app/scripts/services/compiler.service.js b/app/scripts/services/compiler.service.js index 1b7b22312..45f04bcef 100644 --- a/app/scripts/services/compiler.service.js +++ b/app/scripts/services/compiler.service.js @@ -105,6 +105,20 @@ angular.module('icestudio') return code; } + function getParams(project) { + var params = []; + var graph = project.graph; + + for (var i in graph.blocks) { + var block = graph.blocks[i]; + if (block.type == 'basic.constant') { + params.push(digestId(block.id)); + } + } + + return params; + } + function getPorts(project) { var ports = { in: [], @@ -285,6 +299,7 @@ angular.module('icestudio') if (name) { var data = { name: name, + params: getParams(project), ports: getPorts(project), content: getContent(name, project) }; diff --git a/app/scripts/services/graph.service.js b/app/scripts/services/graph.service.js index c37d67537..93bfbacde 100644 --- a/app/scripts/services/graph.service.js +++ b/app/scripts/services/graph.service.js @@ -869,7 +869,7 @@ angular.module('icestudio') topPorts.push({ id: blockInstances.data.params[p], label: blockInstances.data.params[p], - gridUnits: 32 + gridUnits: 48 }); } @@ -904,6 +904,8 @@ angular.module('icestudio') function addGenericBlock(blockInstance, block) { var leftPorts = []; var rightPorts = []; + var topPorts = []; + var bottomPorts = []; for (var i in block.graph.blocks) { var item = block.graph.blocks[i]; @@ -919,23 +921,42 @@ angular.module('icestudio') label: item.data.label }); } + else if (item.type == 'basic.constant') { + topPorts.push({ + id: item.id, + label: item.data.label + }); + } } - var numPorts = Math.max(leftPorts.length, rightPorts.length); - var height = Math.max(4 * gridsize * numPorts, 8 * gridsize); + var numPortsHeight = Math.max(leftPorts.length, rightPorts.length); + var numPortsWidth = Math.max(topPorts.length, bottomPorts.length); - var gridUnits = height / gridsize; + var height = 8 * gridsize; + height = Math.max(4 * gridsize * numPortsHeight, height); + var blockLabel = blockInstance.type.toUpperCase(); + var width = 12 * gridsize; + if (blockLabel.length > 4) { + width = Math.min((blockLabel.length + 8) * gridsize, 24 * gridsize); + } + width = Math.max(4 * gridsize * numPortsWidth, width); + + var gridUnitsHeight = height / gridsize; + var gridUnitsWidth = width / gridsize; for (var i in leftPorts) { - leftPorts[i].gridUnits = gridUnits; + leftPorts[i].gridUnits = gridUnitsHeight; } - for (var o in rightPorts) { - rightPorts[o].gridUnits = gridUnits; + for (var i in rightPorts) { + rightPorts[i].gridUnits = gridUnitsHeight; + } + for (var i in topPorts) { + topPorts[i].gridUnits = gridUnitsWidth; + } + for (var i in bottomPorts) { + bottomPorts[i].gridUnits = gridUnitsWidth; } - - var blockLabel = blockInstance.type.toUpperCase(); - var width = Math.min((blockLabel.length + 8) * gridsize, 24 * gridsize); if (blockInstance.type.indexOf('.') != -1) { blockLabel = blockInstance.type.split('.').join(' '); } @@ -957,6 +978,7 @@ angular.module('icestudio') position: blockInstance.position, leftPorts: leftPorts, rightPorts: rightPorts, + topPorts: topPorts, size: { width: width, height: height From 23138d937c423ae1618f88af4fa1fa3c8d46b856 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jes=C3=BAs=20Arroyo=20Torrens?= Date: Wed, 7 Dec 2016 18:36:05 +0100 Subject: [PATCH 013/169] Load code block status to multiprompt --- app/scripts/services/graph.service.js | 18 ++++++++++++++---- app/scripts/services/utils.service.js | 9 ++++++++- 2 files changed, 22 insertions(+), 5 deletions(-) diff --git a/app/scripts/services/graph.service.js b/app/scripts/services/graph.service.js index 93bfbacde..038f6a5d0 100644 --- a/app/scripts/services/graph.service.js +++ b/app/scripts/services/graph.service.js @@ -317,7 +317,9 @@ angular.module('icestudio') if (paper.options.enabled) { var block = { data: { - code: self.getContent(cellView.model.id) + code: self.getContent(cellView.model.id), + params: data.data.params, + ports: data.data.ports }, position: cellView.model.attributes.position }; @@ -447,13 +449,21 @@ angular.module('icestudio') }; if (type == 'basic.code') { + var defaultValues = [ + ' a , b ', + ' c , d ', + '' + ]; + if (block && block.data) { + defaultValues[0] = ' ' + block.data.ports.in.join(' , ') + ' '; + defaultValues[1] = ' ' + block.data.ports.out.join(' , ') + ' '; + defaultValues[2] = ' ' + block.data.params.join(' , ') + ' '; + } utils.multiprompt( [ gettextCatalog.getString('Enter the input ports'), gettextCatalog.getString('Enter the output ports'), gettextCatalog.getString('Enter the parameters') ], - [ ' a , b ', - ' c , d ', - '' ], + defaultValues, function(evt, ports) { if (ports && (ports[0].length || ports[1].length)) { blockInstance.data = { diff --git a/app/scripts/services/utils.service.js b/app/scripts/services/utils.service.js index 4b83d2ca3..886d2d3ef 100644 --- a/app/scripts/services/utils.service.js +++ b/app/scripts/services/utils.service.js @@ -585,13 +585,20 @@ angular.module('icestudio') } content.push(''); - alertify.confirm(content.join('\n')).set('onok', function(evt) { + alertify.confirm(content.join('\n')) + .set('onok', function(evt) { var values = []; for (var i = 0; i < n; i++) { values.push($('#input' + i.toString()).val()); } if (callback) callback(evt, values); + }) + .set('oncancel', function(evt) { + // Restore previous values + for (var i = 0; i < n; i++) { + $('#input' + i.toString()).val(values[i]); + } }); } From 51b898beb829c9b8508868ba1f80effed5e8313e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jes=C3=BAs=20Arroyo=20Torrens?= Date: Thu, 8 Dec 2016 09:42:22 +0100 Subject: [PATCH 014/169] Add nested parameters to the compiler --- app/scripts/services/compiler.service.js | 72 ++++++++++++++---------- 1 file changed, 42 insertions(+), 30 deletions(-) diff --git a/app/scripts/services/compiler.service.js b/app/scripts/services/compiler.service.js index 45f04bcef..229583651 100644 --- a/app/scripts/services/compiler.service.js +++ b/app/scripts/services/compiler.service.js @@ -58,13 +58,19 @@ angular.module('icestudio') //-- Parameters - if (data.params) { - - var params = []; - for (var p in data.params) { - params.push(' parameter ' + data.params[p] + '=0'); + var params = []; + for (var p in data.params) { + if (data.params[p] instanceof Object) { + // Generic block + params.push(' parameter ' + data.params[p].name + ' = ' + data.params[p].value); + } + else { + // Code block + params.push(' parameter ' + data.params[p] + ' = 0'); } + } + if (params.length > 0) { code += ' #(\n'; code += params.join(',\n'); code += '\n)'; @@ -80,9 +86,11 @@ angular.module('icestudio') ports.push(' output ' + data.ports.out[o]); } - code += ' (\n'; - code += ports.join(',\n'); - code += '\n);\n'; + if (ports.length > 0) { + code += ' (\n'; + code += ports.join(',\n'); + code += '\n);\n'; + } // Content @@ -112,7 +120,10 @@ angular.module('icestudio') for (var i in graph.blocks) { var block = graph.blocks[i]; if (block.type == 'basic.constant') { - params.push(digestId(block.id)); + params.push({ + name: digestId(block.id), + value: block.data.value + }); } } @@ -146,7 +157,9 @@ angular.module('icestudio') // Wires for (var w in graph.wires) { - content.push('wire w' + w + ';'); + if (graph.wires[w].source.port != 'constant-out') { + content.push('wire w' + w + ';'); + } } // I/O connections @@ -165,6 +178,7 @@ angular.module('icestudio') content.push('assign ' + digestId(block.id) + ' = w' + w + ';'); } } + // TODO: assign constant value } } @@ -213,28 +227,24 @@ angular.module('icestudio') //-- Parameters - if (block.data.params) { - - var params = []; - for (var p in block.data.params) { - var paramName = block.data.params[p]; - for (var w in allWires) { - var wire = allWires[w]; - if ((block.id == wire.target.block) && - (paramName == wire.target.port)) { - var constantBlock = findBlock(wire.source.block, graph); - var paramValue = constantBlock.data.value; - if (paramValue) { - var param = ''; - param += ' .' + paramName; - param += '(' + paramValue + ')'; - params.push(param); - } - break; - } + var params = []; + for (var w in graph.wires) { + var wire = graph.wires[w]; + if ((block.id == wire.target.block) && + (wire.source.port == 'constant-out')) { + var paramName = digestId(wire.target.port); + var constantBlock = findBlock(wire.source.block, graph); + var paramValue = digestId(constantBlock.id); + if (paramValue) { + var param = ''; + param += ' .' + paramName; + param += '(' + paramValue + ')'; + params.push(param); } } + } + if (params.length > 0) { instance += ' #(\n' + params.join(',\n') + '\n)'; } @@ -267,7 +277,9 @@ angular.module('icestudio') } } - instance += ' (\n' + ports.join(',\n') + '\n);'; + if (ports.length > 0) { + instance += ' (\n' + ports.join(',\n') + '\n);'; + } } if (instance) From 24e4bedacdb9267366e635646bcdc58c04e93921 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jes=C3=BAs=20Arroyo=20Torrens?= Date: Thu, 8 Dec 2016 15:22:23 +0100 Subject: [PATCH 015/169] Use localparam for Constant block wires --- app/scripts/services/compiler.service.js | 65 ++++++++++++++---------- 1 file changed, 39 insertions(+), 26 deletions(-) diff --git a/app/scripts/services/compiler.service.js b/app/scripts/services/compiler.service.js index 229583651..88b1aa8a0 100644 --- a/app/scripts/services/compiler.service.js +++ b/app/scripts/services/compiler.service.js @@ -6,7 +6,7 @@ angular.module('icestudio') this.generateVerilog = function(project) { var code = header('//'); - code += '`default_nettype none\n\n'; + code += '`default_nettype none\n'; code += verilogCompiler('main', project); return code; }; @@ -54,7 +54,7 @@ angular.module('icestudio') // Header - code += 'module ' + data.name; + code += '\nmodule ' + data.name; //-- Parameters @@ -62,7 +62,7 @@ angular.module('icestudio') for (var p in data.params) { if (data.params[p] instanceof Object) { // Generic block - params.push(' parameter ' + data.params[p].name + ' = ' + data.params[p].value); + params.push(' parameter ' + data.params[p].name + ' = ' + (data.params[p].value ? data.params[p].value : '0')); } else { // Code block @@ -107,7 +107,7 @@ angular.module('icestudio') // Footer - code += '\nendmodule\n\n'; + code += '\nendmodule\n'; } return code; @@ -153,35 +153,51 @@ angular.module('icestudio') function getContent(name, project) { var content = []; var graph = project.graph; - - // Wires - - for (var w in graph.wires) { - if (graph.wires[w].source.port != 'constant-out') { - content.push('wire w' + w + ';'); - } - } - - // I/O connections + var connections = { + localparam: [], + wire: [], + assign: [] + }; for (var w in graph.wires) { var wire = graph.wires[w]; + if (wire.source.port == 'constant-out') { + // Local Parameters + var constantBlock = findBlock(wire.source.block, graph); + var paramValue = digestId(constantBlock.id); + if (paramValue) { + connections.localparam.push('localparam p' + w + ' = ' + paramValue + ';'); + } + } + else { + // Wires + connections.wire.push('wire w' + w + ';'); + } + // Assignations for (var i in graph.blocks) { var block = graph.blocks[i]; if (block.type == 'basic.input') { if (wire.source.block == block.id) { - content.push('assign w' + w + ' = ' + digestId(block.id) + ';'); + connections.assign.push('assign w' + w + ' = ' + digestId(block.id) + ';'); } } else if (block.type == 'basic.output') { if (wire.target.block == block.id) { - content.push('assign ' + digestId(block.id) + ' = w' + w + ';'); + if (wire.source.port == 'constant-out') { + connections.assign.push('assign ' + digestId(block.id) + ' = p' + w + ';'); + } + else { + connections.assign.push('assign ' + digestId(block.id) + ' = w' + w + ';'); + } } } - // TODO: assign constant value } } + content = content.concat(connections.localparam); + content = content.concat(connections.wire); + content = content.concat(connections.assign); + // Wires Connections var numWires = graph.wires.length; @@ -190,7 +206,8 @@ angular.module('icestudio') var wi = graph.wires[i]; var wj = graph.wires[j]; if (wi.source.block == wj.source.block && - wi.source.port == wj.source.port) { + wi.source.port == wj.source.port && + wi.source.port != 'constant-out') { content.push('assign w' + i + ' = w' + j + ';'); } } @@ -233,14 +250,10 @@ angular.module('icestudio') if ((block.id == wire.target.block) && (wire.source.port == 'constant-out')) { var paramName = digestId(wire.target.port); - var constantBlock = findBlock(wire.source.block, graph); - var paramValue = digestId(constantBlock.id); - if (paramValue) { - var param = ''; - param += ' .' + paramName; - param += '(' + paramValue + ')'; - params.push(param); - } + var param = ''; + param += ' .' + paramName; + param += '(p' + w + ')'; + params.push(param); } } From a088036628c19858eb9ff6794823e8fc3824d912 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jes=C3=BAs=20Arroyo=20Torrens?= Date: Thu, 8 Dec 2016 15:26:29 +0100 Subject: [PATCH 016/169] Add demo projects --- .gitignore | 1 + demo/constant-code-block.ice | 85 ++++++++++ demo/constant-code-block.iceb | 80 ++++++++++ demo/constant-generic-block.ice | 155 ++++++++++++++++++ demo/constant-output.ice | 61 +++++++ demo/input-output.ice | 58 +++++++ demo/multi-block-block.ice | 219 ++++++++++++++++++++++++++ demo/multi-block-output.ice | 181 +++++++++++++++++++++ demo/multi-constant-generic-block.ice | 199 +++++++++++++++++++++++ demo/multi-input-output.ice | 83 ++++++++++ 10 files changed, 1122 insertions(+) create mode 100644 demo/constant-code-block.ice create mode 100644 demo/constant-code-block.iceb create mode 100644 demo/constant-generic-block.ice create mode 100644 demo/constant-output.ice create mode 100644 demo/input-output.ice create mode 100644 demo/multi-block-block.ice create mode 100644 demo/multi-block-output.ice create mode 100644 demo/multi-constant-generic-block.ice create mode 100644 demo/multi-input-output.ice diff --git a/.gitignore b/.gitignore index be82bc7d5..6a2245c1b 100644 --- a/.gitignore +++ b/.gitignore @@ -18,3 +18,4 @@ app/profile.json app/_cache app/_build app/resources/locale/**/*.json +demo/*.v diff --git a/demo/constant-code-block.ice b/demo/constant-code-block.ice new file mode 100644 index 000000000..ad9b38df3 --- /dev/null +++ b/demo/constant-code-block.ice @@ -0,0 +1,85 @@ +{ + "image": "", + "state": { + "pan": { + "x": 0, + "y": 0 + }, + "zoom": 0.9999999748467205 + }, + "board": "icezum", + "graph": { + "blocks": [ + { + "id": "386bc685-d806-4487-bece-b442b8c8689c", + "type": "basic.constant", + "data": { + "label": "C", + "value": "1'b0" + }, + "position": { + "x": 280, + "y": 48 + } + }, + { + "id": "94e9a915-defe-4437-8abd-d3e57dafbb45", + "type": "basic.output", + "data": { + "label": "led", + "pin": { + "name": "LED0", + "value": "95" + } + }, + "position": { + "x": 624, + "y": 288 + } + }, + { + "id": "b38fa7c5-3a2e-403b-b3d3-ac32917b5596", + "type": "basic.code", + "data": { + "code": "assign o = v;", + "params": [ + "v" + ], + "ports": { + "in": [], + "out": [ + "o" + ] + } + }, + "position": { + "x": 136, + "y": 192 + } + } + ], + "wires": [ + { + "source": { + "block": "386bc685-d806-4487-bece-b442b8c8689c", + "port": "constant-out" + }, + "target": { + "block": "b38fa7c5-3a2e-403b-b3d3-ac32917b5596", + "port": "v" + } + }, + { + "source": { + "block": "b38fa7c5-3a2e-403b-b3d3-ac32917b5596", + "port": "o" + }, + "target": { + "block": "94e9a915-defe-4437-8abd-d3e57dafbb45", + "port": "in" + } + } + ] + }, + "deps": {} +} \ No newline at end of file diff --git a/demo/constant-code-block.iceb b/demo/constant-code-block.iceb new file mode 100644 index 000000000..75e086e23 --- /dev/null +++ b/demo/constant-code-block.iceb @@ -0,0 +1,80 @@ +{ + "image": "", + "state": { + "pan": { + "x": 0, + "y": 0 + }, + "zoom": 1 + }, + "graph": { + "blocks": [ + { + "id": "386bc685-d806-4487-bece-b442b8c8689c", + "type": "basic.constant", + "data": { + "label": "C", + "value": "1'b0" + }, + "position": { + "x": 280, + "y": 48 + } + }, + { + "id": "94e9a915-defe-4437-8abd-d3e57dafbb45", + "type": "basic.output", + "data": { + "label": "led" + }, + "position": { + "x": 624, + "y": 288 + } + }, + { + "id": "b38fa7c5-3a2e-403b-b3d3-ac32917b5596", + "type": "basic.code", + "data": { + "code": "assign o = v;", + "params": [ + "v" + ], + "ports": { + "in": [], + "out": [ + "o" + ] + } + }, + "position": { + "x": 136, + "y": 192 + } + } + ], + "wires": [ + { + "source": { + "block": "386bc685-d806-4487-bece-b442b8c8689c", + "port": "constant-out" + }, + "target": { + "block": "b38fa7c5-3a2e-403b-b3d3-ac32917b5596", + "port": "v" + } + }, + { + "source": { + "block": "b38fa7c5-3a2e-403b-b3d3-ac32917b5596", + "port": "o" + }, + "target": { + "block": "94e9a915-defe-4437-8abd-d3e57dafbb45", + "port": "in" + } + } + ] + }, + "deps": {} +} \ No newline at end of file diff --git a/demo/constant-generic-block.ice b/demo/constant-generic-block.ice new file mode 100644 index 000000000..1dc630eb6 --- /dev/null +++ b/demo/constant-generic-block.ice @@ -0,0 +1,155 @@ +{ + "image": "", + "state": { + "pan": { + "x": -21, + "y": 66 + }, + "zoom": 1 + }, + "board": "icezum", + "graph": { + "blocks": [ + { + "id": "eb6dddea-3a81-4e26-ab7d-ed107b3676c9", + "type": "constant-code-block", + "data": {}, + "position": { + "x": 248, + "y": 184 + } + }, + { + "id": "3ea55b72-cda0-4f43-886b-e225b00229a4", + "type": "basic.constant", + "data": { + "label": "Value", + "value": "1'b1" + }, + "position": { + "x": 296, + "y": 32 + } + }, + { + "id": "06bd1d14-7302-4dd7-9e95-650d1070a203", + "type": "basic.output", + "data": { + "label": "led", + "pin": { + "name": "LED0", + "value": "95" + } + }, + "position": { + "x": 536, + "y": 184 + } + } + ], + "wires": [ + { + "source": { + "block": "3ea55b72-cda0-4f43-886b-e225b00229a4", + "port": "constant-out" + }, + "target": { + "block": "eb6dddea-3a81-4e26-ab7d-ed107b3676c9", + "port": "386bc685-d806-4487-bece-b442b8c8689c" + } + }, + { + "source": { + "block": "eb6dddea-3a81-4e26-ab7d-ed107b3676c9", + "port": "94e9a915-defe-4437-8abd-d3e57dafbb45" + }, + "target": { + "block": "06bd1d14-7302-4dd7-9e95-650d1070a203", + "port": "in" + } + } + ] + }, + "deps": { + "constant-code-block": { + "image": "", + "state": { + "pan": { + "x": 0, + "y": 0 + }, + "zoom": 1 + }, + "graph": { + "blocks": [ + { + "id": "386bc685-d806-4487-bece-b442b8c8689c", + "type": "basic.constant", + "data": { + "label": "C", + "value": "1'b0" + }, + "position": { + "x": 280, + "y": 48 + } + }, + { + "id": "94e9a915-defe-4437-8abd-d3e57dafbb45", + "type": "basic.output", + "data": { + "label": "led" + }, + "position": { + "x": 624, + "y": 288 + } + }, + { + "id": "b38fa7c5-3a2e-403b-b3d3-ac32917b5596", + "type": "basic.code", + "data": { + "code": "assign o = v;", + "params": [ + "v" + ], + "ports": { + "in": [], + "out": [ + "o" + ] + } + }, + "position": { + "x": 136, + "y": 192 + } + } + ], + "wires": [ + { + "source": { + "block": "386bc685-d806-4487-bece-b442b8c8689c", + "port": "constant-out" + }, + "target": { + "block": "b38fa7c5-3a2e-403b-b3d3-ac32917b5596", + "port": "v" + } + }, + { + "source": { + "block": "b38fa7c5-3a2e-403b-b3d3-ac32917b5596", + "port": "o" + }, + "target": { + "block": "94e9a915-defe-4437-8abd-d3e57dafbb45", + "port": "in" + } + } + ] + }, + "deps": {} + } + } +} \ No newline at end of file diff --git a/demo/constant-output.ice b/demo/constant-output.ice new file mode 100644 index 000000000..1408b9b49 --- /dev/null +++ b/demo/constant-output.ice @@ -0,0 +1,61 @@ +{ + "image": "", + "state": { + "pan": { + "x": 0, + "y": 0 + }, + "zoom": 1 + }, + "board": "icezum", + "graph": { + "blocks": [ + { + "id": "7de57b0c-2b62-4d25-864f-4cd940aa2aa5", + "type": "basic.constant", + "data": { + "label": "C", + "value": "1'b1" + }, + "position": { + "x": 152, + "y": 56 + } + }, + { + "id": "6ca79224-5f67-4c69-95fd-32d27bdc67b4", + "type": "basic.output", + "data": { + "label": "out", + "pin": { + "name": "LED0", + "value": "95" + } + }, + "position": { + "x": 336, + "y": 184 + } + } + ], + "wires": [ + { + "source": { + "block": "7de57b0c-2b62-4d25-864f-4cd940aa2aa5", + "port": "constant-out" + }, + "target": { + "block": "6ca79224-5f67-4c69-95fd-32d27bdc67b4", + "port": "in" + }, + "vertices": [ + { + "x": 208, + "y": 216 + } + ] + } + ] + }, + "deps": {} +} \ No newline at end of file diff --git a/demo/input-output.ice b/demo/input-output.ice new file mode 100644 index 000000000..285925bc1 --- /dev/null +++ b/demo/input-output.ice @@ -0,0 +1,58 @@ +{ + "image": "", + "state": { + "pan": { + "x": 0, + "y": 0 + }, + "zoom": 1 + }, + "board": "icezum", + "graph": { + "blocks": [ + { + "id": "f4405019-32a9-4f31-8e42-441c85f1959c", + "type": "basic.input", + "data": { + "label": "in", + "pin": { + "name": "SW1", + "value": "10" + } + }, + "position": { + "x": 104, + "y": 112 + } + }, + { + "id": "ef08c4f3-94b9-4e85-9fe7-78bc2a376c72", + "type": "basic.output", + "data": { + "label": "out", + "pin": { + "name": "LED0", + "value": "95" + } + }, + "position": { + "x": 344, + "y": 112 + } + } + ], + "wires": [ + { + "source": { + "block": "f4405019-32a9-4f31-8e42-441c85f1959c", + "port": "out" + }, + "target": { + "block": "ef08c4f3-94b9-4e85-9fe7-78bc2a376c72", + "port": "in" + } + } + ] + }, + "deps": {} +} \ No newline at end of file diff --git a/demo/multi-block-block.ice b/demo/multi-block-block.ice new file mode 100644 index 000000000..46e49a468 --- /dev/null +++ b/demo/multi-block-block.ice @@ -0,0 +1,219 @@ +{ + "image": "", + "state": { + "pan": { + "x": 0, + "y": 0 + }, + "zoom": 1.000000007072795 + }, + "board": "icezum", + "graph": { + "blocks": [ + { + "id": "4f302bff-d4d1-4d6f-a7ec-b74698a3cd03", + "type": "basic.input", + "data": { + "label": "in", + "pin": { + "name": "SW1", + "value": "10" + } + }, + "position": { + "x": 96, + "y": 128 + } + }, + { + "id": "7625149d-3511-4d95-8405-a100409a5d42", + "type": "basic.output", + "data": { + "label": "out", + "pin": { + "name": "LED1", + "value": "96" + } + }, + "position": { + "x": 632, + "y": 208 + } + }, + { + "id": "c39221a3-87dd-4524-9f65-879112b27f51", + "type": "basic.output", + "data": { + "label": "out", + "pin": { + "name": "LED0", + "value": "95" + } + }, + "position": { + "x": 632, + "y": 64 + } + }, + { + "id": "6ebac9b8-8eb9-4c4b-8b58-962ccc2919f4", + "type": "logic.gate.not", + "data": {}, + "position": { + "x": 272, + "y": 128 + } + }, + { + "id": "2f906ce2-8c79-49e9-abbb-7141484a9ba9", + "type": "logic.gate.not", + "data": {}, + "position": { + "x": 448, + "y": 64 + } + }, + { + "id": "870693a6-da68-41e8-880c-3defad4b7dde", + "type": "logic.gate.not", + "data": {}, + "position": { + "x": 448, + "y": 208 + } + } + ], + "wires": [ + { + "source": { + "block": "4f302bff-d4d1-4d6f-a7ec-b74698a3cd03", + "port": "out" + }, + "target": { + "block": "6ebac9b8-8eb9-4c4b-8b58-962ccc2919f4", + "port": "18c2ebc7-5152-439c-9b3f-851c59bac834" + } + }, + { + "source": { + "block": "6ebac9b8-8eb9-4c4b-8b58-962ccc2919f4", + "port": "664caf9e-5f40-4df4-800a-b626af702e62" + }, + "target": { + "block": "2f906ce2-8c79-49e9-abbb-7141484a9ba9", + "port": "18c2ebc7-5152-439c-9b3f-851c59bac834" + } + }, + { + "source": { + "block": "6ebac9b8-8eb9-4c4b-8b58-962ccc2919f4", + "port": "664caf9e-5f40-4df4-800a-b626af702e62" + }, + "target": { + "block": "870693a6-da68-41e8-880c-3defad4b7dde", + "port": "18c2ebc7-5152-439c-9b3f-851c59bac834" + } + }, + { + "source": { + "block": "2f906ce2-8c79-49e9-abbb-7141484a9ba9", + "port": "664caf9e-5f40-4df4-800a-b626af702e62" + }, + "target": { + "block": "c39221a3-87dd-4524-9f65-879112b27f51", + "port": "in" + } + }, + { + "source": { + "block": "870693a6-da68-41e8-880c-3defad4b7dde", + "port": "664caf9e-5f40-4df4-800a-b626af702e62" + }, + "target": { + "block": "7625149d-3511-4d95-8405-a100409a5d42", + "port": "in" + } + } + ] + }, + "deps": { + "logic.gate.not": { + "graph": { + "blocks": [ + { + "id": "18c2ebc7-5152-439c-9b3f-851c59bac834", + "type": "basic.input", + "data": { + "label": "" + }, + "position": { + "x": 64, + "y": 144 + } + }, + { + "id": "664caf9e-5f40-4df4-800a-b626af702e62", + "type": "basic.output", + "data": { + "label": "" + }, + "position": { + "x": 752, + "y": 144 + } + }, + { + "id": "5365ed8c-e5db-4445-938f-8d689830ea5c", + "type": "basic.code", + "data": { + "code": "// NOT logic gate\n\nassign c = ~ a;", + "ports": { + "in": [ + "a" + ], + "out": [ + "c" + ] + } + }, + "position": { + "x": 256, + "y": 48 + } + } + ], + "wires": [ + { + "source": { + "block": "18c2ebc7-5152-439c-9b3f-851c59bac834", + "port": "out" + }, + "target": { + "block": "5365ed8c-e5db-4445-938f-8d689830ea5c", + "port": "a" + } + }, + { + "source": { + "block": "5365ed8c-e5db-4445-938f-8d689830ea5c", + "port": "c" + }, + "target": { + "block": "664caf9e-5f40-4df4-800a-b626af702e62", + "port": "in" + } + } + ] + }, + "deps": {}, + "image": "resources/images/not.svg", + "state": { + "pan": { + "x": 0, + "y": 0 + }, + "zoom": 1 + } + } + } +} \ No newline at end of file diff --git a/demo/multi-block-output.ice b/demo/multi-block-output.ice new file mode 100644 index 000000000..f8e40e690 --- /dev/null +++ b/demo/multi-block-output.ice @@ -0,0 +1,181 @@ +{ + "image": "", + "state": { + "pan": { + "x": 0, + "y": 0 + }, + "zoom": 1.000000007072795 + }, + "board": "icezum", + "graph": { + "blocks": [ + { + "id": "4f302bff-d4d1-4d6f-a7ec-b74698a3cd03", + "type": "basic.input", + "data": { + "label": "in", + "pin": { + "name": "SW1", + "value": "10" + } + }, + "position": { + "x": 96, + "y": 120 + } + }, + { + "id": "7625149d-3511-4d95-8405-a100409a5d42", + "type": "basic.output", + "data": { + "label": "out", + "pin": { + "name": "LED1", + "value": "96" + } + }, + "position": { + "x": 464, + "y": 208 + } + }, + { + "id": "c39221a3-87dd-4524-9f65-879112b27f51", + "type": "basic.output", + "data": { + "label": "out", + "pin": { + "name": "LED0", + "value": "95" + } + }, + "position": { + "x": 464, + "y": 40 + } + }, + { + "id": "6ebac9b8-8eb9-4c4b-8b58-962ccc2919f4", + "type": "logic.gate.not", + "data": {}, + "position": { + "x": 272, + "y": 120 + } + } + ], + "wires": [ + { + "source": { + "block": "4f302bff-d4d1-4d6f-a7ec-b74698a3cd03", + "port": "out" + }, + "target": { + "block": "6ebac9b8-8eb9-4c4b-8b58-962ccc2919f4", + "port": "18c2ebc7-5152-439c-9b3f-851c59bac834" + } + }, + { + "source": { + "block": "6ebac9b8-8eb9-4c4b-8b58-962ccc2919f4", + "port": "664caf9e-5f40-4df4-800a-b626af702e62" + }, + "target": { + "block": "c39221a3-87dd-4524-9f65-879112b27f51", + "port": "in" + } + }, + { + "source": { + "block": "6ebac9b8-8eb9-4c4b-8b58-962ccc2919f4", + "port": "664caf9e-5f40-4df4-800a-b626af702e62" + }, + "target": { + "block": "7625149d-3511-4d95-8405-a100409a5d42", + "port": "in" + } + } + ] + }, + "deps": { + "logic.gate.not": { + "graph": { + "blocks": [ + { + "id": "18c2ebc7-5152-439c-9b3f-851c59bac834", + "type": "basic.input", + "data": { + "label": "" + }, + "position": { + "x": 64, + "y": 144 + } + }, + { + "id": "664caf9e-5f40-4df4-800a-b626af702e62", + "type": "basic.output", + "data": { + "label": "" + }, + "position": { + "x": 752, + "y": 144 + } + }, + { + "id": "5365ed8c-e5db-4445-938f-8d689830ea5c", + "type": "basic.code", + "data": { + "code": "// NOT logic gate\n\nassign c = ~ a;", + "ports": { + "in": [ + "a" + ], + "out": [ + "c" + ] + } + }, + "position": { + "x": 256, + "y": 48 + } + } + ], + "wires": [ + { + "source": { + "block": "18c2ebc7-5152-439c-9b3f-851c59bac834", + "port": "out" + }, + "target": { + "block": "5365ed8c-e5db-4445-938f-8d689830ea5c", + "port": "a" + } + }, + { + "source": { + "block": "5365ed8c-e5db-4445-938f-8d689830ea5c", + "port": "c" + }, + "target": { + "block": "664caf9e-5f40-4df4-800a-b626af702e62", + "port": "in" + } + } + ] + }, + "deps": {}, + "image": "resources/images/not.svg", + "state": { + "pan": { + "x": 0, + "y": 0 + }, + "zoom": 1 + } + } + } +} \ No newline at end of file diff --git a/demo/multi-constant-generic-block.ice b/demo/multi-constant-generic-block.ice new file mode 100644 index 000000000..152c349a2 --- /dev/null +++ b/demo/multi-constant-generic-block.ice @@ -0,0 +1,199 @@ +{ + "image": "", + "state": { + "pan": { + "x": -139, + "y": 20 + }, + "zoom": 1 + }, + "board": "icezum", + "graph": { + "blocks": [ + { + "id": "eb6dddea-3a81-4e26-ab7d-ed107b3676c9", + "type": "constant-code-block", + "data": {}, + "position": { + "x": 248, + "y": 184 + } + }, + { + "id": "7217b44b-f3e6-4eb6-862b-1d55c0655ee7", + "type": "constant-code-block", + "data": {}, + "position": { + "x": 392, + "y": 328 + } + }, + { + "id": "3ea55b72-cda0-4f43-886b-e225b00229a4", + "type": "basic.constant", + "data": { + "label": "Value", + "value": "1'b1" + }, + "position": { + "x": 296, + "y": 32 + } + }, + { + "id": "06bd1d14-7302-4dd7-9e95-650d1070a203", + "type": "basic.output", + "data": { + "label": "led", + "pin": { + "name": "LED0", + "value": "95" + } + }, + "position": { + "x": 536, + "y": 184 + } + }, + { + "id": "019e1dba-a150-483a-9c95-c2970ec781a9", + "type": "basic.output", + "data": { + "label": "led", + "pin": { + "name": "LED1", + "value": "96" + } + }, + "position": { + "x": 680, + "y": 328 + } + } + ], + "wires": [ + { + "source": { + "block": "7217b44b-f3e6-4eb6-862b-1d55c0655ee7", + "port": "94e9a915-defe-4437-8abd-d3e57dafbb45" + }, + "target": { + "block": "019e1dba-a150-483a-9c95-c2970ec781a9", + "port": "in" + } + }, + { + "source": { + "block": "3ea55b72-cda0-4f43-886b-e225b00229a4", + "port": "constant-out" + }, + "target": { + "block": "eb6dddea-3a81-4e26-ab7d-ed107b3676c9", + "port": "386bc685-d806-4487-bece-b442b8c8689c" + } + }, + { + "source": { + "block": "eb6dddea-3a81-4e26-ab7d-ed107b3676c9", + "port": "94e9a915-defe-4437-8abd-d3e57dafbb45" + }, + "target": { + "block": "06bd1d14-7302-4dd7-9e95-650d1070a203", + "port": "in" + } + }, + { + "source": { + "block": "3ea55b72-cda0-4f43-886b-e225b00229a4", + "port": "constant-out" + }, + "target": { + "block": "7217b44b-f3e6-4eb6-862b-1d55c0655ee7", + "port": "386bc685-d806-4487-bece-b442b8c8689c" + } + } + ] + }, + "deps": { + "constant-code-block": { + "image": "", + "state": { + "pan": { + "x": 0, + "y": 0 + }, + "zoom": 1 + }, + "graph": { + "blocks": [ + { + "id": "386bc685-d806-4487-bece-b442b8c8689c", + "type": "basic.constant", + "data": { + "label": "C", + "value": "1'b0" + }, + "position": { + "x": 280, + "y": 48 + } + }, + { + "id": "94e9a915-defe-4437-8abd-d3e57dafbb45", + "type": "basic.output", + "data": { + "label": "led" + }, + "position": { + "x": 624, + "y": 288 + } + }, + { + "id": "b38fa7c5-3a2e-403b-b3d3-ac32917b5596", + "type": "basic.code", + "data": { + "code": "assign o = v;", + "params": [ + "v" + ], + "ports": { + "in": [], + "out": [ + "o" + ] + } + }, + "position": { + "x": 136, + "y": 192 + } + } + ], + "wires": [ + { + "source": { + "block": "386bc685-d806-4487-bece-b442b8c8689c", + "port": "constant-out" + }, + "target": { + "block": "b38fa7c5-3a2e-403b-b3d3-ac32917b5596", + "port": "v" + } + }, + { + "source": { + "block": "b38fa7c5-3a2e-403b-b3d3-ac32917b5596", + "port": "o" + }, + "target": { + "block": "94e9a915-defe-4437-8abd-d3e57dafbb45", + "port": "in" + } + } + ] + }, + "deps": {} + } + } +} \ No newline at end of file diff --git a/demo/multi-input-output.ice b/demo/multi-input-output.ice new file mode 100644 index 000000000..335fd4e18 --- /dev/null +++ b/demo/multi-input-output.ice @@ -0,0 +1,83 @@ +{ + "image": "", + "state": { + "pan": { + "x": 0, + "y": 0 + }, + "zoom": 1 + }, + "board": "icezum", + "graph": { + "blocks": [ + { + "id": "4f302bff-d4d1-4d6f-a7ec-b74698a3cd03", + "type": "basic.input", + "data": { + "label": "in", + "pin": { + "name": "SW1", + "value": "10" + } + }, + "position": { + "x": 168, + "y": 120 + } + }, + { + "id": "7625149d-3511-4d95-8405-a100409a5d42", + "type": "basic.output", + "data": { + "label": "out", + "pin": { + "name": "LED1", + "value": "96" + } + }, + "position": { + "x": 408, + "y": 232 + } + }, + { + "id": "c39221a3-87dd-4524-9f65-879112b27f51", + "type": "basic.output", + "data": { + "label": "out", + "pin": { + "name": "LED0", + "value": "95" + } + }, + "position": { + "x": 480, + "y": 120 + } + } + ], + "wires": [ + { + "source": { + "block": "4f302bff-d4d1-4d6f-a7ec-b74698a3cd03", + "port": "out" + }, + "target": { + "block": "7625149d-3511-4d95-8405-a100409a5d42", + "port": "in" + } + }, + { + "source": { + "block": "4f302bff-d4d1-4d6f-a7ec-b74698a3cd03", + "port": "out" + }, + "target": { + "block": "c39221a3-87dd-4524-9f65-879112b27f51", + "port": "in" + } + } + ] + }, + "deps": {} +} \ No newline at end of file From dd32f82f6f09ebad3e8f571ecef6b54b39f43d1d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jes=C3=BAs=20Arroyo=20Torrens?= Date: Thu, 8 Dec 2016 15:52:31 +0100 Subject: [PATCH 017/169] Add complex demo project --- demo/block.iceb | 114 ++++++++++ demo/complex.ice | 358 ++++++++++++++++++++++++++++++++ demo/constant-io-code-block.ice | 127 +++++++++++ 3 files changed, 599 insertions(+) create mode 100644 demo/block.iceb create mode 100644 demo/complex.ice create mode 100644 demo/constant-io-code-block.ice diff --git a/demo/block.iceb b/demo/block.iceb new file mode 100644 index 000000000..95e911752 --- /dev/null +++ b/demo/block.iceb @@ -0,0 +1,114 @@ +{ + "image": "", + "state": { + "pan": { + "x": 45.83406713517239, + "y": 43.306661649315814 + }, + "zoom": 0.8527620016280335 + }, + "graph": { + "blocks": [ + { + "id": "386bc685-d806-4487-bece-b442b8c8689c", + "type": "basic.constant", + "data": { + "label": "C", + "value": "1'b0" + }, + "position": { + "x": 360, + "y": 8 + } + }, + { + "id": "94e9a915-defe-4437-8abd-d3e57dafbb45", + "type": "basic.output", + "data": { + "label": "out" + }, + "position": { + "x": 712, + "y": 264 + } + }, + { + "id": "ec9b901f-4cda-4f53-81ae-bfd74a0f0ae6", + "type": "basic.code", + "data": { + "code": "assign o = v;", + "params": [ + "v" + ], + "ports": { + "in": [ + "i" + ], + "out": [ + "o" + ] + } + }, + "position": { + "x": 216, + "y": 168 + } + }, + { + "id": "a8faca21-4b86-4bb1-8cd1-8c5252d4038f", + "type": "basic.input", + "data": { + "label": "in" + }, + "position": { + "x": 24, + "y": 264 + } + }, + { + "id": "9051bd8c-0c39-4b19-bb08-71ac0ba8e9bf", + "type": "basic.input", + "data": { + "label": "" + }, + "position": { + "x": 24, + "y": 360 + } + } + ], + "wires": [ + { + "source": { + "block": "386bc685-d806-4487-bece-b442b8c8689c", + "port": "constant-out" + }, + "target": { + "block": "ec9b901f-4cda-4f53-81ae-bfd74a0f0ae6", + "port": "v" + } + }, + { + "source": { + "block": "ec9b901f-4cda-4f53-81ae-bfd74a0f0ae6", + "port": "o" + }, + "target": { + "block": "94e9a915-defe-4437-8abd-d3e57dafbb45", + "port": "in" + } + }, + { + "source": { + "block": "a8faca21-4b86-4bb1-8cd1-8c5252d4038f", + "port": "out" + }, + "target": { + "block": "ec9b901f-4cda-4f53-81ae-bfd74a0f0ae6", + "port": "i" + } + } + ] + }, + "deps": {} +} \ No newline at end of file diff --git a/demo/complex.ice b/demo/complex.ice new file mode 100644 index 000000000..bef5d1b15 --- /dev/null +++ b/demo/complex.ice @@ -0,0 +1,358 @@ +{ + "image": "", + "state": { + "pan": { + "x": 0, + "y": 0 + }, + "zoom": 0.9999999822412187 + }, + "board": "icezum", + "graph": { + "blocks": [ + { + "id": "1aa80d81-052d-426d-a073-a6e9678a9959", + "type": "block", + "data": {}, + "position": { + "x": 232, + "y": 264 + } + }, + { + "id": "e55fa1d9-ac88-461c-b5c1-4f4302c547cc", + "type": "block", + "data": {}, + "position": { + "x": 448, + "y": 280 + } + }, + { + "id": "1ffad532-f6da-47b0-8e85-d27fdcc211a8", + "type": "basic.input", + "data": { + "label": "in", + "pin": { + "name": "SW1", + "value": "10" + } + }, + "position": { + "x": 48, + "y": 248 + } + }, + { + "id": "3e7df107-03ee-4c35-9e52-607770f4c832", + "type": "basic.output", + "data": { + "label": "a", + "pin": { + "name": "LED0", + "value": "95" + } + }, + "position": { + "x": 176, + "y": 80 + } + }, + { + "id": "8216800a-e417-4044-9adf-403f8568c3f5", + "type": "basic.output", + "data": { + "label": "b", + "pin": { + "name": "LED1", + "value": "96" + } + }, + "position": { + "x": 600, + "y": 80 + } + }, + { + "id": "083f6679-313b-497a-b2f0-4d972bc3cffa", + "type": "basic.output", + "data": { + "label": "c", + "pin": { + "name": "LED2", + "value": "97" + } + }, + "position": { + "x": 712, + "y": 184 + } + }, + { + "id": "8631a189-f5ed-4be1-88df-30d6acb97f99", + "type": "basic.output", + "data": { + "label": "d", + "pin": { + "name": "LED3", + "value": "98" + } + }, + "position": { + "x": 712, + "y": 280 + } + }, + { + "id": "365fa313-f3c1-433d-9d51-97429dfaa3c8", + "type": "basic.constant", + "data": { + "label": "Value", + "value": "1'b1" + }, + "position": { + "x": 344, + "y": 80 + } + } + ], + "wires": [ + { + "source": { + "block": "1ffad532-f6da-47b0-8e85-d27fdcc211a8", + "port": "out" + }, + "target": { + "block": "1aa80d81-052d-426d-a073-a6e9678a9959", + "port": "a8faca21-4b86-4bb1-8cd1-8c5252d4038f" + } + }, + { + "source": { + "block": "1aa80d81-052d-426d-a073-a6e9678a9959", + "port": "94e9a915-defe-4437-8abd-d3e57dafbb45" + }, + "target": { + "block": "e55fa1d9-ac88-461c-b5c1-4f4302c547cc", + "port": "a8faca21-4b86-4bb1-8cd1-8c5252d4038f" + } + }, + { + "source": { + "block": "1aa80d81-052d-426d-a073-a6e9678a9959", + "port": "94e9a915-defe-4437-8abd-d3e57dafbb45" + }, + "target": { + "block": "1aa80d81-052d-426d-a073-a6e9678a9959", + "port": "9051bd8c-0c39-4b19-bb08-71ac0ba8e9bf" + }, + "vertices": [ + { + "x": 288, + "y": 352 + } + ] + }, + { + "source": { + "block": "1ffad532-f6da-47b0-8e85-d27fdcc211a8", + "port": "out" + }, + "target": { + "block": "3e7df107-03ee-4c35-9e52-607770f4c832", + "port": "in" + }, + "vertices": [] + }, + { + "source": { + "block": "365fa313-f3c1-433d-9d51-97429dfaa3c8", + "port": "constant-out" + }, + "target": { + "block": "1aa80d81-052d-426d-a073-a6e9678a9959", + "port": "386bc685-d806-4487-bece-b442b8c8689c" + }, + "vertices": [] + }, + { + "source": { + "block": "365fa313-f3c1-433d-9d51-97429dfaa3c8", + "port": "constant-out" + }, + "target": { + "block": "e55fa1d9-ac88-461c-b5c1-4f4302c547cc", + "port": "386bc685-d806-4487-bece-b442b8c8689c" + } + }, + { + "source": { + "block": "e55fa1d9-ac88-461c-b5c1-4f4302c547cc", + "port": "94e9a915-defe-4437-8abd-d3e57dafbb45" + }, + "target": { + "block": "083f6679-313b-497a-b2f0-4d972bc3cffa", + "port": "in" + }, + "vertices": [ + { + "x": 592, + "y": 264 + } + ] + }, + { + "source": { + "block": "365fa313-f3c1-433d-9d51-97429dfaa3c8", + "port": "constant-out" + }, + "target": { + "block": "8216800a-e417-4044-9adf-403f8568c3f5", + "port": "in" + } + }, + { + "source": { + "block": "e55fa1d9-ac88-461c-b5c1-4f4302c547cc", + "port": "94e9a915-defe-4437-8abd-d3e57dafbb45" + }, + "target": { + "block": "8631a189-f5ed-4be1-88df-30d6acb97f99", + "port": "in" + } + }, + { + "source": { + "block": "1ffad532-f6da-47b0-8e85-d27fdcc211a8", + "port": "out" + }, + "target": { + "block": "e55fa1d9-ac88-461c-b5c1-4f4302c547cc", + "port": "9051bd8c-0c39-4b19-bb08-71ac0ba8e9bf" + }, + "vertices": [ + { + "x": 168, + "y": 392 + } + ] + } + ] + }, + "deps": { + "block": { + "image": "", + "state": { + "pan": { + "x": 45.83406713517239, + "y": 43.306661649315814 + }, + "zoom": 0.8527620016280335 + }, + "graph": { + "blocks": [ + { + "id": "386bc685-d806-4487-bece-b442b8c8689c", + "type": "basic.constant", + "data": { + "label": "C", + "value": "1'b0" + }, + "position": { + "x": 360, + "y": 8 + } + }, + { + "id": "94e9a915-defe-4437-8abd-d3e57dafbb45", + "type": "basic.output", + "data": { + "label": "out" + }, + "position": { + "x": 712, + "y": 264 + } + }, + { + "id": "ec9b901f-4cda-4f53-81ae-bfd74a0f0ae6", + "type": "basic.code", + "data": { + "code": "assign o = v;", + "params": [ + "v" + ], + "ports": { + "in": [ + "i" + ], + "out": [ + "o" + ] + } + }, + "position": { + "x": 216, + "y": 168 + } + }, + { + "id": "a8faca21-4b86-4bb1-8cd1-8c5252d4038f", + "type": "basic.input", + "data": { + "label": "in" + }, + "position": { + "x": 24, + "y": 264 + } + }, + { + "id": "9051bd8c-0c39-4b19-bb08-71ac0ba8e9bf", + "type": "basic.input", + "data": { + "label": "" + }, + "position": { + "x": 24, + "y": 360 + } + } + ], + "wires": [ + { + "source": { + "block": "386bc685-d806-4487-bece-b442b8c8689c", + "port": "constant-out" + }, + "target": { + "block": "ec9b901f-4cda-4f53-81ae-bfd74a0f0ae6", + "port": "v" + } + }, + { + "source": { + "block": "ec9b901f-4cda-4f53-81ae-bfd74a0f0ae6", + "port": "o" + }, + "target": { + "block": "94e9a915-defe-4437-8abd-d3e57dafbb45", + "port": "in" + } + }, + { + "source": { + "block": "a8faca21-4b86-4bb1-8cd1-8c5252d4038f", + "port": "out" + }, + "target": { + "block": "ec9b901f-4cda-4f53-81ae-bfd74a0f0ae6", + "port": "i" + } + } + ] + }, + "deps": {} + } + } +} \ No newline at end of file diff --git a/demo/constant-io-code-block.ice b/demo/constant-io-code-block.ice new file mode 100644 index 000000000..819b5de0e --- /dev/null +++ b/demo/constant-io-code-block.ice @@ -0,0 +1,127 @@ +{ + "image": "", + "state": { + "pan": { + "x": 45.83406713517239, + "y": 43.306661649315814 + }, + "zoom": 0.8527620016280335 + }, + "board": "icezum", + "graph": { + "blocks": [ + { + "id": "386bc685-d806-4487-bece-b442b8c8689c", + "type": "basic.constant", + "data": { + "label": "C", + "value": "1'b0" + }, + "position": { + "x": 360, + "y": 8 + } + }, + { + "id": "94e9a915-defe-4437-8abd-d3e57dafbb45", + "type": "basic.output", + "data": { + "label": "out", + "pin": { + "name": "LED0", + "value": "95" + } + }, + "position": { + "x": 712, + "y": 264 + } + }, + { + "id": "ec9b901f-4cda-4f53-81ae-bfd74a0f0ae6", + "type": "basic.code", + "data": { + "code": "assign o = v;", + "params": [ + "v" + ], + "ports": { + "in": [ + "i" + ], + "out": [ + "o" + ] + } + }, + "position": { + "x": 216, + "y": 168 + } + }, + { + "id": "a8faca21-4b86-4bb1-8cd1-8c5252d4038f", + "type": "basic.input", + "data": { + "label": "in", + "pin": { + "name": "SW1", + "value": "10" + } + }, + "position": { + "x": 24, + "y": 264 + } + }, + { + "id": "9051bd8c-0c39-4b19-bb08-71ac0ba8e9bf", + "type": "basic.input", + "data": { + "label": "", + "pin": { + "name": "", + "value": 0 + } + }, + "position": { + "x": 24, + "y": 360 + } + } + ], + "wires": [ + { + "source": { + "block": "386bc685-d806-4487-bece-b442b8c8689c", + "port": "constant-out" + }, + "target": { + "block": "ec9b901f-4cda-4f53-81ae-bfd74a0f0ae6", + "port": "v" + } + }, + { + "source": { + "block": "ec9b901f-4cda-4f53-81ae-bfd74a0f0ae6", + "port": "o" + }, + "target": { + "block": "94e9a915-defe-4437-8abd-d3e57dafbb45", + "port": "in" + } + }, + { + "source": { + "block": "a8faca21-4b86-4bb1-8cd1-8c5252d4038f", + "port": "out" + }, + "target": { + "block": "ec9b901f-4cda-4f53-81ae-bfd74a0f0ae6", + "port": "i" + } + } + ] + }, + "deps": {} +} \ No newline at end of file From 0bd65a7fd788c74e643c296aeb91ec2f43badfad Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jes=C3=BAs=20Arroyo=20Torrens?= Date: Thu, 8 Dec 2016 17:11:03 +0100 Subject: [PATCH 018/169] Add connections filters --- app/scripts/plugins/shapes/joint.shapes.js | 4 ++ app/scripts/services/compiler.service.js | 2 +- app/scripts/services/graph.service.js | 16 +++++- demo/complex.ice | 27 +--------- demo/constant-output.ice | 61 ---------------------- 5 files changed, 21 insertions(+), 89 deletions(-) delete mode 100644 demo/constant-output.ice diff --git a/app/scripts/plugins/shapes/joint.shapes.js b/app/scripts/plugins/shapes/joint.shapes.js index e6f1ef72f..f88c7c208 100644 --- a/app/scripts/plugins/shapes/joint.shapes.js +++ b/app/scripts/plugins/shapes/joint.shapes.js @@ -46,18 +46,22 @@ joint.shapes.ice.Model = joint.shapes.basic.Generic.extend({ opacity: 0 }, '.leftPorts .port-body': { + pos: 'left', type: 'input', magnet: false }, '.rightPorts .port-body': { + pos: 'right', type: 'output', magnet: true }, '.topPorts .port-body': { + pos: 'top', type: 'input', magnet: false }, '.bottomPorts .port-body': { + pos: 'bottom', type: 'output', magnet: true }, diff --git a/app/scripts/services/compiler.service.js b/app/scripts/services/compiler.service.js index 88b1aa8a0..bf826eaa5 100644 --- a/app/scripts/services/compiler.service.js +++ b/app/scripts/services/compiler.service.js @@ -184,7 +184,7 @@ angular.module('icestudio') else if (block.type == 'basic.output') { if (wire.target.block == block.id) { if (wire.source.port == 'constant-out') { - connections.assign.push('assign ' + digestId(block.id) + ' = p' + w + ';'); + // connections.assign.push('assign ' + digestId(block.id) + ' = p' + w + ';'); } else { connections.assign.push('assign ' + digestId(block.id) + ' = w' + w + ';'); diff --git a/app/scripts/services/graph.service.js b/app/scripts/services/graph.service.js index 038f6a5d0..f40fa1d8d 100644 --- a/app/scripts/services/graph.service.js +++ b/app/scripts/services/graph.service.js @@ -108,12 +108,26 @@ angular.module('icestudio') // Prevent output-output links if (magnetS.getAttribute('type') == 'output' && magnetT.getAttribute('type') == 'output') { - if (magnetS !== magnetT){ + if (magnetS !== magnetT) { // Show warning if source and target blocks are different warning(gettextCatalog.getString('Invalid connection')); } return false; } + // Ensure right -> left connections + if (magnetS.getAttribute('pos') == 'right') { + if (magnetT.getAttribute('pos') != 'left') { + warning(gettextCatalog.getString('Invalid connection')); + return false; + } + } + // Ensure bottom -> top connections + if (magnetS.getAttribute('pos') == 'bottom') { + if (magnetT.getAttribute('pos') != 'top') { + warning(gettextCatalog.getString('Invalid connection')); + return false; + } + } var links = graph.getLinks(); for (var i in links) { var linkIView = links[i].findView(paper); diff --git a/demo/complex.ice b/demo/complex.ice index bef5d1b15..222d1d5fc 100644 --- a/demo/complex.ice +++ b/demo/complex.ice @@ -5,7 +5,7 @@ "x": 0, "y": 0 }, - "zoom": 0.9999999822412187 + "zoom": 1 }, "board": "icezum", "graph": { @@ -58,21 +58,6 @@ "y": 80 } }, - { - "id": "8216800a-e417-4044-9adf-403f8568c3f5", - "type": "basic.output", - "data": { - "label": "b", - "pin": { - "name": "LED1", - "value": "96" - } - }, - "position": { - "x": 600, - "y": 80 - } - }, { "id": "083f6679-313b-497a-b2f0-4d972bc3cffa", "type": "basic.output", @@ -201,16 +186,6 @@ } ] }, - { - "source": { - "block": "365fa313-f3c1-433d-9d51-97429dfaa3c8", - "port": "constant-out" - }, - "target": { - "block": "8216800a-e417-4044-9adf-403f8568c3f5", - "port": "in" - } - }, { "source": { "block": "e55fa1d9-ac88-461c-b5c1-4f4302c547cc", diff --git a/demo/constant-output.ice b/demo/constant-output.ice deleted file mode 100644 index 1408b9b49..000000000 --- a/demo/constant-output.ice +++ /dev/null @@ -1,61 +0,0 @@ -{ - "image": "", - "state": { - "pan": { - "x": 0, - "y": 0 - }, - "zoom": 1 - }, - "board": "icezum", - "graph": { - "blocks": [ - { - "id": "7de57b0c-2b62-4d25-864f-4cd940aa2aa5", - "type": "basic.constant", - "data": { - "label": "C", - "value": "1'b1" - }, - "position": { - "x": 152, - "y": 56 - } - }, - { - "id": "6ca79224-5f67-4c69-95fd-32d27bdc67b4", - "type": "basic.output", - "data": { - "label": "out", - "pin": { - "name": "LED0", - "value": "95" - } - }, - "position": { - "x": 336, - "y": 184 - } - } - ], - "wires": [ - { - "source": { - "block": "7de57b0c-2b62-4d25-864f-4cd940aa2aa5", - "port": "constant-out" - }, - "target": { - "block": "6ca79224-5f67-4c69-95fd-32d27bdc67b4", - "port": "in" - }, - "vertices": [ - { - "x": 208, - "y": 216 - } - ] - } - ] - }, - "deps": {} -} \ No newline at end of file From 0df90fde4f72b85fbcd994901fa1e1b042a3a80d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jes=C3=BAs=20Arroyo=20Torrens?= Date: Thu, 8 Dec 2016 18:11:40 +0100 Subject: [PATCH 019/169] Remove templates --- app/package.json | 2 +- app/resources/templates/bit/0.ice | 60 ------------ app/resources/templates/bit/1.ice | 60 ------------ app/resources/templates/logic/and.ice | 113 ---------------------- app/resources/templates/logic/not.ice | 87 ----------------- app/resources/templates/logic/or.ice | 113 ---------------------- app/scripts/controllers/menu.js | 1 - app/scripts/services/graph.service.js | 10 +- app/scripts/services/resources.service.js | 4 - app/views/menu.html | 15 --- package.json | 2 +- 11 files changed, 9 insertions(+), 458 deletions(-) delete mode 100644 app/resources/templates/bit/0.ice delete mode 100644 app/resources/templates/bit/1.ice delete mode 100644 app/resources/templates/logic/and.ice delete mode 100644 app/resources/templates/logic/not.ice delete mode 100644 app/resources/templates/logic/or.ice diff --git a/app/package.json b/app/package.json index 0f1242a9e..d54304bba 100644 --- a/app/package.json +++ b/app/package.json @@ -1,6 +1,6 @@ { "name": "icestudio", - "version": "0.2.3", + "version": "0.2.4-dev", "description": "Experimental graphic editor for open FPGAs", "author": "Jesús Arroyo Torrens ", "repository": "https://github.com/FPGAwars/icestudio", diff --git a/app/resources/templates/bit/0.ice b/app/resources/templates/bit/0.ice deleted file mode 100644 index 6eb2caab2..000000000 --- a/app/resources/templates/bit/0.ice +++ /dev/null @@ -1,60 +0,0 @@ -{ - "board": "icezum", - "graph": { - "blocks": [ - { - "id": "b959fb96-ac67-4aea-90b3-ed35a4c17bf5", - "type": "basic.code", - "data": { - "code": "// Bit 0\n\nassign v = 1'b0;", - "ports": { - "in": [], - "out": [ - "v" - ] - } - }, - "position": { - "x": 96, - "y": 96 - } - }, - { - "id": "19c8f68d-5022-487f-9ab0-f0a3cd58bead", - "type": "basic.output", - "data": { - "label": "", - "pin": { - "name": "", - "value": "" - } - }, - "position": { - "x": 608, - "y": 192 - } - } - ], - "wires": [ - { - "source": { - "block": "b959fb96-ac67-4aea-90b3-ed35a4c17bf5", - "port": "v" - }, - "target": { - "block": "19c8f68d-5022-487f-9ab0-f0a3cd58bead", - "port": "in" - } - } - ] - }, - "deps": {}, - "image": "", - "state": { - "pan": { - "x": 0, - "y": 0 - }, - "zoom": 1 - } -} \ No newline at end of file diff --git a/app/resources/templates/bit/1.ice b/app/resources/templates/bit/1.ice deleted file mode 100644 index 1c6f8e96b..000000000 --- a/app/resources/templates/bit/1.ice +++ /dev/null @@ -1,60 +0,0 @@ -{ - "board": "icezum", - "graph": { - "blocks": [ - { - "id": "b959fb96-ac67-4aea-90b3-ed35a4c17bf5", - "type": "basic.code", - "data": { - "code": "// Bit 1\n\nassign v = 1'b1;", - "ports": { - "in": [], - "out": [ - "v" - ] - } - }, - "position": { - "x": 96, - "y": 96 - } - }, - { - "id": "19c8f68d-5022-487f-9ab0-f0a3cd58bead", - "type": "basic.output", - "data": { - "label": "", - "pin": { - "name": "", - "value": "" - } - }, - "position": { - "x": 608, - "y": 192 - } - } - ], - "wires": [ - { - "source": { - "block": "b959fb96-ac67-4aea-90b3-ed35a4c17bf5", - "port": "v" - }, - "target": { - "block": "19c8f68d-5022-487f-9ab0-f0a3cd58bead", - "port": "in" - } - } - ] - }, - "deps": {}, - "image": "", - "state": { - "pan": { - "x": 0, - "y": 0 - }, - "zoom": 1 - } -} \ No newline at end of file diff --git a/app/resources/templates/logic/and.ice b/app/resources/templates/logic/and.ice deleted file mode 100644 index 2d7efe070..000000000 --- a/app/resources/templates/logic/and.ice +++ /dev/null @@ -1,113 +0,0 @@ -{ - "board": "icezum", - "graph": { - "blocks": [ - { - "id": "18c2ebc7-5152-439c-9b3f-851c59bac834", - "type": "basic.input", - "data": { - "label": "", - "pin": { - "name": "", - "value": "" - } - }, - "position": { - "x": 64, - "y": 80 - } - }, - { - "id": "97b51945-d716-4b6c-9db9-970d08541249", - "type": "basic.input", - "data": { - "label": "", - "pin": { - "name": "", - "value": "" - } - }, - "position": { - "x": 64, - "y": 208 - } - }, - { - "id": "664caf9e-5f40-4df4-800a-b626af702e62", - "type": "basic.output", - "data": { - "label": "", - "pin": { - "name": "", - "value": "" - } - }, - "position": { - "x": 752, - "y": 144 - } - }, - { - "id": "00925b04-5004-4307-a737-fa4e97c8b6ab", - "type": "basic.code", - "data": { - "code": "// AND logic gate\n\nassign c = a & b;", - "ports": { - "in": [ - "a", - "b" - ], - "out": [ - "c" - ] - } - }, - "position": { - "x": 256, - "y": 48 - } - } - ], - "wires": [ - { - "source": { - "block": "18c2ebc7-5152-439c-9b3f-851c59bac834", - "port": "out" - }, - "target": { - "block": "00925b04-5004-4307-a737-fa4e97c8b6ab", - "port": "a" - } - }, - { - "source": { - "block": "97b51945-d716-4b6c-9db9-970d08541249", - "port": "out" - }, - "target": { - "block": "00925b04-5004-4307-a737-fa4e97c8b6ab", - "port": "b" - } - }, - { - "source": { - "block": "00925b04-5004-4307-a737-fa4e97c8b6ab", - "port": "c" - }, - "target": { - "block": "664caf9e-5f40-4df4-800a-b626af702e62", - "port": "in" - } - } - ] - }, - "deps": {}, - "image": "", - "state": { - "pan": { - "x": 0, - "y": 0 - }, - "zoom": 1 - } -} \ No newline at end of file diff --git a/app/resources/templates/logic/not.ice b/app/resources/templates/logic/not.ice deleted file mode 100644 index 14945890e..000000000 --- a/app/resources/templates/logic/not.ice +++ /dev/null @@ -1,87 +0,0 @@ -{ - "board": "icezum", - "graph": { - "blocks": [ - { - "id": "18c2ebc7-5152-439c-9b3f-851c59bac834", - "type": "basic.input", - "data": { - "label": "", - "pin": { - "name": "", - "value": "" - } - }, - "position": { - "x": 64, - "y": 144 - } - }, - { - "id": "664caf9e-5f40-4df4-800a-b626af702e62", - "type": "basic.output", - "data": { - "label": "", - "pin": { - "name": "", - "value": "" - } - }, - "position": { - "x": 752, - "y": 144 - } - }, - { - "id": "5365ed8c-e5db-4445-938f-8d689830ea5c", - "type": "basic.code", - "data": { - "code": "// NOT logic gate\n\nassign c = ~ a;", - "ports": { - "in": [ - "a" - ], - "out": [ - "c" - ] - } - }, - "position": { - "x": 256, - "y": 48 - } - } - ], - "wires": [ - { - "source": { - "block": "18c2ebc7-5152-439c-9b3f-851c59bac834", - "port": "out" - }, - "target": { - "block": "5365ed8c-e5db-4445-938f-8d689830ea5c", - "port": "a" - } - }, - { - "source": { - "block": "5365ed8c-e5db-4445-938f-8d689830ea5c", - "port": "c" - }, - "target": { - "block": "664caf9e-5f40-4df4-800a-b626af702e62", - "port": "in" - } - } - ] - }, - "deps": {}, - "image": "", - "state": { - "pan": { - "x": 0, - "y": 0 - }, - "zoom": 1 - } -} \ No newline at end of file diff --git a/app/resources/templates/logic/or.ice b/app/resources/templates/logic/or.ice deleted file mode 100644 index dc45f5f5b..000000000 --- a/app/resources/templates/logic/or.ice +++ /dev/null @@ -1,113 +0,0 @@ -{ - "board": "icezum", - "graph": { - "blocks": [ - { - "id": "18c2ebc7-5152-439c-9b3f-851c59bac834", - "type": "basic.input", - "data": { - "label": "", - "pin": { - "name": "", - "value": "" - } - }, - "position": { - "x": 64, - "y": 80 - } - }, - { - "id": "97b51945-d716-4b6c-9db9-970d08541249", - "type": "basic.input", - "data": { - "label": "", - "pin": { - "name": "", - "value": "" - } - }, - "position": { - "x": 64, - "y": 208 - } - }, - { - "id": "664caf9e-5f40-4df4-800a-b626af702e62", - "type": "basic.output", - "data": { - "label": "", - "pin": { - "name": "", - "value": "" - } - }, - "position": { - "x": 752, - "y": 144 - } - }, - { - "id": "00925b04-5004-4307-a737-fa4e97c8b6ab", - "type": "basic.code", - "data": { - "code": "// OR logic gate\n\nassign c = a | b;", - "ports": { - "in": [ - "a", - "b" - ], - "out": [ - "c" - ] - } - }, - "position": { - "x": 256, - "y": 48 - } - } - ], - "wires": [ - { - "source": { - "block": "18c2ebc7-5152-439c-9b3f-851c59bac834", - "port": "out" - }, - "target": { - "block": "00925b04-5004-4307-a737-fa4e97c8b6ab", - "port": "a" - } - }, - { - "source": { - "block": "97b51945-d716-4b6c-9db9-970d08541249", - "port": "out" - }, - "target": { - "block": "00925b04-5004-4307-a737-fa4e97c8b6ab", - "port": "b" - } - }, - { - "source": { - "block": "00925b04-5004-4307-a737-fa4e97c8b6ab", - "port": "c" - }, - "target": { - "block": "664caf9e-5f40-4df4-800a-b626af702e62", - "port": "in" - } - } - ] - }, - "deps": {}, - "image": "", - "state": { - "pan": { - "x": 0, - "y": 0 - }, - "zoom": 1 - } -} \ No newline at end of file diff --git a/app/scripts/controllers/menu.js b/app/scripts/controllers/menu.js index 970320283..fc7b4f8d2 100644 --- a/app/scripts/controllers/menu.js +++ b/app/scripts/controllers/menu.js @@ -25,7 +25,6 @@ angular.module('icestudio') $scope.profile = profile; $scope.examples = resources.getExamples(); - $scope.templates = resources.getTemplates(); $scope.currentBoards = boards.getBoards(); $scope.menuBlocks = resources.getMenuBlocks(); diff --git a/app/scripts/services/graph.service.js b/app/scripts/services/graph.service.js index f40fa1d8d..4d3a2e736 100644 --- a/app/scripts/services/graph.service.js +++ b/app/scripts/services/graph.service.js @@ -469,9 +469,13 @@ angular.module('icestudio') '' ]; if (block && block.data) { - defaultValues[0] = ' ' + block.data.ports.in.join(' , ') + ' '; - defaultValues[1] = ' ' + block.data.ports.out.join(' , ') + ' '; - defaultValues[2] = ' ' + block.data.params.join(' , ') + ' '; + if (block.data.ports) { + defaultValues[0] = ' ' + block.data.ports.in.join(' , ') + ' '; + defaultValues[1] = ' ' + block.data.ports.out.join(' , ') + ' '; + } + if (block.data.params) { + defaultValues[2] = ' ' + block.data.params.join(' , ') + ' '; + } } utils.multiprompt( [ gettextCatalog.getString('Enter the input ports'), diff --git a/app/scripts/services/resources.service.js b/app/scripts/services/resources.service.js index 62832c6a1..2c4c1ff2c 100644 --- a/app/scripts/services/resources.service.js +++ b/app/scripts/services/resources.service.js @@ -8,10 +8,6 @@ angular.module('icestudio') return utils.getFilesRecursive(nodePath.join('resources', 'examples'), '.ice'); } - this.getTemplates = function() { - return utils.getFilesRecursive(nodePath.join('resources', 'templates'), '.ice'); - } - this.getMenuBlocks = function() { return utils.getFilesRecursive(nodePath.join('resources', 'blocks'), '.iceb'); } diff --git a/app/views/menu.html b/app/views/menu.html index d68d985e6..74c14006a 100644 --- a/app/views/menu.html +++ b/app/views/menu.html @@ -46,21 +46,6 @@ -
  • - {{ 'Templates' | translate }} - -
  • {{ 'Save' | translate }} diff --git a/package.json b/package.json index 7ffa7966b..b573ef17d 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "icestudio", - "version": "0.2.3", + "version": "0.2.4-dev", "description": "Experimental graphic editor for open FPGAs", "author": "Jesús Arroyo Torrens ", "repository": "https://github.com/FPGAwars/icestudio", From 3f6777ad3c04645bb61c2b16f36c2509ef853d89 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jes=C3=BAs=20Arroyo=20Torrens?= Date: Thu, 8 Dec 2016 19:18:06 +0100 Subject: [PATCH 020/169] Add div demo. Move travis_trigger to scripts --- demo/div.ice | 112 ++++++++++++++++++ demo/div.iceb | 103 ++++++++++++++++ .../travis_trigger.sh | 0 3 files changed, 215 insertions(+) create mode 100644 demo/div.ice create mode 100644 demo/div.iceb rename travis_trigger.sh => scripts/travis_trigger.sh (100%) diff --git a/demo/div.ice b/demo/div.ice new file mode 100644 index 000000000..531e8b8f8 --- /dev/null +++ b/demo/div.ice @@ -0,0 +1,112 @@ +{ + "image": "", + "state": { + "pan": { + "x": 3, + "y": 145 + }, + "zoom": 1 + }, + "board": "icezum", + "graph": { + "blocks": [ + { + "id": "5e63bca8-458e-4d7a-ae46-dc2e457fdbf7", + "type": "basic.input", + "data": { + "label": "clk", + "pin": { + "name": "CLK", + "value": "21" + } + }, + "position": { + "x": 64, + "y": 152 + } + }, + { + "id": "400c2d1d-bce3-4d7a-8ab9-078bd072e1b7", + "type": "basic.output", + "data": { + "label": "", + "pin": { + "name": "LED0", + "value": "95" + } + }, + "position": { + "x": 752, + "y": 152 + } + }, + { + "id": "a2836617-8c44-4f54-9d1f-f2681c18db26", + "type": "basic.code", + "data": { + "code": "// Div 12MHz / M\n\nlocalparam N = $clog2(M);\n\nreg [N-1:0] c = 0;\n\nalways @(posedge clk_in)\n c <= (c == M - 1) ? 0 : c + 1;\n\nassign clk_out = c[N-1];", + "params": [ + "M" + ], + "ports": { + "in": [ + "clk_in" + ], + "out": [ + "clk_out" + ] + } + }, + "position": { + "x": 248, + "y": 56 + } + }, + { + "id": "4aba74c5-d08d-4d91-9401-099c6aeceb64", + "type": "basic.constant", + "data": { + "label": "M", + "value": "12000000" + }, + "position": { + "x": 392, + "y": -104 + } + } + ], + "wires": [ + { + "source": { + "block": "5e63bca8-458e-4d7a-ae46-dc2e457fdbf7", + "port": "out" + }, + "target": { + "block": "a2836617-8c44-4f54-9d1f-f2681c18db26", + "port": "clk_in" + } + }, + { + "source": { + "block": "a2836617-8c44-4f54-9d1f-f2681c18db26", + "port": "clk_out" + }, + "target": { + "block": "400c2d1d-bce3-4d7a-8ab9-078bd072e1b7", + "port": "in" + } + }, + { + "source": { + "block": "4aba74c5-d08d-4d91-9401-099c6aeceb64", + "port": "constant-out" + }, + "target": { + "block": "a2836617-8c44-4f54-9d1f-f2681c18db26", + "port": "M" + } + } + ] + }, + "deps": {} +} \ No newline at end of file diff --git a/demo/div.iceb b/demo/div.iceb new file mode 100644 index 000000000..1e66a8203 --- /dev/null +++ b/demo/div.iceb @@ -0,0 +1,103 @@ +{ + "image": "", + "state": { + "pan": { + "x": 3, + "y": 145 + }, + "zoom": 1 + }, + "graph": { + "blocks": [ + { + "id": "5e63bca8-458e-4d7a-ae46-dc2e457fdbf7", + "type": "basic.input", + "data": { + "label": "clk" + }, + "position": { + "x": 64, + "y": 152 + } + }, + { + "id": "400c2d1d-bce3-4d7a-8ab9-078bd072e1b7", + "type": "basic.output", + "data": { + "label": "" + }, + "position": { + "x": 752, + "y": 152 + } + }, + { + "id": "a2836617-8c44-4f54-9d1f-f2681c18db26", + "type": "basic.code", + "data": { + "code": "// Div 12MHz / M\n\nlocalparam N = $clog2(M);\n\nreg [N-1:0] c = 0;\n\nalways @(posedge clk_in)\n c <= (c == M - 1) ? 0 : c + 1;\n\nassign clk_out = c[N-1];", + "params": [ + "M" + ], + "ports": { + "in": [ + "clk_in" + ], + "out": [ + "clk_out" + ] + } + }, + "position": { + "x": 248, + "y": 56 + } + }, + { + "id": "4aba74c5-d08d-4d91-9401-099c6aeceb64", + "type": "basic.constant", + "data": { + "label": "M", + "value": "12000000" + }, + "position": { + "x": 392, + "y": -104 + } + } + ], + "wires": [ + { + "source": { + "block": "5e63bca8-458e-4d7a-ae46-dc2e457fdbf7", + "port": "out" + }, + "target": { + "block": "a2836617-8c44-4f54-9d1f-f2681c18db26", + "port": "clk_in" + } + }, + { + "source": { + "block": "a2836617-8c44-4f54-9d1f-f2681c18db26", + "port": "clk_out" + }, + "target": { + "block": "400c2d1d-bce3-4d7a-8ab9-078bd072e1b7", + "port": "in" + } + }, + { + "source": { + "block": "4aba74c5-d08d-4d91-9401-099c6aeceb64", + "port": "constant-out" + }, + "target": { + "block": "a2836617-8c44-4f54-9d1f-f2681c18db26", + "port": "M" + } + } + ] + }, + "deps": {} +} \ No newline at end of file diff --git a/travis_trigger.sh b/scripts/travis_trigger.sh similarity index 100% rename from travis_trigger.sh rename to scripts/travis_trigger.sh From 6ba26044fc77e3c8c4df4a4fd7056632168e24e3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jes=C3=BAs=20Arroyo=20Torrens?= Date: Thu, 8 Dec 2016 19:19:53 +0100 Subject: [PATCH 021/169] Check duplicated attributes in code block creation --- app/scripts/services/graph.service.js | 30 ++++++++++++++++++--------- app/scripts/services/utils.service.js | 8 +++---- app/views/menu.html | 2 +- 3 files changed, 25 insertions(+), 15 deletions(-) diff --git a/app/scripts/services/graph.service.js b/app/scripts/services/graph.service.js index 4d3a2e736..19e35991d 100644 --- a/app/scripts/services/graph.service.js +++ b/app/scripts/services/graph.service.js @@ -518,18 +518,28 @@ angular.module('icestudio') blockInstance.position.x = 31 * gridsize; blockInstance.position.y = 24 * gridsize; - if (block) { - blockInstance.data.code = block.data.code; - blockInstance.position = block.position; + var allAttrs= inPorts.concat(outPorts, params); + var numAttrs = allAttrs.length; + + // Check duplicated attributes + if (numAttrs == $.unique(allAttrs).length) { + evt.cancel = false; + if (block) { + blockInstance.data.code = block.data.code; + blockInstance.position = block.position; + } + var cell = addBasicCodeBlock(blockInstance); + var cellView = paper.findViewByModel(cell); + if (cellView.$box.css('z-index') < zIndex) { + cellView.$box.css('z-index', ++zIndex); + } + if (callback) + callback(); } - var cell = addBasicCodeBlock(blockInstance); - var cellView = paper.findViewByModel(cell); - if (cellView.$box.css('z-index') < zIndex) { - cellView.$box.css('z-index', ++zIndex); + else { + evt.cancel = true; + alertify.notify(gettextCatalog.getString('Duplicated block attributes'), 'warning', 3); } - - if (callback) - callback(); } }); } diff --git a/app/scripts/services/utils.service.js b/app/scripts/services/utils.service.js index 886d2d3ef..34484c469 100644 --- a/app/scripts/services/utils.service.js +++ b/app/scripts/services/utils.service.js @@ -584,6 +584,10 @@ angular.module('icestudio') content.push(' '); } content.push(''); + // Restore values + for (var i = 0; i < n; i++) { + $('#input' + i.toString()).val(values[i]); + } alertify.confirm(content.join('\n')) .set('onok', function(evt) { @@ -595,10 +599,6 @@ angular.module('icestudio') callback(evt, values); }) .set('oncancel', function(evt) { - // Restore previous values - for (var i = 0; i < n; i++) { - $('#input' + i.toString()).val(values[i]); - } }); } diff --git a/app/views/menu.html b/app/views/menu.html index 74c14006a..9d070693e 100644 --- a/app/views/menu.html +++ b/app/views/menu.html @@ -272,9 +272,9 @@
  • {{ 'Input' | translate }} {{ 'Output' | translate }} + {{ 'Constant' | translate }} {{ 'Code' | translate }} {{ 'Info' | translate }} - {{ 'Constant' | translate }}
    • From cc28b5f4e12a8ad10cfb6de314d333f71d789edc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jes=C3=BAs=20Arroyo=20Torrens?= Date: Fri, 9 Dec 2016 06:36:26 +0100 Subject: [PATCH 022/169] Detect wire start/end directions --- app/scripts/plugins/routers/joint.routers.js | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/app/scripts/plugins/routers/joint.routers.js b/app/scripts/plugins/routers/joint.routers.js index f09b3ab63..8bd484183 100644 --- a/app/scripts/plugins/routers/joint.routers.js +++ b/app/scripts/plugins/routers/joint.routers.js @@ -22,10 +22,10 @@ joint.routers.ice = (function(g, _, joint) { maximumLoops: 2000, // possible starting directions from an element - startDirections: ['right', 'top', 'bottom'], + startDirections: ['right', 'bottom'], // possible ending directions to an element - endDirections: ['left', 'top', 'bottom'], + endDirections: ['left', 'top'], // specify directions above directionMap: { @@ -516,6 +516,14 @@ joint.routers.ice = (function(g, _, joint) { // public function return function(vertices, opt, linkView) { + if (linkView.sourceMagnet) { + opt.startDirections = [linkView.sourceMagnet.attributes.pos.value]; + } + + if (linkView.targetMagnet) { + opt.endDirections = [linkView.targetMagnet.attributes.pos.value]; + } + return router.call(linkView, vertices, _.extend({}, config, opt)); }; From 72df8555af000619ef609b850205bc5309878f64 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jes=C3=BAs=20Arroyo=20Torrens?= Date: Fri, 9 Dec 2016 18:56:49 +0100 Subject: [PATCH 023/169] Check $phase before $apply --- app/scripts/controllers/menu.js | 4 +++- app/scripts/services/common.service.js | 4 +++- app/scripts/services/graph.service.js | 4 +++- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/app/scripts/controllers/menu.js b/app/scripts/controllers/menu.js index fc7b4f8d2..c24a4cb6d 100644 --- a/app/scripts/controllers/menu.js +++ b/app/scripts/controllers/menu.js @@ -380,7 +380,9 @@ angular.module('icestudio') boards.selectBoard(board.name); graph.resetIOChoices(); alertify.success(gettextCatalog.getString('Board {{name}} selected', { name: utils.bold(board.info.label) })); - $rootScope.$apply(); + if(!$rootScope.$$phase) { + $rootScope.$apply(); + } }); } else { diff --git a/app/scripts/services/common.service.js b/app/scripts/services/common.service.js index dfe18f33b..ddf92008e 100644 --- a/app/scripts/services/common.service.js +++ b/app/scripts/services/common.service.js @@ -57,7 +57,9 @@ angular.module('icestudio') else { alertify.notify(gettextCatalog.getString('Wrong project format: {{name}}', { name: utils.bold(name) }), 'error', 30); } - $rootScope.$apply(); + if(!$rootScope.$$phase) { + $rootScope.$apply(); + } }; this.saveProject = function(filepath) { diff --git a/app/scripts/services/graph.service.js b/app/scripts/services/graph.service.js index 19e35991d..085de722b 100644 --- a/app/scripts/services/graph.service.js +++ b/app/scripts/services/graph.service.js @@ -810,7 +810,9 @@ angular.module('icestudio') addBasicConstantBlock(blockInstance, disabled); } else { - addGenericBlock(blockInstance, deps[blockInstance.type]); + if (deps && deps[blockInstance.type]) { + addGenericBlock(blockInstance, deps[blockInstance.type]); + } } } From 62ef02d1f38fdb8a10e1a40b92c4a45098e8a063 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jes=C3=BAs=20Arroyo=20Torrens?= Date: Fri, 9 Dec 2016 19:28:03 +0100 Subject: [PATCH 024/169] Update bower dependencies --- app/bower.json | 4 +--- app/index.html | 2 -- app/scripts/services/common.service.js | 2 +- 3 files changed, 2 insertions(+), 6 deletions(-) diff --git a/app/bower.json b/app/bower.json index a5d073a3b..5d85acf9e 100644 --- a/app/bower.json +++ b/app/bower.json @@ -21,9 +21,7 @@ "tests" ], "dependencies": { - "angular": "^1.5.5", - "angular-translate": "^2.11.0", - "angular-translate-loader-static-files": "^2.11.0", + "angular": "^1.6.0", "angular-route": "^1.5.5", "jquery": "^2.0.3", "backbone": "^1.2.1", diff --git a/app/index.html b/app/index.html index 611823b6a..e35d9e266 100644 --- a/app/index.html +++ b/app/index.html @@ -28,8 +28,6 @@ - - diff --git a/app/scripts/services/common.service.js b/app/scripts/services/common.service.js index ddf92008e..f6d38ed84 100644 --- a/app/scripts/services/common.service.js +++ b/app/scripts/services/common.service.js @@ -49,7 +49,7 @@ angular.module('icestudio') this.loadProject = function(name, project) { this.updateProjectName(name); - this.project = project; + this.project = JSON.parse(JSON.stringify(project)); boards.selectBoard(project.board); if (graph.loadGraph(project)) { alertify.success(gettextCatalog.getString('Project {{name}} loaded', { name: utils.bold(name) })); From 5ea7143b623779ad1c55e185197c73f86fc665dc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jes=C3=BAs=20Arroyo=20Torrens?= Date: Sun, 11 Dec 2016 14:14:09 +0100 Subject: [PATCH 025/169] Bugfix: wrong variable name --- app/scripts/services/tools.service.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/scripts/services/tools.service.js b/app/scripts/services/tools.service.js index 8c1027b44..1ff889c97 100644 --- a/app/scripts/services/tools.service.js +++ b/app/scripts/services/tools.service.js @@ -145,7 +145,7 @@ angular.module('icestudio') // Copy included file var copySuccess = utils.copySync(origPath, destPath, file); if (!copySuccess) { - alertify.notify(gettextCatalog.getString('File {{file}} does not exist', { file: filename }), 'error', 30); + alertify.notify(gettextCatalog.getString('File {{file}} does not exist', { file: file }), 'error', 30); break; } } From 600b4b6441be92b6d372dd733fccb4ae001af5ce Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jes=C3=BAs=20Arroyo=20Torrens?= Date: Sun, 11 Dec 2016 19:35:30 +0100 Subject: [PATCH 026/169] Add "local" setting to the Constant block --- app/scripts/plugins/shapes/joint.shapes.js | 10 ++++++++ app/scripts/services/graph.service.js | 29 ++++++++++++++++------ app/scripts/services/tools.service.js | 1 + app/scripts/services/utils.service.js | 28 +++++++++++++++++++++ app/styles/project.css | 8 ++++++ 5 files changed, 68 insertions(+), 8 deletions(-) diff --git a/app/scripts/plugins/shapes/joint.shapes.js b/app/scripts/plugins/shapes/joint.shapes.js index f88c7c208..01bfd508a 100644 --- a/app/scripts/plugins/shapes/joint.shapes.js +++ b/app/scripts/plugins/shapes/joint.shapes.js @@ -410,6 +410,7 @@ joint.shapes.ice.ConstantView = joint.shapes.ice.ModelView.extend({ template: '\
    \ +

    *

    \ \ \
    \ @@ -425,6 +426,14 @@ joint.shapes.ice.ConstantView = joint.shapes.ice.ModelView.extend({ this.model.attributes.data.value = $(evt.target).val(); }, this)); }, + renderLocal: function() { + if (this.model.get('data').local) { + this.$box.find('p').removeClass('hidden'); + } + else { + this.$box.find('p').addClass('hidden'); + } + }, renderLabel: function () { var name = this.model.attributes.data.label; this.$box.find('label').text(name); @@ -439,6 +448,7 @@ joint.shapes.ice.ConstantView = joint.shapes.ice.ModelView.extend({ this.$box.find('.constant-input').val(''); }, update: function () { + this.renderLocal(); this.renderLabel(); this.renderPorts(); this.renderValue(); diff --git a/app/scripts/services/graph.service.js b/app/scripts/services/graph.service.js index 085de722b..c3362d0ad 100644 --- a/app/scripts/services/graph.service.js +++ b/app/scripts/services/graph.service.js @@ -305,7 +305,7 @@ angular.module('icestudio') if (paper.options.enabled) { alertify.prompt(gettextCatalog.getString('Update the port label'), data.data.label ? ' ' + data.data.label + ' ' : '', function(evt, label) { - label = label.replace(/ /g, ''); + var label = label.replace(/ /g, ''); if (data.data.label != label) { data.data.label = label; cellView.renderLabel(); @@ -316,14 +316,24 @@ angular.module('icestudio') } else if (data.blockType == 'basic.constant') { if (paper.options.enabled) { - alertify.prompt(gettextCatalog.getString('Update the block label'), data.data.label ? ' ' + data.data.label + ' ' : '', - function(evt, label) { - label = label.replace(/ /g, ''); + utils.constantprompt([ + gettextCatalog.getString('Update the block label'), + gettextCatalog.getString('Update the block status'), + gettextCatalog.getString('Local parameter') + ], [ + data.data.label ? ' ' + data.data.label + ' ' : '', + data.data.local ? data.data.local : false + ], + function(evt, values) { + var label = values[0].replace(/ /g, ''); if (data.data.label != label) { data.data.label = label; cellView.renderLabel(); alertify.success(gettextCatalog.getString('Label updated')); } + var local = values[1]; + data.data.local = local; + cellView.renderLocal(); }); } } @@ -646,6 +656,7 @@ angular.module('icestudio') if (names[n]) { blockInstance.data = { label: names[n], + local: false, value: '' }; var cell = addBasicConstantBlock(blockInstance); @@ -962,10 +973,12 @@ angular.module('icestudio') }); } else if (item.type == 'basic.constant') { - topPorts.push({ - id: item.id, - label: item.data.label - }); + if (!item.data.local) { + topPorts.push({ + id: item.id, + label: item.data.label + }); + } } } diff --git a/app/scripts/services/tools.service.js b/app/scripts/services/tools.service.js index 1ff889c97..0b836c737 100644 --- a/app/scripts/services/tools.service.js +++ b/app/scripts/services/tools.service.js @@ -146,6 +146,7 @@ angular.module('icestudio') var copySuccess = utils.copySync(origPath, destPath, file); if (!copySuccess) { alertify.notify(gettextCatalog.getString('File {{file}} does not exist', { file: file }), 'error', 30); + ret = false; break; } } diff --git a/app/scripts/services/utils.service.js b/app/scripts/services/utils.service.js index 34484c469..3dd525dae 100644 --- a/app/scripts/services/utils.service.js +++ b/app/scripts/services/utils.service.js @@ -602,6 +602,34 @@ angular.module('icestudio') }); } + this.constantprompt = function(messages, values, callback) { + var content = []; + var n = messages.length; + content.push('
    '); + content.push('

    ' + messages[0] + '

    '); + content.push(' '); + content.push('
    '); + content.push('

    ' + messages[1] + '

    '); + content.push('
      '); + content.push('

    • ' + messages[2] + '

      • '); + content.push('
    '); + content.push('
    '); + // Restore values + $('#label').val(values[0]); + $('#local').prop('checked', values[1]); + + alertify.confirm(content.join('\n')) + .set('onok', function(evt) { + var values = []; + values.push($('#label').val()); + values.push($('#local').prop('checked')); + if (callback) + callback(evt, values); + }) + .set('oncancel', function(evt) { + }); + } + this.copySync = function(orig, dest, filename) { var ret = true; try { diff --git a/app/styles/project.css b/app/styles/project.css index 412156755..1f3552747 100644 --- a/app/styles/project.css +++ b/app/styles/project.css @@ -139,6 +139,14 @@ z-index: 0; } +.constant-block p { + position: absolute; + top: 0px; + right: 5px; + font-size: 1.5em; + color: #444; +} + .constant-block label { display: block; margin-top: 4px; From a24577a743967fb12b481a5c00800e74ffb4b527 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jes=C3=BAs=20Arroyo=20Torrens?= Date: Sun, 11 Dec 2016 19:50:23 +0100 Subject: [PATCH 027/169] Install libffi in Mac OS Drivers configuration --- app/scripts/services/utils.service.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/app/scripts/services/utils.service.js b/app/scripts/services/utils.service.js index 3dd525dae..2ecf3aa0e 100644 --- a/app/scripts/services/utils.service.js +++ b/app/scripts/services/utils.service.js @@ -441,7 +441,9 @@ angular.module('icestudio') var brewCommands = [ '/usr/local/bin/brew update', '/usr/local/bin/brew install libftdi', - '/usr/local/bin/brew link --overwrite libftdi' + '/usr/local/bin/brew link --overwrite libftdi', + '/usr/local/bin/brew install libffi', + '/usr/local/bin/brew link --overwrite libffi' ]; nodeChildProcess.exec(brewCommands.join('; '), function(error, stdout, stderr) { // console.log(error, stdout, stderr); From 7e6bd42eeb8d199b2d751e5691c3aafc43d75fb8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jes=C3=BAs=20Arroyo=20Torrens?= Date: Wed, 14 Dec 2016 20:53:51 +0100 Subject: [PATCH 028/169] Add force to brew commands --- app/scripts/services/utils.service.js | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/app/scripts/services/utils.service.js b/app/scripts/services/utils.service.js index 2ecf3aa0e..3fa11136f 100644 --- a/app/scripts/services/utils.service.js +++ b/app/scripts/services/utils.service.js @@ -440,10 +440,12 @@ angular.module('icestudio') else { var brewCommands = [ '/usr/local/bin/brew update', - '/usr/local/bin/brew install libftdi', - '/usr/local/bin/brew link --overwrite libftdi', - '/usr/local/bin/brew install libffi', - '/usr/local/bin/brew link --overwrite libffi' + '/usr/local/bin/brew install --force libftdi', + '/usr/local/bin/brew unlink libftdi', + '/usr/local/bin/brew link --force libftdi', + '/usr/local/bin/brew install --force libffi', + '/usr/local/bin/brew unlink libffi', + '/usr/local/bin/brew link --force libffi' ]; nodeChildProcess.exec(brewCommands.join('; '), function(error, stdout, stderr) { // console.log(error, stdout, stderr); @@ -452,6 +454,7 @@ angular.module('icestudio') if ((stderr.indexOf('brew: command not found') != -1) || (stderr.indexOf('brew: No such file or directory') != -1)) { alertify.notify(gettextCatalog.getString('Homebrew is required'), 'error', 30); + // TODO: open web browser with Homebrew website on click } else if (stderr.indexOf('Error: Failed to download') != -1) { alertify.notify(gettextCatalog.getString('Internet connection required'), 'error', 30); From 90a785602271b2abbaba37cf5d44772de47dd871 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jes=C3=BAs=20Arroyo=20Torrens?= Date: Wed, 14 Dec 2016 22:00:38 +0100 Subject: [PATCH 029/169] Sort I/O ports by position --- app/scripts/services/common.service.js | 17 +++++++++++++++++ app/scripts/services/graph.service.js | 8 ++++++++ 2 files changed, 25 insertions(+) diff --git a/app/scripts/services/common.service.js b/app/scripts/services/common.service.js index f6d38ed84..74e10f5f0 100644 --- a/app/scripts/services/common.service.js +++ b/app/scripts/services/common.service.js @@ -171,6 +171,7 @@ angular.module('icestudio') this.exportAsBlock = function(filepath) { var name = utils.basename(filepath); + this.sortGraph(); this.refreshProject(); // Convert project to block var block = angular.copy(this.project); @@ -226,6 +227,22 @@ angular.module('icestudio') }, false); }; + this.sortGraph = function() { + var cells = graph.getCells(); + + // Sort cells by x-coordinate + cells = _.sortBy(cells, function(cell) { + return cell.attributes.position.x; + }); + + // Sort cells by y-coordinate + cells = _.sortBy(cells, function(cell) { + return cell.attributes.position.y; + }); + + graph.setCells(cells); + } + this.refreshProject = function(callback) { var graphData = graph.toJSON(); diff --git a/app/scripts/services/graph.service.js b/app/scripts/services/graph.service.js index c3362d0ad..252cbd2d3 100644 --- a/app/scripts/services/graph.service.js +++ b/app/scripts/services/graph.service.js @@ -697,6 +697,14 @@ angular.module('icestudio') return graph.toJSON(); } + this.getCells = function() { + return graph.getCells(); + } + + this.setCells = function(cells) { + graph.attributes.cells.models = cells; + } + this.getContent = function(id) { return paper.findViewByModel(id).$box.find( '#content' + sha1(id).toString().substring(0, 6)).val(); From a57962f4e9ff87cb317d185146ad29c9f54cae34 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jes=C3=BAs=20Arroyo=20Torrens?= Date: Thu, 15 Dec 2016 12:07:45 +0100 Subject: [PATCH 030/169] Include compressed SVG image in the block --- app/package.json | 1 + app/resources/blocks/bit/0.iceb | 4 ++-- app/resources/blocks/bit/1.iceb | 4 ++-- app/scripts/factories/node.factory.js | 3 +++ app/scripts/plugins/shapes/joint.shapes.js | 2 +- app/scripts/services/graph.service.js | 11 +++++++---- demo/complex.ice | 20 ++++++++++---------- 7 files changed, 26 insertions(+), 19 deletions(-) diff --git a/app/package.json b/app/package.json index d54304bba..2a144c8f4 100644 --- a/app/package.json +++ b/app/package.json @@ -36,6 +36,7 @@ "sha1": "^1.1.1", "ssh-exec": "^2.0.0", "sudo-prompt": "^6.2.0", + "svgo": "^0.7.1", "tarball-extract": "0.0.3" }, "readme": "../README.md", diff --git a/app/resources/blocks/bit/0.iceb b/app/resources/blocks/bit/0.iceb index f223d7ffe..2faefca14 100644 --- a/app/resources/blocks/bit/0.iceb +++ b/app/resources/blocks/bit/0.iceb @@ -44,7 +44,7 @@ ] }, "deps": {}, - "image": "resources/images/0.svg", + "image": "%3Csvg%20xmlns=%22http://www.w3.org/2000/svg%22%20width=%2247.303%22%20height=%2227.648%22%20viewBox=%220%200%2044.346456%2025.919999%22%3E%3Ctext%20style=%22line-height:125%25%22%20x=%22325.37%22%20y=%22315.373%22%20font-weight=%22400%22%20font-size=%2212.669%22%20font-family=%22sans-serif%22%20letter-spacing=%220%22%20word-spacing=%220%22%20transform=%22translate(-307.01%20-298.51)%22%3E%3Ctspan%20x=%22325.37%22%20y=%22315.373%22%20style=%22-inkscape-font-specification:'Courier%2010%20Pitch'%22%20font-family=%22Courier%2010%20Pitch%22%3E0%3C/tspan%3E%3C/text%3E%3C/svg%3E", "state": { "pan": { "x": 0, @@ -52,4 +52,4 @@ }, "zoom": 1 } -} \ No newline at end of file +} diff --git a/app/resources/blocks/bit/1.iceb b/app/resources/blocks/bit/1.iceb index a8048566b..bc83e606f 100644 --- a/app/resources/blocks/bit/1.iceb +++ b/app/resources/blocks/bit/1.iceb @@ -44,7 +44,7 @@ ] }, "deps": {}, - "image": "resources/images/1.svg", + "image": "%3Csvg%20xmlns=%22http://www.w3.org/2000/svg%22%20width=%2247.303%22%20height=%2227.648%22%20viewBox=%220%200%2044.346456%2025.919999%22%3E%3Ctext%20style=%22line-height:125%25%22%20x=%22325.218%22%20y=%22315.455%22%20font-weight=%22400%22%20font-size=%2212.669%22%20font-family=%22sans-serif%22%20letter-spacing=%220%22%20word-spacing=%220%22%20transform=%22translate(-307.01%20-298.51)%22%3E%3Ctspan%20x=%22325.218%22%20y=%22315.455%22%20style=%22-inkscape-font-specification:'Courier%2010%20Pitch'%22%20font-family=%22Courier%2010%20Pitch%22%3E1%3C/tspan%3E%3C/text%3E%3C/svg%3E", "state": { "pan": { "x": 0, @@ -52,4 +52,4 @@ }, "zoom": 1 } -} \ No newline at end of file +} diff --git a/app/scripts/factories/node.factory.js b/app/scripts/factories/node.factory.js index cd7fcde48..d9fe18323 100644 --- a/app/scripts/factories/node.factory.js +++ b/app/scripts/factories/node.factory.js @@ -48,4 +48,7 @@ angular.module('icestudio') }) .factory('nodeLangInfo', function() { return require('node-lang-info'); + }) + .factory('nodeSVGO', function() { + return require('svgo'); }); diff --git a/app/scripts/plugins/shapes/joint.shapes.js b/app/scripts/plugins/shapes/joint.shapes.js index 01bfd508a..cc7d5d852 100644 --- a/app/scripts/plugins/shapes/joint.shapes.js +++ b/app/scripts/plugins/shapes/joint.shapes.js @@ -278,7 +278,7 @@ joint.shapes.ice.GenericView = joint.shapes.ice.ModelView.extend({ var name = this.model.get('label'); if (image) { - this.$box.find('img').attr('src', image); + this.$box.find('img').attr('src', 'data:image/svg+xml,' + image); this.$box.find('img').removeClass('hidden'); this.$box.find('label').addClass('hidden'); } diff --git a/app/scripts/services/graph.service.js b/app/scripts/services/graph.service.js index 252cbd2d3..beb052cf1 100644 --- a/app/scripts/services/graph.service.js +++ b/app/scripts/services/graph.service.js @@ -1023,11 +1023,14 @@ angular.module('icestudio') } var blockImage = ''; - if (block.image && - nodeFs.existsSync(block.image) && - nodeFs.lstatSync(block.image).isFile()) { - blockImage = block.image; + if (block.image) { width = 12 * gridsize; + if (block.image.startsWith('%3Csvg')) { + blockImage = block.image; + } + else if (block.image.startsWith(' Date: Thu, 15 Dec 2016 21:35:16 +0100 Subject: [PATCH 031/169] Start refactor: project service created --- app/index.html | 1 + app/package.json | 2 +- app/scripts/controllers/main.js | 35 +++++ app/scripts/controllers/menu.js | 180 ++++++++++------------- app/scripts/services/common.service.js | 158 +------------------- app/scripts/services/compiler.service.js | 47 +++--- app/scripts/services/graph.service.js | 36 +++-- app/scripts/services/project.service.js | 147 ++++++++++++++++++ app/scripts/services/utils.service.js | 63 +++++++- app/views/menu.html | 20 +-- package.json | 1 + 11 files changed, 383 insertions(+), 307 deletions(-) create mode 100644 app/scripts/services/project.service.js diff --git a/app/index.html b/app/index.html index e35d9e266..c8b5501eb 100644 --- a/app/index.html +++ b/app/index.html @@ -55,6 +55,7 @@ + diff --git a/app/package.json b/app/package.json index 2a144c8f4..8119f3a96 100644 --- a/app/package.json +++ b/app/package.json @@ -11,7 +11,7 @@ "height": 600, "min_width": 800, "min_height": 200, - "toolbar": false, + "toolbar": true, "resizable": true, "position": "center", "icon": "resources/images/icestudio-logo.png" diff --git a/app/scripts/controllers/main.js b/app/scripts/controllers/main.js index d8d5f7018..074282b40 100644 --- a/app/scripts/controllers/main.js +++ b/app/scripts/controllers/main.js @@ -19,4 +19,39 @@ angular.module('icestudio') alertify.set('confirm', 'labels', labels); }, 100); + /*var FS = require('fs'), + PATH = require('path'), + SVGO = require('svgo'), + filepath = PATH.resolve('resources', 'images', '1.svg'), + svgo = new SVGO(); + + FS.readFile(filepath, 'utf8', function(err, data) { + + if (err) { + throw err; + } + + svgo.optimize(data, function(result) { + + console.log(result); + + FS.writeFile('image.json', JSON.stringify({'image': encodeURI(result.data)}), function(err) { + if (err) throw err; + console.log('It\'s saved!'); + }); + + // { + // // optimized SVG data string + // data: 'test' + // // additional info such as width/height + // info: { + // width: '10', + // height: '20' + // } + // } + + }); + + });*/ + }); diff --git a/app/scripts/controllers/menu.js b/app/scripts/controllers/menu.js index c24a4cb6d..6969209aa 100644 --- a/app/scripts/controllers/menu.js +++ b/app/scripts/controllers/menu.js @@ -4,6 +4,7 @@ angular.module('icestudio') .controller('MenuCtrl', function ($rootScope, $scope, $timeout, + project, nodeLangInfo, nodeFs, nodePath, @@ -33,7 +34,6 @@ angular.module('icestudio') $scope.workingdir = ''; $scope.snapshotdir = ''; - $scope.currentProjectPath = ''; // Configure window var win = gui.Window.get(); @@ -71,129 +71,90 @@ angular.module('icestudio') // mouseleave event $scope.hideMenu = function (menu) { timer = $timeout(function () { - $scope.status[menu] = false; + $scope.status[menu] = false; }, 500); }; + // File $scope.newProject = function() { - alertify.prompt(gettextCatalog.getString('Enter the project\'s title'), - gettextCatalog.getString('untitled'), + alertify.prompt( + gettextCatalog.getString('Enter the project name'), + gettextCatalog.getString('untitled'), function(evt, name) { - if (name) { - common.newProject(name); - $scope.currentProjectPath = ''; - pathSync(); - } - }); - } + if (name) + project.new(name); + }); + }; $scope.openProject = function() { - setTimeout(function() { - var ctrl = angular.element('#input-open-project'); - ctrl.on('change', function(event) { - var file = event.target.files[0]; - event.target.files.clear(); - if (file) { - if (file.path.endsWith('.ice')) { - $scope.workingdir = utils.dirname(file.path) + utils.sep; - if (!graph.isEmpty()) { - alertify.confirm(gettextCatalog.getString('The current project will be removed. Do you want to continue loading the project?'), - function() { - common.openProject(file.path); - $scope.currentProjectPath = file.path; - pathSync(); - }); - } - else { - common.openProject(file.path); - $scope.currentProjectPath = file.path; - pathSync(); - } - - } - } + utils.openDialog('#input-open-project', '.ice', function(filepath) { + updateWorkingdir(filepath); + checkGraph(function() { + alertify.confirm( + gettextCatalog.getString('The current project will be removed. Do you want to continue loading the project?'), + function() { + project.open(filepath); + }); + }, + function() { + project.open(filepath); }); - ctrl.click(); - }, 0); - } + }); + }; - $scope.openStoredProject = function(name, project) { - if (project) { - if (!graph.isEmpty()) { - alertify.confirm(gettextCatalog.getString('The current project will be removed. Do you want to continue loading the project?'), - function() { - common.loadProject(name, project); - $scope.currentProjectPath = ''; - pathSync(); - }); - } - else { - common.loadProject(name, project); - $scope.currentProjectPath = ''; - pathSync(); - } + $scope.loadProject = function(name, data) { + if (data) { + checkGraph(function() { + alertify.confirm( + gettextCatalog.getString('The current project will be removed. Do you want to continue loading the project?'), + function() { + project.load(name, data); + }); + }, + function() { + project.load(name, data); + }); } - } + }; $scope.saveProject = function() { - var filepath = $scope.currentProjectPath; + var filepath = project.path; if (filepath) { - common.saveProject(filepath); + project.save(filepath); } else { $scope.saveProjectAs(); } - } + }; $scope.saveProjectAs = function(localCallback) { utils.saveDialog('#input-save-project', '.ice', function(filepath) { - $scope.workingdir = utils.dirname(filepath) + utils.sep; - common.saveProject(filepath); - $scope.currentProjectPath = filepath; - pathSync(); + updateWorkingdir(filepath); + project.save(filepath); if (localCallback) localCallback(); }); - } + }; $rootScope.$on('saveProjectAs', function(event, callback) { $scope.saveProjectAs(callback); - }) - - $scope.importBlock = function() { - setTimeout(function() { - var ctrl = angular.element('#input-import-block'); - ctrl.on('change', function(event) { - var files = JSON.parse(JSON.stringify(event.target.files)); - for (var i in files) { - if (files[i] && - files[i].path && - files[i].path.endsWith('.iceb')) { - common.importBlock(files[i].path); - } - } - event.target.files.clear(); - }); - ctrl.click(); - }, 0); - } + }); - $scope.exportAsBlock = function() { - checkGraph(function() { - utils.saveDialog('#input-export-block', '.iceb', function(filepath) { - $scope.workingdir = utils.dirname(filepath) + utils.sep; - common.exportAsBlock(filepath); + $scope.addAsBlock = function() { + utils.openDialog('#input-add-as-block', '.ice', function(filepath) { + checkGraph(function() { + project.addAsBlock(filepath); }); }); - } + }; $scope.exportVerilog = function() { checkGraph(function() { utils.saveDialog('#input-export-verilog', '.v', function(filepath) { - $scope.workingdir = utils.dirname(filepath) + utils.sep; - common.exportVerilog(filepath); + project.export('verilog', filepath, gettextCatalog.getString('Verilog code exported')); + updateWorkingdir(filepath); }); }); } @@ -201,8 +162,8 @@ angular.module('icestudio') $scope.exportPCF = function() { checkGraph(function() { utils.saveDialog('#input-export-pcf', '.pcf', function(filepath) { - $scope.workingdir = utils.dirname(filepath) + utils.sep; - common.exportPCF(filepath); + project.export('pcf', filepath, gettextCatalog.getString('PCF file exported')); + updateWorkingdir(filepath); }); }); } @@ -210,8 +171,8 @@ angular.module('icestudio') $scope.exportTestbench = function() { checkGraph(function() { utils.saveDialog('#input-export-testbench', '.v', function(filepath) { - $scope.workingdir = utils.dirname(filepath) + utils.sep; - common.exportTestbench(filepath); + project.export('testbench', filepath, gettextCatalog.getString('Testbench exported')); + updateWorkingdir(filepath); }); }); } @@ -219,20 +180,32 @@ angular.module('icestudio') $scope.exportGTKwave = function() { checkGraph(function() { utils.saveDialog('#input-export-gtkwave', '.gtkw', function(filepath) { - $scope.workingdir = utils.dirname(filepath) + utils.sep; - common.exportGTKWave(filepath); + project.export('gtkwave', filepath, gettextCatalog.getString('GTKWave exported')); + updateWorkingdir(filepath); }); }); } + function updateWorkingdir(filepath) { + $scope.workingdir = utils.dirname(filepath) + utils.sep; + }; + + // Edit - $scope.setImagePath = function() { - var current = common.project.image; + $scope.setProjectInformation = function() { + + var values = [ + + ]; + utils.projectinfoprompt(values, function(evt, values) { + + }); + /*var current = common.project.image; alertify.prompt(gettextCatalog.getString('Enter the project\'s image path'), (current) ? current : '', function(evt, imagePath) { common.setImagePath(imagePath); - }); + });*/ } $scope.setRemoteHostname = function() { @@ -413,13 +386,16 @@ angular.module('icestudio') }); } - function checkGraph(callback) { + function checkGraph(callback, callback2) { if (!graph.isEmpty()) { if (callback) callback(); } else { - alertify.notify(gettextCatalog.getString('Add a block to start'), 'warning', 5); + if (callback2) + callback2(); + else + alertify.notify(gettextCatalog.getString('Add a block to start'), 'warning', 5); } } @@ -450,10 +426,6 @@ angular.module('icestudio') // Help $scope.openUrl = function(url) { - /*gui.Window.open(url, { - nodejs: false, - "new-instance": false - });*/ event.preventDefault(); gui.Shell.openExternal(url); } diff --git a/app/scripts/services/common.service.js b/app/scripts/services/common.service.js index 74e10f5f0..b2685b085 100644 --- a/app/scripts/services/common.service.js +++ b/app/scripts/services/common.service.js @@ -3,73 +3,8 @@ angular.module('icestudio') .service('common', ['$rootScope', 'gettextCatalog', 'window', 'graph', 'boards', 'compiler', 'utils', 'nodePath', 'nodeFs', function($rootScope, gettextCatalog, window, graph, boards, compiler, utils, nodePath, nodeFs) { - - // Variables - - this.project = { - image: '', - state: null, - board: '', - graph: {}, - deps: {} - }; - this.projectName = ''; - this.projectPath = ''; - // Functions - this.setProjectPath = function(path) { - this.projectPath = path; - } - - this.newProject = function(name) { - this.project = { - image: '', - state: null, - board: '', - graph: {}, - deps: {} - }; - graph.clearAll(); - graph.setState(this.project.state); - this.updateProjectName(name); - alertify.success(gettextCatalog.getString('New project {{name}} created', { name: utils.bold(name) })); - }; - - this.openProject = function(filepath) { - var self = this; - utils.readFile(filepath, function(data) { - var project = data; - if (project) { - var name = utils.basename(filepath); - self.loadProject(name, project); - } - }); - }; - - this.loadProject = function(name, project) { - this.updateProjectName(name); - this.project = JSON.parse(JSON.stringify(project)); - boards.selectBoard(project.board); - if (graph.loadGraph(project)) { - alertify.success(gettextCatalog.getString('Project {{name}} loaded', { name: utils.bold(name) })); - } - else { - alertify.notify(gettextCatalog.getString('Wrong project format: {{name}}', { name: utils.bold(name) }), 'error', 30); - } - if(!$rootScope.$$phase) { - $rootScope.$apply(); - } - }; - - this.saveProject = function(filepath) { - var name = utils.basename(filepath); - this.updateProjectName(name); - this.refreshProject(); - utils.saveFile(filepath, this.project, function() { - alertify.success(gettextCatalog.getString('Project {{name}} saved', { name: utils.bold(name) })); - }, true); - }; this.importBlock = function(filepath) { var self = this; @@ -187,108 +122,27 @@ angular.module('icestudio') }, true); }; - this.exportVerilog = function(filepath) { - var name = utils.basename(filepath); - this.refreshProject(); - // Generate verilog code from project - var verilog = compiler.generateVerilog(this.project); - utils.saveFile(filepath, verilog, function() { - alertify.success(gettextCatalog.getString('Verilog code exported')); - }, false); - }; - - this.exportPCF = function(filepath) { - var name = utils.basename(filepath); - this.refreshProject(); - // Generate pcf code from project - var pcf = compiler.generatePCF(this.project); - utils.saveFile(filepath, pcf, function() { - alertify.success(gettextCatalog.getString('PCF file exported')); - }, false); - }; - - this.exportTestbench = function(filepath) { - var name = utils.basename(filepath); - this.refreshProject(); - // Generate testbench code from project - var testbench = compiler.generateTestbench(this.project); - utils.saveFile(filepath, testbench, function() { - alertify.success(gettextCatalog.getString('Testbench exported')); - }, false); - }; - - this.exportGTKWave = function(filepath) { - var name = utils.basename(filepath); - this.refreshProject(); - // Generate gtkwave code from project - var gtkwave = compiler.generateGTKWave(this.project); - utils.saveFile(filepath, gtkwave, function() { - alertify.success(gettextCatalog.getString('GTKWave exported')); - }, false); - }; - this.sortGraph = function() { var cells = graph.getCells(); // Sort cells by x-coordinate cells = _.sortBy(cells, function(cell) { - return cell.attributes.position.x; + if (!cell.isLink()) { + return cell.attributes.position.x; + } }); // Sort cells by y-coordinate cells = _.sortBy(cells, function(cell) { - return cell.attributes.position.y; + if (!cell.isLink()) { + return cell.attributes.position.y; + } }); graph.setCells(cells); } - this.refreshProject = function(callback) { - var graphData = graph.toJSON(); - - var blocks = []; - var wires = []; - for (var c = 0; c < graphData.cells.length; c++) { - var cell = graphData.cells[c]; - - if (cell.type == 'ice.Generic' || - cell.type == 'ice.Input' || - cell.type == 'ice.Output' || - cell.type == 'ice.Code' || - cell.type == 'ice.Info' || - cell.type == 'ice.Constant') { - var block = {}; - block.id = cell.id; - block.type = cell.blockType; - block.data = cell.data; - block.position = cell.position; - if (cell.type == 'ice.Code') { - block.data.code = graph.getContent(cell.id); - } - else if (cell.type == 'ice.Info') { - block.data.info = graph.getContent(cell.id); - } - blocks.push(block); - } - else if (cell.type == 'ice.Wire') { - var wire = {}; - wire.source = { block: cell.source.id, port: cell.source.port }; - wire.target = { block: cell.target.id, port: cell.target.port }; - wire.vertices = cell.vertices; - wires.push(wire); - } - } - - this.project.state = graph.getState(); - - this.project.board = boards.selectedBoard.name; - - this.project.graph = { blocks: blocks, wires: wires }; - - if (callback) - callback(); - }; this.clearProject = function() { this.project = { diff --git a/app/scripts/services/compiler.service.js b/app/scripts/services/compiler.service.js index bf826eaa5..10dc051b4 100644 --- a/app/scripts/services/compiler.service.js +++ b/app/scripts/services/compiler.service.js @@ -4,30 +4,31 @@ angular.module('icestudio') .service('compiler', ['nodeSha1', '_package', function(nodeSha1, _package) { - this.generateVerilog = function(project) { - var code = header('//'); - code += '`default_nettype none\n'; - code += verilogCompiler('main', project); - return code; - }; - - this.generatePCF = function(project) { - var code = header('#'); - code += pcfCompiler(project); - return code; - }; - - this.generateTestbench = function(project) { - var code = header('//'); - code += testbenchCompiler(project); - return code; - }; - - this.generateGTKWave = function(project) { - var code = header('[*]'); - code += gtkwaveCompiler(project); + this.generate = function(target, project) { + var code = ''; + switch(target) { + case 'verilog': + code += header('//'); + code += '`default_nettype none\n'; + code += verilogCompiler('main', project); + break; + case 'pcf': + code += header('#'); + code += pcfCompiler(project); + break; + case 'testbench': + code += header('//'); + code += testbenchCompiler(project); + break; + case 'verilog': + code += header('[*]'); + code += gtkwaveCompiler(project); + break; + default: + code += ''; + } return code; - }; + } function header(comment) { var header = ''; diff --git a/app/scripts/services/graph.service.js b/app/scripts/services/graph.service.js index beb052cf1..6d07f86d3 100644 --- a/app/scripts/services/graph.service.js +++ b/app/scripts/services/graph.service.js @@ -56,6 +56,16 @@ angular.module('icestudio') this.setState(null); } + this.resetBreadcrumbs = function(name) { + if (this.breadcrumbs.length > 1) { + this.breadcrumbs = [{ name: name }]; + } + this.breadcrumbs[0].name = name; + if(!$rootScope.$$phase) { + $rootScope.$apply(); + } + } + function setGrid(paper, size, offset) { // TODO: draw grid in a SVG because 'background' truncates the parameters @@ -361,12 +371,12 @@ angular.module('icestudio') zIndex = 1; if (self.breadcrumbs.length == 2) { $rootScope.$broadcast('refreshProject', function() { - self.loadGraph(dependencies[data.blockType], disabled); + self.loadDesign(dependencies[data.blockType], disabled); self.appEnable(false); }); } else { - self.loadGraph(dependencies[data.blockType], disabled); + self.loadDesign(dependencies[data.blockType], disabled); self.appEnable(false); } } @@ -793,22 +803,22 @@ angular.module('icestudio') return paper.options.enabled; } - this.loadGraph = function(project, disabled) { - if (project && - project.graph && - project.graph.blocks && - project.graph.wires && - project.deps) { + this.loadDesign = function(design, disabled) { + if (design && + design.graph && + design.graph.blocks && + design.graph.wires && + design.deps) { - var blockInstances = project.graph.blocks; - var wires = project.graph.wires; - var deps = project.deps; + var blockInstances = design.graph.blocks; + var wires = design.graph.wires; + var deps = design.deps; - dependencies = project.deps; + dependencies = design.deps; this.clearAll(); - this.setState(project.state); + this.setState(design.state); // Blocks for (var i in blockInstances) { diff --git a/app/scripts/services/project.service.js b/app/scripts/services/project.service.js new file mode 100644 index 000000000..658989d23 --- /dev/null +++ b/app/scripts/services/project.service.js @@ -0,0 +1,147 @@ +'use strict'; + +angular.module('icestudio') + .service('project', function(graph, boards, compiler, utils, gettextCatalog) { + + this.path = ''; + this.project = {}; + + function _default() { + return { + version: '1.0', + package: { + name: '', + version: '', + description: '', + author: '', + image: '' + }, + design: { + board: '', + graph: { blocks: [], wires: [] }, + deps: {}, + state: { pan: { x: 0, y: 0 }, zoom: 1.0 } + } + } + }; + + this.new = function(name) { + this.path = ''; + this.project = _default(); + + graph.clearAll(); + graph.resetBreadcrumbs(name); + graph.setState(this.project.design.state); + + utils.updateWindowTitle(name + ' - Icestudio'); + alertify.success(gettextCatalog.getString('New project {{name}} created', { name: utils.bold(name) })); + }; + + this.open = function(filepath) { + var self = this; + utils.readFile(filepath, function(data) { + if (data) { + var name = utils.basename(filepath); + self.path = filepath; + self.load(name, data); + } + }); + }; + + this.load = function(name, data) { + this.name = name; + this.project = _safeLoad(name, data); + + if (graph.loadDesign(this.project.design)) { + graph.resetBreadcrumbs(name); + boards.selectBoard(this.project.design.board); + utils.rootScopeSafeApply(); + alertify.success(gettextCatalog.getString('Project {{name}} loaded', { name: utils.bold(name) })); + } + else { + alertify.notify(gettextCatalog.getString('Wrong project format: {{name}}', { name: utils.bold(name) }), 'error', 30); + } + }; + + function _safeLoad(name, data) { + var project = {}; + if (project.version) { + if (project.version == '1.0') { + // Version 1.0 + project = data; + } + } + else { + // Version 0.0 + project = _default() + project.package.name = name; + project.design = data; + } + return project; + }; + + this.save = function(filepath) { + var name = utils.basename(filepath); + utils.updateWindowTitle(name + ' - Icestudio'); + this.path = filepath; + + this.update(); + utils.saveFile(filepath, this.project, function() { + alertify.success(gettextCatalog.getString('Project {{name}} saved', { name: utils.bold(name) })); + }, true); + }; + + this.update = function(callback) { + var graphData = graph.toJSON(); + + var blocks = []; + var wires = []; + + for (var c = 0; c < graphData.cells.length; c++) { + var cell = graphData.cells[c]; + + if (cell.type == 'ice.Generic' || + cell.type == 'ice.Input' || + cell.type == 'ice.Output' || + cell.type == 'ice.Code' || + cell.type == 'ice.Info' || + cell.type == 'ice.Constant') { + var block = {}; + block.id = cell.id; + block.type = cell.blockType; + block.data = cell.data; + block.position = cell.position; + if (cell.type == 'ice.Code') { + block.data.code = graph.getContent(cell.id); + } + else if (cell.type == 'ice.Info') { + block.data.info = graph.getContent(cell.id); + } + blocks.push(block); + } + else if (cell.type == 'ice.Wire') { + var wire = {}; + wire.source = { block: cell.source.id, port: cell.source.port }; + wire.target = { block: cell.target.id, port: cell.target.port }; + wire.vertices = cell.vertices; + wires.push(wire); + } + } + + this.project.design.state = graph.getState(); + this.project.design.board = boards.selectedBoard.name; + this.project.design.graph = { blocks: blocks, wires: wires }; + + if (callback) + callback(); + }; + + this.export = function(target, filepath, message) { + this.update(); + var data = compiler.generate(target, this.project); + utils.saveFile(filepath, data, function() { + alertify.success(message); + }, false); + }; + + }); diff --git a/app/scripts/services/utils.service.js b/app/scripts/services/utils.service.js index 3fa11136f..2c5c35b83 100644 --- a/app/scripts/services/utils.service.js +++ b/app/scripts/services/utils.service.js @@ -2,8 +2,8 @@ 'use strict'; angular.module('icestudio') - .service('utils', ['gettextCatalog', 'nodeFs', 'nodeFse', 'nodeOs', 'nodePath', 'nodeChildProcess', 'nodeTarball', 'nodeZlib', 'nodeSudo', 'nodeOnline', 'nodeGlob', '_package', - function(gettextCatalog, nodeFs, nodeFse, nodeOs, nodePath, nodeChildProcess, nodeTarball, nodeZlib, nodeSudo, nodeOnline, nodeGlob, _package) { + .service('utils', ['$rootScope', 'gettextCatalog', 'nodeFs', 'nodeFse', 'nodeOs', 'nodePath', 'nodeChildProcess', 'nodeTarball', 'nodeZlib', 'nodeSudo', 'nodeOnline', 'nodeGlob', '_package', 'window', + function($rootScope, gettextCatalog, nodeFs, nodeFse, nodeOs, nodePath, nodeChildProcess, nodeTarball, nodeZlib, nodeSudo, nodeOnline, nodeGlob, _package, window) { const WIN32 = Boolean(process.platform.indexOf('win32') > -1); const DARWIN = Boolean(process.platform.indexOf('darwin') > -1); @@ -635,6 +635,40 @@ angular.module('icestudio') }); } + this.projectinfoprompt = function(values, callback) { + var content = []; + var messages = [ + gettextCatalog.getString('Name'), + gettextCatalog.getString('Version'), + gettextCatalog.getString('Description'), + gettextCatalog.getString('Author') + ] + var n = messages.length; + content.push('
    '); + for (var i in messages) { + if (i > 0) content.push('
    '); + content.push('

    ' + messages[i] + '

    '); + content.push(' '); + } + content.push('
    '); + // Restore values + for (var i = 0; i < n; i++) { + $('#input' + i.toString()).val(values[i]); + } + + alertify.confirm(content.join('\n')) + .set('onok', function(evt) { + var values = []; + for (var i = 0; i < n; i++) { + values.push($('#input' + i.toString()).val()); + } + if (callback) + callback(evt, values); + }) + .set('oncancel', function(evt) { + }); + } + this.copySync = function(orig, dest, filename) { var ret = true; try { @@ -675,6 +709,20 @@ angular.module('icestudio') return '' + text + ''; } + this.openDialog = function(inputID, ext, callback) { + var chooser = $(inputID); + chooser.unbind('change'); + chooser.change(function(evt) { + var filepath = $(this).val(); + //if (filepath.endsWith(ext)) { + if (callback) + callback(filepath); + //} + $(this).val(''); + }); + chooser.trigger('click'); + } + this.saveDialog = function(inputID, ext, callback) { var chooser = $(inputID); chooser.unbind('change'); @@ -689,4 +737,15 @@ angular.module('icestudio') chooser.trigger('click'); } + this.updateWindowTitle = function(title) { + window.get().title = title; + } + + this.rootScopeSafeApply = function() { + if(!$rootScope.$$phase) { + $rootScope.$apply(); + } + } + + }]); diff --git a/app/views/menu.html b/app/views/menu.html index 9d070693e..d0af6601b 100644 --- a/app/views/menu.html +++ b/app/views/menu.html @@ -6,8 +6,7 @@ - - + @@ -24,10 +23,10 @@ {{ 'File' | translate }}
    • - {{ 'New project' | translate }} + {{ 'New' | translate }}
    • - {{ 'Open project' | translate }} + {{ 'Open' | translate }}...
    • {{ 'Examples' | translate }} @@ -38,7 +37,7 @@ {{ example.name | translate }}
      • - + {{ child.name | translate }}
        • @@ -51,18 +50,15 @@ {{ 'Save' | translate }}
      • - {{ 'Save as' | translate }} + {{ 'Save as' | translate }}...
      • - {{ 'Import block' | translate }} -
        • -
      • - {{ 'Export as block' | translate }} + {{ 'Add as block' | translate }}...
      • - {{ 'Export' | translate }} + {{ 'Export' | translate }}...
        • {{ 'Verilog' }} @@ -102,7 +98,7 @@ {{ 'Preferences' | translate }}
          • - {{ 'Image path' | translate }} + {{ 'Project information' | translate }}
          • diff --git a/package.json b/package.json index b573ef17d..55c3fe0f7 100644 --- a/package.json +++ b/package.json @@ -30,6 +30,7 @@ "grunt-exec": "^1.0.0", "grunt-json-minify": "^1.1.0", "grunt-nw-builder": "^2.0.3", + "grunt-replace": "^1.0.1", "grunt-usemin": "^3.1.1", "grunt-wiredep": "^3.0.1", "load-grunt-tasks": "^3.5.0", From cc4c90ce74cf8616da258bb6b94393ee24702035 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jes=C3=BAs=20Arroyo=20Torrens?= Date: Thu, 15 Dec 2016 22:16:20 +0100 Subject: [PATCH 032/169] Update Design controller --- app/index.html | 2 +- .../controllers/{project.js => design.js} | 30 ++++++----- app/scripts/controllers/menu.js | 3 +- app/scripts/services/common.service.js | 12 +---- app/scripts/services/project.service.js | 51 ++++++++++++------- app/views/{project.html => design.html} | 2 +- app/views/main.html | 2 +- app/views/menu.html | 14 ++--- 8 files changed, 64 insertions(+), 52 deletions(-) rename app/scripts/controllers/{project.js => design.js} (57%) rename app/views/{project.html => design.html} (95%) diff --git a/app/index.html b/app/index.html index c8b5501eb..4ab667e81 100644 --- a/app/index.html +++ b/app/index.html @@ -51,7 +51,7 @@ - + diff --git a/app/scripts/controllers/project.js b/app/scripts/controllers/design.js similarity index 57% rename from app/scripts/controllers/project.js rename to app/scripts/controllers/design.js index 035da079f..a811e873b 100644 --- a/app/scripts/controllers/project.js +++ b/app/scripts/controllers/design.js @@ -1,14 +1,13 @@ 'use strict'; angular.module('icestudio') - .controller('ProjectCtrl', function ($rootScope, - $scope, - common, - boards, - graph, - gettextCatalog) { - - $scope.common = common; + .controller('DesignCtrl', function ($rootScope, + $scope, + project, + boards, + graph, + gettextCatalog) { + $scope.boards = boards; $scope.graph = graph; @@ -36,22 +35,27 @@ angular.module('icestudio') function loadSelectedGraph() { if (graph.breadcrumbs.length == 1) { - graph.loadGraph(common.project); + graph.loadDesign(project.project.design); graph.appEnable(true); } else { var disabled = true; - var project = common.project; + var p = project.project; for (var i = 1; i < graph.breadcrumbs.length; i++) { - project = project.deps[graph.breadcrumbs[i].name]; + if (p.design && p.design.deps) { + p = p.design.deps[graph.breadcrumbs[i].name]; + } + else if (p.deps) { + p = p.deps[graph.breadcrumbs[i].name]; + } } - graph.loadGraph(project, disabled); + graph.loadDesign(p.design, disabled); graph.appEnable(false); } } $rootScope.$on('refreshProject', function(event, callback) { - common.refreshProject(callback); + project.update(callback); }); }); diff --git a/app/scripts/controllers/menu.js b/app/scripts/controllers/menu.js index 6969209aa..75ce29465 100644 --- a/app/scripts/controllers/menu.js +++ b/app/scripts/controllers/menu.js @@ -24,6 +24,7 @@ angular.module('icestudio') $scope.common = common; $scope.boards = boards; $scope.profile = profile; + $scope.project = project; $scope.examples = resources.getExamples(); $scope.currentBoards = boards.getBoards(); @@ -240,7 +241,7 @@ angular.module('icestudio') if (graph.hasSelection()) { alertify.confirm(gettextCatalog.getString('Do you want to remove the selected block?'), function() { - common.removeSelected(); + project.removeSelected(); }); } } diff --git a/app/scripts/services/common.service.js b/app/scripts/services/common.service.js index b2685b085..974eefdaf 100644 --- a/app/scripts/services/common.service.js +++ b/app/scripts/services/common.service.js @@ -163,12 +163,7 @@ angular.module('icestudio') graph.cloneSelected(); }; - this.removeSelected = function() { - var self = this; - graph.removeSelected(function(type) { - delete self.project.deps[type]; - }); - }; + this.setImagePath = function(imagePath) { this.project.image = imagePath; @@ -188,9 +183,6 @@ angular.module('icestudio') } }; - this.addBlock = function(type, block) { - this.project.deps[type] = block; - graph.createBlock(type, block); - } + }]); diff --git a/app/scripts/services/project.service.js b/app/scripts/services/project.service.js index 658989d23..a82ee1bd3 100644 --- a/app/scripts/services/project.service.js +++ b/app/scripts/services/project.service.js @@ -4,7 +4,7 @@ angular.module('icestudio') .service('project', function(graph, boards, compiler, utils, gettextCatalog) { this.path = ''; - this.project = {}; + this.project = _default(); function _default() { return { @@ -25,37 +25,42 @@ angular.module('icestudio') } }; + this.updateName = function(name) { + if (name) { + graph.resetBreadcrumbs(name); + utils.updateWindowTitle(name + ' - Icestudio'); + this.project.package.name = name; + } + } + this.new = function(name) { this.path = ''; this.project = _default(); + this.updateName(name); graph.clearAll(); - graph.resetBreadcrumbs(name); graph.setState(this.project.design.state); - utils.updateWindowTitle(name + ' - Icestudio'); alertify.success(gettextCatalog.getString('New project {{name}} created', { name: utils.bold(name) })); }; this.open = function(filepath) { var self = this; + this.path = filepath; utils.readFile(filepath, function(data) { if (data) { var name = utils.basename(filepath); - self.path = filepath; self.load(name, data); } }); }; this.load = function(name, data) { - this.name = name; this.project = _safeLoad(name, data); if (graph.loadDesign(this.project.design)) { - graph.resetBreadcrumbs(name); boards.selectBoard(this.project.design.board); - utils.rootScopeSafeApply(); + this.updateName(name); alertify.success(gettextCatalog.getString('Project {{name}} loaded', { name: utils.bold(name) })); } else { @@ -65,25 +70,23 @@ angular.module('icestudio') function _safeLoad(name, data) { var project = {}; - if (project.version) { - if (project.version == '1.0') { - // Version 1.0 + switch(data.version) { + case '1.0': project = data; - } - } - else { - // Version 0.0 - project = _default() - project.package.name = name; - project.design = data; + break; + default: + project = _default(); + project.package.name = name; + project.design = data; + break; } return project; }; this.save = function(filepath) { var name = utils.basename(filepath); - utils.updateWindowTitle(name + ' - Icestudio'); this.path = filepath; + this.updateName(name); this.update(); utils.saveFile(filepath, this.project, function() { @@ -144,4 +147,16 @@ angular.module('icestudio') }, false); }; + this.addBlock = function(type, block) { + this.project.design.deps[type] = block; + graph.createBlock(type, block); + }; + + this.removeSelected = function() { + var self = this; + graph.removeSelected(function(type) { + delete self.project.design.deps[type]; + }); + }; + }); diff --git a/app/views/project.html b/app/views/design.html similarity index 95% rename from app/views/project.html rename to app/views/design.html index d47b4f66f..d8e41906d 100644 --- a/app/views/project.html +++ b/app/views/design.html @@ -1,4 +1,4 @@ -
            +
            • @@ -279,7 +279,7 @@ {{ blocks.name | translate }}
            • - + {{ block.name | translate }} @@ -287,7 +287,7 @@
              • - + {{ sblock.name | translate }}
                • From 4d7f0196a8c229d07a5bc2edc655931820b2a47a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jes=C3=BAs=20Arroyo=20Torrens?= Date: Thu, 15 Dec 2016 23:59:02 +0100 Subject: [PATCH 033/169] Remove common service. Update all services --- app/index.html | 1 - app/scripts/app.js | 4 +- app/scripts/controllers/design.js | 8 +- app/scripts/controllers/main.js | 3 +- app/scripts/controllers/menu.js | 132 ++++++--------- app/scripts/services/boards.service.js | 6 +- app/scripts/services/common.service.js | 188 ---------------------- app/scripts/services/compiler.service.js | 6 +- app/scripts/services/graph.service.js | 10 +- app/scripts/services/profile.service.js | 4 +- app/scripts/services/project.service.js | 160 ++++++++++++++++-- app/scripts/services/resources.service.js | 6 +- app/scripts/services/tools.service.js | 25 ++- app/scripts/services/utils.service.js | 19 ++- app/views/menu.html | 33 ++-- 15 files changed, 277 insertions(+), 328 deletions(-) delete mode 100644 app/scripts/services/common.service.js diff --git a/app/index.html b/app/index.html index 4ab667e81..2c2603cdc 100644 --- a/app/index.html +++ b/app/index.html @@ -57,7 +57,6 @@ - diff --git a/app/scripts/app.js b/app/scripts/app.js index 8aa6d8414..325416d63 100644 --- a/app/scripts/app.js +++ b/app/scripts/app.js @@ -18,7 +18,7 @@ angular }); } ]) - .run(function(profile, common, utils, nodeLangInfo, gettextCatalog) { + .run(function(profile, project, utils, gettextCatalog, nodeLangInfo) { // Load language profile.load(function(data) { var lang = profile.data.language; @@ -35,6 +35,6 @@ angular } }); setTimeout(function() { - common.updateProjectName(gettextCatalog.getString('untitled')); + project.updateName(gettextCatalog.getString('untitled')); }, 100); }); diff --git a/app/scripts/controllers/design.js b/app/scripts/controllers/design.js index a811e873b..590d9a78d 100644 --- a/app/scripts/controllers/design.js +++ b/app/scripts/controllers/design.js @@ -35,6 +35,7 @@ angular.module('icestudio') function loadSelectedGraph() { if (graph.breadcrumbs.length == 1) { + // TODO: back compat graph.loadDesign(project.project.design); graph.appEnable(true); } @@ -49,7 +50,12 @@ angular.module('icestudio') p = p.deps[graph.breadcrumbs[i].name]; } } - graph.loadDesign(p.design, disabled); + if (p.design) { + graph.loadDesign(p.design, disabled); + } + else if (p.deps) { + graph.loadDesign(p.deps, disabled); + } graph.appEnable(false); } } diff --git a/app/scripts/controllers/main.js b/app/scripts/controllers/main.js index 074282b40..67710ab2c 100644 --- a/app/scripts/controllers/main.js +++ b/app/scripts/controllers/main.js @@ -1,7 +1,8 @@ 'use strict'; angular.module('icestudio') - .controller('MainCtrl', function($scope, gettextCatalog) { + .controller('MainCtrl', function($scope, + gettextCatalog) { alertify.defaults.movable = false; alertify.defaults.closable = false; diff --git a/app/scripts/controllers/menu.js b/app/scripts/controllers/menu.js index 75ce29465..fb2bff34f 100644 --- a/app/scripts/controllers/menu.js +++ b/app/scripts/controllers/menu.js @@ -4,24 +4,21 @@ angular.module('icestudio') .controller('MenuCtrl', function ($rootScope, $scope, $timeout, + boards, + profile, project, - nodeLangInfo, - nodeFs, - nodePath, - common, + resources, graph, tools, - boards, - resources, - profile, gui, utils, gettextCatalog, - _package) { + _package, + nodeFs, + nodePath) { - // Initialize scope + //-- Initialize scope - $scope.common = common; $scope.boards = boards; $scope.profile = profile; $scope.project = project; @@ -51,16 +48,7 @@ angular.module('icestudio') win.menu = mb; } - function pathSync() { - if ($scope.currentProjectPath) { - var projectPath = utils.dirname($scope.currentProjectPath); - tools.setProjectPath(projectPath); - common.setProjectPath(projectPath); - } - } - - // Menu - + // Menu timer var timer; // mouseover event @@ -77,7 +65,7 @@ angular.module('icestudio') }; - // File + //-- File $scope.newProject = function() { alertify.prompt( @@ -145,9 +133,7 @@ angular.module('icestudio') $scope.addAsBlock = function() { utils.openDialog('#input-add-as-block', '.ice', function(filepath) { - checkGraph(function() { - project.addAsBlock(filepath); - }); + project.addAsBlock(filepath); }); }; @@ -192,7 +178,34 @@ angular.module('icestudio') }; - // Edit + //-- Edit + + $scope.resetView = function() { + graph.resetState(); + } + + $scope.cloneSelected = function() { + graph.cloneSelected(); + }; + + $scope.removeSelected = function() { + if (graph.hasSelection()) { + // TODO: don't show again checkbox + alertify.confirm(gettextCatalog.getString('Do you want to remove the selected block?'), + function() { + project.removeSelected(); + }); + } + }; + + $scope.clearGraph = function() { + checkGraph(function() { + alertify.confirm(gettextCatalog.getString('Do you want to clear all?'), + function() { + project.clear(); + }); + }); + }; $scope.setProjectInformation = function() { @@ -202,12 +215,12 @@ angular.module('icestudio') utils.projectinfoprompt(values, function(evt, values) { }); - /*var current = common.project.image; + /*var current = project.image; alertify.prompt(gettextCatalog.getString('Enter the project\'s image path'), (current) ? current : '', function(evt, imagePath) { common.setImagePath(imagePath); });*/ - } + }; $scope.setRemoteHostname = function() { var current = profile.data.remoteHostname; @@ -215,36 +228,14 @@ angular.module('icestudio') function(evt, remoteHostname) { profile.data.remoteHostname = remoteHostname; }); - } + }; $scope.selectLanguage = function(language) { if (profile.data.language != language) { profile.data.language = language; utils.setLocale(language); } - } - - $scope.clearGraph = function() { - checkGraph(function() { - alertify.confirm(gettextCatalog.getString('Do you want to clear all?'), - function() { - common.clearProject(); - }); - }); - } - - $scope.cloneSelected = function() { - common.cloneSelected(); - } - - $scope.removeSelected = function() { - if (graph.hasSelection()) { - alertify.confirm(gettextCatalog.getString('Do you want to remove the selected block?'), - function() { - project.removeSelected(); - }); - } - } + }; // Key events @@ -298,11 +289,8 @@ angular.module('icestudio') }); } - // View - $scope.resetState = function() { - graph.resetState(); - } + //-- View $scope.showPCF = function() { gui.Window.open('resources/viewers/plain/pcf.html?board=' + boards.selectedBoard.name, { @@ -344,7 +332,7 @@ angular.module('icestudio') } } - // Boards + //-- Boards $scope.selectBoard = function(board) { if (boards.selectedBoard.name != board.name) { @@ -354,9 +342,7 @@ angular.module('icestudio') boards.selectBoard(board.name); graph.resetIOChoices(); alertify.success(gettextCatalog.getString('Board {{name}} selected', { name: utils.bold(board.info.label) })); - if(!$rootScope.$$phase) { - $rootScope.$apply(); - } + utils.rootScopeSafeApply(); }); } else { @@ -367,7 +353,8 @@ angular.module('icestudio') } } - // Tools + + //-- Tools $scope.verifyCode = function() { checkGraph(function() { @@ -400,31 +387,8 @@ angular.module('icestudio') } } - $scope.installToolchain = function() { - tools.installToolchain(); - } - - $scope.updateToolchain = function() { - tools.updateToolchain(); - } - - $scope.removeToolchain = function() { - tools.removeToolchain(); - } - - $scope.resetToolchain = function() { - tools.resetToolchain(); - } - - $scope.enableDrivers = function() { - tools.enableDrivers(); - } - - $scope.disableDrivers = function() { - tools.disableDrivers(); - } - // Help + //-- Help $scope.openUrl = function(url) { event.preventDefault(); diff --git a/app/scripts/services/boards.service.js b/app/scripts/services/boards.service.js index 0d33490df..7a15481e2 100644 --- a/app/scripts/services/boards.service.js +++ b/app/scripts/services/boards.service.js @@ -1,8 +1,8 @@ 'use strict'; angular.module('icestudio') - .service('boards', ['nodePath', 'nodeFs', - function(nodePath, nodeFs) { + .service('boards', function(nodeFs, + nodePath) { this.selectedBoard = null; this.currentBoards = loadBoards(nodePath.join('resources', 'boards')); @@ -57,4 +57,4 @@ angular.module('icestudio') return this.selectedBoard.pinout; }; - }]); + }); diff --git a/app/scripts/services/common.service.js b/app/scripts/services/common.service.js deleted file mode 100644 index 974eefdaf..000000000 --- a/app/scripts/services/common.service.js +++ /dev/null @@ -1,188 +0,0 @@ -'use strict'; - -angular.module('icestudio') - .service('common', ['$rootScope', 'gettextCatalog', 'window', 'graph', 'boards', 'compiler', 'utils', 'nodePath', 'nodeFs', - function($rootScope, gettextCatalog, window, graph, boards, compiler, utils, nodePath, nodeFs) { - // Functions - - - this.importBlock = function(filepath) { - var self = this; - utils.readFile(filepath, function(data) { - var block = data; - if (block) { - var name = utils.basename(filepath); - var path = utils.dirname(filepath); - // 1. Parse and find included files - var code = JSON.stringify(block); - var files = utils.findIncludedFiles(code); - // Are there included files? - if (files.length > 0) { - // 2. Check project's directory - if (self.projectPath) { - // 3. Copy the included files - copyIncludedFiles(function(success) { - if (success) { - // 4. Success: import block - doImportBlock(); - } - }); - } - else { - alertify.confirm(gettextCatalog.getString('This import operation requires a project path. You need to save the current project. Do you want to continue?'), - function() { - $rootScope.$emit('saveProjectAs', function() { - setTimeout(function() { - // 3. Copy the included files - copyIncludedFiles(function(success) { - if (success) { - // 4. Success: import block - doImportBlock(); - } - }); - }, 500); - }); - }); - } - } - else { - // No included files to copy - // 4. Import block - doImportBlock(); - } - } - - function copyIncludedFiles(callback) { - var success = true; - async.eachSeries(files, function(filename, next) { - setTimeout(function() { - var origPath = nodePath.join(path, filename); - var destPath = nodePath.join(self.projectPath, filename); - if (nodeFs.existsSync(destPath)) { - alertify.confirm(gettextCatalog.getString('File {{file}} already exists in the project path. Do you want to replace it?', { file: utils.bold(filename) }), - function() { - success &= doCopySync(origPath, destPath, filename) - if (!success) { - return next(); // break - } - next(); - }, - function() { - next(); - }); - } - else { - success &= doCopySync(origPath, destPath, filename) - if (!success) { - return next(); // break - } - next(); - } - }, 0); - }, function(result) { - return callback(success); - }); - } - - function doCopySync(orig, dest, filename) { - var success = utils.copySync(orig, dest, filename); - if (success) { - alertify.notify(gettextCatalog.getString('File {{file}} imported', { file: utils.bold(filename) }), 'message', 5); - } - else { - alertify.notify(gettextCatalog.getString('Original file {{file}} does not exist', { file: utils.bold(filename) }), 'error', 30); - } - return success; - } - - function doImportBlock() { - graph.importBlock(name, block); - self.project.deps[name] = block; - alertify.success(gettextCatalog.getString('Block {{name}} imported', { name: utils.bold(name) })); - } - - }); - }; - - this.exportAsBlock = function(filepath) { - var name = utils.basename(filepath); - this.sortGraph(); - this.refreshProject(); - // Convert project to block - var block = angular.copy(this.project); - delete block.board; - for (var i in block.graph.blocks) { - if (block.graph.blocks[i].type == 'basic.input' || - block.graph.blocks[i].type == 'basic.output') { - delete block.graph.blocks[i].data.pin; - } - } - utils.saveFile(filepath, block, function() { - alertify.success(gettextCatalog.getString('Block exported as {{name}}', { name: utils.bold(name) })); - }, true); - }; - - this.sortGraph = function() { - var cells = graph.getCells(); - - // Sort cells by x-coordinate - cells = _.sortBy(cells, function(cell) { - if (!cell.isLink()) { - return cell.attributes.position.x; - } - }); - - // Sort cells by y-coordinate - cells = _.sortBy(cells, function(cell) { - if (!cell.isLink()) { - return cell.attributes.position.y; - } - }); - - graph.setCells(cells); - } - - - - this.clearProject = function() { - this.project = { - image: '', - state: this.project.state, - board: '', - graph: {}, - deps: {} - }; - graph.clearAll(); - graph.breadcrumbs = [{ name: this.projectName }]; - if(!$rootScope.$$phase) { - $rootScope.$apply(); - } - }; - - this.cloneSelected = function() { - graph.cloneSelected(); - }; - - - - this.setImagePath = function(imagePath) { - this.project.image = imagePath; - } - - this.updateProjectName = function(name) { - if (name) { - this.projectName = name - if (graph.breadcrumbs.length > 1) { - graph.breadcrumbs = [{ name: name }]; - } - graph.breadcrumbs[0].name = name; - if(!$rootScope.$$phase) { - $rootScope.$apply(); - } - window.get().title = name + ' - Icestudio'; - } - }; - - - - }]); diff --git a/app/scripts/services/compiler.service.js b/app/scripts/services/compiler.service.js index 10dc051b4..f42abc83d 100644 --- a/app/scripts/services/compiler.service.js +++ b/app/scripts/services/compiler.service.js @@ -1,8 +1,8 @@ 'use strict'; angular.module('icestudio') - .service('compiler', ['nodeSha1', '_package', - function(nodeSha1, _package) { + .service('compiler', function(nodeSha1, + _package) { this.generate = function(target, project) { var code = ''; @@ -500,4 +500,4 @@ angular.module('icestudio') return [input, output]; } - }]); + }); diff --git a/app/scripts/services/graph.service.js b/app/scripts/services/graph.service.js index 6d07f86d3..666c810a5 100644 --- a/app/scripts/services/graph.service.js +++ b/app/scripts/services/graph.service.js @@ -1,8 +1,12 @@ 'use strict'; angular.module('icestudio') - .service('graph', ['$rootScope', 'gettextCatalog', 'nodeFs', 'joint', 'boards', 'utils', - function($rootScope, gettextCatalog, nodeFs, joint, boards, utils) { + .service('graph', function($rootScope, + joint, + boards, + utils, + gettextCatalog, + nodeFs) { // Variables @@ -1109,4 +1113,4 @@ angular.module('icestudio') graph.addCell(cell); } - }]); + }); diff --git a/app/scripts/services/profile.service.js b/app/scripts/services/profile.service.js index b13f780dc..c6c8fc5fd 100644 --- a/app/scripts/services/profile.service.js +++ b/app/scripts/services/profile.service.js @@ -1,7 +1,9 @@ 'use strict'; angular.module('icestudio') - .service('profile', function(nodeFs, nodePath, utils) { + .service('profile', function(utils, + nodeFs, + nodePath) { const BASE_DIR = process.env.HOME || process.env.USERPROFILE; const ICESTUDIO_DIR = nodePath.join(BASE_DIR, '.icestudio'); diff --git a/app/scripts/services/project.service.js b/app/scripts/services/project.service.js index a82ee1bd3..d0a6e1e94 100644 --- a/app/scripts/services/project.service.js +++ b/app/scripts/services/project.service.js @@ -1,9 +1,16 @@ 'use strict'; angular.module('icestudio') - .service('project', function(graph, boards, compiler, utils, gettextCatalog) { + .service('project', function(graph, + boards, + compiler, + utils, + gettextCatalog, + nodeFs, + nodePath) { - this.path = ''; + this.name = ''; // Used in File dialogs + this.path = ''; // Used in Save / Save as this.project = _default(); function _default() { @@ -25,14 +32,6 @@ angular.module('icestudio') } }; - this.updateName = function(name) { - if (name) { - graph.resetBreadcrumbs(name); - utils.updateWindowTitle(name + ' - Icestudio'); - this.project.package.name = name; - } - } - this.new = function(name) { this.path = ''; this.project = _default(); @@ -76,7 +75,6 @@ angular.module('icestudio') break; default: project = _default(); - project.package.name = name; project.design = data; break; } @@ -88,12 +86,138 @@ angular.module('icestudio') this.path = filepath; this.updateName(name); + sortGraph(); this.update(); utils.saveFile(filepath, this.project, function() { alertify.success(gettextCatalog.getString('Project {{name}} saved', { name: utils.bold(name) })); }, true); }; + function sortGraph() { + var cells = graph.getCells(); + + // Sort cells by x-coordinate + cells = _.sortBy(cells, function(cell) { + if (!cell.isLink()) + return cell.attributes.position.x; + }); + + // Sort cells by y-coordinate + cells = _.sortBy(cells, function(cell) { + if (!cell.isLink()) + return cell.attributes.position.y; + }); + + graph.setCells(cells); + }; + + this.addAsBlock = function(filepath) { + var self = this; + utils.readFile(filepath, function(data) { + var name = utils.basename(filepath); + var path = utils.dirname(filepath); + var block = _safeLoad(name, data); + if (block) { + // 1. Parse and find included files + var code = JSON.stringify(block); + var files = utils.findIncludedFiles(code); + // Are there included files? + if (files.length > 0) { + // 2. Check project's directory + if (self.path) { + // 3. Copy the included files + copyIncludedFiles(function(success) { + if (success) { + // 4. Success: import block + doImportBlock(name, block); + } + }); + } + else { + alertify.confirm(gettextCatalog.getString('This import operation requires a project path. You need to save the current project. Do you want to continue?'), + function() { + $rootScope.$emit('saveProjectAs', function() { + setTimeout(function() { + // 3. Copy the included files + copyIncludedFiles(function(success) { + if (success) { + // 4. Success: import block + doImportBlock(name, block); + } + }); + }, 500); + }); + }); + } + } + else { + // No included files to copy + // 4. Import block + doImportBlock(name, block); + } + } + + function copyIncludedFiles(callback) { + var success = true; + async.eachSeries(files, function(filename, next) { + setTimeout(function() { + var origPath = nodePath.join(path, filename); + var destPath = nodePath.join(self.projectPath, filename); + if (nodeFs.existsSync(destPath)) { + alertify.confirm(gettextCatalog.getString('File {{file}} already exists in the project path. Do you want to replace it?', { file: utils.bold(filename) }), + function() { + success &= doCopySync(origPath, destPath, filename) + if (!success) { + return next(); // break + } + next(); + }, + function() { + next(); + }); + } + else { + success &= doCopySync(origPath, destPath, filename) + if (!success) { + return next(); // break + } + next(); + } + }, 0); + }, function(result) { + return callback(success); + }); + }; + + function doCopySync(orig, dest, filename) { + var success = utils.copySync(orig, dest, filename); + if (success) { + alertify.notify(gettextCatalog.getString('File {{file}} imported', { file: utils.bold(filename) }), 'message', 5); + } + else { + alertify.notify(gettextCatalog.getString('Original file {{file}} does not exist', { file: utils.bold(filename) }), 'error', 30); + } + return success; + }; + + function doImportBlock(name, block) { + // Convert project to block + delete block.design.board; + for (var i in block.design.graph.blocks) { + if (block.design.graph.blocks[i].type == 'basic.input' || + block.design.graph.blocks[i].type == 'basic.output') { + delete block.design.graph.blocks[i].data.pin; + } + } + // Add block + graph.importBlock(name, block.design); + self.project.design.deps[name] = block; + alertify.success(gettextCatalog.getString('Block {{name}} imported', { name: utils.bold(name) })); + }; + + }); + }; + this.update = function(callback) { var graphData = graph.toJSON(); @@ -139,6 +263,14 @@ angular.module('icestudio') callback(); }; + this.updateName = function(name) { + if (name) { + this.name = name; + graph.resetBreadcrumbs(name); + utils.updateWindowTitle(name + ' - Icestudio'); + } + }; + this.export = function(target, filepath, message) { this.update(); var data = compiler.generate(target, this.project); @@ -159,4 +291,10 @@ angular.module('icestudio') }); }; + this.clear = function() { + this.project = _default(); + graph.clearAll(); + graph.resetBreadcrumbs(); + }; + }); diff --git a/app/scripts/services/resources.service.js b/app/scripts/services/resources.service.js index 2c4c1ff2c..d2fc61180 100644 --- a/app/scripts/services/resources.service.js +++ b/app/scripts/services/resources.service.js @@ -1,8 +1,8 @@ 'use strict'; angular.module('icestudio') - .service('resources', ['nodePath', 'utils', - function(nodePath, utils) { + .service('resources', function(utils, + nodePath) { this.getExamples = function() { return utils.getFilesRecursive(nodePath.join('resources', 'examples'), '.ice'); @@ -12,4 +12,4 @@ angular.module('icestudio') return utils.getFilesRecursive(nodePath.join('resources', 'blocks'), '.iceb'); } - }]); + }); diff --git a/app/scripts/services/tools.service.js b/app/scripts/services/tools.service.js index 0b836c737..58109719a 100644 --- a/app/scripts/services/tools.service.js +++ b/app/scripts/services/tools.service.js @@ -1,8 +1,21 @@ 'use strict'; angular.module('icestudio') - .service('tools', ['gettextCatalog', 'gettext', 'profile', 'nodeFs', 'nodeFse', 'nodeOs', 'nodePath', 'nodeProcess', 'nodeChildProcess', 'nodeSSHexec', 'nodeRSync', 'common', 'boards', 'compiler', 'utils', - function(gettextCatalog, gettext, profile, nodeFs, nodeFse, nodeOs, nodePath, nodeProcess, nodeChildProcess, nodeSSHexec, nodeRSync, common, boards, compiler, utils) { + .service('tools', function(project, + boards, + compiler, + profile, + utils, + gettextCatalog, + gettext, + nodeFs, + nodeFse, + nodeOs, + nodePath, + nodeProcess, + nodeChildProcess, + nodeSSHexec, + nodeRSync) { var currentAlert = null; var toolchain = { apio: '-', installed: false, disabled: false }; @@ -111,9 +124,9 @@ angular.module('icestudio') this.generateCode = function() { if (!nodeFs.existsSync(this.buildPath)) nodeFs.mkdirSync(this.buildPath); - common.refreshProject(); - var verilog = compiler.generateVerilog(common.project); - var pcf = compiler.generatePCF(common.project); + project.update(); + var verilog = compiler.generate('verilog', project.project); + var pcf = compiler.generate('pcf', project.project); nodeFs.writeFileSync(nodePath.join(this.buildPath, 'main.v'), verilog, 'utf8'); nodeFs.writeFileSync(nodePath.join(this.buildPath, 'main.pcf'), pcf, 'utf8'); return verilog; @@ -546,4 +559,4 @@ angular.module('icestudio') .css('width', '100%'); } - }]); + }); diff --git a/app/scripts/services/utils.service.js b/app/scripts/services/utils.service.js index 2c5c35b83..ed786a51c 100644 --- a/app/scripts/services/utils.service.js +++ b/app/scripts/services/utils.service.js @@ -2,8 +2,20 @@ 'use strict'; angular.module('icestudio') - .service('utils', ['$rootScope', 'gettextCatalog', 'nodeFs', 'nodeFse', 'nodeOs', 'nodePath', 'nodeChildProcess', 'nodeTarball', 'nodeZlib', 'nodeSudo', 'nodeOnline', 'nodeGlob', '_package', 'window', - function($rootScope, gettextCatalog, nodeFs, nodeFse, nodeOs, nodePath, nodeChildProcess, nodeTarball, nodeZlib, nodeSudo, nodeOnline, nodeGlob, _package, window) { + .service('utils', function($rootScope, + gettextCatalog, + _package, + window, + nodeFs, + nodeFse, + nodeOs, + nodePath, + nodeChildProcess, + nodeTarball, + nodeZlib, + nodeSudo, + nodeOnline, + nodeGlob) { const WIN32 = Boolean(process.platform.indexOf('win32') > -1); const DARWIN = Boolean(process.platform.indexOf('darwin') > -1); @@ -747,5 +759,4 @@ angular.module('icestudio') } } - - }]); + }); diff --git a/app/views/menu.html b/app/views/menu.html index 95b7d5427..fb97cb97d 100644 --- a/app/views/menu.html +++ b/app/views/menu.html @@ -3,15 +3,15 @@
              • +
            • + {{ 'Add as block' | translate }}... +
            • {{ 'Save' | translate }} @@ -53,10 +56,6 @@ {{ 'Save as' | translate }}...
            • -
            • - {{ 'Add as block' | translate }}... -
              • -
            • {{ 'Export' | translate }}...
                @@ -81,7 +80,7 @@ {{ 'Edit' | translate }}
                • - {{ 'Reset view' | translate }} + {{ 'Reset view' | translate }}
                • @@ -192,20 +191,20 @@ {{ 'Toolchain' | translate }}
                  • - + {{ 'Install' | translate }} - + {{ 'Update' | translate }}
                  • - + {{ 'Remove' | translate }}
                  • - + {{ 'Reset default' | translate }}
                    • @@ -219,11 +218,11 @@ {{ 'Drivers' | translate }} From decc8a0603faeef09d7cd86b50c96429799fb45a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jes=C3=BAs=20Arroyo=20Torrens?= Date: Fri, 16 Dec 2016 00:06:46 +0100 Subject: [PATCH 034/169] Add File > Quit --- app/scripts/controllers/menu.js | 33 ++++++++++++++++++++------------- app/views/menu.html | 4 ++++ 2 files changed, 24 insertions(+), 13 deletions(-) diff --git a/app/scripts/controllers/menu.js b/app/scripts/controllers/menu.js index fb2bff34f..78f3686bf 100644 --- a/app/scripts/controllers/menu.js +++ b/app/scripts/controllers/menu.js @@ -177,12 +177,17 @@ angular.module('icestudio') $scope.workingdir = utils.dirname(filepath) + utils.sep; }; + $scope.quit = function() { + profile.save(); + win.close(true); + }; + //-- Edit $scope.resetView = function() { graph.resetState(); - } + }; $scope.cloneSelected = function() { graph.cloneSelected(); @@ -276,7 +281,7 @@ angular.module('icestudio') var base64Data = img.replace(/^data:image\/(png|jpg|jpeg);base64,/, ""); saveSnapshot(base64Data); }, 'png'); - } + }; function saveSnapshot(base64Data) { utils.saveDialog('#input-save-snapshot', '.png', function(filepath) { @@ -287,7 +292,7 @@ angular.module('icestudio') else throw err; }); }); - } + }; //-- View @@ -302,7 +307,7 @@ angular.module('icestudio') height: 700, icon: 'resources/images/icestudio-logo.png' }); - } + }; $scope.showPinout = function() { var board = boards.selectedBoard; @@ -320,7 +325,7 @@ angular.module('icestudio') else { alertify.notify(gettextCatalog.getString('{{board}} pinout not defined', { board: utils.bold(board.info.label) }), 'warning', 5); } - } + }; $scope.showDatasheet = function() { var board = boards.selectedBoard; @@ -330,7 +335,8 @@ angular.module('icestudio') else { alertify.notify(gettextCatalog.getString('{{board}} datasheet not defined', { board: utils.bold(board.info.label) }), 'error', 5); } - } + }; + //-- Boards @@ -351,7 +357,7 @@ angular.module('icestudio') alertify.success(gettextCatalog.getString('Board {{name}} selected', { name: utils.bold(board.info.label) })); } } - } + }; //-- Tools @@ -360,19 +366,19 @@ angular.module('icestudio') checkGraph(function() { tools.verifyCode(); }); - } + }; $scope.buildCode = function() { checkGraph(function() { tools.buildCode(); }); - } + }; $scope.uploadCode = function() { checkGraph(function() { tools.uploadCode(); }); - } + }; function checkGraph(callback, callback2) { if (!graph.isEmpty()) { @@ -385,7 +391,7 @@ angular.module('icestudio') else alertify.notify(gettextCatalog.getString('Add a block to start'), 'warning', 5); } - } + }; //-- Help @@ -393,7 +399,7 @@ angular.module('icestudio') $scope.openUrl = function(url) { event.preventDefault(); gui.Shell.openExternal(url); - } + }; $scope.about = function() { var content = [ @@ -411,5 +417,6 @@ angular.module('icestudio') ' ', ''].join('\n'); alertify.alert(content); - } + }; + }); diff --git a/app/views/menu.html b/app/views/menu.html index fb97cb97d..6609f9367 100644 --- a/app/views/menu.html +++ b/app/views/menu.html @@ -73,6 +73,10 @@
                  • +
                • +
                • + {{ 'Quit' | translate }} +
                From 099a38cef90cce59cb187cf2eb270fb0bf1c4aeb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jes=C3=BAs=20Arroyo=20Torrens?= Date: Fri, 16 Dec 2016 00:51:38 +0100 Subject: [PATCH 035/169] Update graph and compiler services to the new project format --- app/scripts/controllers/menu.js | 14 ++++++++--- app/scripts/services/compiler.service.js | 32 ++++++++++++++---------- app/scripts/services/graph.service.js | 25 +++++++++--------- app/scripts/services/project.service.js | 22 ++++++++++------ app/scripts/services/tools.service.js | 7 +----- 5 files changed, 59 insertions(+), 41 deletions(-) diff --git a/app/scripts/controllers/menu.js b/app/scripts/controllers/menu.js index 78f3686bf..a579ec0a8 100644 --- a/app/scripts/controllers/menu.js +++ b/app/scripts/controllers/menu.js @@ -178,10 +178,18 @@ angular.module('icestudio') }; $scope.quit = function() { - profile.save(); - win.close(true); + exit(); }; + function exit() { + alertify.confirm( + gettextCatalog.getString('Do you want to exit the application?'), + function() { + profile.save(); + win.close(true); + }); + } + //-- Edit @@ -209,7 +217,7 @@ angular.module('icestudio') function() { project.clear(); }); - }); + }, function() {}); }; $scope.setProjectInformation = function() { diff --git a/app/scripts/services/compiler.service.js b/app/scripts/services/compiler.service.js index f42abc83d..c64083b62 100644 --- a/app/scripts/services/compiler.service.js +++ b/app/scripts/services/compiler.service.js @@ -116,7 +116,7 @@ angular.module('icestudio') function getParams(project) { var params = []; - var graph = project.graph; + var graph = project.design.graph; for (var i in graph.blocks) { var block = graph.blocks[i]; @@ -136,7 +136,7 @@ angular.module('icestudio') in: [], out: [] }; - var graph = project.graph; + var graph = project.design.graph; for (var i in graph.blocks) { var block = graph.blocks[i]; @@ -153,7 +153,7 @@ angular.module('icestudio') function getContent(name, project) { var content = []; - var graph = project.graph; + var graph = project.design.graph; var connections = { localparam: [], wire: [], @@ -216,7 +216,7 @@ angular.module('icestudio') // Block instances - content = content.concat(getInstances(name, project.graph)); + content = content.concat(getInstances(name, project.design.graph)); return content.join('\n'); } @@ -314,7 +314,11 @@ angular.module('icestudio') var code = ''; if (project && - project.graph) { + project.design && + project.design.graph) { + + var graph = project.design.graph; + var deps = project.design.deps; // Scape dot in name @@ -334,14 +338,14 @@ angular.module('icestudio') // Dependencies modules - for (var d in project.deps) { - code += verilogCompiler(name + '_' + digestId(d, true), project.deps[d]); + for (var d in deps) { + code += verilogCompiler(name + '_' + digestId(d, true), deps[d]); } // Code modules - for (var i in project.graph.blocks) { - var block = project.graph.blocks[i]; + for (var i in graph.blocks) { + var block = graph.blocks[i]; if (block) { if (block.type == 'basic.code') { var data = { @@ -361,9 +365,10 @@ angular.module('icestudio') function pcfCompiler(project) { var code = ''; + var graph = project.design.graph; - for (var i in project.graph.blocks) { - var block = project.graph.blocks[i]; + for (var i in graph.blocks) { + var block = graph.blocks[i]; if (block.type == 'basic.input' || block.type == 'basic.output') { code += 'set_io '; @@ -475,8 +480,9 @@ angular.module('icestudio') var output = []; var input_unnamed = 0; var output_unnamed = 0; - for (var i in project.graph.blocks) { - var block = project.graph.blocks[i]; + var graph = project.design.graph; + for (var i in graph.blocks) { + var block = graph.blocks[i]; if (block.type == 'basic.input') { if (block.data.label) { input.push({ id: digestId(block.id), label: 'input_' + block.data.label.replace(' ', '_') }); diff --git a/app/scripts/services/graph.service.js b/app/scripts/services/graph.service.js index 666c810a5..68114cd5c 100644 --- a/app/scripts/services/graph.service.js +++ b/app/scripts/services/graph.service.js @@ -688,11 +688,12 @@ angular.module('icestudio') } else { if (block && - block.graph && - block.graph.blocks && - block.graph.wires && - block.deps) { - dependencies[type] = block; + block.design && + block.design.graph && + block.design.graph.blocks && + block.design.graph.wires && + block.design.deps) { + dependencies[type] = block.design; blockInstance.position.x = 6 * gridsize; blockInstance.position.y = 16 * gridsize; var cell = addGenericBlock(blockInstance, block); @@ -980,8 +981,8 @@ angular.module('icestudio') var topPorts = []; var bottomPorts = []; - for (var i in block.graph.blocks) { - var item = block.graph.blocks[i]; + for (var i in block.design.graph.blocks) { + var item = block.design.graph.blocks[i]; if (item.type == 'basic.input') { leftPorts.push({ id: item.id, @@ -1037,13 +1038,13 @@ angular.module('icestudio') } var blockImage = ''; - if (block.image) { + if (block.package.image) { width = 12 * gridsize; - if (block.image.startsWith('%3Csvg')) { - blockImage = block.image; + if (block.package.image.startsWith('%3Csvg')) { + blockImage = block.package.image; } - else if (block.image.startsWith(' Date: Fri, 16 Dec 2016 02:00:48 +0100 Subject: [PATCH 036/169] Improvements in data load --- app/scripts/controllers/design.js | 18 +----- app/scripts/controllers/menu.js | 19 +++--- app/scripts/services/graph.service.js | 80 ++++++++++++++----------- app/scripts/services/project.service.js | 17 ++++-- 4 files changed, 69 insertions(+), 65 deletions(-) diff --git a/app/scripts/controllers/design.js b/app/scripts/controllers/design.js index 590d9a78d..536753be5 100644 --- a/app/scripts/controllers/design.js +++ b/app/scripts/controllers/design.js @@ -35,32 +35,20 @@ angular.module('icestudio') function loadSelectedGraph() { if (graph.breadcrumbs.length == 1) { - // TODO: back compat - graph.loadDesign(project.project.design); - graph.appEnable(true); + graph.loadDesign(project.project.design, false); } else { - var disabled = true; var p = project.project; for (var i = 1; i < graph.breadcrumbs.length; i++) { if (p.design && p.design.deps) { p = p.design.deps[graph.breadcrumbs[i].name]; } - else if (p.deps) { - p = p.deps[graph.breadcrumbs[i].name]; - } - } - if (p.design) { - graph.loadDesign(p.design, disabled); - } - else if (p.deps) { - graph.loadDesign(p.deps, disabled); } - graph.appEnable(false); + graph.loadDesign(p.design, true); } } - $rootScope.$on('refreshProject', function(event, callback) { + $rootScope.$on('updateProject', function(event, callback) { project.update(callback); }); diff --git a/app/scripts/controllers/menu.js b/app/scripts/controllers/menu.js index a579ec0a8..3d63679bf 100644 --- a/app/scripts/controllers/menu.js +++ b/app/scripts/controllers/menu.js @@ -61,7 +61,7 @@ angular.module('icestudio') $scope.hideMenu = function (menu) { timer = $timeout(function () { $scope.status[menu] = false; - }, 500); + }, 700); }; @@ -221,18 +221,19 @@ angular.module('icestudio') }; $scope.setProjectInformation = function() { - + var p = project.project.package; var values = [ - + p.name, + p.version, + p.description, + p.author ]; utils.projectinfoprompt(values, function(evt, values) { - + project.project.package.name = values[0]; + project.project.package.version = values[1]; + project.project.package.description = values[2]; + project.project.package.author = values[3]; }); - /*var current = project.image; - alertify.prompt(gettextCatalog.getString('Enter the project\'s image path'), (current) ? current : '', - function(evt, imagePath) { - common.setImagePath(imagePath); - });*/ }; $scope.setRemoteHostname = function() { diff --git a/app/scripts/services/graph.service.js b/app/scripts/services/graph.service.js index 68114cd5c..d927cb653 100644 --- a/app/scripts/services/graph.service.js +++ b/app/scripts/services/graph.service.js @@ -371,17 +371,14 @@ angular.module('icestudio') if(!$rootScope.$$phase) { $rootScope.$apply(); } - var disabled = true; zIndex = 1; if (self.breadcrumbs.length == 2) { - $rootScope.$broadcast('refreshProject', function() { - self.loadDesign(dependencies[data.blockType], disabled); - self.appEnable(false); + $rootScope.$broadcast('updateProject', function() { + self.loadDesign(dependencies[data.blockType].design, true); }); } else { - self.loadDesign(dependencies[data.blockType], disabled); - self.appEnable(false); + self.loadDesign(dependencies[data.blockType].design, true); } } }); @@ -693,7 +690,7 @@ angular.module('icestudio') block.design.graph.blocks && block.design.graph.wires && block.design.deps) { - dependencies[type] = block.design; + dependencies[type] = block; blockInstance.position.x = 6 * gridsize; blockInstance.position.y = 16 * gridsize; var cell = addGenericBlock(blockInstance, block); @@ -808,52 +805,65 @@ angular.module('icestudio') return paper.options.enabled; } - this.loadDesign = function(design, disabled) { + this.loadDesign = function(design, disabled, callback) { if (design && design.graph && design.graph.blocks && design.graph.wires && design.deps) { + var self = this; var blockInstances = design.graph.blocks; var wires = design.graph.wires; var deps = design.deps; dependencies = design.deps; - this.clearAll(); + $('body').addClass('waiting'); + this.clearAll(); this.setState(design.state); - // Blocks - for (var i in blockInstances) { - var blockInstance = blockInstances[i]; - if (blockInstance.type == 'basic.code') { - addBasicCodeBlock(blockInstance, disabled); - } - else if (blockInstance.type == 'basic.info') { - addBasicInfoBlock(blockInstance, disabled); - } - else if (blockInstance.type == 'basic.input') { - addBasicInputBlock(blockInstance, disabled); - } - else if (blockInstance.type == 'basic.output') { - addBasicOutputBlock(blockInstance, disabled); - } - else if (blockInstance.type == 'basic.constant') { - addBasicConstantBlock(blockInstance, disabled); - } - else { - if (deps && deps[blockInstance.type]) { - addGenericBlock(blockInstance, deps[blockInstance.type]); + setTimeout(function() { + + // Blocks + for (var i in blockInstances) { + var blockInstance = blockInstances[i]; + if (blockInstance.type == 'basic.code') { + addBasicCodeBlock(blockInstance, disabled); + } + else if (blockInstance.type == 'basic.info') { + addBasicInfoBlock(blockInstance, disabled); + } + else if (blockInstance.type == 'basic.input') { + addBasicInputBlock(blockInstance, disabled); + } + else if (blockInstance.type == 'basic.output') { + addBasicOutputBlock(blockInstance, disabled); + } + else if (blockInstance.type == 'basic.constant') { + addBasicConstantBlock(blockInstance, disabled); + } + else { + if (deps && deps[blockInstance.type]) { + addGenericBlock(blockInstance, deps[blockInstance.type]); + } } } - } - // Wires - for (var i in wires) { - addWire(wires[i]); - } + // Wires + for (var i in wires) { + addWire(wires[i]); + } + + self.appEnable(!disabled); + + $('body').removeClass('waiting'); + + if (callback) + callback(); + + }, 20); return true; } diff --git a/app/scripts/services/project.service.js b/app/scripts/services/project.service.js index 4a12b1b08..3d061fa94 100644 --- a/app/scripts/services/project.service.js +++ b/app/scripts/services/project.service.js @@ -1,7 +1,8 @@ 'use strict'; angular.module('icestudio') - .service('project', function(graph, + .service('project', function($rootScope, + graph, boards, compiler, utils, @@ -56,11 +57,13 @@ angular.module('icestudio') this.load = function(name, data) { this.project = _safeLoad(data); + var ret = graph.loadDesign(this.project.design, false, function() { + alertify.success(gettextCatalog.getString('Project {{name}} loaded', { name: utils.bold(name) })); + }); - if (graph.loadDesign(this.project.design)) { + if (ret) { boards.selectBoard(this.project.design.board); this.updateName(name); - alertify.success(gettextCatalog.getString('Project {{name}} loaded', { name: utils.bold(name) })); } else { alertify.notify(gettextCatalog.getString('Wrong project format: {{name}}', { name: utils.bold(name) }), 'error', 30); @@ -169,7 +172,7 @@ angular.module('icestudio') async.eachSeries(files, function(filename, next) { setTimeout(function() { var origPath = nodePath.join(path, filename); - var destPath = nodePath.join(self.projectPath, filename); + var destPath = nodePath.join(utils.dirname(self.path), filename); if (nodeFs.existsSync(destPath)) { alertify.confirm(gettextCatalog.getString('File {{file}} already exists in the project path. Do you want to replace it?', { file: utils.bold(filename) }), function() { @@ -287,8 +290,10 @@ angular.module('icestudio') }; this.addBlock = function(type, block) { - block = _safeLoad(block); - this.project.design.deps[type] = block; + if (block) { + block = _safeLoad(block); + this.project.design.deps[type] = block; + } graph.createBlock(type, block); }; From 73fb5895781d64efa9a4879535f6dcb0af07a34e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jes=C3=BAs=20Arroyo=20Torrens?= Date: Fri, 16 Dec 2016 02:04:11 +0100 Subject: [PATCH 037/169] Update version 0.3.0-dev --- app/package.json | 2 +- package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/package.json b/app/package.json index 8119f3a96..716d87065 100644 --- a/app/package.json +++ b/app/package.json @@ -1,6 +1,6 @@ { "name": "icestudio", - "version": "0.2.4-dev", + "version": "0.3.0-dev", "description": "Experimental graphic editor for open FPGAs", "author": "Jesús Arroyo Torrens ", "repository": "https://github.com/FPGAwars/icestudio", diff --git a/package.json b/package.json index 55c3fe0f7..59cfb67f8 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "icestudio", - "version": "0.2.4-dev", + "version": "0.3.0-dev", "description": "Experimental graphic editor for open FPGAs", "author": "Jesús Arroyo Torrens ", "repository": "https://github.com/FPGAwars/icestudio", From f635495f35bd126023b858b1b8f5be951c784a87 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jes=C3=BAs=20Arroyo=20Torrens?= Date: Fri, 16 Dec 2016 10:28:07 +0100 Subject: [PATCH 038/169] Minor compiler improvement --- app/scripts/services/compiler.service.js | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/app/scripts/services/compiler.service.js b/app/scripts/services/compiler.service.js index c64083b62..e4592999e 100644 --- a/app/scripts/services/compiler.service.js +++ b/app/scripts/services/compiler.service.js @@ -20,7 +20,7 @@ angular.module('icestudio') code += header('//'); code += testbenchCompiler(project); break; - case 'verilog': + case 'gtkwave': code += header('[*]'); code += gtkwaveCompiler(project); break; @@ -90,9 +90,11 @@ angular.module('icestudio') if (ports.length > 0) { code += ' (\n'; code += ports.join(',\n'); - code += '\n);\n'; + code += '\n)'; } + code += ';\n'; + // Content if (data.content) { @@ -233,7 +235,8 @@ angular.module('icestudio') if (block.type != 'basic.input' && block.type != 'basic.output' && block.type != 'basic.constant' && - block.type != 'basic.info') { + block.type != 'basic.info' && + graph.wires.length > 0) { // Header From 2076600e29e2cb29efcc67940d89417d20550df2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jes=C3=BAs=20Arroyo=20Torrens?= Date: Fri, 16 Dec 2016 16:13:11 +0100 Subject: [PATCH 039/169] Check all code using JSHint --- README.md | 5 +- app/.jshintrc | 38 + app/index.html | 126 +- app/scripts/app.js | 12 +- app/scripts/controllers/design.js | 12 +- app/scripts/controllers/menu.js | 56 +- app/scripts/factories/joint.factory.js | 2 +- .../plugins/connectors/joint.connectors.js | 57 +- app/scripts/plugins/routers/joint.routers.js | 887 ++++---- app/scripts/plugins/shapes/joint.shapes.js | 38 +- app/scripts/plugins/ui/joint.ui.js | 406 ++-- app/scripts/services/boards.service.js | 102 +- app/scripts/services/compiler.service.js | 808 +++---- app/scripts/services/graph.service.js | 1956 ++++++++--------- app/scripts/services/profile.service.js | 58 +- app/scripts/services/project.service.js | 54 +- app/scripts/services/resources.service.js | 18 +- app/scripts/services/tools.service.js | 1059 ++++----- app/scripts/services/utils.service.js | 1470 +++++++------ app/styles/main.css | 16 +- app/styles/menu.css | 4 +- app/styles/project.css | 9 +- app/views/design.html | 5 +- app/views/main.html | 1 + app/views/menu.html | 1 + 25 files changed, 3620 insertions(+), 3580 deletions(-) create mode 100644 app/.jshintrc diff --git a/README.md b/README.md index 36757d02c..9d503171f 100644 --- a/README.md +++ b/README.md @@ -37,6 +37,8 @@ Install [Python 2.7](https://www.python.org/downloads/release/python-2711/) Install [nodejs](https://github.com/nodejs/node) +Using [Atom](https://atom.io/) editor with [linter-jshint](https://atom.io/packages/linter-jshint). + ##### Ubuntu ```bash @@ -129,12 +131,13 @@ There is a [Wishlist](https://github.com/FPGAwars/icestudio/wiki/Wishlist:-propo * [Salvador E. Tropea](https://github.com/set-soft) * [Democrito](https://github.com/Democrito) * [Martoni](https://github.com/Martoni) + * [Pascal Cotret](https://github.com/pcotret) * v0.1 * [Miguel Sánchez de León Peque](https://github.com/Peque) ## Credits -* v0.2: using [JointJS](https://github.com/clientIO/joint) +* v0.3, v0.2: using [JointJS](https://github.com/clientIO/joint) and [AlertifyJS](https://github.com/MohammadYounes/AlertifyJS) * v0.1: using [AngularJS-Flowchart](https://github.com/codecapers/AngularJS-FlowChart) * Sponsored by [BQ](https://www.bq.com) diff --git a/app/.jshintrc b/app/.jshintrc new file mode 100644 index 000000000..c44f120b1 --- /dev/null +++ b/app/.jshintrc @@ -0,0 +1,38 @@ +{ + "node": true, + "browser": true, + "esnext": true, + "bitwise": true, + "camelcase": true, + "curly": true, + "eqeqeq": true, + "immed": true, + "indent": 2, + "latedef": false, + "newcap": true, + "noarg": true, + "quotmark": "single", + "undef": true, + "unused": true, + "strict": true, + "trailing": true, + "smarttabs": true, + "multistr": true, + "-W064": true, + "-W069": true, + "-W084": true, + "globals": { + "$": false, + "angular": false, + "console": false, + "alertify": false, + "joint": false, + "_": false, + "svgPanZoom": false, + "Backbone": false, + "async": false, + "ace": false, + "g": false, + "V": false + } +} diff --git a/app/index.html b/app/index.html index 2c2603cdc..3e2ff3b32 100644 --- a/app/index.html +++ b/app/index.html @@ -2,72 +2,72 @@ - Icestudio - - - - - - - - - - - - - - - + Icestudio + + + + + + + + + + + + + + + -
                - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +
                + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/scripts/app.js b/app/scripts/app.js index 325416d63..c32ff7005 100644 --- a/app/scripts/app.js +++ b/app/scripts/app.js @@ -5,9 +5,9 @@ angular 'ngRoute', 'ui.bootstrap', 'gettext' - ]).config(['$routeProvider', + ]) + .config(['$routeProvider', function($routeProvider) { - $routeProvider .when('/', { templateUrl: 'views/main.html', @@ -18,9 +18,13 @@ angular }); } ]) - .run(function(profile, project, utils, gettextCatalog, nodeLangInfo) { + .run(function(profile, + project, + utils, + gettextCatalog, + nodeLangInfo) { // Load language - profile.load(function(data) { + profile.load(function() { var lang = profile.data.language; if (lang) { utils.setLocale(lang); diff --git a/app/scripts/controllers/design.js b/app/scripts/controllers/design.js index 536753be5..13040eefd 100644 --- a/app/scripts/controllers/design.js +++ b/app/scripts/controllers/design.js @@ -5,8 +5,7 @@ angular.module('icestudio') $scope, project, boards, - graph, - gettextCatalog) { + graph) { $scope.boards = boards; $scope.graph = graph; @@ -15,7 +14,6 @@ angular.module('icestudio') graph.createPaper($('#paper')); - // Breadcrumbs $scope.breadcrumbsNavitate = function(selectedItem) { @@ -24,17 +22,17 @@ angular.module('icestudio') graph.breadcrumbs.pop(); item = graph.breadcrumbs.slice(-1)[0]; } - while (selectedItem != item); + while (selectedItem !== item); loadSelectedGraph(); - } + }; $scope.breadcrumbsBack = function() { graph.breadcrumbs.pop(); loadSelectedGraph(); - } + }; function loadSelectedGraph() { - if (graph.breadcrumbs.length == 1) { + if (graph.breadcrumbs.length === 1) { graph.loadDesign(project.project.design, false); } else { diff --git a/app/scripts/controllers/menu.js b/app/scripts/controllers/menu.js index 3d63679bf..37f51bdfd 100644 --- a/app/scripts/controllers/menu.js +++ b/app/scripts/controllers/menu.js @@ -22,6 +22,7 @@ angular.module('icestudio') $scope.boards = boards; $scope.profile = profile; $scope.project = project; + $scope.tools = tools; $scope.examples = resources.getExamples(); $scope.currentBoards = boards.getBoards(); @@ -72,8 +73,9 @@ angular.module('icestudio') gettextCatalog.getString('Enter the project name'), gettextCatalog.getString('untitled'), function(evt, name) { - if (name) + if (name) { project.new(name); + } }); }; @@ -122,8 +124,9 @@ angular.module('icestudio') utils.saveDialog('#input-save-project', '.ice', function(filepath) { updateWorkingdir(filepath); project.save(filepath); - if (localCallback) + if (localCallback) { localCallback(); + } }); }; @@ -144,7 +147,7 @@ angular.module('icestudio') updateWorkingdir(filepath); }); }); - } + }; $scope.exportPCF = function() { checkGraph(function() { @@ -153,7 +156,7 @@ angular.module('icestudio') updateWorkingdir(filepath); }); }); - } + }; $scope.exportTestbench = function() { checkGraph(function() { @@ -162,7 +165,7 @@ angular.module('icestudio') updateWorkingdir(filepath); }); }); - } + }; $scope.exportGTKwave = function() { checkGraph(function() { @@ -171,11 +174,11 @@ angular.module('icestudio') updateWorkingdir(filepath); }); }); - } + }; function updateWorkingdir(filepath) { $scope.workingdir = utils.dirname(filepath) + utils.sep; - }; + } $scope.quit = function() { exit(); @@ -245,7 +248,7 @@ angular.module('icestudio') }; $scope.selectLanguage = function(language) { - if (profile.data.language != language) { + if (profile.data.language !== language) { profile.data.language = language; utils.setLocale(language); } @@ -266,20 +269,20 @@ angular.module('icestudio') $(document).on('keydown', function(event) { if (graph.isEnabled() && !promptShown) { - if (event.keyCode == 46 || // Supr - (event.keyCode == 88 && event.ctrlKey)) { // Ctrl + x + if (event.keyCode === 46 || // Supr + (event.keyCode === 88 && event.ctrlKey)) { // Ctrl + x $scope.removeSelected(); } - else if (event.keyCode == 67 && event.ctrlKey) { // Ctrl + c + else if (event.keyCode === 67 && event.ctrlKey) { // Ctrl + c $scope.cloneSelected(); } if (process.platform === 'darwin') { - if (event.keyCode == 8) { // Back + if (event.keyCode === 8) { // Back $scope.removeSelected(); } } } - if (event.keyCode == 80 && event.ctrlKey) { // Ctrl + p + if (event.keyCode === 80 && event.ctrlKey) { // Ctrl + p // Print and save a window snapshot takeSnapshot(); } @@ -287,21 +290,25 @@ angular.module('icestudio') function takeSnapshot() { win.capturePage(function(img) { - var base64Data = img.replace(/^data:image\/(png|jpg|jpeg);base64,/, ""); + var base64Data = img.replace(/^data:image\/(png|jpg|jpeg);base64,/, ''); saveSnapshot(base64Data); }, 'png'); - }; + } function saveSnapshot(base64Data) { utils.saveDialog('#input-save-snapshot', '.png', function(filepath) { nodeFs.writeFile(filepath, base64Data, 'base64', function (err) { $scope.snapshotdir = utils.dirname(filepath) + utils.sep; $scope.$apply(); - if (!err) alertify.success(gettextCatalog.getString('Image {{name}} saved', { name: utils.bold(utils.basename(filepath)) })); - else throw err; + if (!err) { + alertify.success(gettextCatalog.getString('Image {{name}} saved', { name: utils.bold(utils.basename(filepath)) })); + } + else { + throw err; + } }); }); - }; + } //-- View @@ -350,7 +357,7 @@ angular.module('icestudio') //-- Boards $scope.selectBoard = function(board) { - if (boards.selectedBoard.name != board.name) { + if (boards.selectedBoard.name !== board.name) { if (!graph.isEmpty()) { alertify.confirm(gettextCatalog.getString('The current FPGA I/O configuration will be lost. Do you want to change to {{name}} board?', { name: utils.bold(board.info.label) }), function() { @@ -391,16 +398,19 @@ angular.module('icestudio') function checkGraph(callback, callback2) { if (!graph.isEmpty()) { - if (callback) + if (callback) { callback(); + } } else { - if (callback2) + if (callback2) { callback2(); - else + } + else { alertify.notify(gettextCatalog.getString('Add a block to start'), 'warning', 5); + } } - }; + } //-- Help diff --git a/app/scripts/factories/joint.factory.js b/app/scripts/factories/joint.factory.js index 3c9d19e27..97262d600 100644 --- a/app/scripts/factories/joint.factory.js +++ b/app/scripts/factories/joint.factory.js @@ -3,4 +3,4 @@ angular.module('icestudio') .factory('joint', function($window) { return $window.joint; - }) + }); diff --git a/app/scripts/plugins/connectors/joint.connectors.js b/app/scripts/plugins/connectors/joint.connectors.js index 152a961ec..c6b50c0d4 100644 --- a/app/scripts/plugins/connectors/joint.connectors.js +++ b/app/scripts/plugins/connectors/joint.connectors.js @@ -1,42 +1,43 @@ +'use strict'; joint.connectors.ice = function(sourcePoint, targetPoint, vertices) { - var points = []; + var points = []; - points.push({ x: sourcePoint.x, y: sourcePoint.y }); - _.each(vertices, function(vertex) { - points.push({ x: vertex.x, y: vertex.y }); - }); - points.push({ x: targetPoint.x, y: targetPoint.y }); + points.push({ x: sourcePoint.x, y: sourcePoint.y }); + _.each(vertices, function(vertex) { + points.push({ x: vertex.x, y: vertex.y }); + }); + points.push({ x: targetPoint.x, y: targetPoint.y }); - var step = 16; - var n = points.length; + var step = 16; + var n = points.length; - var sq = { x: points[0].x - points[1].x, y: points[0].y - points[1].y }; - var tq = { x: points[n-1].x - points[n-2].x, y: points[n-1].y - points[n-2].y }; + var sq = { x: points[0].x - points[1].x, y: points[0].y - points[1].y }; + var tq = { x: points[n-1].x - points[n-2].x, y: points[n-1].y - points[n-2].y }; - var sx = Math.sign(sq.x) * step; - var sy = Math.sign(sq.y) * step; + var sx = Math.sign(sq.x) * step; + var sy = Math.sign(sq.y) * step; - var tx = (tq.y == 0) ? Math.sign(tq.x) * step : 0; - var ty = (tq.x == 0) ? Math.sign(tq.y) * step : 0; + var tx = (tq.y === 0) ? Math.sign(tq.x) * step : 0; + var ty = (tq.x === 0) ? Math.sign(tq.y) * step : 0; - var full = ['M']; - var wrap = ['M']; + var full = ['M']; + var wrap = ['M']; - var dVertices = []; - _.each(vertices, function(vertex) { dVertices.push(vertex.x, vertex.y); }); + var dVertices = []; + _.each(vertices, function(vertex) { dVertices.push(vertex.x, vertex.y); }); - full.push(sourcePoint.x + sx, sourcePoint.y + sy); - wrap.push(sourcePoint.x, sourcePoint.y); + full.push(sourcePoint.x + sx, sourcePoint.y + sy); + wrap.push(sourcePoint.x, sourcePoint.y); - full = full.concat(dVertices); - wrap = wrap.concat(dVertices); + full = full.concat(dVertices); + wrap = wrap.concat(dVertices); - full.push(targetPoint.x + tx, targetPoint.y + ty); - wrap.push(targetPoint.x, targetPoint.y); + full.push(targetPoint.x + tx, targetPoint.y + ty); + wrap.push(targetPoint.x, targetPoint.y); - return { - full: full.join(' '), - wrap: wrap.join(' ') - }; + return { + full: full.join(' '), + wrap: wrap.join(' ') + }; }; diff --git a/app/scripts/plugins/routers/joint.routers.js b/app/scripts/plugins/routers/joint.routers.js index 8bd484183..982bad08c 100644 --- a/app/scripts/plugins/routers/joint.routers.js +++ b/app/scripts/plugins/routers/joint.routers.js @@ -1,530 +1,535 @@ joint.routers.ice = (function(g, _, joint) { - 'use strict'; - - var config = { - - // size of the step to find a route - step: 8, - - // use of the perpendicular linkView option to connect center of element with first vertex - perpendicular: true, - - // should be source or target not to be consider as an obstacle - excludeEnds: [], // 'source', 'target' - - // should be any element with a certain type not to be consider as an obstacle - excludeTypes: ['basic.Text'], - - // if number of route finding loops exceed the maximum, stops searching and returns - // fallback route - maximumLoops: 2000, - - // possible starting directions from an element - startDirections: ['right', 'bottom'], - - // possible ending directions to an element - endDirections: ['left', 'top'], - - // specify directions above - directionMap: { - right: { x: 1, y: 0 }, - bottom: { x: 0, y: 1 }, - left: { x: -1, y: 0 }, - top: { x: 0, y: -1 } - }, - - // maximum change of the direction - maxAllowedDirectionChange: 90, - - // padding applied on the element bounding boxes - paddingBox: function() { - - var step = 1; - - return { - x: -step, - y: -step, - width: 2 * step, - height: 2 * step - }; - }, - - // an array of directions to find next points on the route - directions: function() { - - var step = this.step; - - return [ - { offsetX: step , offsetY: 0 , cost: step }, - { offsetX: 0 , offsetY: step , cost: step }, - { offsetX: -step , offsetY: 0 , cost: step }, - { offsetX: 0 , offsetY: -step , cost: step } - ]; - }, - - // a penalty received for direction change - penalties: function() { - - return { - 0: 0, - 45: this.step / 2, - 90: this.step / 2 - }; - }, - - // * Deprecated * - // a simple route used in situations, when main routing method fails - // (exceed loops, inaccessible). - /* i.e. - function(from, to, opts) { - // Find an orthogonal route ignoring obstacles. - var point = ((opts.previousDirAngle || 0) % 180 === 0) - ? g.point(from.x, to.y) - : g.point(to.x, from.y); - return [point, to]; - }, - */ - fallbackRoute: _.constant(null), - - // if a function is provided, it's used to route the link while dragging an end - // i.e. function(from, to, opts) { return []; } - draggingRoute: null - }; - - // Map of obstacles - // Helper structure to identify whether a point lies in an obstacle. - function ObstacleMap(opt) { - - this.map = {}; - this.options = opt; - // tells how to divide the paper when creating the elements map - this.mapGridSize = 100; + 'use strict'; + + var config = { + + // size of the step to find a route + step: 8, + + // use of the perpendicular linkView option to connect center of element with first vertex + perpendicular: true, + + // should be source or target not to be consider as an obstacle + excludeEnds: [], // 'source', 'target' + + // should be any element with a certain type not to be consider as an obstacle + excludeTypes: ['basic.Text'], + + // if number of route finding loops exceed the maximum, stops searching and returns + // fallback route + maximumLoops: 2000, + + // possible starting directions from an element + startDirections: ['right', 'bottom'], + + // possible ending directions to an element + endDirections: ['left', 'top'], + + // specify directions above + directionMap: { + right: { x: 1, y: 0 }, + bottom: { x: 0, y: 1 }, + left: { x: -1, y: 0 }, + top: { x: 0, y: -1 } + }, + + // maximum change of the direction + maxAllowedDirectionChange: 90, + + // padding applied on the element bounding boxes + paddingBox: function() { + + var step = 1; + + return { + x: -step, + y: -step, + width: 2 * step, + height: 2 * step + }; + }, + + // an array of directions to find next points on the route + directions: function() { + + var step = this.step; + + return [ + { offsetX: step , offsetY: 0 , cost: step }, + { offsetX: 0 , offsetY: step , cost: step }, + { offsetX: -step , offsetY: 0 , cost: step }, + { offsetX: 0 , offsetY: -step , cost: step } + ]; + }, + + // a penalty received for direction change + penalties: function() { + + return { + 0: 0, + 45: this.step / 2, + 90: this.step / 2 + }; + }, + + // * Deprecated * + // a simple route used in situations, when main routing method fails + // (exceed loops, inaccessible). + /* i.e. + function(from, to, opts) { + // Find an orthogonal route ignoring obstacles. + var point = ((opts.previousDirAngle || 0) % 180 === 0) + ? g.point(from.x, to.y) + : g.point(to.x, from.y); + return [point, to]; + }, + */ + fallbackRoute: _.constant(null), + + // if a function is provided, it's used to route the link while dragging an end + // i.e. function(from, to, opts) { return []; } + draggingRoute: null + }; + + // Map of obstacles + // Helper structure to identify whether a point lies in an obstacle. + function ObstacleMap(opt) { + + this.map = {}; + this.options = opt; + // tells how to divide the paper when creating the elements map + this.mapGridSize = 100; + } + + ObstacleMap.prototype.build = function(graph, link) { + + var opt = this.options; + + // source or target element could be excluded from set of obstacles + var excludedEnds = _.chain(opt.excludeEnds) + .map(link.get, link) + .pluck('id') + .map(graph.getCell, graph).value(); + + // Exclude any embedded elements from the source and the target element. + var excludedAncestors = []; + + var source = graph.getCell(link.get('source').id); + if (source) { + excludedAncestors = _.union(excludedAncestors, _.map(source.getAncestors(), 'id')); } - ObstacleMap.prototype.build = function(graph, link) { + var target = graph.getCell(link.get('target').id); + if (target) { + excludedAncestors = _.union(excludedAncestors, _.map(target.getAncestors(), 'id')); + } - var opt = this.options; + // builds a map of all elements for quicker obstacle queries (i.e. is a point contained + // in any obstacle?) (a simplified grid search) + // The paper is divided to smaller cells, where each of them holds an information which + // elements belong to it. When we query whether a point is in an obstacle we don't need + // to go through all obstacles, we check only those in a particular cell. + var mapGridSize = this.mapGridSize; + + _.chain(graph.getElements()) + // remove source and target element if required + .difference(excludedEnds) + // remove all elements whose type is listed in excludedTypes array + .reject(function(element) { + // reject any element which is an ancestor of either source or target + return _.contains(opt.excludeTypes, element.get('type')) || _.contains(excludedAncestors, element.id); + }) + // change elements (models) to their bounding boxes + .invoke('getBBox') + // expand their boxes by specific padding + .invoke('moveAndExpand', opt.paddingBox) + // build the map + .foldl(function(map, bbox) { + + var origin = bbox.origin().snapToGrid(mapGridSize); + var corner = bbox.corner().snapToGrid(mapGridSize); + + for (var x = origin.x; x <= corner.x; x += mapGridSize) { + for (var y = origin.y; y <= corner.y; y += mapGridSize) { + + var gridKey = x + '@' + y; + + map[gridKey] = map[gridKey] || []; + map[gridKey].push(bbox); + } + } - // source or target element could be excluded from set of obstacles - var excludedEnds = _.chain(opt.excludeEnds) - .map(link.get, link) - .pluck('id') - .map(graph.getCell, graph).value(); + return map; - // Exclude any embedded elements from the source and the target element. - var excludedAncestors = []; + }, this.map).value(); - var source = graph.getCell(link.get('source').id); - if (source) { - excludedAncestors = _.union(excludedAncestors, _.map(source.getAncestors(), 'id')); - }; + return this; + }; - var target = graph.getCell(link.get('target').id); - if (target) { - excludedAncestors = _.union(excludedAncestors, _.map(target.getAncestors(), 'id')); - } + ObstacleMap.prototype.isPointAccessible = function(point) { - // builds a map of all elements for quicker obstacle queries (i.e. is a point contained - // in any obstacle?) (a simplified grid search) - // The paper is divided to smaller cells, where each of them holds an information which - // elements belong to it. When we query whether a point is in an obstacle we don't need - // to go through all obstacles, we check only those in a particular cell. - var mapGridSize = this.mapGridSize; - - _.chain(graph.getElements()) - // remove source and target element if required - .difference(excludedEnds) - // remove all elements whose type is listed in excludedTypes array - .reject(function(element) { - // reject any element which is an ancestor of either source or target - return _.contains(opt.excludeTypes, element.get('type')) || _.contains(excludedAncestors, element.id); - }) - // change elements (models) to their bounding boxes - .invoke('getBBox') - // expand their boxes by specific padding - .invoke('moveAndExpand', opt.paddingBox) - // build the map - .foldl(function(map, bbox) { - - var origin = bbox.origin().snapToGrid(mapGridSize); - var corner = bbox.corner().snapToGrid(mapGridSize); - - for (var x = origin.x; x <= corner.x; x += mapGridSize) { - for (var y = origin.y; y <= corner.y; y += mapGridSize) { - - var gridKey = x + '@' + y; - - map[gridKey] = map[gridKey] || []; - map[gridKey].push(bbox); - } - } - - return map; - - }, this.map).value(); - - return this; - }; - - ObstacleMap.prototype.isPointAccessible = function(point) { - - var mapKey = point.clone().snapToGrid(this.mapGridSize).toString(); - - return _.every(this.map[mapKey], function(obstacle) { - return !obstacle.containsPoint(point); - }); - }; - - // Sorted Set - // Set of items sorted by given value. - function SortedSet() { - this.items = []; - this.hash = {}; - this.values = {}; - this.OPEN = 1; - this.CLOSE = 2; - } + var mapKey = point.clone().snapToGrid(this.mapGridSize).toString(); - SortedSet.prototype.add = function(item, value) { + return _.every(this.map[mapKey], function(obstacle) { + return !obstacle.containsPoint(point); + }); + }; - if (this.hash[item]) { - // item removal - this.items.splice(this.items.indexOf(item), 1); - } else { - this.hash[item] = this.OPEN; - } - - this.values[item] = value; + // Sorted Set + // Set of items sorted by given value. + function SortedSet() { + this.items = []; + this.hash = {}; + this.values = {}; + this.OPEN = 1; + this.CLOSE = 2; + } - var index = _.sortedIndex(this.items, item, function(i) { - return this.values[i]; - }, this); + SortedSet.prototype.add = function(item, value) { - this.items.splice(index, 0, item); - }; + if (this.hash[item]) { + // item removal + this.items.splice(this.items.indexOf(item), 1); + } else { + this.hash[item] = this.OPEN; + } - SortedSet.prototype.remove = function(item) { - this.hash[item] = this.CLOSE; - }; + this.values[item] = value; - SortedSet.prototype.isOpen = function(item) { - return this.hash[item] === this.OPEN; - }; + var index = _.sortedIndex(this.items, item, function(i) { + return this.values[i]; + }, this); - SortedSet.prototype.isClose = function(item) { - return this.hash[item] === this.CLOSE; - }; + this.items.splice(index, 0, item); + }; - SortedSet.prototype.isEmpty = function() { - return this.items.length === 0; - }; + SortedSet.prototype.remove = function(item) { + this.hash[item] = this.CLOSE; + }; - SortedSet.prototype.pop = function() { - var item = this.items.shift(); - this.remove(item); - return item; - }; + SortedSet.prototype.isOpen = function(item) { + return this.hash[item] === this.OPEN; + }; - function normalizePoint(point) { - return g.point( - point.x === 0 ? 0 : Math.abs(point.x) / point.x, - point.y === 0 ? 0 : Math.abs(point.y) / point.y - ); - } + SortedSet.prototype.isClose = function(item) { + return this.hash[item] === this.CLOSE; + }; - // reconstructs a route by concating points with their parents - function reconstructRoute(parents, point, startCenter, endCenter) { + SortedSet.prototype.isEmpty = function() { + return this.items.length === 0; + }; - var route = []; - var prevDiff = normalizePoint(endCenter.difference(point)); - var current = point; - var parent; + SortedSet.prototype.pop = function() { + var item = this.items.shift(); + this.remove(item); + return item; + }; - while ((parent = parents[current])) { + function normalizePoint(point) { + return g.point( + point.x === 0 ? 0 : Math.abs(point.x) / point.x, + point.y === 0 ? 0 : Math.abs(point.y) / point.y + ); + } - var diff = normalizePoint(current.difference(parent)); + // reconstructs a route by concating points with their parents + function reconstructRoute(parents, point, startCenter, endCenter) { - if (!diff.equals(prevDiff)) { + var route = []; + var prevDiff = normalizePoint(endCenter.difference(point)); + var current = point; + var parent; - route.unshift(current); - prevDiff = diff; - } + while ((parent = parents[current])) { - current = parent; - } + var diff = normalizePoint(current.difference(parent)); - var startDiff = normalizePoint(g.point(current).difference(startCenter)); - if (!startDiff.equals(prevDiff)) { - route.unshift(current); - } + if (!diff.equals(prevDiff)) { + route.unshift(current); + prevDiff = diff; + } - return route; + current = parent; } - // find points around the rectangle taking given directions in the account - function getRectPoints(bbox, directionList, opt) { + var startDiff = normalizePoint(g.point(current).difference(startCenter)); + if (!startDiff.equals(prevDiff)) { + route.unshift(current); + } - var step = opt.step; - var center = bbox.center(); - var startPoints = _.chain(opt.directionMap).pick(directionList).map(function(direction) { + return route; + } - var x = direction.x * bbox.width / 2; - var y = direction.y * bbox.height / 2; + // find points around the rectangle taking given directions in the account + function getRectPoints(bbox, directionList, opt) { - var point = center.clone().offset(x, y); + var step = opt.step; + var center = bbox.center(); + var startPoints = _.chain(opt.directionMap).pick(directionList).map(function(direction) { - if (bbox.containsPoint(point)) { + var x = direction.x * bbox.width / 2; + var y = direction.y * bbox.height / 2; - point.offset(direction.x * step, direction.y * step); - } + var point = center.clone().offset(x, y); - return point.snapToGrid(step); + if (bbox.containsPoint(point)) { + point.offset(direction.x * step, direction.y * step); + } - }).value(); + return point.snapToGrid(step); - return startPoints; - }; + }).value(); - // returns a direction index from start point to end point - function getDirectionAngle(start, end, dirLen) { + return startPoints; + } - var q = 360 / dirLen; - return Math.floor(g.normalizeAngle(start.theta(end) + q / 2) / q) * q; - } + // returns a direction index from start point to end point + function getDirectionAngle(start, end, dirLen) { - function getDirectionChange(angle1, angle2) { + var q = 360 / dirLen; + return Math.floor(g.normalizeAngle(start.theta(end) + q / 2) / q) * q; + } - var dirChange = Math.abs(angle1 - angle2); - return dirChange > 180 ? 360 - dirChange : dirChange; - } + function getDirectionChange(angle1, angle2) { - // heurestic method to determine the distance between two points - function estimateCost(from, endPoints) { + var dirChange = Math.abs(angle1 - angle2); + return dirChange > 180 ? 360 - dirChange : dirChange; + } - var min = Infinity; + // heurestic method to determine the distance between two points + function estimateCost(from, endPoints) { - for (var i = 0, len = endPoints.length; i < len; i++) { - var cost = from.manhattanDistance(endPoints[i]); - if (cost < min) min = cost; - }; + var min = Infinity; - return min; + for (var i = 0, len = endPoints.length; i < len; i++) { + var cost = from.manhattanDistance(endPoints[i]); + if (cost < min) { + min = cost; + } } - // finds the route between to points/rectangles implementing A* alghoritm - function findRoute(start, end, map, opt) { + return min; + } - var step = opt.step; - var startPoints, endPoints; - var startCenter, endCenter; + // finds the route between to points/rectangles implementing A* alghoritm + function findRoute(start, end, map, opt) { - // set of points we start pathfinding from - if (start instanceof g.rect) { - startPoints = getRectPoints(start, opt.startDirections, opt); - startCenter = start.center().snapToGrid(step); - } else { - startCenter = start.clone().snapToGrid(step); - startPoints = [startCenter]; - } + var step = opt.step; + var startPoints, endPoints; + var startCenter, endCenter; - // set of points we want the pathfinding to finish at - if (end instanceof g.rect) { - endPoints = getRectPoints(end, opt.endDirections, opt); - endCenter = end.center().snapToGrid(step); - } else { - endCenter = end.clone().snapToGrid(step); - endPoints = [endCenter]; + // set of points we start pathfinding from + if (start instanceof g.rect) { + startPoints = getRectPoints(start, opt.startDirections, opt); + startCenter = start.center().snapToGrid(step); + } else { + startCenter = start.clone().snapToGrid(step); + startPoints = [startCenter]; + } + + // set of points we want the pathfinding to finish at + if (end instanceof g.rect) { + endPoints = getRectPoints(end, opt.endDirections, opt); + endCenter = end.center().snapToGrid(step); + } else { + endCenter = end.clone().snapToGrid(step); + endPoints = [endCenter]; + } + + // take into account only accessible end points + startPoints = _.filter(startPoints, map.isPointAccessible, map); + endPoints = _.filter(endPoints, map.isPointAccessible, map); + + // Check if there is a accessible end point. + // We would have to use a fallback route otherwise. + if (startPoints.length > 0 && endPoints.length > 0) { + + // The set of tentative points to be evaluated, initially containing the start points. + var openSet = new SortedSet(); + // Keeps reference to a point that is immediate predecessor of given element. + var parents = {}; + // Cost from start to a point along best known path. + var costs = {}; + + _.each(startPoints, function(point) { + var key = point.toString(); + openSet.add(key, estimateCost(point, endPoints)); + costs[key] = 0; + }); + + // directions + var dir, dirChange; + var dirs = opt.directions; + var dirLen = dirs.length; + var loopsRemain = opt.maximumLoops; + var endPointsKeys = _.invoke(endPoints, 'toString'); + + // main route finding loop + while (!openSet.isEmpty() && loopsRemain > 0) { + + // remove current from the open list + var currentKey = openSet.pop(); + var currentPoint = g.point(currentKey); + var currentDist = costs[currentKey]; + var previousDirAngle = currentDirAngle; + /* jshint -W116 */ + var currentDirAngle = parents[currentKey] ? getDirectionAngle(parents[currentKey], currentPoint, dirLen) + : opt.previousDirAngle != null ? opt.previousDirAngle : getDirectionAngle(startCenter, currentPoint, dirLen); + /* jshint +W116 */ + + // Check if we reached any endpoint + if (endPointsKeys.indexOf(currentKey) >= 0) { + // We don't want to allow route to enter the end point in opposite direction. + dirChange = getDirectionChange(currentDirAngle, getDirectionAngle(currentPoint, endCenter, dirLen)); + if (currentPoint.equals(endCenter) || dirChange < 180) { + opt.previousDirAngle = currentDirAngle; + return reconstructRoute(parents, currentPoint, startCenter, endCenter); + } } - // take into account only accessible end points - startPoints = _.filter(startPoints, map.isPointAccessible, map); - endPoints = _.filter(endPoints, map.isPointAccessible, map); - - // Check if there is a accessible end point. - // We would have to use a fallback route otherwise. - if (startPoints.length > 0 && endPoints.length > 0) { - - // The set of tentative points to be evaluated, initially containing the start points. - var openSet = new SortedSet(); - // Keeps reference to a point that is immediate predecessor of given element. - var parents = {}; - // Cost from start to a point along best known path. - var costs = {}; - - _.each(startPoints, function(point) { - var key = point.toString(); - openSet.add(key, estimateCost(point, endPoints)); - costs[key] = 0; - }); - - // directions - var dir, dirChange; - var dirs = opt.directions; - var dirLen = dirs.length; - var loopsRemain = opt.maximumLoops; - var endPointsKeys = _.invoke(endPoints, 'toString'); - - // main route finding loop - while (!openSet.isEmpty() && loopsRemain > 0) { - - // remove current from the open list - var currentKey = openSet.pop(); - var currentPoint = g.point(currentKey); - var currentDist = costs[currentKey]; - var previousDirAngle = currentDirAngle; - var currentDirAngle = parents[currentKey] - ? getDirectionAngle(parents[currentKey], currentPoint, dirLen) - : opt.previousDirAngle != null ? opt.previousDirAngle : getDirectionAngle(startCenter, currentPoint, dirLen); - - // Check if we reached any endpoint - if (endPointsKeys.indexOf(currentKey) >= 0) { - // We don't want to allow route to enter the end point in opposite direction. - dirChange = getDirectionChange(currentDirAngle, getDirectionAngle(currentPoint, endCenter, dirLen)); - if (currentPoint.equals(endCenter) || dirChange < 180) { - opt.previousDirAngle = currentDirAngle; - return reconstructRoute(parents, currentPoint, startCenter, endCenter); - } - } - - // Go over all possible directions and find neighbors. - for (var i = 0; i < dirLen; i++) { - - dir = dirs[i]; - dirChange = getDirectionChange(currentDirAngle, dir.angle); - // if the direction changed rapidly don't use this point - // Note that check is relevant only for points with previousDirAngle i.e. - // any direction is allowed for starting points - if (previousDirAngle && dirChange > opt.maxAllowedDirectionChange) { - continue; - } - - var neighborPoint = currentPoint.clone().offset(dir.offsetX, dir.offsetY); - var neighborKey = neighborPoint.toString(); - // Closed points from the openSet were already evaluated. - if (openSet.isClose(neighborKey) || !map.isPointAccessible(neighborPoint)) { - continue; - } - - // The current direction is ok to proccess. - var costFromStart = currentDist + dir.cost + opt.penalties[dirChange]; - - if (!openSet.isOpen(neighborKey) || costFromStart < costs[neighborKey]) { - // neighbor point has not been processed yet or the cost of the path - // from start is lesser than previously calcluated. - parents[neighborKey] = currentPoint; - costs[neighborKey] = costFromStart; - openSet.add(neighborKey, costFromStart + estimateCost(neighborPoint, endPoints)); - }; - }; - - loopsRemain--; - } + // Go over all possible directions and find neighbors. + for (var i = 0; i < dirLen; i++) { + + dir = dirs[i]; + dirChange = getDirectionChange(currentDirAngle, dir.angle); + // if the direction changed rapidly don't use this point + // Note that check is relevant only for points with previousDirAngle i.e. + // any direction is allowed for starting points + if (previousDirAngle && dirChange > opt.maxAllowedDirectionChange) { + continue; + } + + var neighborPoint = currentPoint.clone().offset(dir.offsetX, dir.offsetY); + var neighborKey = neighborPoint.toString(); + // Closed points from the openSet were already evaluated. + if (openSet.isClose(neighborKey) || !map.isPointAccessible(neighborPoint)) { + continue; + } + + // The current direction is ok to proccess. + var costFromStart = currentDist + dir.cost + opt.penalties[dirChange]; + + if (!openSet.isOpen(neighborKey) || costFromStart < costs[neighborKey]) { + // neighbor point has not been processed yet or the cost of the path + // from start is lesser than previously calcluated. + parents[neighborKey] = currentPoint; + costs[neighborKey] = costFromStart; + openSet.add(neighborKey, costFromStart + estimateCost(neighborPoint, endPoints)); + } } - // no route found ('to' point wasn't either accessible or finding route took - // way to much calculations) - return opt.fallbackRoute(startCenter, endCenter, opt); + loopsRemain--; + } } - // resolve some of the options - function resolveOptions(opt) { + // no route found ('to' point wasn't either accessible or finding route took + // way to much calculations) + return opt.fallbackRoute(startCenter, endCenter, opt); + } - opt.directions = _.result(opt, 'directions'); - opt.penalties = _.result(opt, 'penalties'); - opt.paddingBox = _.result(opt, 'paddingBox'); + // resolve some of the options + function resolveOptions(opt) { - _.each(opt.directions, function(direction) { + opt.directions = _.result(opt, 'directions'); + opt.penalties = _.result(opt, 'penalties'); + opt.paddingBox = _.result(opt, 'paddingBox'); - var point1 = g.point(0, 0); - var point2 = g.point(direction.offsetX, direction.offsetY); + _.each(opt.directions, function(direction) { - direction.angle = g.normalizeAngle(point1.theta(point2)); - }); - } + var point1 = g.point(0, 0); + var point2 = g.point(direction.offsetX, direction.offsetY); + + direction.angle = g.normalizeAngle(point1.theta(point2)); + }); + } - // initiation of the route finding - function router(vertices, opt) { + // initiation of the route finding + function router(vertices, opt) { - resolveOptions(opt); + resolveOptions(opt); - // enable/disable linkView perpendicular option - this.options.perpendicular = !!opt.perpendicular; + /* jshint -W040 */ - // expand boxes by specific padding - var sourceBBox = g.rect(this.sourceBBox).moveAndExpand(opt.paddingBox); - var targetBBox = g.rect(this.targetBBox).moveAndExpand(opt.paddingBox); + // enable/disable linkView perpendicular option + this.options.perpendicular = !!opt.perpendicular; - // pathfinding - var map = (new ObstacleMap(opt)).build(this.paper.model, this.model); - var oldVertices = _.map(vertices, g.point); - var newVertices = []; - var tailPoint = sourceBBox.center().snapToGrid(opt.step); + // expand boxes by specific padding + var sourceBBox = g.rect(this.sourceBBox).moveAndExpand(opt.paddingBox); + var targetBBox = g.rect(this.targetBBox).moveAndExpand(opt.paddingBox); - // find a route by concating all partial routes (routes need to go through the vertices) - // startElement -> vertex[1] -> ... -> vertex[n] -> endElement - for (var i = 0, len = oldVertices.length; i <= len; i++) { + // pathfinding + var map = (new ObstacleMap(opt)).build(this.paper.model, this.model); + var oldVertices = _.map(vertices, g.point); + var newVertices = []; + var tailPoint = sourceBBox.center().snapToGrid(opt.step); - var partialRoute = null; + // find a route by concating all partial routes (routes need to go through the vertices) + // startElement -> vertex[1] -> ... -> vertex[n] -> endElement + for (var i = 0, len = oldVertices.length; i <= len; i++) { - var from = to || sourceBBox; - var to = oldVertices[i]; + var partialRoute = null; - if (!to) { + var from = to || sourceBBox; + var to = oldVertices[i]; - to = targetBBox; + if (!to) { - // 'to' is not a vertex. If the target is a point (i.e. it's not an element), we - // might use dragging route instead of main routing method if that is enabled. - var endingAtPoint = !this.model.get('source').id || !this.model.get('target').id; + to = targetBBox; - if (endingAtPoint && _.isFunction(opt.draggingRoute)) { - // Make sure we passing points only (not rects). - var dragFrom = from instanceof g.rect ? from.center() : from; - partialRoute = opt.draggingRoute(dragFrom, to.origin(), opt); - } - } + // 'to' is not a vertex. If the target is a point (i.e. it's not an element), we + // might use dragging route instead of main routing method if that is enabled. + var endingAtPoint = !this.model.get('source').id || !this.model.get('target').id; - // if partial route has not been calculated yet use the main routing method to find one - partialRoute = partialRoute || findRoute(from, to, map, opt); + if (endingAtPoint && _.isFunction(opt.draggingRoute)) { + // Make sure we passing points only (not rects). + var dragFrom = from instanceof g.rect ? from.center() : from; + partialRoute = opt.draggingRoute(dragFrom, to.origin(), opt); + } + } - if (partialRoute === null) { - // The partial route could not be found. - // use orthogonal (do not avoid elements) route instead. - if (!_.isFunction(joint.routers.orthogonal)) { - throw new Error('Manhattan requires the orthogonal router.'); - } - return joint.routers.orthogonal(vertices, opt, this); - }; + // if partial route has not been calculated yet use the main routing method to find one + partialRoute = partialRoute || findRoute(from, to, map, opt); - var leadPoint = _.first(partialRoute); + if (partialRoute === null) { + // The partial route could not be found. + // use orthogonal (do not avoid elements) route instead. + if (!_.isFunction(joint.routers.orthogonal)) { + throw new Error('Manhattan requires the orthogonal router.'); + } + return joint.routers.orthogonal(vertices, opt, this); + } - if (leadPoint && leadPoint.equals(tailPoint)) { - // remove the first point if the previous partial route had the same point as last - partialRoute.shift(); - } + var leadPoint = _.first(partialRoute); - tailPoint = _.last(partialRoute) || tailPoint; + if (leadPoint && leadPoint.equals(tailPoint)) { + // remove the first point if the previous partial route had the same point as last + partialRoute.shift(); + } - Array.prototype.push.apply(newVertices, partialRoute); - }; + tailPoint = _.last(partialRoute) || tailPoint; - return newVertices; + Array.prototype.push.apply(newVertices, partialRoute); } - // public function - return function(vertices, opt, linkView) { + /* jshint +W040 */ - if (linkView.sourceMagnet) { - opt.startDirections = [linkView.sourceMagnet.attributes.pos.value]; - } + return newVertices; + } - if (linkView.targetMagnet) { - opt.endDirections = [linkView.targetMagnet.attributes.pos.value]; - } + // public function + return function(vertices, opt, linkView) { + + if (linkView.sourceMagnet) { + opt.startDirections = [linkView.sourceMagnet.attributes.pos.value]; + } + + if (linkView.targetMagnet) { + opt.endDirections = [linkView.targetMagnet.attributes.pos.value]; + } - return router.call(linkView, vertices, _.extend({}, config, opt)); - }; + return router.call(linkView, vertices, _.extend({}, config, opt)); + }; })(g, _, joint); diff --git a/app/scripts/plugins/shapes/joint.shapes.js b/app/scripts/plugins/shapes/joint.shapes.js index cc7d5d852..f7699e8f9 100644 --- a/app/scripts/plugins/shapes/joint.shapes.js +++ b/app/scripts/plugins/shapes/joint.shapes.js @@ -82,7 +82,7 @@ joint.shapes.ice.Model = joint.shapes.basic.Generic.extend({ this.constructor.__super__.constructor.__super__.initialize.apply(this, arguments); }, - updatePortsAttrs: function(eventName) { + updatePortsAttrs: function(/*eventName*/) { if (this._portSelectors) { var newAttrs = _.omit(this.get('attrs'), this._portSelectors); this.set('attrs', newAttrs, { silent: true }); @@ -214,16 +214,16 @@ joint.shapes.ice.ModelView = joint.dia.ElementView.extend({ var $bottomPorts = this.$('.bottomPorts').empty(); var portTemplate = _.template(this.model.portMarkup); - _.each(_.filter(this.model.ports, function (p) { return p.type === 'left' }), function (port, index) { + _.each(_.filter(this.model.ports, function (p) { return p.type === 'left'; }), function (port, index) { $leftPorts.append(V(portTemplate({ id: index, port: port })).node); }); - _.each(_.filter(this.model.ports, function (p) { return p.type === 'right' }), function (port, index) { + _.each(_.filter(this.model.ports, function (p) { return p.type === 'right'; }), function (port, index) { $rightPorts.append(V(portTemplate({ id: index, port: port })).node); }); - _.each(_.filter(this.model.ports, function (p) { return p.type === 'top' }), function (port, index) { + _.each(_.filter(this.model.ports, function (p) { return p.type === 'top'; }), function (port, index) { $topPorts.append(V(portTemplate({ id: index, port: port })).node); }); - _.each(_.filter(this.model.ports, function (p) { return p.type === 'bottom' }), function (port, index) { + _.each(_.filter(this.model.ports, function (p) { return p.type === 'bottom'; }), function (port, index) { $bottomPorts.append(V(portTemplate({ id: index, port: port })).node); }); }, @@ -248,7 +248,7 @@ joint.shapes.ice.ModelView = joint.dia.ElementView.extend({ }); }, - removeBox: function(evt) { + removeBox: function(/*evt*/) { this.$box.remove(); } }); @@ -344,7 +344,7 @@ joint.shapes.ice.IOView = joint.shapes.ice.ModelView.extend({ this.$box.find('.io-combo').on('mousedown click', function(evt) { evt.stopPropagation(); }); this.$box.find('.io-combo').on('change', _.bind(function(evt) { - this.model.attributes.data.pin.name = $(evt.target).find("option:selected").text(); + this.model.attributes.data.pin.name = $(evt.target).find('option:selected').text(); this.model.attributes.data.pin.value = $(evt.target).val(); }, this)); }, @@ -632,7 +632,7 @@ joint.shapes.ice.InfoView = joint.dia.ElementView.extend({ left: bbox.x * state.zoom + state.pan.x, top: bbox.y * state.zoom + state.pan.y }); }, - removeBox: function(evt) { + removeBox: function(/*evt*/) { this.$box.remove(); } }); @@ -752,7 +752,9 @@ joint.shapes.ice.WireView = joint.dia.LinkView.extend({ // The markup needs to contain a `.connection` this._V.connection.attr('d', pathData.full); - this._V.connectionWrap && this._V.connectionWrap.attr('d', pathData.wrap); + if(this._V.connectionWrap) { + this._V.connectionWrap.attr('d', pathData.wrap); + } this._translateAndAutoOrientArrows(this._V.markerSource, this._V.markerTarget); }, @@ -766,8 +768,8 @@ joint.shapes.ice.WireView = joint.dia.LinkView.extend({ // Find all the wires in the same port var portWires = []; _.each(allWires, function(wire) { - if ((wire.attributes.source.id == currentWire.attributes.source.id) && - (wire.attributes.source.port == currentWire.attributes.source.port)) + if ((wire.attributes.source.id === currentWire.attributes.source.id) && + (wire.attributes.source.port === currentWire.attributes.source.port)) { // Wire with the same source of currentWire var wireView = self.paper.findViewByModel(wire); @@ -789,7 +791,7 @@ joint.shapes.ice.WireView = joint.dia.LinkView.extend({ ); _.each(portWires, function(wireA) { _.each(portWires, function(wireB) { - if (wireA.id != wireB.id) { + if (wireA.id !== wireB.id) { // Not the same wire findBifurcations(wireA.view, wireB.view, wireA.markers); } @@ -797,6 +799,8 @@ joint.shapes.ice.WireView = joint.dia.LinkView.extend({ }); } + /* jshint -W082 */ + function findBifurcations(wireA, wireB, markersA) { // Find the corners in A that intersects with any B segment var vA = v(wireA); @@ -804,7 +808,7 @@ joint.shapes.ice.WireView = joint.dia.LinkView.extend({ if (vA.length > 2) { for (var i = 1; i < vA.length - 1; i++) { - if ((vA[i-1].x != vA[i+1].x) && (vA[i-1].y != vA[i+1].y)) { + if ((vA[i-1].x !== vA[i+1].x) && (vA[i-1].y !== vA[i+1].y)) { // vA[i] is a corner for (var j = 0; j < vB.length - 1; j++) { // Eval if intersects any segment of wire vB @@ -827,21 +831,23 @@ joint.shapes.ice.WireView = joint.dia.LinkView.extend({ } function evalIntersection(point, segment) { - if (segment[0].x == segment[1].x) { + if (segment[0].x === segment[1].x) { // Vertical - return ((point.x == segment[0].x) && + return ((point.x === segment[0].x) && (point.y > Math.min(segment[0].y, segment[1].y)) && (point.y < Math.max(segment[0].y, segment[1].y))); } else { // Horizontal - return ((point.y == segment[0].y) && + return ((point.y === segment[0].y) && (point.x > Math.min(segment[0].x, segment[1].x)) && (point.x < Math.max(segment[0].x, segment[1].x))); } } } + /* jshint +W082 */ + return this; } diff --git a/app/scripts/plugins/ui/joint.ui.js b/app/scripts/plugins/ui/joint.ui.js index b8846cd28..9bebf6a99 100644 --- a/app/scripts/plugins/ui/joint.ui.js +++ b/app/scripts/plugins/ui/joint.ui.js @@ -10,310 +10,280 @@ file, You can obtain one at http://jointjs.com/license/jointjs_plus_v1.txt or from the JointJS+ archive as was distributed by client IO. See the LICENSE file.*/ -// SelectionView -// ============= - -// `SelectionView` implements selecting group of elements and moving the selected elements in one go. -// Typically, the selection will be bound to the `Shift` key -// and selecting/deselecting individual elements to the `Ctrl` key. - -// Example usage: - -// var graph = new joint.dia.Graph; -// var paper = new joint.dia.Paper({ model: graph }); -// var selection = new Backbone.Collection; -// var selectionView = new joint.ui.SelectionView({ paper: paper, graph: graph, model: selection }); - -// // Bulk selecting group of elements by creating a rectangular selection area. -// paper.on('blank:pointerdown', selectionView.startSelecting); - -// // Selecting individual elements with click and the `Ctrl`/`Command` key. -// paper.on('cell:pointerup', function(cellView, evt) { -// if ((evt.ctrlKey || evt.metaKey) && !(cellView.model instanceof joint.dia.Link)) { -// selectionView.createSelectionBox(cellView); -// selection.add(cellView.model); -// } -// }); - -// // Deselecting previously selected elements with click and the `Ctrl`/`Command` key. -// selectionView.on('selection-box:pointerdown', function(evt) { -// if (evt.ctrlKey || evt.metaKey) { -// var cell = selection.get($(evt.target).data('model')); -// selectionView.destroySelectionBox(paper.findViewByModel(cell)); -// selection.reset(selection.without(cell)); -// } -// }); +'use strict'; joint.ui.SelectionView = Backbone.View.extend({ - className: 'selectionarea', + className: 'selectionarea', - events: { + events: { - 'mousedown .selection-box': 'startTranslatingSelection' - }, + 'mousedown .selection-box': 'startTranslatingSelection' + }, - initialize: function(options) { + initialize: function(options) { - _.bindAll(this, 'startSelecting', 'stopSelecting', 'adjustSelection'); + _.bindAll(this, 'startSelecting', 'stopSelecting', 'adjustSelection'); - $(document.body).on('mouseup touchend', this.stopSelecting); - $(document.body).on('mousemove touchmove', this.adjustSelection); + $(document.body).on('mouseup touchend', this.stopSelecting); + $(document.body).on('mousemove touchmove', this.adjustSelection); - this.options = options; + this.options = options; - this.options.paper.$el.append(this.$el); - }, + this.options.paper.$el.append(this.$el); + }, - startTranslatingSelection: function(evt) { + startTranslatingSelection: function(evt) { - this._action = 'translating'; + this._action = 'translating'; - this.options.graph.trigger('batch:start'); + this.options.graph.trigger('batch:start'); - var snappedClientCoords = this.options.paper.snapToGrid(g.point(evt.clientX, evt.clientY)); - this._snappedClientX = snappedClientCoords.x; - this._snappedClientY = snappedClientCoords.y; + var snappedClientCoords = this.options.paper.snapToGrid(g.point(evt.clientX, evt.clientY)); + this._snappedClientX = snappedClientCoords.x; + this._snappedClientY = snappedClientCoords.y; - this.trigger('selection-box:pointerdown', evt); + this.trigger('selection-box:pointerdown', evt); - evt.stopPropagation(); - }, + evt.stopPropagation(); + }, - isTranslating: function() { + isTranslating: function() { - return this._action == 'translating'; - }, + return this._action === 'translating'; + }, - startSelecting: function(evt, x, y) { + startSelecting: function(evt/*, x, y*/) { - this.$el.removeClass('selected'); - this.$el.empty(); - this.model.reset([]); + this.$el.removeClass('selected'); + this.$el.empty(); + this.model.reset([]); - this._action = 'selecting'; + this._action = 'selecting'; - this._clientX = evt.clientX; - this._clientY = evt.clientY; + this._clientX = evt.clientX; + this._clientY = evt.clientY; - // Normalize `evt.offsetX`/`evt.offsetY` for browsers that don't support it (Firefox). - var paperElement = evt.target.parentElement || evt.target.parentNode; - var paperOffset = $(paperElement).offset(); - var paperScrollLeft = paperElement.scrollLeft; - var paperScrollTop = paperElement.scrollTop; + // Normalize `evt.offsetX`/`evt.offsetY` for browsers that don't support it (Firefox). + var paperElement = evt.target.parentElement || evt.target.parentNode; + var paperOffset = $(paperElement).offset(); + var paperScrollLeft = paperElement.scrollLeft; + var paperScrollTop = paperElement.scrollTop; - this._offsetX = evt.offsetX === undefined ? evt.clientX - paperOffset.left + window.pageXOffset + paperScrollLeft : evt.offsetX; - this._offsetY = evt.offsetY === undefined ? evt.clientY - paperOffset.top + window.pageYOffset + paperScrollTop : evt.offsetY; + this._offsetX = evt.offsetX === undefined ? evt.clientX - paperOffset.left + window.pageXOffset + paperScrollLeft : evt.offsetX; + this._offsetY = evt.offsetY === undefined ? evt.clientY - paperOffset.top + window.pageYOffset + paperScrollTop : evt.offsetY; - this.$el.css({ - width: 1, - height: 1, - left: this._offsetX, - top: this._offsetY + this.$el.css({ + width: 1, + height: 1, + left: this._offsetX, + top: this._offsetY - }).show(); - }, + }).show(); + }, - adjustSelection: function(evt) { + adjustSelection: function(evt) { - var dx; - var dy; + var dx; + var dy; - switch (this._action) { + switch (this._action) { - case 'selecting': + case 'selecting': - dx = evt.clientX - this._clientX; - dy = evt.clientY - this._clientY; + dx = evt.clientX - this._clientX; + dy = evt.clientY - this._clientY; - var left = parseInt(this.$el.css('left'), 10); - var top = parseInt(this.$el.css('top'), 10); + var left = parseInt(this.$el.css('left'), 10); + var top = parseInt(this.$el.css('top'), 10); - this.$el.css({ - left: dx < 0 ? this._offsetX + dx : left, - top: dy < 0 ? this._offsetY + dy : top, - width: Math.abs(dx), - height: Math.abs(dy) - }); - break; + this.$el.css({ + left: dx < 0 ? this._offsetX + dx : left, + top: dy < 0 ? this._offsetY + dy : top, + width: Math.abs(dx), + height: Math.abs(dy) + }); + break; - case 'translating': + case 'translating': - var snappedClientCoords = this.options.paper.snapToGrid(g.point(evt.clientX, evt.clientY)); - var snappedClientX = snappedClientCoords.x; - var snappedClientY = snappedClientCoords.y; + var snappedClientCoords = this.options.paper.snapToGrid(g.point(evt.clientX, evt.clientY)); + var snappedClientX = snappedClientCoords.x; + var snappedClientY = snappedClientCoords.y; - dx = snappedClientX - this._snappedClientX; - dy = snappedClientY - this._snappedClientY; + dx = snappedClientX - this._snappedClientX; + dy = snappedClientY - this._snappedClientY; - // This hash of flags makes sure we're not adjusting vertices of one link twice. - // This could happen as one link can be an inbound link of one element in the selection - // and outbound link of another at the same time. - var processedLinks = {}; + // This hash of flags makes sure we're not adjusting vertices of one link twice. + // This could happen as one link can be an inbound link of one element in the selection + // and outbound link of another at the same time. + var processedLinks = {}; - this.model.each(function(element) { + this.model.each(function(element) { - // TODO: snap to grid. + // TODO: snap to grid. - // Translate the element itself. - element.translate(dx, dy); + // Translate the element itself. + element.translate(dx, dy); - // Translate also the `selection-box` of the element. - this.updateBox(element); + // Translate also the `selection-box` of the element. + this.updateBox(element); - // Translate link vertices as well. - var connectedLinks = this.options.graph.getConnectedLinks(element); + // Translate link vertices as well. + var connectedLinks = this.options.graph.getConnectedLinks(element); - _.each(connectedLinks, function(link) { + _.each(connectedLinks, function(link) { - if (processedLinks[link.id]) return; + if (processedLinks[link.id]) { + return; + } - var vertices = link.get('vertices'); - if (vertices && vertices.length) { + var vertices = link.get('vertices'); + if (vertices && vertices.length) { - var newVertices = []; - _.each(vertices, function(vertex) { + var newVertices = []; + _.each(vertices, function(vertex) { - newVertices.push({ x: vertex.x + dx, y: vertex.y + dy }); - }); + newVertices.push({ x: vertex.x + dx, y: vertex.y + dy }); + }); - link.set('vertices', newVertices); - } + link.set('vertices', newVertices); + } - processedLinks[link.id] = true; - }); + processedLinks[link.id] = true; + }); - }, this); + }, this); - if (dx || dy) { + if (dx || dy) { - this._snappedClientX = snappedClientX; - this._snappedClientY = snappedClientY; - } + this._snappedClientX = snappedClientX; + this._snappedClientY = snappedClientY; + } - break; - } - }, + break; + } + }, - stopSelecting: function() { + stopSelecting: function() { - switch (this._action) { + switch (this._action) { - case 'selecting': + case 'selecting': - var offset = this.$el.offset(); - var width = this.$el.width(); - var height = this.$el.height(); + var offset = this.$el.offset(); + var width = this.$el.width(); + var height = this.$el.height(); - // Convert offset coordinates to the local point of the root element. - var localPoint = V(this.options.paper.svg).toLocalPoint(offset.left, offset.top); + // Convert offset coordinates to the local point of the root element. + var localPoint = V(this.options.paper.svg).toLocalPoint(offset.left, offset.top); - // Take page scroll into consideration. - localPoint.x -= window.pageXOffset; - localPoint.y -= window.pageYOffset; + // Take page scroll into consideration. + localPoint.x -= window.pageXOffset; + localPoint.y -= window.pageYOffset; - var elementViews = this.options.paper.findViewsInArea( - g.rect( - (localPoint.x - this.options.state.pan.x) / this.options.state.zoom, - (localPoint.y - this.options.state.pan.y) / this.options.state.zoom, - width / this.options.state.zoom, - height / this.options.state.zoom - )); + var elementViews = this.options.paper.findViewsInArea( + g.rect( + (localPoint.x - this.options.state.pan.x) / this.options.state.zoom, + (localPoint.y - this.options.state.pan.y) / this.options.state.zoom, + width / this.options.state.zoom, + height / this.options.state.zoom + )); - if (elementViews.length) { + if (elementViews.length) { - // Create a `selection-box` `
                ` for each element covering its bounding box area. - _.each(elementViews, this.createSelectionBox, this); + // Create a `selection-box` `
                ` for each element covering its bounding box area. + _.each(elementViews, this.createSelectionBox, this); - // The root element of the selection switches `position` to `static` when `selected`. This - // is neccessary in order for the `selection-box` coordinates to be relative to the - // `paper` element, not the `selection` `
                `. - this.$el.addClass('selected'); + // The root element of the selection switches `position` to `static` when `selected`. This + // is neccessary in order for the `selection-box` coordinates to be relative to the + // `paper` element, not the `selection` `
                `. + this.$el.addClass('selected'); - } else { + } else { - // Hide the selection box if there was no element found in the area covered by the - // selection box. - this.$el.hide(); - } + // Hide the selection box if there was no element found in the area covered by the + // selection box. + this.$el.hide(); + } - this.model.reset(_.pluck(elementViews, 'model')); - break; + this.model.reset(_.pluck(elementViews, 'model')); + break; - case 'translating': + case 'translating': - this.options.graph.trigger('batch:stop'); - // Everything else is done during the translation. - break; + this.options.graph.trigger('batch:stop'); + // Everything else is done during the translation. + break; - case 'cherry-picking': - // noop; All is done in the `createSelectionBox()` function. - // This is here to avoid removing selection boxes as a reaction on mouseup event and - // propagating to the `default` branch in this switch. - break; + case 'cherry-picking': + // noop; All is done in the `createSelectionBox()` function. + // This is here to avoid removing selection boxes as a reaction on mouseup event and + // propagating to the `default` branch in this switch. + break; - default: - // Hide selection if the user clicked somehwere else in the document. - // this.$el.hide().empty(); - // this.model.reset([]); - break; - } + default: + // Hide selection if the user clicked somehwere else in the document. + // this.$el.hide().empty(); + // this.model.reset([]); + break; + } - delete this._action; - }, + delete this._action; + }, - cancelSelection: function() { + cancelSelection: function() { - this.$('.selection-box').remove(); - this.$el.hide().removeClass('selected'); - this.model.reset([]); - }, + this.$('.selection-box').remove(); + this.$el.hide().removeClass('selected'); + this.model.reset([]); + }, - destroySelectionBox: function(elementView) { + destroySelectionBox: function(elementView) { - this.$('[data-model="' + elementView.model.get('id') + '"]').remove(); - if (this.$('.selection-box').length === 0) { + this.$('[data-model="' + elementView.model.get('id') + '"]').remove(); + if (this.$('.selection-box').length === 0) { - this.$el.hide().removeClass('selected'); - } - }, + this.$el.hide().removeClass('selected'); + } + }, - createSelectionBox: function(elementView) { + createSelectionBox: function(elementView) { - var element = elementView.model; + var element = elementView.model; - if (!element.isLink()) { + if (!element.isLink()) { - var $selectionBox = $('
                ', { - 'class': 'selection-box', - 'data-model': element.get('id') - }); - this.$el.append($selectionBox); + var $selectionBox = $('
                ', { + 'class': 'selection-box', + 'data-model': element.get('id') + }); + this.$el.append($selectionBox); - this.updateBox(element); + this.updateBox(element); - this.$el.addClass('selected').show(); + this.$el.addClass('selected').show(); - this._action = 'cherry-picking'; - } - }, + this._action = 'cherry-picking'; + } + }, - updateBox: function(element) { + updateBox: function(element) { - var border = 12; + var border = 12; - var bbox = element.getBBox(); - var state = this.options.state; + var bbox = element.getBBox(); + var state = this.options.state; - $("div[data-model='" + element.get('id') + "']").css({ - left: bbox.x * state.zoom + state.pan.x + - bbox.width / 2.0 * (state.zoom - 1) - border / 2, - top: bbox.y * state.zoom + state.pan.y + - bbox.height / 2.0 * (state.zoom - 1) - border / 2, - width: bbox.width + border, - height: bbox.height + border, - transform: 'scale(' + state.zoom + ')' - }); - } + $('div[data-model=\'' + element.get('id') + '\']').css({ + left: bbox.x * state.zoom + state.pan.x + + bbox.width / 2.0 * (state.zoom - 1) - border / 2, + top: bbox.y * state.zoom + state.pan.y + + bbox.height / 2.0 * (state.zoom - 1) - border / 2, + width: bbox.width + border, + height: bbox.height + border, + transform: 'scale(' + state.zoom + ')' + }); + } }); diff --git a/app/scripts/services/boards.service.js b/app/scripts/services/boards.service.js index 7a15481e2..3b2dfc654 100644 --- a/app/scripts/services/boards.service.js +++ b/app/scripts/services/boards.service.js @@ -1,60 +1,60 @@ 'use strict'; angular.module('icestudio') - .service('boards', function(nodeFs, - nodePath) { - - this.selectedBoard = null; - this.currentBoards = loadBoards(nodePath.join('resources', 'boards')); - - function loadBoards(path) { - var boards = []; - var contents = nodeFs.readdirSync(path); - contents.forEach(function (content) { - var contentPath = nodePath.join(path, content); - if (nodeFs.statSync(contentPath).isDirectory()) { - if (!content.startsWith('_')) { - var info = readJSONFile(contentPath, 'info.json'); - var pinout = readJSONFile(contentPath, 'pinout.json'); - boards.push({ - 'name': content, - 'info': info, - 'pinout': pinout - }); - } - } - }); - return boards; - } - - function readJSONFile(filepath, filename) { - var ret = {}; - try { - var data = nodeFs.readFileSync(nodePath.join(filepath, filename)); - ret = JSON.parse(data.toString()); + .service('boards', function(nodeFs, + nodePath) { + + this.selectedBoard = null; + this.currentBoards = loadBoards(nodePath.join('resources', 'boards')); + + function loadBoards(path) { + var boards = []; + var contents = nodeFs.readdirSync(path); + contents.forEach(function (content) { + var contentPath = nodePath.join(path, content); + if (nodeFs.statSync(contentPath).isDirectory()) { + if (!content.startsWith('_')) { + var info = readJSONFile(contentPath, 'info.json'); + var pinout = readJSONFile(contentPath, 'pinout.json'); + boards.push({ + 'name': content, + 'info': info, + 'pinout': pinout + }); } - catch (err) { } - return ret; } + }); + return boards; + } + + function readJSONFile(filepath, filename) { + var ret = {}; + try { + var data = nodeFs.readFileSync(nodePath.join(filepath, filename)); + ret = JSON.parse(data.toString()); + } + catch (err) { } + return ret; + } + + this.selectBoard = function(name) { + for (var i in this.currentBoards) { + if (name === this.currentBoards[i].name) { + this.selectedBoard = this.currentBoards[i]; + break; + } + } + }; - this.selectBoard = function(name) { - for (var i in this.currentBoards) { - if (name == this.currentBoards[i].name) { - this.selectedBoard = this.currentBoards[i]; - break; - } - } - }; - - // Set default board - this.selectBoard('icezum'); + // Set default board + this.selectBoard('icezum'); - this.getBoards = function() { - return this.currentBoards; - }; + this.getBoards = function() { + return this.currentBoards; + }; - this.getPinout = function() { - return this.selectedBoard.pinout; - }; + this.getPinout = function() { + return this.selectedBoard.pinout; + }; - }); + }); diff --git a/app/scripts/services/compiler.service.js b/app/scripts/services/compiler.service.js index e4592999e..e2b878a12 100644 --- a/app/scripts/services/compiler.service.js +++ b/app/scripts/services/compiler.service.js @@ -4,509 +4,513 @@ angular.module('icestudio') .service('compiler', function(nodeSha1, _package) { - this.generate = function(target, project) { - var code = ''; - switch(target) { - case 'verilog': - code += header('//'); - code += '`default_nettype none\n'; - code += verilogCompiler('main', project); - break; - case 'pcf': - code += header('#'); - code += pcfCompiler(project); - break; - case 'testbench': - code += header('//'); - code += testbenchCompiler(project); - break; - case 'gtkwave': - code += header('[*]'); - code += gtkwaveCompiler(project); - break; - default: - code += ''; - } - return code; + this.generate = function(target, project) { + var code = ''; + switch(target) { + case 'verilog': + code += header('//'); + code += '`default_nettype none\n'; + code += verilogCompiler('main', project); + break; + case 'pcf': + code += header('#'); + code += pcfCompiler(project); + break; + case 'testbench': + code += header('//'); + code += testbenchCompiler(project); + break; + case 'gtkwave': + code += header('[*]'); + code += gtkwaveCompiler(project); + break; + default: + code += ''; } - - function header(comment) { - var header = ''; - var date = new Date(); - header += comment + ' Code generated by Icestudio ' + _package.version + '\n'; - header += comment + ' ' + date.toUTCString() + '\n'; - header += '\n'; - return header; + return code; + }; + + function header(comment) { + var header = ''; + var date = new Date(); + header += comment + ' Code generated by Icestudio ' + _package.version + '\n'; + header += comment + ' ' + date.toUTCString() + '\n'; + header += '\n'; + return header; + } + + function digestId(id, force) { + if (id.indexOf('-') !== -1 || force) { + return 'v' + nodeSha1(id).toString().substring(0, 6); } - - function digestId(id, force) { - if (id.indexOf('-') != -1) { - return 'v' + nodeSha1(id).toString().substring(0, 6); - } - else { - return id.replace('.', '_'); - } + else { + return id.replace('.', '_'); } + } - function module(data) { - var code = ''; + function module(data) { + var code = ''; + if (data && data.name && data.ports) { - if (data && data.name && data.ports) { - - // Header + // Header - code += '\nmodule ' + data.name; + code += '\nmodule ' + data.name; - //-- Parameters + //-- Parameters - var params = []; - for (var p in data.params) { - if (data.params[p] instanceof Object) { - // Generic block - params.push(' parameter ' + data.params[p].name + ' = ' + (data.params[p].value ? data.params[p].value : '0')); - } - else { - // Code block - params.push(' parameter ' + data.params[p] + ' = 0'); - } + var params = []; + for (var p in data.params) { + if (data.params[p] instanceof Object) { + // Generic block + params.push(' parameter ' + data.params[p].name + ' = ' + (data.params[p].value ? data.params[p].value : '0')); } - - if (params.length > 0) { - code += ' #(\n'; - code += params.join(',\n'); - code += '\n)'; + else { + // Code block + params.push(' parameter ' + data.params[p] + ' = 0'); } + } - //-- Ports + if (params.length > 0) { + code += ' #(\n'; + code += params.join(',\n'); + code += '\n)'; + } - var ports = []; - for (var i in data.ports.in) { - ports.push(' input ' + data.ports.in[i]); - } - for (var o in data.ports.out) { - ports.push(' output ' + data.ports.out[o]); - } + //-- Ports - if (ports.length > 0) { - code += ' (\n'; - code += ports.join(',\n'); - code += '\n)'; - } + var ports = []; + for (var i in data.ports.in) { + ports.push(' input ' + data.ports.in[i]); + } + for (var o in data.ports.out) { + ports.push(' output ' + data.ports.out[o]); + } - code += ';\n'; + if (ports.length > 0) { + code += ' (\n'; + code += ports.join(',\n'); + code += '\n)'; + } - // Content + code += ';\n'; - if (data.content) { + // Content - var content = data.content.split('\n'); + if (data.content) { - content.forEach(function (element, index, array) { - array[index] = ' ' + element; - }); + var content = data.content.split('\n'); - code += content.join('\n'); - } + content.forEach(function (element, index, array) { + array[index] = ' ' + element; + }); - // Footer - - code += '\nendmodule\n'; + code += content.join('\n'); } - return code; + // Footer + + code += '\nendmodule\n'; } - function getParams(project) { - var params = []; - var graph = project.design.graph; + return code; + } - for (var i in graph.blocks) { - var block = graph.blocks[i]; - if (block.type == 'basic.constant') { - params.push({ - name: digestId(block.id), - value: block.data.value - }); - } - } + function getParams(project) { + var params = []; + var graph = project.design.graph; - return params; + for (var i in graph.blocks) { + var block = graph.blocks[i]; + if (block.type === 'basic.constant') { + params.push({ + name: digestId(block.id), + value: block.data.value + }); + } } - function getPorts(project) { - var ports = { - in: [], - out: [] - }; - var graph = project.design.graph; + return params; + } - for (var i in graph.blocks) { - var block = graph.blocks[i]; - if (block.type == 'basic.input') { - ports.in.push(digestId(block.id)); - } - else if (block.type == 'basic.output') { - ports.out.push(digestId(block.id)); - } - } + function getPorts(project) { + var ports = { + in: [], + out: [] + }; + var graph = project.design.graph; - return ports; + for (var i in graph.blocks) { + var block = graph.blocks[i]; + if (block.type === 'basic.input') { + ports.in.push(digestId(block.id)); + } + else if (block.type === 'basic.output') { + ports.out.push(digestId(block.id)); + } } - function getContent(name, project) { - var content = []; - var graph = project.design.graph; - var connections = { - localparam: [], - wire: [], - assign: [] - }; - - for (var w in graph.wires) { - var wire = graph.wires[w]; - if (wire.source.port == 'constant-out') { - // Local Parameters - var constantBlock = findBlock(wire.source.block, graph); - var paramValue = digestId(constantBlock.id); - if (paramValue) { - connections.localparam.push('localparam p' + w + ' = ' + paramValue + ';'); - } + return ports; + } + + function getContent(name, project) { + var i, j, w; + var content = []; + var graph = project.design.graph; + var connections = { + localparam: [], + wire: [], + assign: [] + }; + + for (w in graph.wires) { + var wire = graph.wires[w]; + if (wire.source.port === 'constant-out') { + // Local Parameters + var constantBlock = findBlock(wire.source.block, graph); + var paramValue = digestId(constantBlock.id); + if (paramValue) { + connections.localparam.push('localparam p' + w + ' = ' + paramValue + ';'); } - else { - // Wires - connections.wire.push('wire w' + w + ';'); + } + else { + // Wires + connections.wire.push('wire w' + w + ';'); + } + // Assignations + for (i in graph.blocks) { + var block = graph.blocks[i]; + if (block.type === 'basic.input') { + if (wire.source.block === block.id) { + connections.assign.push('assign w' + w + ' = ' + digestId(block.id) + ';'); + } } - // Assignations - for (var i in graph.blocks) { - var block = graph.blocks[i]; - if (block.type == 'basic.input') { - if (wire.source.block == block.id) { - connections.assign.push('assign w' + w + ' = ' + digestId(block.id) + ';'); + else if (block.type === 'basic.output') { + if (wire.target.block === block.id) { + if (wire.source.port === 'constant-out') { + // connections.assign.push('assign ' + digestId(block.id) + ' = p' + w + ';'); } - } - else if (block.type == 'basic.output') { - if (wire.target.block == block.id) { - if (wire.source.port == 'constant-out') { - // connections.assign.push('assign ' + digestId(block.id) + ' = p' + w + ';'); - } - else { - connections.assign.push('assign ' + digestId(block.id) + ' = w' + w + ';'); - } + else { + connections.assign.push('assign ' + digestId(block.id) + ' = w' + w + ';'); } } } } + } - content = content.concat(connections.localparam); - content = content.concat(connections.wire); - content = content.concat(connections.assign); - - // Wires Connections - - var numWires = graph.wires.length; - for (var i = 1; i < numWires; i++) { - for (var j = 0; j < i; j++) { - var wi = graph.wires[i]; - var wj = graph.wires[j]; - if (wi.source.block == wj.source.block && - wi.source.port == wj.source.port && - wi.source.port != 'constant-out') { - content.push('assign w' + i + ' = w' + j + ';'); - } + content = content.concat(connections.localparam); + content = content.concat(connections.wire); + content = content.concat(connections.assign); + + // Wires Connections + + var numWires = graph.wires.length; + for (i = 1; i < numWires; i++) { + for (j = 0; j < i; j++) { + var wi = graph.wires[i]; + var wj = graph.wires[j]; + if (wi.source.block === wj.source.block && + wi.source.port === wj.source.port && + wi.source.port !== 'constant-out') { + content.push('assign w' + i + ' = w' + j + ';'); } } + } - // Block instances + // Block instances - content = content.concat(getInstances(name, project.design.graph)); + content = content.concat(getInstances(name, project.design.graph)); - return content.join('\n'); - } + return content.join('\n'); + } - function getInstances(name, graph) { - var instances = []; - var blocks = graph.blocks; - var allWires = graph.wires; + function getInstances(name, graph) { + var w, wire; + var instances = []; + var blocks = graph.blocks; - for (var b in blocks) { - var instance = ''; - var block = blocks[b]; + for (var b in blocks) { + var instance = ''; + var block = blocks[b]; - if (block.type != 'basic.input' && - block.type != 'basic.output' && - block.type != 'basic.constant' && - block.type != 'basic.info' && - graph.wires.length > 0) { + if (block.type !== 'basic.input' && + block.type !== 'basic.output' && + block.type !== 'basic.constant' && + block.type !== 'basic.info' && + graph.wires.length > 0) { - // Header + // Header - var id = digestId(block.type, true); - if (block.type == 'basic.code') { - id += '_' + digestId(block.id); - } - instance += name + '_' + digestId(id); - - //-- Parameters - - var params = []; - for (var w in graph.wires) { - var wire = graph.wires[w]; - if ((block.id == wire.target.block) && - (wire.source.port == 'constant-out')) { - var paramName = digestId(wire.target.port); - var param = ''; - param += ' .' + paramName; - param += '(p' + w + ')'; - params.push(param); - } - } + var id = digestId(block.type, true); + if (block.type === 'basic.code') { + id += '_' + digestId(block.id); + } + instance += name + '_' + digestId(id); + + //-- Parameters - if (params.length > 0) { - instance += ' #(\n' + params.join(',\n') + '\n)'; + var params = []; + for (w in graph.wires) { + wire = graph.wires[w]; + if ((block.id === wire.target.block) && + (wire.source.port === 'constant-out')) { + var paramName = digestId(wire.target.port); + var param = ''; + param += ' .' + paramName; + param += '(p' + w + ')'; + params.push(param); } + } - //-- Instance name + if (params.length > 0) { + instance += ' #(\n' + params.join(',\n') + '\n)'; + } - instance += ' ' + digestId(block.id); + //-- Instance name - //-- Ports + instance += ' ' + digestId(block.id); - var ports = []; - var portsNames = []; - for (var w in graph.wires) { - var portName = ''; - var isConstant = false; - var wire = graph.wires[w]; - if (block.id == wire.source.block) { - portName = digestId(wire.source.port); - } - else if (block.id == wire.target.block) { - portName = digestId(wire.target.port); - isConstant = wire.source.port == 'constant-out'; - } - if (portName && !isConstant && - portsNames.indexOf(portName) == -1) { - portsNames.push(portName); - var port = ''; - port += ' .' + portName; - port += '(w' + w + ')'; - ports.push(port); - } - } + //-- Ports - if (ports.length > 0) { - instance += ' (\n' + ports.join(',\n') + '\n);'; + var ports = []; + var portsNames = []; + for (w in graph.wires) { + var portName = ''; + var isConstant = false; + wire = graph.wires[w]; + if (block.id === wire.source.block) { + portName = digestId(wire.source.port); + } + else if (block.id === wire.target.block) { + portName = digestId(wire.target.port); + isConstant = wire.source.port === 'constant-out'; + } + if (portName && !isConstant && + portsNames.indexOf(portName) === -1) { + portsNames.push(portName); + var port = ''; + port += ' .' + portName; + port += '(w' + w + ')'; + ports.push(port); } } - if (instance) - instances.push(instance); + if (ports.length > 0) { + instance += ' (\n' + ports.join(',\n') + '\n);'; + } } - return instances; - } - function findBlock(id, graph) { - for (var b in graph.blocks) { - if (graph.blocks[b].id == id) - return graph.blocks[b]; + if (instance) { + instances.push(instance); } - return null; } + return instances; + } - function verilogCompiler(name, project) { - var code = ''; + function findBlock(id, graph) { + for (var b in graph.blocks) { + if (graph.blocks[b].id === id) { + return graph.blocks[b]; + } + } + return null; + } - if (project && - project.design && - project.design.graph) { + function verilogCompiler(name, project) { + var data; + var code = ''; - var graph = project.design.graph; - var deps = project.design.deps; + if (project && + project.design && + project.design.graph) { - // Scape dot in name + var graph = project.design.graph; + var deps = project.design.deps; - name = digestId(name); + // Scape dot in name - // Main module + name = digestId(name); - if (name) { - var data = { - name: name, - params: getParams(project), - ports: getPorts(project), - content: getContent(name, project) - }; - code += module(data); - } + // Main module - // Dependencies modules + if (name) { + data = { + name: name, + params: getParams(project), + ports: getPorts(project), + content: getContent(name, project) + }; + code += module(data); + } - for (var d in deps) { - code += verilogCompiler(name + '_' + digestId(d, true), deps[d]); - } + // Dependencies modules - // Code modules - - for (var i in graph.blocks) { - var block = graph.blocks[i]; - if (block) { - if (block.type == 'basic.code') { - var data = { - name: name + '_' + digestId(block.type, true) + '_' + digestId(block.id), - params: block.data.params, - ports: block.data.ports, - content: block.data.code - } - code += module(data); - } - } - } + for (var d in deps) { + code += verilogCompiler(name + '_' + digestId(d, true), deps[d]); } - return code; - } - - function pcfCompiler(project) { - var code = ''; - var graph = project.design.graph; + // Code modules for (var i in graph.blocks) { var block = graph.blocks[i]; - if (block.type == 'basic.input' || - block.type == 'basic.output') { - code += 'set_io '; - code += digestId(block.id); - code += ' '; - code += block.data.pin.value; - code += '\n'; + if (block) { + if (block.type === 'basic.code') { + data = { + name: name + '_' + digestId(block.type, true) + '_' + digestId(block.id), + params: block.data.params, + ports: block.data.ports, + content: block.data.code + }; + code += module(data); + } } } - - return code; } - function testbenchCompiler(project) { - var code = ''; - - code += '// Testbench template\n\n' + return code; + } + + function pcfCompiler(project) { + var code = ''; + var graph = project.design.graph; + + for (var i in graph.blocks) { + var block = graph.blocks[i]; + if (block.type === 'basic.input' || + block.type === 'basic.output') { + code += 'set_io '; + code += digestId(block.id); + code += ' '; + code += block.data.pin.value; + code += '\n'; + } + } - code += '`default_nettype none\n'; - code += '`define DUMPSTR(x) `"x.vcd`"\n'; - code += '`timescale 10 ns / 1 ns\n\n'; + return code; + } - var ports = { in: [], out: [] }; - var content = '\n'; + function testbenchCompiler(project) { + var i, o, w; + var code = ''; - content += '// Simulation time: 100ns (10 * 10ns)\n'; - content += 'parameter DURATION = 10;\n\n'; + code += '// Testbench template\n\n'; - var io = mainIO(project); - var input = io[0]; - var output = io[1]; + code += '`default_nettype none\n'; + code += '`define DUMPSTR(x) `"x.vcd`"\n'; + code += '`timescale 10 ns / 1 ns\n\n'; - // Input/Output - content += '// Input/Output\n'; - for (var i in input) { - content += 'reg ' + input[i].label + ';\n'; - } - for (var o in output) { - content += 'wire ' + output[o].label + ';\n'; - } + var ports = { in: [], out: [] }; + var content = '\n'; - var wires = input.concat(output); + content += '// Simulation time: 100ns (10 * 10ns)\n'; + content += 'parameter DURATION = 10;\n\n'; - // Module instance - content += '\n// Module instance\n'; - content += 'main MAIN (\n'; - var connections = []; - for (var w in wires) { - connections.push(' .' + wires[w].id + '(' + wires[w].label + ')'); - } - content += connections.join(',\n'); - content += '\n);\n'; - - // Clock signal - var hasClk = false; - for (var i in input) { - if (input[i].label.toLowerCase() == 'input_clk') { - hasClk = true; - break; - } - } - if (hasClk) { - content += '\n// Clock signal\n'; - content += 'always #0.5 input_clk = ~input_clk;\n'; - } + var io = mainIO(project); + var input = io[0]; + var output = io[1]; - content += '\ninitial begin\n'; - content += ' // File were to store the simulation results\n'; - content += ' $dumpfile(`DUMPSTR(`VCD_OUTPUT));\n'; - content += ' $dumpvars(0, main_tb);\n\n'; - content += ' // TODO: initialize the registers here\n'; - content += ' // e.g. input_value = 1;\n'; - content += ' // e.g. #2 input_value = 0;\n'; - for (var i in input) { - content += ' ' + input[i].label + ' = 0;\n'; - } - content += '\n'; - content += ' #(DURATION) $display("End of simulation");\n'; - content += ' $finish;\n'; - content += 'end\n'; - - var data = { - name: 'main_tb', - ports: ports, - content: content - }; - code += module(data); - - return code; + // Input/Output + content += '// Input/Output\n'; + for (i in input) { + content += 'reg ' + input[i].label + ';\n'; + } + for (o in output) { + content += 'wire ' + output[o].label + ';\n'; } - function gtkwaveCompiler(project) { - var code = ''; - - var io = mainIO(project); - var input = io[0]; - var output = io[1]; + var wires = input.concat(output); - var wires = input.concat(output); - for (var w in wires) { - code += 'main_tb.' + wires[w].label + '\n'; + // Module instance + content += '\n// Module instance\n'; + content += 'main MAIN (\n'; + var connections = []; + for (w in wires) { + connections.push(' .' + wires[w].id + '(' + wires[w].label + ')'); + } + content += connections.join(',\n'); + content += '\n);\n'; + + // Clock signal + var hasClk = false; + for (i in input) { + if (input[i].label.toLowerCase() === 'input_clk') { + hasClk = true; + break; } + } + if (hasClk) { + content += '\n// Clock signal\n'; + content += 'always #0.5 input_clk = ~input_clk;\n'; + } - return code; + content += '\ninitial begin\n'; + content += ' // File were to store the simulation results\n'; + content += ' $dumpfile(`DUMPSTR(`VCD_OUTPUT));\n'; + content += ' $dumpvars(0, main_tb);\n\n'; + content += ' // TODO: initialize the registers here\n'; + content += ' // e.g. input_value = 1;\n'; + content += ' // e.g. #2 input_value = 0;\n'; + for (i in input) { + content += ' ' + input[i].label + ' = 0;\n'; + } + content += '\n'; + content += ' #(DURATION) $display("End of simulation");\n'; + content += ' $finish;\n'; + content += 'end\n'; + + var data = { + name: 'main_tb', + ports: ports, + content: content + }; + code += module(data); + + return code; + } + + function gtkwaveCompiler(project) { + var code = ''; + + var io = mainIO(project); + var input = io[0]; + var output = io[1]; + + var wires = input.concat(output); + for (var w in wires) { + code += 'main_tb.' + wires[w].label + '\n'; } - function mainIO(project) { - var input = []; - var output = []; - var input_unnamed = 0; - var output_unnamed = 0; - var graph = project.design.graph; - for (var i in graph.blocks) { - var block = graph.blocks[i]; - if (block.type == 'basic.input') { - if (block.data.label) { - input.push({ id: digestId(block.id), label: 'input_' + block.data.label.replace(' ', '_') }); - } - else { - input.push({ id: digestId(block.id), label: 'input_' + input_unnamed.toString() }); - input_unnamed += 1; - } + return code; + } + + function mainIO(project) { + var input = []; + var output = []; + var inputUnnamed = 0; + var outputUnnamed = 0; + var graph = project.design.graph; + for (var i in graph.blocks) { + var block = graph.blocks[i]; + if (block.type === 'basic.input') { + if (block.data.label) { + input.push({ id: digestId(block.id), label: 'input_' + block.data.label.replace(' ', '_') }); } - else if (block.type == 'basic.output') { - if (block.data.label) { - output.push({ id: digestId(block.id), label: 'output_' + block.data.label.replace(' ', '_') }); - } - else { - output.push({ id: digestId(block.id), label: 'output_' + output_unnamed.toString() }); - output_unnamed += 1; - } + else { + input.push({ id: digestId(block.id), label: 'input_' + inputUnnamed.toString() }); + inputUnnamed += 1; + } + } + else if (block.type === 'basic.output') { + if (block.data.label) { + output.push({ id: digestId(block.id), label: 'output_' + block.data.label.replace(' ', '_') }); + } + else { + output.push({ id: digestId(block.id), label: 'output_' + outputUnnamed.toString() }); + outputUnnamed += 1; } } - - return [input, output]; } + return [input, output]; + } + }); diff --git a/app/scripts/services/graph.service.js b/app/scripts/services/graph.service.js index d927cb653..97d505bc1 100644 --- a/app/scripts/services/graph.service.js +++ b/app/scripts/services/graph.service.js @@ -1,606 +1,552 @@ 'use strict'; angular.module('icestudio') - .service('graph', function($rootScope, - joint, - boards, - utils, - gettextCatalog, - nodeFs) { - - // Variables - - var zIndex = 100; - var ctrlPressed = false; - - var graph = null; - var paper = null; - var selection = null; - var selectionView = null; + .service('graph', function($rootScope, + joint, + boards, + utils, + gettextCatalog, + nodeSha1) { + // Variables + + var zIndex = 100; + var ctrlPressed = false; + + var graph = null; + var paper = null; + var selection = null; + var selectionView = null; + + var dependencies = {}; + this.breadcrumbs = [{ name: '' }]; + + var gridsize = 8; + var state = { + pan: { + x: 0, + y: 0 + }, + zoom: 1 + }; + + // Functions + + $(document).on('keydown', function(event) { + ctrlPressed = event.keyCode === 17; + }); - var dependencies = {}; - this.breadcrumbs = [{ name: '' }]; + this.getState = function() { + // Clone state + return JSON.parse(JSON.stringify(state)); + }; - var gridsize = 8; - var state = { + this.setState = function(_state) { + if (!_state) { + _state = { pan: { x: 0, y: 0 }, zoom: 1 }; + } + this.panAndZoom.zoom(_state.zoom); + this.panAndZoom.pan(_state.pan); + }; - // Functions - - $(document).on('keydown', function(event) { - ctrlPressed = event.keyCode == 17; - }); - - this.getState = function() { - // Clone state - return JSON.parse(JSON.stringify(state)); - } + this.resetState = function() { + this.setState(null); + }; - this.setState = function(_state) { - if (!_state) { - _state = { - pan: { - x: 0, - y: 0 - }, - zoom: 1 - }; + this.resetBreadcrumbs = function(name) { + if (this.breadcrumbs.length > 1) { + this.breadcrumbs = [{ name: name }]; + } + this.breadcrumbs[0].name = name; + if(!$rootScope.$$phase) { + $rootScope.$apply(); + } + }; + + this.createPaper = function(element) { + graph = new joint.dia.Graph(); + paper = new joint.dia.Paper({ + el: element, + width: 2000, + height: 1000, + model: graph, + gridSize: gridsize, + snapLinks: { radius: 15 }, + linkPinning: false, + embeddingMode: false, + //markAvailable: true, + defaultLink: new joint.shapes.ice.Wire(), + /*guard: function(evt, view) { + // FALSE means the event isn't guarded. + return false; + },*/ + validateMagnet: function(cellView, magnet) { + // Prevent to start wires from an input port + return (magnet.getAttribute('type') === 'output'); + }, + validateConnection: function(cellViewS, magnetS, cellViewT, magnetT, end, linkView) { + // Prevent output-output links + if (magnetS.getAttribute('type') === 'output' && + magnetT.getAttribute('type') === 'output') { + if (magnetS !== magnetT) { + // Show warning if source and target blocks are different + warning(gettextCatalog.getString('Invalid connection')); + } + return false; } - this.panAndZoom.zoom(_state.zoom); - this.panAndZoom.pan(_state.pan); - setGrid(paper, gridsize*2*_state.zoom, _state.pan); - } - - this.resetState = function() { - this.setState(null); - } - - this.resetBreadcrumbs = function(name) { - if (this.breadcrumbs.length > 1) { - this.breadcrumbs = [{ name: name }]; + // Ensure right -> left connections + if (magnetS.getAttribute('pos') === 'right') { + if (magnetT.getAttribute('pos') !== 'left') { + warning(gettextCatalog.getString('Invalid connection')); + return false; + } } - this.breadcrumbs[0].name = name; - if(!$rootScope.$$phase) { - $rootScope.$apply(); + // Ensure bottom -> top connections + if (magnetS.getAttribute('pos') === 'bottom') { + if (magnetT.getAttribute('pos') !== 'top') { + warning(gettextCatalog.getString('Invalid connection')); + return false; + } + } + var links = graph.getLinks(); + for (var i in links) { + var linkIView = links[i].findView(paper); + if (linkView === linkIView) { + //Skip the wire the user is drawing + continue; + } + // Prevent multiple input links + if ((cellViewT.model.id === links[i].get('target').id) && + (magnetT.getAttribute('port') === links[i].get('target').port)) { + warning(gettextCatalog.getString('Invalid multiple input connections')); + return false; + } + // Prevent to connect a pull-up if other blocks are connected + if ((cellViewT.model.attributes.blockType === 'config.pull_up' || + cellViewT.model.attributes.blockType === 'config.pull_up_inv') && + (cellViewS.model.id === links[i].get('source').id)) { + warning(gettextCatalog.getString('Invalid Pull up connection:
                block already connected')); + return false; + } + // Prevent to connect other blocks if a pull-up is connected + if ((linkIView.targetView.model.attributes.blockType === 'config.pull_up' || + linkIView.targetView.model.attributes.blockType === 'config.pull_up_inv') && + (cellViewS.model.id === links[i].get('source').id)) { + warning(gettextCatalog.getString('Invalid block connection:
                Pull up already connected')); + return false; + } } + // Ensure input -> pull-up connections + if (cellViewT.model.attributes.blockType === 'config.pull_up' || + cellViewT.model.attributes.blockType === 'config.pull_up_inv') { + var ret = (cellViewS.model.attributes.blockType === 'basic.input'); + if (!ret) { + warning(gettextCatalog.getString('Invalid Pull up connection:
                only Input blocks allowed')); + } + return ret; + } + // Prevent loop links + return magnetS !== magnetT; } - - function setGrid(paper, size, offset) { - - // TODO: draw grid in a SVG because 'background' truncates the parameters - - /* - // Set grid size on the JointJS paper object (joint.dia.Paper instance) - paper.options.gridsize = gridsize; - // Draw a grid into the HTML 5 canvas and convert it to a data URI image - var canvas = $('', { width: size, height: size }); - canvas[0].width = size; - canvas[0].height = size; - var context = canvas[0].getContext('2d'); - context.beginPath(); - context.rect(1, 1, 1, 1); - context.fillStyle = '#555'; - context.globalAlpha = size / gridsize / 2; - context.fill(); - // Finally, set the grid background image of the paper container element. - var gridBackgroundImage = canvas[0].toDataURL('image/png'); - $(paper.el.childNodes[0]).css( - 'background-image', 'url("' + gridBackgroundImage + '")'); - if(typeof(offset) != 'undefined'){ - $(paper.el.childNodes[0]).css( - 'background-position', offset.x + 'px ' + offset.y + 'px'); - }*/ + }); + + paper.options.enabled = true; + paper.options.warningTimer = false; + + function warning(message) { + if (!paper.options.warningTimer) { + paper.options.warningTimer = true; + alertify.notify(message, 'warning', 5); + setTimeout(function() { + paper.options.warningTimer = false; + }, 4000); } + } - this.createPaper = function(element) { - graph = new joint.dia.Graph(); - paper = new joint.dia.Paper({ - el: element, - width: 2000, - height: 1000, - model: graph, - gridSize: gridsize, - snapLinks: { radius: 15 }, - linkPinning: false, - embeddingMode: false, - //markAvailable: true, - defaultLink: new joint.shapes.ice.Wire(), - guard: function(evt, view) { - // FALSE means the event isn't guarded. - return false; - }, - validateMagnet: function(cellView, magnet) { - // Prevent to start wires from an input port - return (magnet.getAttribute('type') == 'output'); - }, - validateConnection: function(cellViewS, magnetS, cellViewT, magnetT, end, linkView) { - // Prevent output-output links - if (magnetS.getAttribute('type') == 'output' && - magnetT.getAttribute('type') == 'output') { - if (magnetS !== magnetT) { - // Show warning if source and target blocks are different - warning(gettextCatalog.getString('Invalid connection')); - } - return false; - } - // Ensure right -> left connections - if (magnetS.getAttribute('pos') == 'right') { - if (magnetT.getAttribute('pos') != 'left') { - warning(gettextCatalog.getString('Invalid connection')); - return false; - } - } - // Ensure bottom -> top connections - if (magnetS.getAttribute('pos') == 'bottom') { - if (magnetT.getAttribute('pos') != 'top') { - warning(gettextCatalog.getString('Invalid connection')); - return false; - } - } - var links = graph.getLinks(); - for (var i in links) { - var linkIView = links[i].findView(paper); - if (linkView == linkIView) { - //Skip the wire the user is drawing - continue; - } - // Prevent multiple input links - if ((cellViewT.model.id == links[i].get('target').id) && - (magnetT.getAttribute('port') == links[i].get('target').port)) { - warning(gettextCatalog.getString('Invalid multiple input connections')); - return false; - } - // Prevent to connect a pull-up if other blocks are connected - if ((cellViewT.model.attributes.blockType == 'config.pull_up' || - cellViewT.model.attributes.blockType == 'config.pull_up_inv') && - (cellViewS.model.id == links[i].get('source').id)) { - warning(gettextCatalog.getString('Invalid Pull up connection:
                block already connected')); - return false; - } - // Prevent to connect other blocks if a pull-up is connected - if ((linkIView.targetView.model.attributes.blockType == 'config.pull_up' || - linkIView.targetView.model.attributes.blockType == 'config.pull_up_inv') && - (cellViewS.model.id == links[i].get('source').id)) { - warning(gettextCatalog.getString('Invalid block connection:
                Pull up already connected')); - return false; - } - } - // Ensure input -> pull-up connections - if (cellViewT.model.attributes.blockType == 'config.pull_up' || - cellViewT.model.attributes.blockType == 'config.pull_up_inv') { - var ret = (cellViewS.model.attributes.blockType == 'basic.input'); - if (!ret) { - warning(gettextCatalog.getString('Invalid Pull up connection:
                only Input blocks allowed')); - } - return ret; - } - // Prevent loop links - return magnetS !== magnetT; - } - }); + var targetElement= element[0]; + + this.panAndZoom = svgPanZoom(targetElement.childNodes[0], + { + viewportSelector: targetElement.childNodes[0].childNodes[0], + fit: false, + center: false, + zoomEnabled: true, + panEnabled: false, + zoomScaleSensitivity: 0.1, + dblClickZoomEnabled: false, + minZoom: 0.2, + maxZoom: 2, + /*beforeZoom: function(oldzoom, newzoom) { + },*/ + onZoom: function(scale) { + state.zoom = scale; + // Already rendered in pan + }, + /*beforePan: function(oldpan, newpan) { + },*/ + onPan: function(newPan) { + state.pan = newPan; + selectionView.options.state = state; - paper.options.enabled = true; - paper.options.warningTimer = false; + var cells = graph.getCells(); - function warning(message) { - if (!paper.options.warningTimer) { - paper.options.warningTimer = true; - alertify.notify(message, 'warning', 5); - setTimeout(function() { - paper.options.warningTimer = false; - }, 4000); - } - }; - - setGrid(paper, gridsize * 2); - - var targetElement= element[0]; - - this.panAndZoom = svgPanZoom(targetElement.childNodes[0], - { - viewportSelector: targetElement.childNodes[0].childNodes[0], - fit: false, - center: false, - zoomEnabled: true, - panEnabled: false, - zoomScaleSensitivity: 0.1, - dblClickZoomEnabled: false, - minZoom: 0.2, - maxZoom: 2, - beforeZoom: function(oldzoom, newzoom) { - }, - onZoom: function(scale) { - state.zoom = scale; - setGrid(paper, gridsize*2*state.zoom); - // Already rendered in pan - }, - beforePan: function(oldpan, newpan) { - setGrid(paper, gridsize*2*state.zoom, newpan); - }, - onPan: function(newPan) { - state.pan = newPan; - selectionView.options.state = state; - - var cells = graph.getCells(); - - _.each(cells, function(cell) { - if (!cell.isLink()) { - cell.attributes.state = state; - var elementView = paper.findViewByModel(cell); - // Pan blocks - elementView.updateBox(); - // Pan selection boxes - selectionView.updateBox(elementView.model); - } - }); + _.each(cells, function(cell) { + if (!cell.isLink()) { + cell.attributes.state = state; + var elementView = paper.findViewByModel(cell); + // Pan blocks + elementView.updateBox(); + // Pan selection boxes + selectionView.updateBox(elementView.model); } }); - - selection = new Backbone.Collection; - selectionView = new joint.ui.SelectionView({ - paper: paper, - graph: graph, - model: selection, - state: state - }); - - // Events - - var self = this; - - selectionView.on('selection-box:pointerdown', function(evt) { - // Selection to top view - if (selection) { - selection.each(function(cell) { - var cellView = paper.findViewByModel(cell); - if (cellView) { - if (!cellView.model.isLink()) { - if (cellView.$box.css('z-index') < zIndex) { - cellView.$box.css('z-index', ++zIndex); - } - } + } + }); + + selection = new Backbone.Collection(); + selectionView = new joint.ui.SelectionView({ + paper: paper, + graph: graph, + model: selection, + state: state + }); + + // Events + + var self = this; + + selectionView.on('selection-box:pointerdown', function(evt) { + // Selection to top view + if (selection) { + selection.each(function(cell) { + var cellView = paper.findViewByModel(cell); + if (cellView) { + if (!cellView.model.isLink()) { + if (cellView.$box.css('z-index') < zIndex) { + cellView.$box.css('z-index', ++zIndex); } - }); - } - // Toggle selection - if ((evt.which == 3) && (evt.ctrlKey || evt.metaKey)) { - var cell = selection.get($(evt.target).data('model')); - selection.reset(selection.without(cell)); - selectionView.destroySelectionBox(paper.findViewByModel(cell)); + } } }); - - paper.on('cell:pointerup', - function(cellView, evt, x, y) { - if (paper.options.enabled) { - if (!cellView.model.isLink()) { - if (evt.which == 3) { - // Disable current focus - document.activeElement.blur(); - // Right button - selection.add(cellView.model); - selectionView.createSelectionBox(cellView); - cellView.$box.removeClass('highlight'); - } - // Update wires on obstacles - var cells = graph.getCells(); - for (var i in cells) { - var cell = cells[i]; - if (cell.isLink()) { - paper.findViewByModel(cell).update(); - } - } - } + } + // Toggle selection + if ((evt.which === 3) && (evt.ctrlKey || evt.metaKey)) { + var cell = selection.get($(evt.target).data('model')); + selection.reset(selection.without(cell)); + selectionView.destroySelectionBox(paper.findViewByModel(cell)); + } + }); + + paper.on('cell:pointerup', function(cellView, evt/*, x, y*/) { + if (paper.options.enabled) { + if (!cellView.model.isLink()) { + if (evt.which === 3) { + // Disable current focus + document.activeElement.blur(); + // Right button + selection.add(cellView.model); + selectionView.createSelectionBox(cellView); + cellView.$box.removeClass('highlight'); + } + // Update wires on obstacles + var cells = graph.getCells(); + for (var i in cells) { + var cell = cells[i]; + if (cell.isLink()) { + paper.findViewByModel(cell).update(); } } - ); + } + } + }); - paper.on('cell:pointerdown', - function(cellView, evt, x, y) { - if (paper.options.enabled) { - if (!cellView.model.isLink()) { - if (cellView.$box.css('z-index') < zIndex) { - cellView.$box.css('z-index', ++zIndex); - } - } - } - } - ); - - paper.on('cell:pointerdblclick', function(cellView, evt, x, y) { - var data = cellView.model.attributes; - if (data.blockType == 'basic.input' || - data.blockType == 'basic.output') { - if (paper.options.enabled) { - alertify.prompt(gettextCatalog.getString('Update the port label'), data.data.label ? ' ' + data.data.label + ' ' : '', - function(evt, label) { - var label = label.replace(/ /g, ''); - if (data.data.label != label) { - data.data.label = label; - cellView.renderLabel(); - alertify.success(gettextCatalog.getString('Label updated')); - } - }); - } - } - else if (data.blockType == 'basic.constant') { - if (paper.options.enabled) { - utils.constantprompt([ - gettextCatalog.getString('Update the block label'), - gettextCatalog.getString('Update the block status'), - gettextCatalog.getString('Local parameter') - ], [ - data.data.label ? ' ' + data.data.label + ' ' : '', - data.data.local ? data.data.local : false - ], - function(evt, values) { - var label = values[0].replace(/ /g, ''); - if (data.data.label != label) { - data.data.label = label; - cellView.renderLabel(); - alertify.success(gettextCatalog.getString('Label updated')); - } - var local = values[1]; - data.data.local = local; - cellView.renderLocal(); - }); - } - } - else if (data.blockType == 'basic.code') { - if (paper.options.enabled) { - var block = { - data: { - code: self.getContent(cellView.model.id), - params: data.data.params, - ports: data.data.ports - }, - position: cellView.model.attributes.position - }; - self.createBlock('basic.code', block, function() { - cellView.model.remove(); - }); - } - } - else if (data.type != 'ice.Wire' && data.type != 'ice.Info') { - self.breadcrumbs.push({ name: data.blockType }); - if(!$rootScope.$$phase) { - $rootScope.$apply(); - } - zIndex = 1; - if (self.breadcrumbs.length == 2) { - $rootScope.$broadcast('updateProject', function() { - self.loadDesign(dependencies[data.blockType].design, true); - }); - } - else { - self.loadDesign(dependencies[data.blockType].design, true); - } + paper.on('cell:pointerdown', function(cellView) { + if (paper.options.enabled) { + if (!cellView.model.isLink()) { + if (cellView.$box.css('z-index') < zIndex) { + cellView.$box.css('z-index', ++zIndex); } - }); - - paper.on('blank:pointerdown', function(evt, x, y) { - // Disable current focus - document.activeElement.blur(); + } + } + }); + + paper.on('cell:pointerdblclick', function(cellView/*, evt, x, y*/) { + var data = cellView.model.attributes; + if (data.blockType === 'basic.input' || + data.blockType === 'basic.output') { + if (paper.options.enabled) { + alertify.prompt(gettextCatalog.getString('Update the port label'), data.data.label ? ' ' + data.data.label + ' ' : '', + function(evt, label) { + label = label.replace(/ /g, ''); + if (data.data.label !== label) { + data.data.label = label; + cellView.renderLabel(); + alertify.success(gettextCatalog.getString('Label updated')); + } + }); + } + } + else if (data.blockType === 'basic.constant') { + if (paper.options.enabled) { + utils.constantprompt([ + gettextCatalog.getString('Update the block label'), + gettextCatalog.getString('Update the block status'), + gettextCatalog.getString('Local parameter') + ], [ + data.data.label ? ' ' + data.data.label + ' ' : '', + data.data.local ? data.data.local : false + ], + function(evt, values) { + var label = values[0].replace(/ /g, ''); + if (data.data.label !== label) { + data.data.label = label; + cellView.renderLabel(); + alertify.success(gettextCatalog.getString('Label updated')); + } + var local = values[1]; + data.data.local = local; + cellView.renderLocal(); + }); + } + } + else if (data.blockType === 'basic.code') { + if (paper.options.enabled) { + var block = { + data: { + code: self.getContent(cellView.model.id), + params: data.data.params, + ports: data.data.ports + }, + position: cellView.model.attributes.position + }; + self.createBlock('basic.code', block, function() { + cellView.model.remove(); + }); + } + } + else if (data.type !== 'ice.Wire' && data.type !== 'ice.Info') { + self.breadcrumbs.push({ name: data.blockType }); + if(!$rootScope.$$phase) { + $rootScope.$apply(); + } + zIndex = 1; + if (self.breadcrumbs.length === 2) { + $rootScope.$broadcast('updateProject', function() { + self.loadDesign(dependencies[data.blockType].design, true); + }); + } + else { + self.loadDesign(dependencies[data.blockType].design, true); + } + } + }); - if (evt.which == 3) { - // Right button - if (paper.options.enabled) { - selectionView.startSelecting(evt, x, y); - } - } - else if (evt.which == 1) { - // Left button - self.panAndZoom.enablePan(); - } - }); + paper.on('blank:pointerdown', function(evt, x, y) { + // Disable current focus + document.activeElement.blur(); - paper.on('cell:pointerup blank:pointerup', function(cellView, evt) { - self.panAndZoom.disablePan(); - }); + if (evt.which === 3) { + // Right button + if (paper.options.enabled) { + selectionView.startSelecting(evt, x, y); + } + } + else if (evt.which === 1) { + // Left button + self.panAndZoom.enablePan(); + } + }); - paper.on('cell:mouseover', - function(cellView, evt) { - if (!cellView.model.isLink()) { - cellView.$box.addClass('highlight'); - } - } - ); + paper.on('cell:pointerup blank:pointerup', function(/*cellView, evt*/) { + self.panAndZoom.disablePan(); + }); - paper.on('cell:mouseout', - function(cellView, evt) { - if (!cellView.model.isLink()) { - cellView.$box.removeClass('highlight'); - } - } - ); - - graph.on('change:position', function(cell) { - if (!selectionView.isTranslating()) { - // Update wires on obstacles motion - /*var cells = graph.getCells(); - for (var i in cells) { - var cell = cells[i]; - if (cell.isLink()) { - paper.findViewByModel(cell).update(); - } - }*/ - } - }); - }; + paper.on('cell:mouseover', function(cellView/*, evt*/) { + if (!cellView.model.isLink()) { + cellView.$box.addClass('highlight'); + } + }); - this.clearAll = function() { - graph.clear(); - this.appEnable(true); - selection.reset(); - selectionView.cancelSelection(); - }; + paper.on('cell:mouseout', function(cellView/*, evt*/) { + if (!cellView.model.isLink()) { + cellView.$box.removeClass('highlight'); + } + }); - this.appEnable = function(value) { - paper.options.enabled = value; + graph.on('change:position', function(/*cell*/) { + if (!selectionView.isTranslating()) { + // Update wires on obstacles motion + /*var cells = graph.getCells(); + for (var i in cells) { + var cell = cells[i]; + if (cell.isLink()) { + paper.findViewByModel(cell).update(); + } + }*/ + } + }); + }; + + this.clearAll = function() { + graph.clear(); + this.appEnable(true); + selection.reset(); + selectionView.cancelSelection(); + }; + + this.appEnable = function(value) { + paper.options.enabled = value; + if (value) { + angular.element('#menu').removeClass('disable-menu'); + angular.element('#paper').removeClass('disable-paper'); + angular.element('#banner').addClass('hidden'); + } + else { + angular.element('#menu').addClass('disable-menu'); + angular.element('#paper').addClass('disable-paper'); + angular.element('#banner').removeClass('hidden'); + } + var cells = graph.getCells(); + for (var i in cells) { + var cellView = paper.findViewByModel(cells[i].id); + cellView.options.interactive = value; + if (cells[i].attributes.type !== 'ice.Generic') { if (value) { - angular.element('#menu').removeClass('disable-menu'); - angular.element('#paper').removeClass('disable-paper'); - angular.element('#banner').addClass('hidden'); + cellView.$el.removeClass('disable-graph'); } else { - angular.element('#menu').addClass('disable-menu'); - angular.element('#paper').addClass('disable-paper'); - angular.element('#banner').removeClass('hidden'); + cellView.$el.addClass('disable-graph'); } - var cells = graph.getCells(); - for (var i in cells) { - var cellView = paper.findViewByModel(cells[i].id); - cellView.options.interactive = value; - if (cells[i].attributes.type != 'ice.Generic') { - if (value) { - cellView.$el.removeClass('disable-graph'); - } - else { - cellView.$el.addClass('disable-graph'); + } + else if (cells[i].attributes.type !== 'ice.Wire') { + if (value) { + cellView.$el.find('.port-body').removeClass('disable-graph'); + } + else { + cellView.$el.find('.port-body').addClass('disable-graph'); + } + } + } + }; + + this.createBlock = function(type, block, callback) { + var blockInstance = { + id: null, + data: {}, + type: type, + position: { x: 4 * gridsize, y: 4 * gridsize } + }; + + if (type === 'basic.code') { + var defaultValues = [ + ' a , b ', + ' c , d ', + '' + ]; + if (block && block.data) { + if (block.data.ports) { + defaultValues[0] = ' ' + block.data.ports.in.join(' , ') + ' '; + defaultValues[1] = ' ' + block.data.ports.out.join(' , ') + ' '; + } + if (block.data.params) { + defaultValues[2] = ' ' + block.data.params.join(' , ') + ' '; + } + } + utils.multiprompt( + [ gettextCatalog.getString('Enter the input ports'), + gettextCatalog.getString('Enter the output ports'), + gettextCatalog.getString('Enter the parameters') ], + defaultValues, + function(evt, ports) { + if (ports && (ports[0].length || ports[1].length)) { + blockInstance.data = { + code: '', + params: [], + ports: { in: [], out: [] } + }; + // Parse ports + var inPorts = []; + var outPorts = []; + var params = []; + if (ports.length > 0) { + inPorts = ports[0].replace(/ /g, '').split(','); } - } - else if (cells[i].attributes.type != 'ice.Wire') { - if (value) { - cellView.$el.find('.port-body').removeClass('disable-graph'); + if (ports.length > 1) { + outPorts = ports[1].replace(/ /g, '').split(','); } - else { - cellView.$el.find('.port-body').addClass('disable-graph'); + if (ports.length > 2) { + params = ports[2].replace(/ /g, '').split(','); } - } - } - }; - this.createBlock = function(type, block, callback) { - var blockInstance = { - id: null, - data: {}, - type: type, - position: { x: 4 * gridsize, y: 4 * gridsize } - }; - - if (type == 'basic.code') { - var defaultValues = [ - ' a , b ', - ' c , d ', - '' - ]; - if (block && block.data) { - if (block.data.ports) { - defaultValues[0] = ' ' + block.data.ports.in.join(' , ') + ' '; - defaultValues[1] = ' ' + block.data.ports.out.join(' , ') + ' '; + for (var i in inPorts) { + if (inPorts[i]) { + blockInstance.data.ports.in.push(inPorts[i]); + } } - if (block.data.params) { - defaultValues[2] = ' ' + block.data.params.join(' , ') + ' '; + for (var o in outPorts) { + if (outPorts[o]) { + blockInstance.data.ports.out.push(outPorts[o]); + } } - } - utils.multiprompt( - [ gettextCatalog.getString('Enter the input ports'), - gettextCatalog.getString('Enter the output ports'), - gettextCatalog.getString('Enter the parameters') ], - defaultValues, - function(evt, ports) { - if (ports && (ports[0].length || ports[1].length)) { - blockInstance.data = { - code: '', - params: [], - ports: { in: [], out: [] } - }; - // Parse ports - var inPorts = []; - var outPorts = []; - var params = []; - if (ports.length > 0) { - inPorts = ports[0].replace(/ /g, '').split(','); - } - if (ports.length > 1) { - outPorts = ports[1].replace(/ /g, '').split(','); - } - if (ports.length > 2) { - params = ports[2].replace(/ /g, '').split(','); - } - - for (var i in inPorts) { - if (inPorts[i]) - blockInstance.data.ports.in.push(inPorts[i]); - } - for (var o in outPorts) { - if (outPorts[o]) - blockInstance.data.ports.out.push(outPorts[o]); - } - for (var p in params) { - if (params[p]) - blockInstance.data.params.push(params[p]); - } - blockInstance.position.x = 31 * gridsize; - blockInstance.position.y = 24 * gridsize; - - var allAttrs= inPorts.concat(outPorts, params); - var numAttrs = allAttrs.length; - - // Check duplicated attributes - if (numAttrs == $.unique(allAttrs).length) { - evt.cancel = false; - if (block) { - blockInstance.data.code = block.data.code; - blockInstance.position = block.position; - } - var cell = addBasicCodeBlock(blockInstance); - var cellView = paper.findViewByModel(cell); - if (cellView.$box.css('z-index') < zIndex) { - cellView.$box.css('z-index', ++zIndex); - } - if (callback) - callback(); - } - else { - evt.cancel = true; - alertify.notify(gettextCatalog.getString('Duplicated block attributes'), 'warning', 3); - } + for (var p in params) { + if (params[p]) { + blockInstance.data.params.push(params[p]); } - }); - } - else if (type == 'basic.info') { - blockInstance.data = { - info: '' - }; - blockInstance.position.y = 30 * gridsize; - var cell = addBasicInfoBlock(blockInstance); - var cellView = paper.findViewByModel(cell); - if (cellView.$box.css('z-index') < zIndex) { - cellView.$box.css('z-index', ++zIndex); - } - } - else if (type == 'basic.input') { - alertify.prompt(gettextCatalog.getString('Enter the input ports'), ' in ', - function(evt, name) { - if (name) { - var names = name.replace(/ /g, '').split(','); - for (var n in names) { - if (names[n]) { - blockInstance.data = { - label: names[n], - pin: { - name: '', - value: 0 - } - }; - var cell = addBasicInputBlock(blockInstance); - var cellView = paper.findViewByModel(cell); - if (cellView.$box.css('z-index') < zIndex) { - cellView.$box.css('z-index', ++zIndex); - } - blockInstance.position.y += 10 * gridsize; - } - } + } + blockInstance.position.x = 31 * gridsize; + blockInstance.position.y = 24 * gridsize; + + var allAttrs= inPorts.concat(outPorts, params); + var numAttrs = allAttrs.length; + + // Check duplicated attributes + if (numAttrs === $.unique(allAttrs).length) { + evt.cancel = false; + if (block) { + blockInstance.data.code = block.data.code; + blockInstance.position = block.position; + } + var cell = addBasicCodeBlock(blockInstance); + var cellView = paper.findViewByModel(cell); + if (cellView.$box.css('z-index') < zIndex) { + cellView.$box.css('z-index', ++zIndex); + } + if (callback) { + callback(); } - else { - /*blockInstance.data = { - label: '', + } + else { + evt.cancel = true; + alertify.notify(gettextCatalog.getString('Duplicated block attributes'), 'warning', 3); + } + } + }); + } + else if (type === 'basic.info') { + blockInstance.data = { + info: '' + }; + blockInstance.position.y = 30 * gridsize; + var cell = addBasicInfoBlock(blockInstance); + var cellView = paper.findViewByModel(cell); + if (cellView.$box.css('z-index') < zIndex) { + cellView.$box.css('z-index', ++zIndex); + } + } + else if (type === 'basic.input') { + alertify.prompt(gettextCatalog.getString('Enter the input ports'), ' in ', + function(evt, name) { + if (name) { + var names = name.replace(/ /g, '').split(','); + for (var n in names) { + if (names[n]) { + blockInstance.data = { + label: names[n], pin: { name: '', value: 0 @@ -611,38 +557,37 @@ angular.module('icestudio') if (cellView.$box.css('z-index') < zIndex) { cellView.$box.css('z-index', ++zIndex); } - blockInstance.position.y += 10 * gridsize;*/ + blockInstance.position.y += 10 * gridsize; } - }); - } - else if (type == 'basic.output') { - alertify.prompt(gettextCatalog.getString('Enter the output ports'), ' out ', - function(evt, name) { - if (name) { - var names = name.replace(/ /g, '').split(','); - blockInstance.position.x = 95 * gridsize; - for (var n in names) { - if (names[n]) { - blockInstance.data = { - label: names[n], - pin: { - name: '', - value: 0 - } - }; - var cell = addBasicOutputBlock(blockInstance); - var cellView = paper.findViewByModel(cell); - if (cellView.$box.css('z-index') < zIndex) { - cellView.$box.css('z-index', ++zIndex); - } - blockInstance.position.y += 10 * gridsize; - } - } + } + } + else { + /*blockInstance.data = { + label: '', + pin: { + name: '', + value: 0 } - else { - /*blockInstance.position.x = 95 * gridsize; + }; + var cell = addBasicInputBlock(blockInstance); + var cellView = paper.findViewByModel(cell); + if (cellView.$box.css('z-index') < zIndex) { + cellView.$box.css('z-index', ++zIndex); + } + blockInstance.position.y += 10 * gridsize;*/ + } + }); + } + else if (type === 'basic.output') { + alertify.prompt(gettextCatalog.getString('Enter the output ports'), ' out ', + function(evt, name) { + if (name) { + var names = name.replace(/ /g, '').split(','); + blockInstance.position.x = 95 * gridsize; + for (var n in names) { + if (names[n]) { blockInstance.data = { - label: '', + label: names[n], pin: { name: '', value: 0 @@ -653,475 +598,496 @@ angular.module('icestudio') if (cellView.$box.css('z-index') < zIndex) { cellView.$box.css('z-index', ++zIndex); } - blockInstance.position.y += 10 * gridsize;*/ - } - }); - } - else if (type == 'basic.constant') { - alertify.prompt(gettextCatalog.getString('Enter the constant blocks'), ' C ', - function(evt, name) { - if (name) { - var names = name.replace(/ /g, '').split(','); - blockInstance.position.x = 20 * gridsize; - for (var n in names) { - if (names[n]) { - blockInstance.data = { - label: names[n], - local: false, - value: '' - }; - var cell = addBasicConstantBlock(blockInstance); - var cellView = paper.findViewByModel(cell); - if (cellView.$box.css('z-index') < zIndex) { - cellView.$box.css('z-index', ++zIndex); - } - blockInstance.position.x += 15 * gridsize; - } - } + blockInstance.position.y += 10 * gridsize; } - else { + } + } + else { + /*blockInstance.position.x = 95 * gridsize; + blockInstance.data = { + label: '', + pin: { + name: '', + value: 0 } - }); - } - else { - if (block && - block.design && - block.design.graph && - block.design.graph.blocks && - block.design.graph.wires && - block.design.deps) { - dependencies[type] = block; - blockInstance.position.x = 6 * gridsize; - blockInstance.position.y = 16 * gridsize; - var cell = addGenericBlock(blockInstance, block); + }; + var cell = addBasicOutputBlock(blockInstance); var cellView = paper.findViewByModel(cell); if (cellView.$box.css('z-index') < zIndex) { cellView.$box.css('z-index', ++zIndex); } + blockInstance.position.y += 10 * gridsize;*/ + } + }); + } + else if (type === 'basic.constant') { + alertify.prompt(gettextCatalog.getString('Enter the constant blocks'), ' C ', + function(evt, name) { + if (name) { + var names = name.replace(/ /g, '').split(','); + blockInstance.position.x = 20 * gridsize; + for (var n in names) { + if (names[n]) { + blockInstance.data = { + label: names[n], + local: false, + value: '' + }; + var cell = addBasicConstantBlock(blockInstance); + var cellView = paper.findViewByModel(cell); + if (cellView.$box.css('z-index') < zIndex) { + cellView.$box.css('z-index', ++zIndex); + } + blockInstance.position.x += 15 * gridsize; + } + } } else { - alertify.notify(gettextCatalog.getString('Wrong block format: {{type}}', { type: type }), 'error', 30); } + }); + } + else { + if (block && + block.design && + block.design.graph && + block.design.graph.blocks && + block.design.graph.wires && + block.design.deps) { + dependencies[type] = block; + blockInstance.position.x = 6 * gridsize; + blockInstance.position.y = 16 * gridsize; + var _cell = addGenericBlock(blockInstance, block); + var _cellView = paper.findViewByModel(_cell); + if (_cellView.$box.css('z-index') < zIndex) { + _cellView.$box.css('z-index', ++zIndex); } - }; - - this.toJSON = function() { - return graph.toJSON(); } - - this.getCells = function() { - return graph.getCells(); + else { + alertify.notify(gettextCatalog.getString('Wrong block format: {{type}}', { type: type }), 'error', 30); } - - this.setCells = function(cells) { - graph.attributes.cells.models = cells; - } - - this.getContent = function(id) { - return paper.findViewByModel(id).$box.find( - '#content' + sha1(id).toString().substring(0, 6)).val(); + } + }; + + this.toJSON = function() { + return graph.toJSON(); + }; + + this.getCells = function() { + return graph.getCells(); + }; + + this.setCells = function(cells) { + graph.attributes.cells.models = cells; + }; + + this.getContent = function(id) { + return paper.findViewByModel(id).$box.find( + '#content' + nodeSha1(id).toString().substring(0, 6)).val(); + }; + + this.resetIOChoices = function() { + var cells = graph.getCells(); + // Reset choices in all i/o blocks + for (var i in cells) { + var cell = cells[i]; + var type = cell.attributes.blockType; + if (type === 'basic.input' || type === 'basic.output') { + cell.attributes.choices = boards.getPinout(); + var view = paper.findViewByModel(cell.id); + view.renderChoices(); + view.clearValue(); } - - this.resetIOChoices = function() { - var cells = graph.getCells(); - // Reset choices in all i/o blocks - for (var i in cells) { - var cell = cells[i]; - var type = cell.attributes.blockType; - if (type == 'basic.input' || type == 'basic.output') { - cell.attributes.choices = boards.getPinout(); - var view = paper.findViewByModel(cell.id); - view.renderChoices(); - view.clearValue(); - } + } + }; + + this.cloneSelected = function() { + var self = this; + if (selection) { + selection.each(function(cell) { + var newCell = cell.clone(); + var type = cell.attributes.blockType; + var content = self.getContent(cell.id); + if (type === 'basic.code') { + newCell.attributes.data.code = content; } - } - - this.cloneSelected = function() { - var self = this; - if (selection) { - selection.each(function(cell) { - var newCell = cell.clone(); - var type = cell.attributes.blockType; - var content = self.getContent(cell.id); - if (type == 'basic.code') { - newCell.attributes.data.code = content; - } - else if (type == 'basic.info') { - newCell.attributes.data.info = content; - } - newCell.translate(6 * gridsize, 6 * gridsize); - addCell(newCell); - if (type.indexOf('config.') != -1) { - paper.findViewByModel(newCell).$box.addClass('config-block'); - } - var cellView = paper.findViewByModel(newCell); - if (cellView.$box.css('z-index') < zIndex) { - cellView.$box.css('z-index', ++zIndex); - } - selection.reset(selection.without(cell)); - selectionView.cancelSelection(); - }); + else if (type === 'basic.info') { + newCell.attributes.data.info = content; } - } - - this.hasSelection = function() { - return selection.length > 0; - } - - this.removeSelected = function(removeDep) { - if (selection) { - selection.each(function(cell) { - selection.reset(selection.without(cell)); - selectionView.cancelSelection(); - var type = cell.attributes.blockType; - cell.remove(); - if (!typeInGraph(type)) { - // Check if it is the last "type" block - if (removeDep) { - // Remove "type" dependency in the project - removeDep(type); - } - } - }); + newCell.translate(6 * gridsize, 6 * gridsize); + addCell(newCell); + if (type.indexOf('config.') !== -1) { + paper.findViewByModel(newCell).$box.addClass('config-block'); } - } + var cellView = paper.findViewByModel(newCell); + if (cellView.$box.css('z-index') < zIndex) { + cellView.$box.css('z-index', ++zIndex); + } + selection.reset(selection.without(cell)); + selectionView.cancelSelection(); + }); + } + }; - function typeInGraph(type) { - var cells = graph.getCells(); - for (var i in cells) { - if (cells[i].attributes.blockType == type) { - return true; + this.hasSelection = function() { + return selection.length > 0; + }; + + this.removeSelected = function(removeDep) { + if (selection) { + selection.each(function(cell) { + selection.reset(selection.without(cell)); + selectionView.cancelSelection(); + var type = cell.attributes.blockType; + cell.remove(); + if (!typeInGraph(type)) { + // Check if it is the last "type" block + if (removeDep) { + // Remove "type" dependency in the project + removeDep(type); } } - return false; - }; + }); + } + }; - this.isEmpty = function() { - return (graph.getCells().length == 0); + function typeInGraph(type) { + var cells = graph.getCells(); + for (var i in cells) { + if (cells[i].attributes.blockType === type) { + return true; } + } + return false; + } - this.isEnabled = function() { - return paper.options.enabled; - } + this.isEmpty = function() { + return (graph.getCells().length === 0); + }; - this.loadDesign = function(design, disabled, callback) { - if (design && - design.graph && - design.graph.blocks && - design.graph.wires && - design.deps) { + this.isEnabled = function() { + return paper.options.enabled; + }; - var self = this; - var blockInstances = design.graph.blocks; - var wires = design.graph.wires; - var deps = design.deps; + this.loadDesign = function(design, disabled, callback) { + if (design && + design.graph && + design.graph.blocks && + design.graph.wires && + design.deps) { - dependencies = design.deps; + var i; + var self = this; + var blockInstances = design.graph.blocks; + var wires = design.graph.wires; + var deps = design.deps; - $('body').addClass('waiting'); + dependencies = design.deps; - this.clearAll(); - this.setState(design.state); + $('body').addClass('waiting'); - setTimeout(function() { + this.clearAll(); + this.setState(design.state); - // Blocks - for (var i in blockInstances) { - var blockInstance = blockInstances[i]; - if (blockInstance.type == 'basic.code') { - addBasicCodeBlock(blockInstance, disabled); - } - else if (blockInstance.type == 'basic.info') { - addBasicInfoBlock(blockInstance, disabled); - } - else if (blockInstance.type == 'basic.input') { - addBasicInputBlock(blockInstance, disabled); - } - else if (blockInstance.type == 'basic.output') { - addBasicOutputBlock(blockInstance, disabled); - } - else if (blockInstance.type == 'basic.constant') { - addBasicConstantBlock(blockInstance, disabled); - } - else { - if (deps && deps[blockInstance.type]) { - addGenericBlock(blockInstance, deps[blockInstance.type]); - } - } - } + setTimeout(function() { - // Wires - for (var i in wires) { - addWire(wires[i]); + // Blocks + for (i in blockInstances) { + var blockInstance = blockInstances[i]; + if (blockInstance.type === 'basic.code') { + addBasicCodeBlock(blockInstance, disabled); + } + else if (blockInstance.type === 'basic.info') { + addBasicInfoBlock(blockInstance, disabled); + } + else if (blockInstance.type === 'basic.input') { + addBasicInputBlock(blockInstance, disabled); + } + else if (blockInstance.type === 'basic.output') { + addBasicOutputBlock(blockInstance, disabled); + } + else if (blockInstance.type === 'basic.constant') { + addBasicConstantBlock(blockInstance, disabled); + } + else { + if (deps && deps[blockInstance.type]) { + addGenericBlock(blockInstance, deps[blockInstance.type]); } - - self.appEnable(!disabled); - - $('body').removeClass('waiting'); - - if (callback) - callback(); - - }, 20); - - return true; + } } - } - this.importBlock = function(type, block) { - var blockInstance = { - id: null, - data: {}, - type: type, - position: { x: 6 * gridsize, y: 16 * gridsize } - } - dependencies[type] = block; - var cell = addGenericBlock(blockInstance, block); - var cellView = paper.findViewByModel(cell); - if (cellView.$box.css('z-index') < zIndex) { - cellView.$box.css('z-index', ++zIndex); + // Wires + for (i in wires) { + addWire(wires[i]); } - } - - function addBasicInputBlock(blockInstances, disabled) { - var cell = new joint.shapes.ice.Input({ - id: blockInstances.id, - blockType: blockInstances.type, - data: blockInstances.data, - label: blockInstances.data.label, - position: blockInstances.position, - disabled: disabled, - choices: boards.getPinout() - }); - - addCell(cell); - return cell; - }; - function addBasicOutputBlock(blockInstances, disabled) { - var cell = new joint.shapes.ice.Output({ - id: blockInstances.id, - blockType: blockInstances.type, - data: blockInstances.data, - label: blockInstances.data.label, - position: blockInstances.position, - disabled: disabled, - choices: boards.getPinout() - }); + self.appEnable(!disabled); - addCell(cell); - return cell; - }; + $('body').removeClass('waiting'); - function addBasicConstantBlock(blockInstances, disabled) { - var cell = new joint.shapes.ice.Constant({ - id: blockInstances.id, - blockType: blockInstances.type, - data: blockInstances.data, - label: blockInstances.data.label, - position: blockInstances.position, - disabled: disabled - }); + if (callback) { + callback(); + } - addCell(cell); - return cell; - }; + }, 20); - function addBasicCodeBlock(blockInstances, disabled) { - var leftPorts = []; - var rightPorts = []; - var topPorts = []; + return true; + } + }; + + this.importBlock = function(type, block) { + var blockInstance = { + id: null, + data: {}, + type: type, + position: { x: 6 * gridsize, y: 16 * gridsize } + }; + dependencies[type] = block; + var cell = addGenericBlock(blockInstance, block); + var cellView = paper.findViewByModel(cell); + if (cellView.$box.css('z-index') < zIndex) { + cellView.$box.css('z-index', ++zIndex); + } + }; + + function addBasicInputBlock(blockInstances, disabled) { + var cell = new joint.shapes.ice.Input({ + id: blockInstances.id, + blockType: blockInstances.type, + data: blockInstances.data, + label: blockInstances.data.label, + position: blockInstances.position, + disabled: disabled, + choices: boards.getPinout() + }); + + addCell(cell); + return cell; + } + + function addBasicOutputBlock(blockInstances, disabled) { + var cell = new joint.shapes.ice.Output({ + id: blockInstances.id, + blockType: blockInstances.type, + data: blockInstances.data, + label: blockInstances.data.label, + position: blockInstances.position, + disabled: disabled, + choices: boards.getPinout() + }); + + addCell(cell); + return cell; + } + + function addBasicConstantBlock(blockInstances, disabled) { + var cell = new joint.shapes.ice.Constant({ + id: blockInstances.id, + blockType: blockInstances.type, + data: blockInstances.data, + label: blockInstances.data.label, + position: blockInstances.position, + disabled: disabled + }); + + addCell(cell); + return cell; + } + + function addBasicCodeBlock(blockInstances, disabled) { + var leftPorts = []; + var rightPorts = []; + var topPorts = []; + + for (var i in blockInstances.data.ports.in) { + leftPorts.push({ + id: blockInstances.data.ports.in[i], + label: blockInstances.data.ports.in[i], + gridUnits: 32 + }); + } - for (var i in blockInstances.data.ports.in) { - leftPorts.push({ - id: blockInstances.data.ports.in[i], - label: blockInstances.data.ports.in[i], - gridUnits: 32 - }); - } + for (var o in blockInstances.data.ports.out) { + rightPorts.push({ + id: blockInstances.data.ports.out[o], + label: blockInstances.data.ports.out[o], + gridUnits: 32 + }); + } - for (var o in blockInstances.data.ports.out) { - rightPorts.push({ - id: blockInstances.data.ports.out[o], - label: blockInstances.data.ports.out[o], - gridUnits: 32 - }); - } + for (var p in blockInstances.data.params) { + topPorts.push({ + id: blockInstances.data.params[p], + label: blockInstances.data.params[p], + gridUnits: 48 + }); + } - for (var p in blockInstances.data.params) { + var cell = new joint.shapes.ice.Code({ + id: blockInstances.id, + blockType: blockInstances.type, + data: blockInstances.data, + position: blockInstances.position, + disabled: disabled, + leftPorts: leftPorts, + rightPorts: rightPorts, + topPorts: topPorts + }); + + addCell(cell); + return cell; + } + + function addBasicInfoBlock(blockInstances, disabled) { + var cell = new joint.shapes.ice.Info({ + id: blockInstances.id, + blockType: blockInstances.type, + data: blockInstances.data, + position: blockInstances.position, + disabled: disabled + }); + + addCell(cell); + return cell; + } + + function addGenericBlock(blockInstance, block) { + var i; + var leftPorts = []; + var rightPorts = []; + var topPorts = []; + var bottomPorts = []; + + for (i in block.design.graph.blocks) { + var item = block.design.graph.blocks[i]; + if (item.type === 'basic.input') { + leftPorts.push({ + id: item.id, + label: item.data.label + }); + } + else if (item.type === 'basic.output') { + rightPorts.push({ + id: item.id, + label: item.data.label + }); + } + else if (item.type === 'basic.constant') { + if (!item.data.local) { topPorts.push({ - id: blockInstances.data.params[p], - label: blockInstances.data.params[p], - gridUnits: 48 + id: item.id, + label: item.data.label }); } + } + } - var cell = new joint.shapes.ice.Code({ - id: blockInstances.id, - blockType: blockInstances.type, - data: blockInstances.data, - position: blockInstances.position, - disabled: disabled, - leftPorts: leftPorts, - rightPorts: rightPorts, - topPorts: topPorts - }); - - addCell(cell); - return cell; - }; - - function addBasicInfoBlock(blockInstances, disabled) { - var cell = new joint.shapes.ice.Info({ - id: blockInstances.id, - blockType: blockInstances.type, - data: blockInstances.data, - position: blockInstances.position, - disabled: disabled - }); - - addCell(cell); - return cell; - }; + var numPortsHeight = Math.max(leftPorts.length, rightPorts.length); + var numPortsWidth = Math.max(topPorts.length, bottomPorts.length); - function addGenericBlock(blockInstance, block) { - var leftPorts = []; - var rightPorts = []; - var topPorts = []; - var bottomPorts = []; - - for (var i in block.design.graph.blocks) { - var item = block.design.graph.blocks[i]; - if (item.type == 'basic.input') { - leftPorts.push({ - id: item.id, - label: item.data.label - }); - } - else if (item.type == 'basic.output') { - rightPorts.push({ - id: item.id, - label: item.data.label - }); - } - else if (item.type == 'basic.constant') { - if (!item.data.local) { - topPorts.push({ - id: item.id, - label: item.data.label - }); - } - } - } + var height = 8 * gridsize; + height = Math.max(4 * gridsize * numPortsHeight, height); + var blockLabel = blockInstance.type.toUpperCase(); + var width = 12 * gridsize; + if (blockLabel.length > 4) { + width = Math.min((blockLabel.length + 8) * gridsize, 24 * gridsize); + } + width = Math.max(4 * gridsize * numPortsWidth, width); - var numPortsHeight = Math.max(leftPorts.length, rightPorts.length); - var numPortsWidth = Math.max(topPorts.length, bottomPorts.length); + var gridUnitsHeight = height / gridsize; + var gridUnitsWidth = width / gridsize; - var height = 8 * gridsize; - height = Math.max(4 * gridsize * numPortsHeight, height); - var blockLabel = blockInstance.type.toUpperCase(); - var width = 12 * gridsize; - if (blockLabel.length > 4) { - width = Math.min((blockLabel.length + 8) * gridsize, 24 * gridsize); - } - width = Math.max(4 * gridsize * numPortsWidth, width); + for (i in leftPorts) { + leftPorts[i].gridUnits = gridUnitsHeight; + } + for (i in rightPorts) { + rightPorts[i].gridUnits = gridUnitsHeight; + } + for (i in topPorts) { + topPorts[i].gridUnits = gridUnitsWidth; + } + for (i in bottomPorts) { + bottomPorts[i].gridUnits = gridUnitsWidth; + } - var gridUnitsHeight = height / gridsize; - var gridUnitsWidth = width / gridsize; + if (blockInstance.type.indexOf('.') !== -1) { + blockLabel = blockInstance.type.split('.').join(' '); + } - for (var i in leftPorts) { - leftPorts[i].gridUnits = gridUnitsHeight; - } - for (var i in rightPorts) { - rightPorts[i].gridUnits = gridUnitsHeight; - } - for (var i in topPorts) { - topPorts[i].gridUnits = gridUnitsWidth; - } - for (var i in bottomPorts) { - bottomPorts[i].gridUnits = gridUnitsWidth; - } + var blockImage = ''; + if (block.package.image) { + width = 12 * gridsize; + if (block.package.image.startsWith('%3Csvg')) { + blockImage = block.package.image; + } + else if (block.package.image.startsWith(' 0) { + alertify.notify(stdoutError[0], 'error', 30); } else { - processExecute(label, callback, error, stdout, stderr); + alertify.notify(stdout, 'error', 30); } - }); - } - else { - var apio = utils.getApioExecutable(); - toolchain.disabled = utils.toolchainDisabled; - nodeChildProcess.exec(([apio].concat(commands)).join(' '), { maxBuffer: 5000 * 1024 }, - function(error, stdout, stderr) { - // console.log(error, stdout, stderr); - processExecute(label, callback, error, stdout, stderr); - }); + } } - } - - function processExecute(label, callback, error, stdout, stderr) { - if (callback) - callback(); - if (label) { - if (error || stderr) { - if (stdout) { - if (stdout.indexOf('[upload] Error') != -1 || - stdout.indexOf('Error: board not detected') != -1) { - alertify.notify(gettextCatalog.getString('Board {{name}} not detected', { name: utils.bold(boards.selectedBoard.info.label) }), 'error', 30); - } - else if (stdout.indexOf('Error: unkown board') != -1) { - alertify.notify(gettextCatalog.getString('Unknown board'), 'error', 30); - } - else if (stdout.indexOf('set_io: too few arguments') != -1) { - alertify.notify(gettextCatalog.getString('FPGA I/O ports not defined'), 'error', 30); - } - else if (stdout.indexOf('error: unknown pin') != -1) { - alertify.notify(gettextCatalog.getString('FPGA I/O ports not defined'), 'error', 30); - } - else if (stdout.indexOf('error: duplicate pin constraints') != -1) { - alertify.notify(gettextCatalog.getString('Duplicated FPGA I/O ports'), 'error', 30); - } - else { - var stdoutError = stdout.split('\n').filter(isError); - function isError(line) { - return (line.indexOf('syntax error') != -1 || - line.indexOf('not installed') != -1 || - line.indexOf('error: ') != -1 || - line.indexOf('ERROR: ') != -1 || - line.indexOf('Error: ') != -1 || - line.indexOf('already declared') != -1); - } - if (stdoutError.length > 0) { - alertify.notify(stdoutError[0], 'error', 30); - } - else { - alertify.notify(stdout, 'error', 30); - } - } - } - else if (stderr) { - if (stderr.indexOf('Could not resolve hostname') != -1 || - stderr.indexOf('Connection refused') != -1) { - alertify.notify(gettextCatalog.getString('Wrong remote hostname {{name}}', { name: profile.data.remoteHostname }), 'error', 30); - } - else if (stderr.indexOf('No route to host') != -1) { - alertify.notify(gettextCatalog.getString('Remote host {{name}} not connected', { name: profile.data.remoteHostname }), 'error', 30); - } - else { - alertify.notify(stderr, 'error', 30); - } - } + else if (stderr) { + if (stderr.indexOf('Could not resolve hostname') !== -1 || + stderr.indexOf('Connection refused') !== -1) { + alertify.notify(gettextCatalog.getString('Wrong remote hostname {{name}}', { name: profile.data.remoteHostname }), 'error', 30); + } + else if (stderr.indexOf('No route to host') !== -1) { + alertify.notify(gettextCatalog.getString('Remote host {{name}} not connected', { name: profile.data.remoteHostname }), 'error', 30); } else { - // Annotate strings for translation - /// Verification done - gettext('done_verify'); - /// Build done - gettext('done_build'); - /// Upload done - gettext('done_upload'); - var message = 'done_' + label; - alertify.success(gettextCatalog.getString(message)); - if ((label == 'build') && stdout) { - // Show used resources in the FPGA - /* - PIOs 0 / 96 - PLBs 0 / 160 - BRAMs 0 / 16 - */ - var match, - fpgaResources = '', - patterns = [ - /PIOs.+/g, - /PLBs.+/g, - /BRAMs.+/g - ]; - - for (var p in patterns) { - match = patterns[p].exec(stdout); - fpgaResources += (match && match.length > 0) ? match[0] + '\n' : ''; - } - if (fpgaResources) { - alertify.notify('
                ' + fpgaResources + '
                ', 'message', 5); - } - } + alertify.notify(stderr, 'error', 30); } - $('body').removeClass('waiting'); - } - } - - this.installToolchain = function() { - if (utils.checkDefaultToolchain()) { - utils.removeToolchain(); - installDefaultToolchain(); - } - else { - alertify.confirm(gettextCatalog.getString('Default toolchain not found. Toolchain will be downloaded. This operation requires Internet connection. Do you want to continue?'), - function() { - installOnlineToolchain(); - }); - } - } - - this.updateToolchain = function() { - alertify.confirm(gettextCatalog.getString('The toolchain will be updated. This operation requires Internet connection. Do you want to continue?'), - function() { - installOnlineToolchain(); - }); - } - - this.resetToolchain = function() { - if (utils.checkDefaultToolchain()) { - alertify.confirm(gettextCatalog.getString('The toolchain will be restored to default. Do you want to continue?'), - function() { - utils.removeToolchain(); - installDefaultToolchain(); - }); } - else { - alertify.alert(gettextCatalog.getString('Error: default toolchain not found in \'{{dir}}\'', { dir: utils.TOOLCHAIN_DIR})); - } - } - - this.removeToolchain = function() { - alertify.confirm(gettextCatalog.getString('The toolchain will be removed. Do you want to continue?'), - function() { - utils.removeToolchain(); - toolchain.installed = false; - alertify.success(gettextCatalog.getString('Toolchain removed')); - }); - } - - this.enableDrivers = function() { - utils.enableDrivers(); - } - - this.disableDrivers = function() { - utils.disableDrivers(); - } - - function installDefaultToolchain() { - // Configure alert - alertify.defaults.closable = false; - - utils.disableClickEvent(); - - var content = [ - '
                ', - '

                ' + gettextCatalog.getString('Installing toolchain') + '

                ', - '
                ', - '
                ', - '
                ', - '
                ', - '
                ', - '
                '].join('\n'); - alertify.alert(content, function() { - setTimeout(function() { - initProgress(); - }, 200); - }); - - // Reset toolchain - async.series([ - ensurePythonIsAvailable, - extractVirtualEnv, - makeVenvDirectory, - extractDefaultApio, - installDefaultApio, - extractDefaultApioPackages, - installationCompleted - ]); - - // Restore alert - alertify.defaults.closable = true; - } - - function installOnlineToolchain() { - // Configure alert - alertify.defaults.closable = false; - - utils.disableClickEvent(); - - var content = [ - '
                ', - '

                ' + gettextCatalog.getString('Installing toolchain') + '

                ', - '
                ', - '
                ', - '
                ', - '
                ', - '
                ', - '
                '].join('\n'); - alertify.alert(content, function() { - setTimeout(function() { - initProgress(); - }, 200); - }); - - // Install toolchain - async.series([ - checkInternetConnection, - ensurePythonIsAvailable, - extractVirtualEnv, - makeVenvDirectory, - installOnlineApio, - apioInstallSystem, - apioInstallIcestorm, - apioInstallIverilog, - apioInstallDrivers, - apioInstallScons, - installationCompleted - ]); - - // Restore alert - alertify.defaults.closable = true; - } - - function checkInternetConnection(callback) { - updateProgress(gettextCatalog.getString('Check Internet connection...'), 0); - utils.isOnline(callback, function() { - errorProgress(gettextCatalog.getString('Internet connection required')); - utils.enableClickEvent(); - }); - } - - function ensurePythonIsAvailable(callback) { - updateProgress(gettextCatalog.getString('Check Python...'), 0); - if (utils.getPythonExecutable()) { - callback(); - } - else { - errorProgress(gettextCatalog.getString('Python 2.7 is required')); - utils.enableClickEvent(); - callback(true); - } - } - - function extractVirtualEnv(callback) { - updateProgress(gettextCatalog.getString('Extract virtual env files...'), 5); - utils.extractVirtualEnv(callback); - } - - function makeVenvDirectory(callback) { - updateProgress(gettextCatalog.getString('Make virtual env...'), 10); - utils.makeVenvDirectory(callback); - } - - // Local installation - - function extractDefaultApio(callback) { - updateProgress(gettextCatalog.getString('Extract default apio files...'), 20); - utils.extractDefaultApio(callback); } - - function installDefaultApio(callback) { - updateProgress(gettextCatalog.getString('Install default apio...'), 40); - utils.installDefaultApio(callback); - } - - function extractDefaultApioPackages(callback) { - updateProgress(gettextCatalog.getString('Extract default apio packages...'), 70); - utils.extractDefaultApioPackages(callback); - } - - // Remote installation - - function installOnlineApio(callback) { - updateProgress('pip install -U apio', 30); - utils.installOnlineApio(callback); - } - - function apioInstallSystem(callback) { - updateProgress('apio install system', 40); - utils.apioInstall('system', callback); - } - - function apioInstallIcestorm(callback) { - updateProgress('apio install icestorm', 50); - utils.apioInstall('icestorm', callback); - } - - function apioInstallIverilog(callback) { - updateProgress('apio install iverilog', 70); - utils.apioInstall('iverilog', callback); - } - - function apioInstallDrivers(callback) { - if (nodeOs.platform().indexOf('win32') > -1) { - updateProgress('apio install drivers', 80); - utils.apioInstall('drivers', callback); - } - else { - callback(); - } - } - - function apioInstallScons(callback) { - updateProgress('apio install scons', 90); - utils.apioInstall('scons', callback); - } - - function installationCompleted(callback) { - checkToolchain(function(installed) { - if (installed) { - updateProgress(gettextCatalog.getString('Installation completed'), 100); - alertify.success(gettextCatalog.getString('Toolchain installed')); - updateToolchainInfo(); + else { + // Annotate strings for translation + /// Verification done + gettext('done_verify'); + /// Build done + gettext('done_build'); + /// Upload done + gettext('done_upload'); + var message = 'done_' + label; + alertify.success(gettextCatalog.getString(message)); + if ((label === 'build') && stdout) { + // Show used resources in the FPGA + /* + PIOs 0 / 96 + PLBs 0 / 160 + BRAMs 0 / 16 + */ + var match, + fpgaResources = '', + patterns = [ + /PIOs.+/g, + /PLBs.+/g, + /BRAMs.+/g + ]; + + for (var p in patterns) { + match = patterns[p].exec(stdout); + fpgaResources += (match && match.length > 0) ? match[0] + '\n' : ''; } - else { - errorProgress(gettextCatalog.getString('Toolchain not installed')); + if (fpgaResources) { + alertify.notify('
                ' + fpgaResources + '
                ', 'message', 5); } - utils.enableClickEvent(); - callback(); - }); - } - - function updateProgress(message, value) { - angular.element('#progress-message') - .text(message); - var bar = angular.element('#progress-bar') - if (value == 100) - bar.removeClass('progress-bar-striped active'); - bar.text(value + '%') - bar.attr('aria-valuenow', value) - bar.css('width', value + '%'); - } - - function initProgress() { - angular.element('#progress-bar') - .addClass('notransition progress-bar-info progress-bar-striped active') - .removeClass('progress-bar-danger') - .text('0%') - .attr('aria-valuenow', 0) - .css('width', '0%') - .removeClass('notransition'); - - } - - function errorProgress(message) { - angular.element('#progress-message') - .text(message); - angular.element('#progress-bar') - .addClass('notransition progress-bar-danger') - .removeClass('progress-bar-info progress-bar-striped active') - .text('Error') - .attr('aria-valuenow', 100) - .css('width', '100%'); + } } - - }); + $('body').removeClass('waiting'); + } + } + + this.installToolchain = function() { + if (utils.checkDefaultToolchain()) { + utils.removeToolchain(); + installDefaultToolchain(); + } + else { + alertify.confirm(gettextCatalog.getString('Default toolchain not found. Toolchain will be downloaded. This operation requires Internet connection. Do you want to continue?'), + function() { + installOnlineToolchain(); + }); + } + }; + + this.updateToolchain = function() { + alertify.confirm(gettextCatalog.getString('The toolchain will be updated. This operation requires Internet connection. Do you want to continue?'), + function() { + installOnlineToolchain(); + }); + }; + + this.resetToolchain = function() { + if (utils.checkDefaultToolchain()) { + alertify.confirm(gettextCatalog.getString('The toolchain will be restored to default. Do you want to continue?'), + function() { + utils.removeToolchain(); + installDefaultToolchain(); + }); + } + else { + alertify.alert(gettextCatalog.getString('Error: default toolchain not found in \'{{dir}}\'', { dir: utils.TOOLCHAIN_DIR})); + } + }; + + this.removeToolchain = function() { + alertify.confirm(gettextCatalog.getString('The toolchain will be removed. Do you want to continue?'), + function() { + utils.removeToolchain(); + toolchain.installed = false; + alertify.success(gettextCatalog.getString('Toolchain removed')); + }); + }; + + this.enableDrivers = function() { + utils.enableDrivers(); + }; + + this.disableDrivers = function() { + utils.disableDrivers(); + }; + + function installDefaultToolchain() { + // Configure alert + alertify.defaults.closable = false; + + utils.disableClickEvent(); + + var content = [ + '
                ', + '

                ' + gettextCatalog.getString('Installing toolchain') + '

                ', + '
                ', + '
                ', + '
                ', + '
                ', + '
                ', + '
                '].join('\n'); + alertify.alert(content, function() { + setTimeout(function() { + initProgress(); + }, 200); + }); + + // Reset toolchain + async.series([ + ensurePythonIsAvailable, + extractVirtualEnv, + makeVenvDirectory, + extractDefaultApio, + installDefaultApio, + extractDefaultApioPackages, + installationCompleted + ]); + + // Restore alert + alertify.defaults.closable = true; + } + + function installOnlineToolchain() { + // Configure alert + alertify.defaults.closable = false; + + utils.disableClickEvent(); + + var content = [ + '
                ', + '

                ' + gettextCatalog.getString('Installing toolchain') + '

                ', + '
                ', + '
                ', + '
                ', + '
                ', + '
                ', + '
                '].join('\n'); + alertify.alert(content, function() { + setTimeout(function() { + initProgress(); + }, 200); + }); + + // Install toolchain + async.series([ + checkInternetConnection, + ensurePythonIsAvailable, + extractVirtualEnv, + makeVenvDirectory, + installOnlineApio, + apioInstallSystem, + apioInstallIcestorm, + apioInstallIverilog, + apioInstallDrivers, + apioInstallScons, + installationCompleted + ]); + + // Restore alert + alertify.defaults.closable = true; + } + + function checkInternetConnection(callback) { + updateProgress(gettextCatalog.getString('Check Internet connection...'), 0); + utils.isOnline(callback, function() { + errorProgress(gettextCatalog.getString('Internet connection required')); + utils.enableClickEvent(); + }); + } + + function ensurePythonIsAvailable(callback) { + updateProgress(gettextCatalog.getString('Check Python...'), 0); + if (utils.getPythonExecutable()) { + callback(); + } + else { + errorProgress(gettextCatalog.getString('Python 2.7 is required')); + utils.enableClickEvent(); + callback(true); + } + } + + function extractVirtualEnv(callback) { + updateProgress(gettextCatalog.getString('Extract virtual env files...'), 5); + utils.extractVirtualEnv(callback); + } + + function makeVenvDirectory(callback) { + updateProgress(gettextCatalog.getString('Make virtual env...'), 10); + utils.makeVenvDirectory(callback); + } + + // Local installation + + function extractDefaultApio(callback) { + updateProgress(gettextCatalog.getString('Extract default apio files...'), 20); + utils.extractDefaultApio(callback); + } + + function installDefaultApio(callback) { + updateProgress(gettextCatalog.getString('Install default apio...'), 40); + utils.installDefaultApio(callback); + } + + function extractDefaultApioPackages(callback) { + updateProgress(gettextCatalog.getString('Extract default apio packages...'), 70); + utils.extractDefaultApioPackages(callback); + } + + // Remote installation + + function installOnlineApio(callback) { + updateProgress('pip install -U apio', 30); + utils.installOnlineApio(callback); + } + + function apioInstallSystem(callback) { + updateProgress('apio install system', 40); + utils.apioInstall('system', callback); + } + + function apioInstallIcestorm(callback) { + updateProgress('apio install icestorm', 50); + utils.apioInstall('icestorm', callback); + } + + function apioInstallIverilog(callback) { + updateProgress('apio install iverilog', 70); + utils.apioInstall('iverilog', callback); + } + + function apioInstallDrivers(callback) { + if (nodeOs.platform().indexOf('win32') > -1) { + updateProgress('apio install drivers', 80); + utils.apioInstall('drivers', callback); + } + else { + callback(); + } + } + + function apioInstallScons(callback) { + updateProgress('apio install scons', 90); + utils.apioInstall('scons', callback); + } + + function installationCompleted(callback) { + checkToolchain(function(installed) { + if (installed) { + updateProgress(gettextCatalog.getString('Installation completed'), 100); + alertify.success(gettextCatalog.getString('Toolchain installed')); + updateToolchainInfo(); + } + else { + errorProgress(gettextCatalog.getString('Toolchain not installed')); + } + utils.enableClickEvent(); + callback(); + }); + } + + function updateProgress(message, value) { + angular.element('#progress-message') + .text(message); + var bar = angular.element('#progress-bar'); + if (value === 100) { + bar.removeClass('progress-bar-striped active'); + } + bar.text(value + '%'); + bar.attr('aria-valuenow', value); + bar.css('width', value + '%'); + } + + function initProgress() { + angular.element('#progress-bar') + .addClass('notransition progress-bar-info progress-bar-striped active') + .removeClass('progress-bar-danger') + .text('0%') + .attr('aria-valuenow', 0) + .css('width', '0%') + .removeClass('notransition'); + } + + function errorProgress(message) { + angular.element('#progress-message') + .text(message); + angular.element('#progress-bar') + .addClass('notransition progress-bar-danger') + .removeClass('progress-bar-info progress-bar-striped active') + .text('Error') + .attr('aria-valuenow', 100) + .css('width', '100%'); + } + + }); diff --git a/app/scripts/services/utils.service.js b/app/scripts/services/utils.service.js index ed786a51c..632431b9a 100644 --- a/app/scripts/services/utils.service.js +++ b/app/scripts/services/utils.service.js @@ -2,761 +2,781 @@ 'use strict'; angular.module('icestudio') - .service('utils', function($rootScope, - gettextCatalog, - _package, - window, - nodeFs, - nodeFse, - nodeOs, - nodePath, - nodeChildProcess, - nodeTarball, - nodeZlib, - nodeSudo, - nodeOnline, - nodeGlob) { - - const WIN32 = Boolean(process.platform.indexOf('win32') > -1); - const DARWIN = Boolean(process.platform.indexOf('darwin') > -1); - const LINUX = Boolean(process.platform.indexOf('linux') > -1); - - const CACHE = '_cache'; - - const VENV = 'virtualenv-15.0.1'; - const VENV_DIR = nodePath.join(CACHE, VENV); - const VENV_TARGZ = nodePath.join('resources', 'virtualenv', VENV + '.tar.gz'); - - const SAMPLE_DIR = nodePath.join('resources', 'sample'); - this.SAMPLE_DIR = SAMPLE_DIR; - - const LOCALE_DIR = nodePath.join('resources', 'locale'); - - const APP_DIR = nodePath.dirname(process.execPath); - const TOOLCHAIN_DIR = nodePath.join(APP_DIR, 'toolchain'); - this.TOOLCHAIN_DIR = TOOLCHAIN_DIR; - - const DEFAULT_APIO = 'default-apio'; - const DEFAULT_APIO_DIR = nodePath.join(CACHE, DEFAULT_APIO); - const DEFAULT_APIO_TARGZ = nodePath.join(TOOLCHAIN_DIR, DEFAULT_APIO + '.tar.gz'); - - const DEFAULT_APIO_PACKAGES = 'default-apio-packages'; - const DEFAULT_APIO_PACKAGES_TARGZ = nodePath.join(TOOLCHAIN_DIR, DEFAULT_APIO_PACKAGES + '.tar.gz'); - - const BASE_DIR = process.env.HOME || process.env.USERPROFILE; - const ICESTUDIO_DIR = nodePath.join(BASE_DIR, '.icestudio'); - const APIO_HOME_DIR = nodePath.join(ICESTUDIO_DIR, 'apio'); - - const ENV_DIR = _get_env_dir(nodePath.join(ICESTUDIO_DIR, 'venv')); - const ENV_BIN_DIR = nodePath.join(ENV_DIR, WIN32 ? 'Scripts' : 'bin'); - const ENV_PIP = nodePath.join(ENV_BIN_DIR, 'pip'); - const ENV_APIO = nodePath.join(ENV_BIN_DIR, WIN32 ? 'apio.exe' : 'apio'); - const APIO_CMD = (WIN32 ? 'set' : 'export') + ' APIO_HOME_DIR=' + APIO_HOME_DIR + (WIN32 ? '& ' : '; ') + ENV_APIO; - const SYSTEM_APIO = '/usr/bin/apio'; - - function _get_env_dir(defaultEnvDir) { - if (WIN32) { - // Put the env directory to the root of the current local disk when - // default path contains non-ASCII characters. Virtualenv will fail to - for (var i in defaultEnvDir) { - var char = defaultEnvDir[i]; - if (char.charCodeAt(0) > 127) { - var defaultEnvDirFormat = nodeOs.parse(defaultEnvDir); - return nodeOs.format({ - root: defaultEnvDirFormat.root, - dir: defaultEnvDirFormat.root, - base: '.icestudiovenv', - name: '.icestudiovenv', - }); - } - } - } - - return defaultEnvDir; - } - - var _pythonExecutableCached = null; - // Get the system executable - this.getPythonExecutable = function() { - if (!_pythonExecutableCached) { - const possibleExecutables = []; - - if (WIN32) { - possibleExecutables.push('python.exe'); - possibleExecutables.push('C:\\Python27\\python.exe'); - } else { - possibleExecutables.push('python2.7'); - possibleExecutables.push('python'); - } - - for (var i in possibleExecutables) { - var executable = possibleExecutables[i]; - if (isPython2(executable)) { - _pythonExecutableCached = executable; - break; - } - } - } - return _pythonExecutableCached; - } - - function isPython2(executable) { - const args = ['-c', 'import sys; print \'.\'.join(str(v) for v in sys.version_info[:2])']; - try { - const result = nodeChildProcess.spawnSync(executable, args); - return 0 === result.status && result.stdout.toString().startsWith('2.7'); - } catch(e) { - return false; + .service('utils', function($rootScope, + gettextCatalog, + _package, + window, + nodeFs, + nodeFse, + nodeOs, + nodePath, + nodeChildProcess, + nodeTarball, + nodeZlib, + nodeSudo, + nodeOnline, + nodeGlob) { + + const WIN32 = Boolean(process.platform.indexOf('win32') > -1); + const DARWIN = Boolean(process.platform.indexOf('darwin') > -1); + + const CACHE = '_cache'; + + const VENV = 'virtualenv-15.0.1'; + const VENV_DIR = nodePath.join(CACHE, VENV); + const VENV_TARGZ = nodePath.join('resources', 'virtualenv', VENV + '.tar.gz'); + + const SAMPLE_DIR = nodePath.join('resources', 'sample'); + this.SAMPLE_DIR = SAMPLE_DIR; + + const LOCALE_DIR = nodePath.join('resources', 'locale'); + + const APP_DIR = nodePath.dirname(process.execPath); + const TOOLCHAIN_DIR = nodePath.join(APP_DIR, 'toolchain'); + this.TOOLCHAIN_DIR = TOOLCHAIN_DIR; + + const DEFAULT_APIO = 'default-apio'; + const DEFAULT_APIO_DIR = nodePath.join(CACHE, DEFAULT_APIO); + const DEFAULT_APIO_TARGZ = nodePath.join(TOOLCHAIN_DIR, DEFAULT_APIO + '.tar.gz'); + + const DEFAULT_APIO_PACKAGES = 'default-apio-packages'; + const DEFAULT_APIO_PACKAGES_TARGZ = nodePath.join(TOOLCHAIN_DIR, DEFAULT_APIO_PACKAGES + '.tar.gz'); + + const BASE_DIR = process.env.HOME || process.env.USERPROFILE; + const ICESTUDIO_DIR = nodePath.join(BASE_DIR, '.icestudio'); + const APIO_HOME_DIR = nodePath.join(ICESTUDIO_DIR, 'apio'); + + const ENV_DIR = _getEnvDir(nodePath.join(ICESTUDIO_DIR, 'venv')); + const ENV_BIN_DIR = nodePath.join(ENV_DIR, WIN32 ? 'Scripts' : 'bin'); + const ENV_PIP = nodePath.join(ENV_BIN_DIR, 'pip'); + const ENV_APIO = nodePath.join(ENV_BIN_DIR, WIN32 ? 'apio.exe' : 'apio'); + const APIO_CMD = (WIN32 ? 'set' : 'export') + ' APIO_HOME_DIR=' + APIO_HOME_DIR + (WIN32 ? '& ' : '; ') + ENV_APIO; + const SYSTEM_APIO = '/usr/bin/apio'; + + function _getEnvDir(defaultEnvDir) { + if (WIN32) { + // Put the env directory to the root of the current local disk when + // default path contains non-ASCII characters. Virtualenv will fail to + for (var i in defaultEnvDir) { + var char = defaultEnvDir[i]; + if (char.charCodeAt(0) > 127) { + var defaultEnvDirFormat = nodeOs.parse(defaultEnvDir); + return nodeOs.format({ + root: defaultEnvDirFormat.root, + dir: defaultEnvDirFormat.root, + base: '.icestudiovenv', + name: '.icestudiovenv', + }); } } - - this.extractTargz = function(source, destination, callback) { - nodeTarball.extractTarball(source, destination, function(err) { - if(err) { - //console.log(err); - callback(true); - } - else { - callback(); - } - }); - } - - this.extractVirtualEnv = function(callback) { - this.extractTargz(VENV_TARGZ, CACHE, callback); - } - - function disableClick(e) { - e.stopPropagation(); - e.preventDefault(); - } - - function enableClickEvent() { - document.removeEventListener('click', disableClick, true); - } - - function disableClickEvent() { - document.addEventListener('click', disableClick, true); - } - - this.enableClickEvent = enableClickEvent; - this.disableClickEvent = disableClickEvent; - - this.executeCommand = function(command, callback) { - nodeChildProcess.exec(command.join(' '), - function (error, stdout, stderr) { - // console.log(error, stdout, stderr); - if (error) { - enableClickEvent(); - callback(true); - angular.element('#progress-message') - .text(stderr); - angular.element('#progress-bar') - .addClass('notransition progress-bar-danger') - .removeClass('progress-bar-info progress-bar-striped active') - .text('Error') - .attr('aria-valuenow', 100) - .css('width', '100%'); - } - else { - callback(); - } - } - ); - } - - this.makeVenvDirectory = function(callback) { - if (!nodeFs.existsSync(ICESTUDIO_DIR)) { - nodeFs.mkdirSync(ICESTUDIO_DIR); - } - if (!nodeFs.existsSync(ENV_DIR)) { - nodeFs.mkdirSync(ENV_DIR); - this.executeCommand( - [this.getPythonExecutable(), nodePath.join(VENV_DIR, 'virtualenv.py'), ENV_DIR], callback) + } + + return defaultEnvDir; + } + + var _pythonExecutableCached = null; + // Get the system executable + this.getPythonExecutable = function() { + if (!_pythonExecutableCached) { + const possibleExecutables = []; + + if (WIN32) { + possibleExecutables.push('python.exe'); + possibleExecutables.push('C:\\Python27\\python.exe'); + } else { + possibleExecutables.push('python2.7'); + possibleExecutables.push('python'); + } + + for (var i in possibleExecutables) { + var executable = possibleExecutables[i]; + if (isPython2(executable)) { + _pythonExecutableCached = executable; + break; + } + } + } + return _pythonExecutableCached; + }; + + function isPython2(executable) { + const args = ['-c', 'import sys; print \'.\'.join(str(v) for v in sys.version_info[:2])']; + try { + const result = nodeChildProcess.spawnSync(executable, args); + return 0 === result.status && result.stdout.toString().startsWith('2.7'); + } catch(e) { + return false; + } + } + + this.extractTargz = function(source, destination, callback) { + nodeTarball.extractTarball(source, destination, function(err) { + if(err) { + //console.log(err); + callback(true); + } + else { + callback(); + } + }); + }; + + this.extractVirtualEnv = function(callback) { + this.extractTargz(VENV_TARGZ, CACHE, callback); + }; + + function disableClick(e) { + e.stopPropagation(); + e.preventDefault(); + } + + function enableClickEvent() { + document.removeEventListener('click', disableClick, true); + } + + function disableClickEvent() { + document.addEventListener('click', disableClick, true); + } + + this.enableClickEvent = enableClickEvent; + this.disableClickEvent = disableClickEvent; + + this.executeCommand = function(command, callback) { + nodeChildProcess.exec(command.join(' '), + function (error, stdout, stderr) { + // console.log(error, stdout, stderr); + if (error) { + enableClickEvent(); + callback(true); + angular.element('#progress-message') + .text(stderr); + angular.element('#progress-bar') + .addClass('notransition progress-bar-danger') + .removeClass('progress-bar-info progress-bar-striped active') + .text('Error') + .attr('aria-valuenow', 100) + .css('width', '100%'); } else { callback(); } } - - this.checkDefaultToolchain = function() { - try { - // TODO: use tar.gz with sha1 - return nodeFs.statSync(TOOLCHAIN_DIR).isDirectory(); - } - catch (err) { - return false; + ); + }; + + this.makeVenvDirectory = function(callback) { + if (!nodeFs.existsSync(ICESTUDIO_DIR)) { + nodeFs.mkdirSync(ICESTUDIO_DIR); + } + if (!nodeFs.existsSync(ENV_DIR)) { + nodeFs.mkdirSync(ENV_DIR); + this.executeCommand( + [this.getPythonExecutable(), nodePath.join(VENV_DIR, 'virtualenv.py'), ENV_DIR], callback); + } + else { + callback(); + } + }; + + this.checkDefaultToolchain = function() { + try { + // TODO: use tar.gz with sha1 + return nodeFs.statSync(TOOLCHAIN_DIR).isDirectory(); + } + catch (err) { + return false; + } + }; + + this.extractDefaultApio = function(callback) { + this.extractTargz(DEFAULT_APIO_TARGZ, DEFAULT_APIO_DIR, callback); + }; + + this.installDefaultApio = function(callback) { + var self = this; + nodeGlob(nodePath.join(DEFAULT_APIO_DIR, '*.*'), {}, function (error, files) { + if (!error) { + self.executeCommand([ENV_PIP, 'install', '-U', '--no-deps'].concat(files), callback); + } + }); + }; + + this.extractDefaultApioPackages = function(callback) { + this.extractTargz(DEFAULT_APIO_PACKAGES_TARGZ, APIO_HOME_DIR, callback); + }; + + this.isOnline = function(callback, error) { + nodeOnline({ + timeout: 5000 + }, function(err, online) { + if (online) { + callback(); + } + else { + error(); + callback(true); + } + }); + }; + + this.installOnlineApio = function(callback) { + this.executeCommand([ENV_PIP, 'install', '-U', 'apio">=' + _package.apio.min + ',<' + _package.apio.max + '"'], callback); + }; + + this.apioInstall = function(_package, callback) { + this.executeCommand([APIO_CMD, 'install', _package], callback); + }; + + this.toolchainDisabled = false; + + this.getApioExecutable = function() { + var candidateApio = process.env.ICESTUDIO_APIO ? process.env.ICESTUDIO_APIO : SYSTEM_APIO; + if (nodeFs.existsSync(candidateApio)) { + if (!this.toolchainDisabled) { + // Show message only on start + alertify.notify('Using system wide apio', 'message', 5); + } + this.toolchainDisabled = true; + return candidateApio; + } + this.toolchainDisabled = false; + return APIO_CMD; + }; + + this.removeToolchain = function() { + deleteFolderRecursive(ENV_DIR); + deleteFolderRecursive(APIO_HOME_DIR); + }; + + var deleteFolderRecursive = function(path) { + if (nodeFs.existsSync(path)) { + nodeFs.readdirSync(path).forEach(function(file/*, index*/) { + var curPath = nodePath.join(path, file); + if (nodeFs.lstatSync(curPath).isDirectory()) { // recursive + deleteFolderRecursive(curPath); + } + else { // delete file + nodeFs.unlinkSync(curPath); + } + }); + nodeFs.rmdirSync(path); + } + }; + + this.sep = nodePath.sep; + + this.basename = basename; + function basename(filepath) { + return nodePath.basename(filepath).split('.')[0]; + } + + this.dirname = function(filepath) { + return nodePath.dirname(filepath); + }; + + this.readFile = function(filepath, callback) { + nodeFs.readFile(filepath, + function(err, data) { + if (!err) { + decompressJSON(data, callback); } - } - - this.extractDefaultApio = function(callback) { - this.extractTargz(DEFAULT_APIO_TARGZ, DEFAULT_APIO_DIR, callback); - } - - this.installDefaultApio = function(callback) { - var self = this; - nodeGlob(nodePath.join(DEFAULT_APIO_DIR, '*.*'), {}, function (error, files) { - if (!error) { - self.executeCommand([ENV_PIP, 'install', '-U', '--no-deps'].concat(files), callback); + else { + if (callback) { + callback(); } - }); - } + } + }); + }; - this.extractDefaultApioPackages = function(callback) { - this.extractTargz(DEFAULT_APIO_PACKAGES_TARGZ, APIO_HOME_DIR, callback); - } + var saveBin = false; - this.isOnline = function(callback, error) { - nodeOnline({ - timeout: 5000 - }, function(err, online) { - if (online) { + this.saveFile = function(filepath, content, callback, compress) { + if (compress) { + compressJSON(content, function(compressed) { + nodeFs.writeFile(filepath, compressed, saveBin ? 'binary' : null, + function(err) { + if (!err && callback) { callback(); } - else { - error(); - callback(true); - } }); - } - - this.installOnlineApio = function(callback) { - this.executeCommand([ENV_PIP, 'install', '-U', 'apio">=' + _package.apio.min + ',<' + _package.apio.max + '"'], callback); - } - - this.apioInstall = function(_package, callback) { - this.executeCommand([APIO_CMD, 'install', _package], callback); - } - - this.toolchainDisabled = false; - - this.getApioExecutable = function() { - var candidate_apio = process.env.ICESTUDIO_APIO ? process.env.ICESTUDIO_APIO : SYSTEM_APIO; - if (nodeFs.existsSync(candidate_apio)) { - if (!this.toolchainDisabled) { - // Show message only on start - alertify.notify('Using system wide apio', 'message', 5); - } - this.toolchainDisabled = true; - return candidate_apio; - } - this.toolchainDisabled = false; - return APIO_CMD; - } - - this.removeToolchain = function() { - deleteFolderRecursive(ENV_DIR); - deleteFolderRecursive(APIO_HOME_DIR); - } - - var deleteFolderRecursive = function(path) { - if (nodeFs.existsSync(path)) { - nodeFs.readdirSync(path).forEach(function(file, index) { - var curPath = nodePath.join(path, file); - if (nodeFs.lstatSync(curPath).isDirectory()) { // recursive - deleteFolderRecursive(curPath); - } - else { // delete file - nodeFs.unlinkSync(curPath); - } - }); - nodeFs.rmdirSync(path); + }); + } + else { + nodeFs.writeFile(filepath, content, function(err) { + if (!err && callback) { + callback(); } - } - - this.sep = nodePath.sep; - - this.basename = basename; - function basename(filepath) { - return nodePath.basename(filepath).split('.')[0]; - } - - this.dirname = function(filepath) { - return nodePath.dirname(filepath); - } - - this.readFile = function(filepath, callback) { - nodeFs.readFile(filepath, - function(err, data) { - if (!err) { - decompressJSON(data, callback); - } - else { - if (callback) - callback(); - } + }); + } + }; + + function compressJSON(json, callback) { + if (!saveBin) { + if (callback) { + callback(JSON.stringify(json, null, 2)); + } + } + else { + var data = JSON.stringify(json); + nodeZlib.gzip(data, function (_, result) { + if (callback) { + callback(result); + } + }); + } + } + + function decompressJSON(json, callback) { + var data = isJSON(json); + if (data) { + if (callback) { + callback(data); + } + } + else { + nodeZlib.gunzip(json, function(_, uncompressed) { + var result = JSON.parse(uncompressed); + if (callback) { + callback(result); + } + }); + } + } + + function isJSON(str) { + var result = false; + try { + result = JSON.parse(str); + } catch (e) { + return false; + } + return result; + } + + this.getFilesRecursive = getFilesRecursive; + + function getFilesRecursive(folder, extension) { + var fileContents = nodeFs.readdirSync(folder), + fileTree = [], + stats; + + fileContents.forEach(function (fileName) { + var filePath = nodePath.join(folder, fileName); + stats = nodeFs.lstatSync(filePath); + + if (stats.isDirectory()) { + fileTree.push({ + name: fileName, + children: getFilesRecursive(filePath, extension) }); - } - - var saveBin = false; - - this.saveFile = function(filepath, content, callback, compress) { - if (compress) { - compressJSON(content, function(compressed) { - nodeFs.writeFile(filepath, compressed, saveBin ? 'binary' : null, - function(err) { - if (!err && callback) { - callback(); - } - }); - }); - } - else { - nodeFs.writeFile(filepath, content, function(err) { - if (!err && callback) { - callback(); - } - }); - } - } - - function compressJSON(json, callback) { - if (!saveBin) { - if (callback) - callback(JSON.stringify(json, null, 2)); - } - else { - var data = JSON.stringify(json); - nodeZlib.gzip(data, function (_, result) { - if (callback) - callback(result); + } else { + if (fileName.endsWith(extension)) { + var content = JSON.parse(nodeFs.readFileSync(filePath).toString()); + fileTree.push({ + name: basename(fileName), + content: content }); } } - - function decompressJSON(json, callback) { - var data = isJSON(json); - if (data) { - if (callback) - callback(data); - } - else { - nodeZlib.gunzip(json, function(_, uncompressed) { - var result = JSON.parse(uncompressed); - if (callback) - callback(result); - }); - } - } - - function isJSON(str) { - var result = false; - try { - result = JSON.parse(str); - } catch (e) { - return false; - } - return result; - } - - this.getFilesRecursive = getFilesRecursive; - - function getFilesRecursive(folder, extension) { - var fileContents = nodeFs.readdirSync(folder), - fileTree = [], - stats; - - fileContents.forEach(function (fileName) { - var filePath = nodePath.join(folder, fileName); - stats = nodeFs.lstatSync(filePath); - - if (stats.isDirectory()) { - fileTree.push({ - name: fileName, - children: getFilesRecursive(filePath, extension) - }); - } else { - if (fileName.endsWith(extension)) { - var content = JSON.parse(nodeFs.readFileSync(filePath).toString()); - fileTree.push({ - name: basename(fileName), - content: content - }); - } - } - }); - - return fileTree; - } - - this.enableDrivers = function() { - if (WIN32) { - enableWindowsDrivers(); - } - else if (DARWIN) { - enableDarwinDrivers(); - } - else { - linuxDrivers(true); - } - } - - this.disableDrivers = function() { - if (WIN32) { - disableWindowsDrivers(); - } - else if (DARWIN) { - disableDarwinDrivers(); - } - else { - linuxDrivers(false); - } - } - - function linuxDrivers(enable) { + }); + + return fileTree; + } + + this.enableDrivers = function() { + if (WIN32) { + enableWindowsDrivers(); + } + else if (DARWIN) { + enableDarwinDrivers(); + } + else { + linuxDrivers(true); + } + }; + + this.disableDrivers = function() { + if (WIN32) { + disableWindowsDrivers(); + } + else if (DARWIN) { + disableDarwinDrivers(); + } + else { + linuxDrivers(false); + } + }; + + function linuxDrivers(enable) { + var commands; + if (enable) { + commands = [ + 'cp ' + nodePath.resolve('resources/config/80-icestick.rules') + ' /etc/udev/rules.d/80-icestick.rules', + 'service udev restart' + ]; + } + else { + commands = [ + 'rm /etc/udev/rules.d/80-icestick.rules', + 'service udev restart' + ]; + } + var command = 'sh -c "' + commands.join('; ') + '"'; + + beginLazyProcess(); + nodeSudo.exec(command, {name: 'Icestudio'}, function(error/*, stdout, stderr*/) { + // console.log(error, stdout, stderr); + endLazyProcess(); + if (!error) { if (enable) { - var commands = [ - 'cp ' + nodePath.resolve('resources/config/80-icestick.rules') + ' /etc/udev/rules.d/80-icestick.rules', - 'service udev restart' - ]; + alertify.success(gettextCatalog.getString('Drivers enabled')); } else { - var commands = [ - 'rm /etc/udev/rules.d/80-icestick.rules', - 'service udev restart' - ]; - } - var command = 'sh -c "' + commands.join('; ') + '"'; - - beginLazyProcess(); - nodeSudo.exec(command, {name: 'Icestudio'}, function(error, stdout, stderr) { - // console.log(error, stdout, stderr); - endLazyProcess(); - if (!error) { - if (enable) { - alertify.success(gettextCatalog.getString('Drivers enabled')); - } - else { - alertify.warning(gettextCatalog.getString('Drivers disabled')); - } - setTimeout(function() { - alertify.notify(gettextCatalog.getString('Unplug and reconnect the board'), 'message', 5); - }, 1000); - } - }); - } - - function enableDarwinDrivers() { - var commands = [ - 'kextunload -b com.FTDI.driver.FTDIUSBSerialDriver -q || true', - 'kextunload -b com.apple.driver.AppleUSBFTDI -q || true' + alertify.warning(gettextCatalog.getString('Drivers disabled')); + } + setTimeout(function() { + alertify.notify(gettextCatalog.getString('Unplug and reconnect the board'), 'message', 5); + }, 1000); + } + }); + } + + function enableDarwinDrivers() { + var commands = [ + 'kextunload -b com.FTDI.driver.FTDIUSBSerialDriver -q || true', + 'kextunload -b com.apple.driver.AppleUSBFTDI -q || true' + ]; + var command = 'sh -c "' + commands.join('; ') + '"'; + + beginLazyProcess(); + nodeSudo.exec(command, {name: 'Icestudio'}, function(error/*, stdout, stderr*/) { + // console.log(error, stdout, stderr); + if (error) { + endLazyProcess(); + } + else { + var brewCommands = [ + '/usr/local/bin/brew update', + '/usr/local/bin/brew install --force libftdi', + '/usr/local/bin/brew unlink libftdi', + '/usr/local/bin/brew link --force libftdi', + '/usr/local/bin/brew install --force libffi', + '/usr/local/bin/brew unlink libffi', + '/usr/local/bin/brew link --force libffi' ]; - var command = 'sh -c "' + commands.join('; ') + '"'; - - beginLazyProcess(); - nodeSudo.exec(command, {name: 'Icestudio'}, function(error, stdout, stderr) { - // console.log(error, stdout, stderr); - if (error) { - endLazyProcess(); - } - else { - var brewCommands = [ - '/usr/local/bin/brew update', - '/usr/local/bin/brew install --force libftdi', - '/usr/local/bin/brew unlink libftdi', - '/usr/local/bin/brew link --force libftdi', - '/usr/local/bin/brew install --force libffi', - '/usr/local/bin/brew unlink libffi', - '/usr/local/bin/brew link --force libffi' - ]; - nodeChildProcess.exec(brewCommands.join('; '), function(error, stdout, stderr) { - // console.log(error, stdout, stderr); - endLazyProcess(); - if (error) { - if ((stderr.indexOf('brew: command not found') != -1) || - (stderr.indexOf('brew: No such file or directory') != -1)) { - alertify.notify(gettextCatalog.getString('Homebrew is required'), 'error', 30); - // TODO: open web browser with Homebrew website on click - } - else if (stderr.indexOf('Error: Failed to download') != -1) { - alertify.notify(gettextCatalog.getString('Internet connection required'), 'error', 30); - } - else { - alertify.notify(stderr, 'error', 30); - } - } - else { - alertify.success(gettextCatalog.getString('Drivers enabled')); - } - }); - } - }); - } - - function disableDarwinDrivers() { - var commands = [ - 'kextload -b com.FTDI.driver.FTDIUSBSerialDriver -q || true', - 'kextload -b com.apple.driver.AppleUSBFTDI -q || true' - ]; - var command = 'sh -c "' + commands.join('; ') + '"' - - beginLazyProcess(); - nodeSudo.exec(command, {name: 'Icestudio'}, function(error, stdout, stderr) { + nodeChildProcess.exec(brewCommands.join('; '), function(error, stdout, stderr) { // console.log(error, stdout, stderr); endLazyProcess(); - if (!error) { - alertify.warning(gettextCatalog.getString('Drivers disabled')); - } - }); - } - - function enableWindowsDrivers() { - alertify.confirm(gettextCatalog.getString('

                FTDI driver installation instructions

                1. Connect the FPGA board
                2. Replace the (Interface 0) driver of the board by libusbK
                3. Unplug and reconnect the board
                '), function() { - beginLazyProcess(); - nodeChildProcess.exec([APIO_CMD, 'drivers', '--enable'].join(' '), function(error, stdout, stderr) { - // console.log(error, stdout, stderr); - endLazyProcess(); - if (stderr) { - alertify.notify(gettextCatalog.getString('Toolchain not installed. Please, install the toolchain'), 'error', 30); + if (error) { + if ((stderr.indexOf('brew: command not found') !== -1) || + (stderr.indexOf('brew: No such file or directory') !== -1)) { + alertify.notify(gettextCatalog.getString('Homebrew is required'), 'error', 30); + // TODO: open web browser with Homebrew website on click } - if (!error) { - alertify.notify(gettextCatalog.getString('Unplug and reconnect the board'), 'message', 5); + else if (stderr.indexOf('Error: Failed to download') !== -1) { + alertify.notify(gettextCatalog.getString('Internet connection required'), 'error', 30); } - }); - }); - } - - function disableWindowsDrivers() { - alertify.confirm(gettextCatalog.getString('

                FTDI driver uninstallation instructions

                1. Find the FPGA USB Device
                2. Select the board interface and uninstall the driver
                '), function() { - beginLazyProcess(); - nodeChildProcess.exec([APIO_CMD, 'drivers', '--disable'].join(' '), function(error, stdout, stderr) { - // console.log(error, stdout, stderr); - endLazyProcess(); - if (stderr) { - alertify.notify(gettextCatalog.getString('Toolchain not installed. Please, install the toolchain'), 'error', 30); - } - }); - }); - } - - function beginLazyProcess() { - $('body').addClass('waiting'); - angular.element('#menu').addClass('disable-menu'); - } - - function endLazyProcess() { - $('body').removeClass('waiting'); - angular.element('#menu').removeClass('disable-menu'); - } - - this.setLocale = function(locale) { - // Update current locale format - locale = splitLocale(locale); - // Load supported languages - var supported = getSupportedLanguages(); - // Set the best matching language - var bestLang = bestLocale(locale, supported); - gettextCatalog.setCurrentLanguage(bestLang); - gettextCatalog.loadRemote(nodePath.join(LOCALE_DIR, bestLang, bestLang + '.json')); - return bestLang; - } - - function splitLocale(locale) { - var ret = {}; - var list = locale.split('_'); - if (list.length > 0) ret.lang = list[0]; - if (list.length > 1) ret.country = list[1]; - return ret; - } - - function getSupportedLanguages() { - var supported = []; - nodeFs.readdirSync(LOCALE_DIR).forEach(function(element, index) { - var curPath = nodePath.join(LOCALE_DIR, element); - if (nodeFs.lstatSync(curPath).isDirectory()) { - supported.push(splitLocale(element)); - } - }); - return supported; - } - - function bestLocale(locale, supported) { - var ret = 'en'; - // 1. Try complete match - if (locale.country) { - for (var i = 0; i < supported.length; i++) { - if (locale.lang === supported[i].lang && - locale.country === supported[i].country) { - return supported[i].lang + '_' + supported[i].country; + else { + alertify.notify(stderr, 'error', 30); } } - } - // 2. Try lang match - for (var i = 0; i < supported.length; i++) { - if (locale.lang === supported[i].lang) { - return supported[i].lang + (supported[i].country ? '_' + supported[i].country : ''); - } - } - // 3. Return default lang - return 'en'; - } - - this.multiprompt = function(messages, values, callback) { - var content = []; - var n = messages.length; - content.push('
                '); - for (var i in messages) { - if (i > 0) content.push('
                '); - content.push('

                ' + messages[i] + '

                '); - content.push(' '); - } - content.push('
                '); - // Restore values - for (var i = 0; i < n; i++) { - $('#input' + i.toString()).val(values[i]); - } - - alertify.confirm(content.join('\n')) - .set('onok', function(evt) { - var values = []; - for (var i = 0; i < n; i++) { - values.push($('#input' + i.toString()).val()); - } - if (callback) - callback(evt, values); - }) - .set('oncancel', function(evt) { - }); - } - - this.constantprompt = function(messages, values, callback) { - var content = []; - var n = messages.length; - content.push('
                '); - content.push('

                ' + messages[0] + '

                '); - content.push(' '); - content.push('
                '); - content.push('

                ' + messages[1] + '

                '); - content.push('
                  '); - content.push('

                • ' + messages[2] + '

                  • '); - content.push('
                '); - content.push('
                '); - // Restore values - $('#label').val(values[0]); - $('#local').prop('checked', values[1]); - - alertify.confirm(content.join('\n')) - .set('onok', function(evt) { - var values = []; - values.push($('#label').val()); - values.push($('#local').prop('checked')); - if (callback) - callback(evt, values); - }) - .set('oncancel', function(evt) { - }); - } - - this.projectinfoprompt = function(values, callback) { - var content = []; - var messages = [ - gettextCatalog.getString('Name'), - gettextCatalog.getString('Version'), - gettextCatalog.getString('Description'), - gettextCatalog.getString('Author') - ] - var n = messages.length; - content.push('
                '); - for (var i in messages) { - if (i > 0) content.push('
                '); - content.push('

                ' + messages[i] + '

                '); - content.push(' '); - } - content.push('
                '); - // Restore values - for (var i = 0; i < n; i++) { - $('#input' + i.toString()).val(values[i]); - } - - alertify.confirm(content.join('\n')) - .set('onok', function(evt) { - var values = []; - for (var i = 0; i < n; i++) { - values.push($('#input' + i.toString()).val()); - } - if (callback) - callback(evt, values); - }) - .set('oncancel', function(evt) { - }); - } - - this.copySync = function(orig, dest, filename) { - var ret = true; - try { - if (nodeFs.existsSync(orig)) { - nodeFse.copySync(orig, dest); - } else { - // Error: file does not exist - ret = false; - } - } - catch (e) { - alertify.notify(gettextCatalog.getString('Error: {{error}}', { error: e.toString() }), 'error', 30); - ret = false; - } - return ret; - } - - this.findIncludedFiles = function(code) { - var ret = []; - var patterns = [ - /@include\s(.*?)(\\n|\n|\s)/g, - /\\"(.*\.list?)\\"/g - ]; - for (var p in patterns) { - var match; - while (match = patterns[p].exec(code)) { - var file = match[1].replace(/ /g, ''); - if (ret.indexOf(file) == -1) { - ret.push(file); - } + alertify.success(gettextCatalog.getString('Drivers enabled')); } - } - return ret; - } - - this.bold = function(text) { - return '' + text + ''; - } - - this.openDialog = function(inputID, ext, callback) { - var chooser = $(inputID); - chooser.unbind('change'); - chooser.change(function(evt) { - var filepath = $(this).val(); - //if (filepath.endsWith(ext)) { - if (callback) - callback(filepath); - //} - $(this).val(''); - }); - chooser.trigger('click'); - } - - this.saveDialog = function(inputID, ext, callback) { - var chooser = $(inputID); - chooser.unbind('change'); - chooser.change(function(evt) { - var filepath = $(this).val(); - if (!filepath.endsWith(ext)) - filepath += ext; - if (callback) - callback(filepath); - $(this).val(''); }); - chooser.trigger('click'); } - - this.updateWindowTitle = function(title) { - window.get().title = title; - } - - this.rootScopeSafeApply = function() { - if(!$rootScope.$$phase) { - $rootScope.$apply(); - } - } - - }); + }); + } + + function disableDarwinDrivers() { + var commands = [ + 'kextload -b com.FTDI.driver.FTDIUSBSerialDriver -q || true', + 'kextload -b com.apple.driver.AppleUSBFTDI -q || true' + ]; + var command = 'sh -c "' + commands.join('; ') + '"'; + + beginLazyProcess(); + nodeSudo.exec(command, {name: 'Icestudio'}, function(error/*, stdout, stderr*/) { + // console.log(error, stdout, stderr); + endLazyProcess(); + if (!error) { + alertify.warning(gettextCatalog.getString('Drivers disabled')); + } + }); + } + + function enableWindowsDrivers() { + alertify.confirm(gettextCatalog.getString('

                FTDI driver installation instructions

                1. Connect the FPGA board
                2. Replace the (Interface 0) driver of the board by libusbK
                3. Unplug and reconnect the board
                '), function() { + beginLazyProcess(); + nodeChildProcess.exec([APIO_CMD, 'drivers', '--enable'].join(' '), function(error, stdout, stderr) { + // console.log(error, stdout, stderr); + endLazyProcess(); + if (stderr) { + alertify.notify(gettextCatalog.getString('Toolchain not installed. Please, install the toolchain'), 'error', 30); + } + if (!error) { + alertify.notify(gettextCatalog.getString('Unplug and reconnect the board'), 'message', 5); + } + }); + }); + } + + function disableWindowsDrivers() { + alertify.confirm(gettextCatalog.getString('

                FTDI driver uninstallation instructions

                1. Find the FPGA USB Device
                2. Select the board interface and uninstall the driver
                '), function() { + beginLazyProcess(); + nodeChildProcess.exec([APIO_CMD, 'drivers', '--disable'].join(' '), function(error, stdout, stderr) { + // console.log(error, stdout, stderr); + endLazyProcess(); + if (stderr) { + alertify.notify(gettextCatalog.getString('Toolchain not installed. Please, install the toolchain'), 'error', 30); + } + }); + }); + } + + function beginLazyProcess() { + $('body').addClass('waiting'); + angular.element('#menu').addClass('disable-menu'); + } + + function endLazyProcess() { + $('body').removeClass('waiting'); + angular.element('#menu').removeClass('disable-menu'); + } + + this.setLocale = function(locale) { + // Update current locale format + locale = splitLocale(locale); + // Load supported languages + var supported = getSupportedLanguages(); + // Set the best matching language + var bestLang = bestLocale(locale, supported); + gettextCatalog.setCurrentLanguage(bestLang); + gettextCatalog.loadRemote(nodePath.join(LOCALE_DIR, bestLang, bestLang + '.json')); + return bestLang; + }; + + function splitLocale(locale) { + var ret = {}; + var list = locale.split('_'); + if (list.length > 0) { + ret.lang = list[0]; + } + if (list.length > 1) { + ret.country = list[1]; + } + return ret; + } + + function getSupportedLanguages() { + var supported = []; + nodeFs.readdirSync(LOCALE_DIR).forEach(function(element/*, index*/) { + var curPath = nodePath.join(LOCALE_DIR, element); + if (nodeFs.lstatSync(curPath).isDirectory()) { + supported.push(splitLocale(element)); + } + }); + return supported; + } + + function bestLocale(locale, supported) { + var i; + // 1. Try complete match + if (locale.country) { + for (i = 0; i < supported.length; i++) { + if (locale.lang === supported[i].lang && + locale.country === supported[i].country) { + return supported[i].lang + '_' + supported[i].country; + } + } + } + // 2. Try lang match + for (i = 0; i < supported.length; i++) { + if (locale.lang === supported[i].lang) { + return supported[i].lang + (supported[i].country ? '_' + supported[i].country : ''); + } + } + // 3. Return default lang + return 'en'; + } + + this.multiprompt = function(messages, values, callback) { + var i; + var content = []; + var n = messages.length; + content.push('
                '); + for (i in messages) { + if (i > 0) { + content.push('
                '); + } + content.push('

                ' + messages[i] + '

                '); + content.push(' '); + } + content.push('
                '); + // Restore values + for (i = 0; i < n; i++) { + $('#input' + i.toString()).val(values[i]); + } + + alertify.confirm(content.join('\n')) + .set('onok', function(evt) { + var values = []; + for (var i = 0; i < n; i++) { + values.push($('#input' + i.toString()).val()); + } + if (callback) { + callback(evt, values); + } + }) + .set('oncancel', function(/*evt*/) { + }); + }; + + this.constantprompt = function(messages, values, callback) { + var content = []; + content.push('
                '); + content.push('

                ' + messages[0] + '

                '); + content.push(' '); + content.push('
                '); + content.push('

                ' + messages[1] + '

                '); + content.push('
                  '); + content.push('

                • ' + messages[2] + '

                  • '); + content.push('
                '); + content.push('
                '); + // Restore values + $('#label').val(values[0]); + $('#local').prop('checked', values[1]); + + alertify.confirm(content.join('\n')) + .set('onok', function(evt) { + var values = []; + values.push($('#label').val()); + values.push($('#local').prop('checked')); + if (callback) { + callback(evt, values); + } + }) + .set('oncancel', function(/*evt*/) { + }); + }; + + this.projectinfoprompt = function(values, callback) { + var i; + var content = []; + var messages = [ + gettextCatalog.getString('Name'), + gettextCatalog.getString('Version'), + gettextCatalog.getString('Description'), + gettextCatalog.getString('Author') + ]; + var n = messages.length; + content.push('
                '); + for (i in messages) { + if (i > 0) { + content.push('
                '); + } + content.push('

                ' + messages[i] + '

                '); + content.push(' '); + } + content.push('
                '); + // Restore values + for (i = 0; i < n; i++) { + $('#input' + i.toString()).val(values[i]); + } + + alertify.confirm(content.join('\n')) + .set('onok', function(evt) { + var values = []; + for (var i = 0; i < n; i++) { + values.push($('#input' + i.toString()).val()); + } + if (callback) { + callback(evt, values); + } + }) + .set('oncancel', function(/*evt*/) { + }); + }; + + this.copySync = function(orig, dest) { + var ret = true; + try { + if (nodeFs.existsSync(orig)) { + nodeFse.copySync(orig, dest); + } + else { + // Error: file does not exist + ret = false; + } + } + catch (e) { + alertify.notify(gettextCatalog.getString('Error: {{error}}', { error: e.toString() }), 'error', 30); + ret = false; + } + return ret; + }; + + this.findIncludedFiles = function(code) { + var ret = []; + var patterns = [ + /@include\s(.*?)(\\n|\n|\s)/g, + /\\"(.*\.list?)\\"/g + ]; + for (var p in patterns) { + var match; + while (match = patterns[p].exec(code)) { + var file = match[1].replace(/ /g, ''); + if (ret.indexOf(file) === -1) { + ret.push(file); + } + } + } + return ret; + }; + + this.bold = function(text) { + return '' + text + ''; + }; + + this.openDialog = function(inputID, ext, callback) { + var chooser = $(inputID); + chooser.unbind('change'); + chooser.change(function(/*evt*/) { + var filepath = $(this).val(); + //if (filepath.endsWith(ext)) { + if (callback) { + callback(filepath); + } + //} + $(this).val(''); + }); + chooser.trigger('click'); + }; + + this.saveDialog = function(inputID, ext, callback) { + var chooser = $(inputID); + chooser.unbind('change'); + chooser.change(function(/*evt*/) { + var filepath = $(this).val(); + if (!filepath.endsWith(ext)) { + filepath += ext; + } + if (callback) { + callback(filepath); + } + $(this).val(''); + }); + chooser.trigger('click'); + }; + + this.updateWindowTitle = function(title) { + window.get().title = title; + }; + + this.rootScopeSafeApply = function() { + if(!$rootScope.$$phase) { + $rootScope.$apply(); + } + }; + + }); diff --git a/app/styles/main.css b/app/styles/main.css index b6d47b7c4..2f7bdd540 100644 --- a/app/styles/main.css +++ b/app/styles/main.css @@ -9,11 +9,11 @@ } .notransition { - -webkit-transition: none !important; - -moz-transition: none !important; - -o-transition: none !important; - -ms-transition: none !important; - transition: none !important; + -webkit-transition: none; + -moz-transition: none; + -o-transition: none; + -ms-transition: none; + transition: none; } body { @@ -22,15 +22,15 @@ body { height: 100%; } -body.waiting * { +.waiting * { cursor: progress; } -.alertify-notifier.ajs-right { +.alertify-notifier .ajs-right { bottom: 45px; } -.alertify-notifier.ajs-bottom { +.alertify-notifier .ajs-bottom { bottom: 45px; } diff --git a/app/styles/menu.css b/app/styles/menu.css index c379857b5..57dfc4f61 100644 --- a/app/styles/menu.css +++ b/app/styles/menu.css @@ -12,7 +12,7 @@ } .navbar-right { - margin-right: 0px; + margin-right: 0; } .dropdown-submenu { @@ -23,7 +23,7 @@ top: 0; left: 100%; margin-top: -6px; - margin-left: 0px; + margin-left: 0; -webkit-border-radius: 0; -moz-border-radius: 0; border-radius: 0; diff --git a/app/styles/project.css b/app/styles/project.css index 1f3552747..1ed356620 100644 --- a/app/styles/project.css +++ b/app/styles/project.css @@ -78,6 +78,7 @@ border: 2px solid #888; pointer-events: none; -webkit-user-select: none; + user-select: none; z-index: 0; } @@ -110,6 +111,7 @@ border: 2px solid #888; pointer-events: none; -webkit-user-select: none; + user-select: none; z-index: 0; } @@ -136,12 +138,13 @@ border: 2px solid #888; pointer-events: none; -webkit-user-select: none; + user-select: none; z-index: 0; } .constant-block p { position: absolute; - top: 0px; + top: 0; right: 5px; font-size: 1.5em; color: #444; @@ -171,6 +174,7 @@ border: 2px solid #888; pointer-events: none; -webkit-user-select: none; + user-select: none; z-index: 0; } @@ -195,6 +199,7 @@ border: 2px solid #888; pointer-events: none; -webkit-user-select: none; + user-select: none; z-index: 0; } @@ -217,7 +222,7 @@ } .highlight { - box-shadow: 0px 0px 30px 0px rgba(200,200,200,1); + box-shadow: 0 0 30px 0 rgba(200,200,200,1); } .selectionarea { diff --git a/app/views/design.html b/app/views/design.html index d8e41906d..a065467ba 100644 --- a/app/views/design.html +++ b/app/views/design.html @@ -1,7 +1,8 @@ +
                diff --git a/app/views/main.html b/app/views/main.html index 6a19147cd..a845bbc1f 100644 --- a/app/views/main.html +++ b/app/views/main.html @@ -1,3 +1,4 @@ +
                diff --git a/app/views/menu.html b/app/views/menu.html index 6609f9367..52777f30c 100644 --- a/app/views/menu.html +++ b/app/views/menu.html @@ -1,3 +1,4 @@ +
                '); // Restore values for (i = 0; i < n; i++) { $('#input' + i.toString()).val(values[i]); } + alertify.confirm() + .set('onshow', function() { + var chooser = $('#input-open-svg'); + chooser.unbind('change'); + chooser.change(function(/*evt*/) { + var filepath = $(this).val(); + var svgo = new SVGO(); + nodeFs.readFile(filepath, 'utf8', function(err, data) { + if (err) { + throw err; + } + svgo.optimize(data, function(result) { + var image = encodeURI(result.data); + $('#preview-svg').attr('src', 'data:image/svg+xml,' + image); + }); + }); + }); + }); + alertify.confirm(content.join('\n')) .set('onok', function(evt) { var values = []; @@ -693,8 +716,10 @@ angular.module('icestudio') if (callback) { callback(evt, values); } + alertify.confirm().set('onshow', function() {}); }) .set('oncancel', function(/*evt*/) { + alertify.confirm().set('onshow', function() {}); }); }; From 79b326adf91205529193a02fee405c06240e8044 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jes=C3=BAs=20Arroyo=20Torrens?= Date: Fri, 16 Dec 2016 18:21:51 +0100 Subject: [PATCH 041/169] Finish Project information prompt --- app/package.json | 2 +- app/scripts/controllers/menu.js | 12 ++++++++---- app/scripts/services/utils.service.js | 13 +++++++++---- 3 files changed, 18 insertions(+), 9 deletions(-) diff --git a/app/package.json b/app/package.json index 716d87065..4ee3ebdaa 100644 --- a/app/package.json +++ b/app/package.json @@ -11,7 +11,7 @@ "height": 600, "min_width": 800, "min_height": 200, - "toolbar": true, + "toolbar": false, "resizable": true, "position": "center", "icon": "resources/images/icestudio-logo.png" diff --git a/app/scripts/controllers/menu.js b/app/scripts/controllers/menu.js index 0a584bd39..23de657d1 100644 --- a/app/scripts/controllers/menu.js +++ b/app/scripts/controllers/menu.js @@ -226,14 +226,18 @@ angular.module('icestudio') $scope.setProjectInformation = function() { var p = project.project.package; var values = [ + p.name, p.version, p.description, - p.author + p.author, + p.image ]; utils.projectinfoprompt(values, function(evt, values) { - project.project.package.version = values[0]; - project.project.package.description = values[1]; - project.project.package.author = values[2]; + project.project.package.name = values[0]; + project.project.package.version = values[1]; + project.project.package.description = values[2]; + project.project.package.author = values[3]; + project.project.package.image = values[4]; }); }; diff --git a/app/scripts/services/utils.service.js b/app/scripts/services/utils.service.js index 3ff2e8a41..0c9116494 100644 --- a/app/scripts/services/utils.service.js +++ b/app/scripts/services/utils.service.js @@ -665,6 +665,7 @@ angular.module('icestudio') var i; var content = []; var messages = [ + gettextCatalog.getString('Name'), gettextCatalog.getString('Version'), gettextCatalog.getString('Description'), gettextCatalog.getString('Author') @@ -673,20 +674,23 @@ angular.module('icestudio') content.push('
                '); for (i in messages) { if (i > 0) { - content.push('
                '); + //content.push('
                '); } content.push('

                ' + messages[i] + '

                '); content.push(' '); } content.push('

                ' + gettextCatalog.getString('Image') + '

                '); - content.push(' '); + content.push(' '); content.push(' '); // TODO: add Save SVG content.push('
                '); - // Restore values + /*// Restore values for (i = 0; i < n; i++) { $('#input' + i.toString()).val(values[i]); } + $('#preview-svg').attr('src', 'data:image/svg+xml,' + values[4]);*/ + + var image = ''; alertify.confirm() .set('onshow', function() { @@ -700,7 +704,7 @@ angular.module('icestudio') throw err; } svgo.optimize(data, function(result) { - var image = encodeURI(result.data); + image = encodeURI(result.data); $('#preview-svg').attr('src', 'data:image/svg+xml,' + image); }); }); @@ -713,6 +717,7 @@ angular.module('icestudio') for (var i = 0; i < n; i++) { values.push($('#input' + i.toString()).val()); } + values.push(image); if (callback) { callback(evt, values); } From a3566d12ec71f9d2ab6c6ac612d9cefe7eda6d4c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jes=C3=BAs=20Arroyo=20Torrens?= Date: Fri, 16 Dec 2016 18:41:36 +0100 Subject: [PATCH 042/169] Update bit and config blocks --- app/resources/blocks/bit/0.ice | 65 +++++++++ app/resources/blocks/bit/0.iceb | 55 -------- app/resources/blocks/bit/1.ice | 65 +++++++++ app/resources/blocks/bit/1.iceb | 55 -------- app/resources/blocks/config/pull_up.ice | 88 +++++++++++++ app/resources/blocks/config/pull_up.iceb | 78 ----------- app/resources/blocks/config/pull_up_inv.ice | 88 +++++++++++++ app/resources/blocks/config/pull_up_inv.iceb | 78 ----------- app/resources/blocks/config/tri_state.ice | 132 +++++++++++++++++++ app/resources/blocks/config/tri_state.iceb | 122 ----------------- app/resources/images/0.svg | 116 ---------------- app/resources/images/1.svg | 116 ---------------- app/resources/images/pull_up.svg | 18 --- app/resources/images/pull_up_inv.svg | 19 --- app/resources/images/tri_state.svg | 55 -------- app/scripts/services/resources.service.js | 2 +- app/scripts/services/utils.service.js | 4 +- 17 files changed, 441 insertions(+), 715 deletions(-) create mode 100644 app/resources/blocks/bit/0.ice delete mode 100644 app/resources/blocks/bit/0.iceb create mode 100644 app/resources/blocks/bit/1.ice delete mode 100644 app/resources/blocks/bit/1.iceb create mode 100644 app/resources/blocks/config/pull_up.ice delete mode 100644 app/resources/blocks/config/pull_up.iceb create mode 100644 app/resources/blocks/config/pull_up_inv.ice delete mode 100644 app/resources/blocks/config/pull_up_inv.iceb create mode 100644 app/resources/blocks/config/tri_state.ice delete mode 100644 app/resources/blocks/config/tri_state.iceb delete mode 100644 app/resources/images/0.svg delete mode 100644 app/resources/images/1.svg delete mode 100755 app/resources/images/pull_up.svg delete mode 100755 app/resources/images/pull_up_inv.svg delete mode 100644 app/resources/images/tri_state.svg diff --git a/app/resources/blocks/bit/0.ice b/app/resources/blocks/bit/0.ice new file mode 100644 index 000000000..12afc6a86 --- /dev/null +++ b/app/resources/blocks/bit/0.ice @@ -0,0 +1,65 @@ +{ + "version": "1.0", + "package": { + "name": "Bit 0", + "version": "1.0.0", + "description": "Assign 0 to the output wire", + "author": "Jesús Arroyo", + "image": "%3Csvg%20xmlns=%22http://www.w3.org/2000/svg%22%20width=%2247.303%22%20height=%2227.648%22%20viewBox=%220%200%2044.346456%2025.919999%22%3E%3Ctext%20style=%22line-height:125%25%22%20x=%22325.37%22%20y=%22315.373%22%20font-weight=%22400%22%20font-size=%2212.669%22%20font-family=%22sans-serif%22%20letter-spacing=%220%22%20word-spacing=%220%22%20transform=%22translate(-307.01%20-298.51)%22%3E%3Ctspan%20x=%22325.37%22%20y=%22315.373%22%20style=%22-inkscape-font-specification:'Courier%2010%20Pitch'%22%20font-family=%22Courier%2010%20Pitch%22%3E0%3C/tspan%3E%3C/text%3E%3C/svg%3E" + }, + "design": { + "board": "icezum", + "graph": { + "blocks": [ + { + "id": "b959fb96-ac67-4aea-90b3-ed35a4c17bf5", + "type": "basic.code", + "data": { + "code": "// Bit 0\n\nassign v = 1'b0;", + "ports": { + "in": [], + "out": [ + "v" + ] + } + }, + "position": { + "x": 96, + "y": 96 + } + }, + { + "id": "19c8f68d-5022-487f-9ab0-f0a3cd58bead", + "type": "basic.output", + "data": { + "label": "" + }, + "position": { + "x": 608, + "y": 192 + } + } + ], + "wires": [ + { + "source": { + "block": "b959fb96-ac67-4aea-90b3-ed35a4c17bf5", + "port": "v" + }, + "target": { + "block": "19c8f68d-5022-487f-9ab0-f0a3cd58bead", + "port": "in" + } + } + ] + }, + "deps": {}, + "state": { + "pan": { + "x": 0, + "y": 0 + }, + "zoom": 1 + } + } +} diff --git a/app/resources/blocks/bit/0.iceb b/app/resources/blocks/bit/0.iceb deleted file mode 100644 index 2faefca14..000000000 --- a/app/resources/blocks/bit/0.iceb +++ /dev/null @@ -1,55 +0,0 @@ -{ - "graph": { - "blocks": [ - { - "id": "b959fb96-ac67-4aea-90b3-ed35a4c17bf5", - "type": "basic.code", - "data": { - "code": "// Bit 0\n\nassign v = 1'b0;", - "ports": { - "in": [], - "out": [ - "v" - ] - } - }, - "position": { - "x": 96, - "y": 96 - } - }, - { - "id": "19c8f68d-5022-487f-9ab0-f0a3cd58bead", - "type": "basic.output", - "data": { - "label": "" - }, - "position": { - "x": 608, - "y": 192 - } - } - ], - "wires": [ - { - "source": { - "block": "b959fb96-ac67-4aea-90b3-ed35a4c17bf5", - "port": "v" - }, - "target": { - "block": "19c8f68d-5022-487f-9ab0-f0a3cd58bead", - "port": "in" - } - } - ] - }, - "deps": {}, - "image": "%3Csvg%20xmlns=%22http://www.w3.org/2000/svg%22%20width=%2247.303%22%20height=%2227.648%22%20viewBox=%220%200%2044.346456%2025.919999%22%3E%3Ctext%20style=%22line-height:125%25%22%20x=%22325.37%22%20y=%22315.373%22%20font-weight=%22400%22%20font-size=%2212.669%22%20font-family=%22sans-serif%22%20letter-spacing=%220%22%20word-spacing=%220%22%20transform=%22translate(-307.01%20-298.51)%22%3E%3Ctspan%20x=%22325.37%22%20y=%22315.373%22%20style=%22-inkscape-font-specification:'Courier%2010%20Pitch'%22%20font-family=%22Courier%2010%20Pitch%22%3E0%3C/tspan%3E%3C/text%3E%3C/svg%3E", - "state": { - "pan": { - "x": 0, - "y": 0 - }, - "zoom": 1 - } -} diff --git a/app/resources/blocks/bit/1.ice b/app/resources/blocks/bit/1.ice new file mode 100644 index 000000000..ed3410f62 --- /dev/null +++ b/app/resources/blocks/bit/1.ice @@ -0,0 +1,65 @@ +{ + "version": "1.0", + "package": { + "name": "Bit 1", + "version": "1.0.0", + "description": "Assign 1 to the output wire", + "author": "Jesús Arroyo", + "image": "%3Csvg%20xmlns=%22http://www.w3.org/2000/svg%22%20width=%2247.303%22%20height=%2227.648%22%20viewBox=%220%200%2044.346456%2025.919999%22%3E%3Ctext%20style=%22line-height:125%25%22%20x=%22325.218%22%20y=%22315.455%22%20font-weight=%22400%22%20font-size=%2212.669%22%20font-family=%22sans-serif%22%20letter-spacing=%220%22%20word-spacing=%220%22%20transform=%22translate(-307.01%20-298.51)%22%3E%3Ctspan%20x=%22325.218%22%20y=%22315.455%22%20style=%22-inkscape-font-specification:'Courier%2010%20Pitch'%22%20font-family=%22Courier%2010%20Pitch%22%3E1%3C/tspan%3E%3C/text%3E%3C/svg%3E" + }, + "design": { + "board": "icezum", + "graph": { + "blocks": [ + { + "id": "b959fb96-ac67-4aea-90b3-ed35a4c17bf5", + "type": "basic.code", + "data": { + "code": "// Bit 1\n\nassign v = 1'b1;", + "ports": { + "in": [], + "out": [ + "v" + ] + } + }, + "position": { + "x": 96, + "y": 96 + } + }, + { + "id": "19c8f68d-5022-487f-9ab0-f0a3cd58bead", + "type": "basic.output", + "data": { + "label": "" + }, + "position": { + "x": 608, + "y": 192 + } + } + ], + "wires": [ + { + "source": { + "block": "b959fb96-ac67-4aea-90b3-ed35a4c17bf5", + "port": "v" + }, + "target": { + "block": "19c8f68d-5022-487f-9ab0-f0a3cd58bead", + "port": "in" + } + } + ] + }, + "deps": {}, + "state": { + "pan": { + "x": 0, + "y": 0 + }, + "zoom": 1 + } + } +} \ No newline at end of file diff --git a/app/resources/blocks/bit/1.iceb b/app/resources/blocks/bit/1.iceb deleted file mode 100644 index bc83e606f..000000000 --- a/app/resources/blocks/bit/1.iceb +++ /dev/null @@ -1,55 +0,0 @@ -{ - "graph": { - "blocks": [ - { - "id": "b959fb96-ac67-4aea-90b3-ed35a4c17bf5", - "type": "basic.code", - "data": { - "code": "// Bit 1\n\nassign v = 1'b1;", - "ports": { - "in": [], - "out": [ - "v" - ] - } - }, - "position": { - "x": 96, - "y": 96 - } - }, - { - "id": "19c8f68d-5022-487f-9ab0-f0a3cd58bead", - "type": "basic.output", - "data": { - "label": "" - }, - "position": { - "x": 608, - "y": 192 - } - } - ], - "wires": [ - { - "source": { - "block": "b959fb96-ac67-4aea-90b3-ed35a4c17bf5", - "port": "v" - }, - "target": { - "block": "19c8f68d-5022-487f-9ab0-f0a3cd58bead", - "port": "in" - } - } - ] - }, - "deps": {}, - "image": "%3Csvg%20xmlns=%22http://www.w3.org/2000/svg%22%20width=%2247.303%22%20height=%2227.648%22%20viewBox=%220%200%2044.346456%2025.919999%22%3E%3Ctext%20style=%22line-height:125%25%22%20x=%22325.218%22%20y=%22315.455%22%20font-weight=%22400%22%20font-size=%2212.669%22%20font-family=%22sans-serif%22%20letter-spacing=%220%22%20word-spacing=%220%22%20transform=%22translate(-307.01%20-298.51)%22%3E%3Ctspan%20x=%22325.218%22%20y=%22315.455%22%20style=%22-inkscape-font-specification:'Courier%2010%20Pitch'%22%20font-family=%22Courier%2010%20Pitch%22%3E1%3C/tspan%3E%3C/text%3E%3C/svg%3E", - "state": { - "pan": { - "x": 0, - "y": 0 - }, - "zoom": 1 - } -} diff --git a/app/resources/blocks/config/pull_up.ice b/app/resources/blocks/config/pull_up.ice new file mode 100644 index 000000000..3b8ec0127 --- /dev/null +++ b/app/resources/blocks/config/pull_up.ice @@ -0,0 +1,88 @@ +{ + "version": "1.0", + "package": { + "name": "Pull up", + "version": "1.0.0", + "description": "FPGA internal pull up configuration on the connected input port", + "author": "Jesús Arroyo", + "image": "%3Csvg%20id=%22svg2%22%20xmlns=%22http://www.w3.org/2000/svg%22%20viewBox=%22-265%20401.5%2063.5%2038.4%22%3E%3Cstyle%3E.st0%7Bdisplay:none%7D.st1%7Bfill:none;stroke:#000;stroke-width:.75;stroke-linejoin:round;stroke-miterlimit:10%7D.st2%7Bfill:#010002%7D%3C/style%3E%3Cpath%20class=%22st0%22%20d=%22M-242.5%20411.8v11.8h-5.4v-11.8h5.4m1-1h-7.4v13.8h7.4v-13.8z%22/%3E%3Cpath%20d=%22M-212%20425.6l-15.4-8.7v8.5h-17.4v-2.7c0-.2-.1-.4-.3-.4l-2.3-1.2%205.6-2.9c.2-.1.3-.3.3-.5s-.1-.4-.3-.4l-5.7-2.7%202.4-1.6c.1-.1.2-.2.2-.4v-2.7h3.1l-3.5-6.1-3.5%206.1h3v2.5l-2.9%202c-.1.1-.2.3-.2.5s.1.3.3.4l5.6%202.6-5.6%202.9c-.2.1-.3.3-.3.4s.1.4.3.4l2.9%201.5V425.5H-265v1.2h37.6v8.5l15.4-8.7h10.5v-.8H-212zm-33.3-20.4l2.2%203.9h-4.5l2.3-3.9zm19.2%2027.7v-13.8l12.3%206.9-12.3%206.9z%22/%3E%3C/svg%3E" + }, + "design": { + "board": "icezum", + "graph": { + "blocks": [ + { + "id": "2b245a71-2d80-466b-955f-e3d61839fe25", + "type": "basic.code", + "data": { + "code": "// Pull up\n\nwire din, dout, outen;\n\nassign o = din;\n\nSB_IO #(\n .PIN_TYPE(6'b 1010_01),\n .PULLUP(1'b 1)\n) io_pin (\n .PACKAGE_PIN(i),\n .OUTPUT_ENABLE(outen),\n .D_OUT_0(dout),\n .D_IN_0(din)\n);", + "ports": { + "in": [ + "i" + ], + "out": [ + "o" + ] + } + }, + "position": { + "x": 256, + "y": 104 + } + }, + { + "id": "bb4a1ca9-1b30-471e-92ca-ca7ff2fc1150", + "type": "basic.input", + "data": { + "label": "" + }, + "position": { + "x": 64, + "y": 200 + } + }, + { + "id": "a139fa0d-9b45-4480-a251-f4a66b49aa23", + "type": "basic.output", + "data": { + "label": "" + }, + "position": { + "x": 760, + "y": 200 + } + } + ], + "wires": [ + { + "source": { + "block": "bb4a1ca9-1b30-471e-92ca-ca7ff2fc1150", + "port": "out" + }, + "target": { + "block": "2b245a71-2d80-466b-955f-e3d61839fe25", + "port": "i" + } + }, + { + "source": { + "block": "2b245a71-2d80-466b-955f-e3d61839fe25", + "port": "o" + }, + "target": { + "block": "a139fa0d-9b45-4480-a251-f4a66b49aa23", + "port": "in" + } + } + ] + }, + "deps": {}, + "state": { + "pan": { + "x": -23, + "y": 8 + }, + "zoom": 1 + } + } +} diff --git a/app/resources/blocks/config/pull_up.iceb b/app/resources/blocks/config/pull_up.iceb deleted file mode 100644 index 06e5ec841..000000000 --- a/app/resources/blocks/config/pull_up.iceb +++ /dev/null @@ -1,78 +0,0 @@ -{ - "image": "resources/images/pull_up.svg", - "state": { - "pan": { - "x": -23, - "y": 8 - }, - "zoom": 1 - }, - "graph": { - "blocks": [ - { - "id": "2b245a71-2d80-466b-955f-e3d61839fe25", - "type": "basic.code", - "data": { - "code": "// Pull up\n\nwire din, dout, outen;\n\nassign o = din;\n\nSB_IO #(\n .PIN_TYPE(6'b 1010_01),\n .PULLUP(1'b 1)\n) io_pin (\n .PACKAGE_PIN(i),\n .OUTPUT_ENABLE(outen),\n .D_OUT_0(dout),\n .D_IN_0(din)\n);", - "ports": { - "in": [ - "i" - ], - "out": [ - "o" - ] - } - }, - "position": { - "x": 256, - "y": 104 - } - }, - { - "id": "bb4a1ca9-1b30-471e-92ca-ca7ff2fc1150", - "type": "basic.input", - "data": { - "label": "" - }, - "position": { - "x": 64, - "y": 200 - } - }, - { - "id": "a139fa0d-9b45-4480-a251-f4a66b49aa23", - "type": "basic.output", - "data": { - "label": "" - }, - "position": { - "x": 760, - "y": 200 - } - } - ], - "wires": [ - { - "source": { - "block": "bb4a1ca9-1b30-471e-92ca-ca7ff2fc1150", - "port": "out" - }, - "target": { - "block": "2b245a71-2d80-466b-955f-e3d61839fe25", - "port": "i" - } - }, - { - "source": { - "block": "2b245a71-2d80-466b-955f-e3d61839fe25", - "port": "o" - }, - "target": { - "block": "a139fa0d-9b45-4480-a251-f4a66b49aa23", - "port": "in" - } - } - ] - }, - "deps": {} -} diff --git a/app/resources/blocks/config/pull_up_inv.ice b/app/resources/blocks/config/pull_up_inv.ice new file mode 100644 index 000000000..71237e305 --- /dev/null +++ b/app/resources/blocks/config/pull_up_inv.ice @@ -0,0 +1,88 @@ +{ + "version": "1.0", + "package": { + "name": "Pull up inv", + "version": "1.0.0", + "description": "FPGA internal pull up configuration on the connected input port plus a logic inverter", + "author": "Jesús Arroyo", + "image": "%3Csvg%20id=%22svg2%22%20xmlns=%22http://www.w3.org/2000/svg%22%20viewBox=%22-265%20401.5%2063.5%2038.4%22%3E%3Cstyle%3E.st0%7Bdisplay:none%7D.st1%7Bfill:none;stroke:#000;stroke-width:.75;stroke-linejoin:round;stroke-miterlimit:10%7D.st2%7Bfill:#010002%7D%3C/style%3E%3Cpath%20class=%22st0%22%20d=%22M-242.5%20411.8v11.8h-5.4v-11.8h5.4m1-1h-7.4v13.8h7.4v-13.8z%22/%3E%3Cpath%20d=%22M-207.6%20425.4c-.3-.9-1.1-1.6-2.1-1.6-1.1%200-2%20.8-2.2%201.8l-15.4-8.7v8.5h-17.4v-2.7c0-.2-.1-.4-.3-.4l-2.3-1.2%205.6-2.9c.2-.1.3-.3.3-.5s-.1-.4-.3-.4l-5.7-2.7%202.4-1.6c.1-.1.2-.2.2-.4v-2.7h3.1l-3.5-6.1-3.5%206.1h3v2.5l-2.9%202c-.1.1-.2.3-.2.5s.1.3.3.4l5.6%202.6-5.6%202.9c-.2.1-.3.3-.3.4s.1.4.3.4l2.9%201.5V425.5H-265v1.2h37.6v8.5l15.4-8.7c.2%201%201.1%201.8%202.2%201.8%201%200%201.9-.7%202.1-1.6h6.1v-1.2h-6zm-37.7-20.2l2.2%203.9h-4.5l2.3-3.9zm19.2%2027.7v-13.8l12.3%206.9-12.3%206.9zm16.3-5.5c-.8%200-1.4-.6-1.4-1.4%200-.8.6-1.4%201.4-1.4s1.4.6%201.4%201.4c0%20.8-.6%201.4-1.4%201.4z%22/%3E%3C/svg%3E" + }, + "design": { + "board": "icezum", + "graph": { + "blocks": [ + { + "id": "2b245a71-2d80-466b-955f-e3d61839fe25", + "type": "basic.code", + "data": { + "code": "// Pull up inv\n\nwire din, dout, outen;\n\nassign o = ~din;\n\nSB_IO #(\n .PIN_TYPE(6'b 1010_01),\n .PULLUP(1'b 1)\n) io_pin (\n .PACKAGE_PIN(i),\n .OUTPUT_ENABLE(outen),\n .D_OUT_0(dout),\n .D_IN_0(din)\n);", + "ports": { + "in": [ + "i" + ], + "out": [ + "o" + ] + } + }, + "position": { + "x": 256, + "y": 104 + } + }, + { + "id": "bb4a1ca9-1b30-471e-92ca-ca7ff2fc1150", + "type": "basic.input", + "data": { + "label": "" + }, + "position": { + "x": 64, + "y": 200 + } + }, + { + "id": "a139fa0d-9b45-4480-a251-f4a66b49aa23", + "type": "basic.output", + "data": { + "label": "" + }, + "position": { + "x": 760, + "y": 200 + } + } + ], + "wires": [ + { + "source": { + "block": "bb4a1ca9-1b30-471e-92ca-ca7ff2fc1150", + "port": "out" + }, + "target": { + "block": "2b245a71-2d80-466b-955f-e3d61839fe25", + "port": "i" + } + }, + { + "source": { + "block": "2b245a71-2d80-466b-955f-e3d61839fe25", + "port": "o" + }, + "target": { + "block": "a139fa0d-9b45-4480-a251-f4a66b49aa23", + "port": "in" + } + } + ] + }, + "deps": {}, + "state": { + "pan": { + "x": -23, + "y": 8 + }, + "zoom": 1 + } + } +} \ No newline at end of file diff --git a/app/resources/blocks/config/pull_up_inv.iceb b/app/resources/blocks/config/pull_up_inv.iceb deleted file mode 100644 index b2089d065..000000000 --- a/app/resources/blocks/config/pull_up_inv.iceb +++ /dev/null @@ -1,78 +0,0 @@ -{ - "image": "resources/images/pull_up_inv.svg", - "state": { - "pan": { - "x": -23, - "y": 8 - }, - "zoom": 1 - }, - "graph": { - "blocks": [ - { - "id": "2b245a71-2d80-466b-955f-e3d61839fe25", - "type": "basic.code", - "data": { - "code": "// Pull up inv\n\nwire din, dout, outen;\n\nassign o = ~din;\n\nSB_IO #(\n .PIN_TYPE(6'b 1010_01),\n .PULLUP(1'b 1)\n) io_pin (\n .PACKAGE_PIN(i),\n .OUTPUT_ENABLE(outen),\n .D_OUT_0(dout),\n .D_IN_0(din)\n);", - "ports": { - "in": [ - "i" - ], - "out": [ - "o" - ] - } - }, - "position": { - "x": 256, - "y": 104 - } - }, - { - "id": "bb4a1ca9-1b30-471e-92ca-ca7ff2fc1150", - "type": "basic.input", - "data": { - "label": "" - }, - "position": { - "x": 64, - "y": 200 - } - }, - { - "id": "a139fa0d-9b45-4480-a251-f4a66b49aa23", - "type": "basic.output", - "data": { - "label": "" - }, - "position": { - "x": 760, - "y": 200 - } - } - ], - "wires": [ - { - "source": { - "block": "bb4a1ca9-1b30-471e-92ca-ca7ff2fc1150", - "port": "out" - }, - "target": { - "block": "2b245a71-2d80-466b-955f-e3d61839fe25", - "port": "i" - } - }, - { - "source": { - "block": "2b245a71-2d80-466b-955f-e3d61839fe25", - "port": "o" - }, - "target": { - "block": "a139fa0d-9b45-4480-a251-f4a66b49aa23", - "port": "in" - } - } - ] - }, - "deps": {} -} diff --git a/app/resources/blocks/config/tri_state.ice b/app/resources/blocks/config/tri_state.ice new file mode 100644 index 000000000..9936f1e07 --- /dev/null +++ b/app/resources/blocks/config/tri_state.ice @@ -0,0 +1,132 @@ +{ + "version": "1.0", + "package": { + "name": "Tri state", + "version": "1.0.0", + "description": "Tri-state logic block", + "author": "Salvador E. Tropea", + "image": "%3Csvg%20xmlns=%22http://www.w3.org/2000/svg%22%20viewBox=%22-265%20401.5%2063.5%2038.4%22%20id=%22svg2%22%3E%3Cstyle%20id=%22style3%22/%3E%3Cpath%20d=%22M-168.164%20460.895l-15.4-8.7v8.5c-14.685-.007-22.294.1-37.6.1v1.2h37.6v8.5l15.4-8.7h10.5v-.8h-10.5zm-14.1%207.3v-13.8l12.3%206.9z%22%20id=%22path7%22/%3E%3Cpath%20d=%22M-180.515%20415.613l15.4%208.7v-8.5c14.685.007%2022.294-.1%2037.6-.1l-7.823.145%207.823-1.145v-.2h-37.6v-8.5l-15.4%208.7h-10.5v.8h10.5zm14.1-7.3v13.8l-12.3-6.9z%22%20id=%22path7-3%22/%3E%3Cpath%20d=%22M-9.78%203.538l-4.214%2024.984-19.53-16.141z%22%20transform=%22matrix(.62422%20-.11476%20.1058%20.67701%20-219.33%20413.046)%22%20id=%22path3008%22%20fill=%22none%22%20stroke=%22#0b0b0b%22%20stroke-width=%221.885%22/%3E%3Cpath%20d=%22M-9.78%203.538l-4.214%2024.984-19.53-16.141z%22%20transform=%22matrix(-.62422%20-.11476%20-.1058%20.67701%20-244.991%20400.53)%22%20id=%22path3008-6%22%20fill=%22none%22%20stroke=%22#0b0b0b%22%20stroke-width=%221.885%22/%3E%3Cpath%20d=%22M40.154%2011.247H63.74%22%20transform=%22translate(-265%20401.5)%22%20id=%22path3800%22%20fill=%22none%22%20stroke=%22#000%22/%3E%3Cpath%20d=%22M25.945%2023.73l-7.364.058V11.305h7.076%22%20transform=%22translate(-265%20401.5)%22%20id=%22path3802%22%20fill=%22none%22%20stroke=%22#000%22/%3E%3Cpath%20d=%22M-265.029%20412.747l18.582.058%22%20id=%22path3804%22%20fill=%22none%22%20stroke=%22#000%22/%3E%3Cpath%20d=%22M.081%2023.919h12.936v7.566h19.037V27.58%22%20transform=%22translate(-265%20401.5)%22%20id=%22path3806%22%20fill=%22none%22%20stroke=%22#000%22/%3E%3Cpath%20d=%22M0%2035.96h49.302V24.162h-9.356%22%20transform=%22translate(-265%20401.5)%22%20id=%22path3812%22%20fill=%22none%22%20stroke=%22#000%22/%3E%3C/svg%3E" + }, + "design": { + "board": "icezum", + "graph": { + "blocks": [ + { + "id": "5c8e9a35-33e7-46ef-a0cc-cc27edcc99c0", + "type": "basic.code", + "data": { + "code": " SB_IO #(\n .PIN_TYPE(6'b1010_01),\n .PULLUP(1'b0)\n ) triState (\n .PACKAGE_PIN(pin),\n .OUTPUT_ENABLE(oe),\n .D_OUT_0(din),\n .D_IN_0(dout)\n );", + "ports": { + "in": [ + "pin", + "oe", + "din" + ], + "out": [ + "dout" + ] + } + }, + "position": { + "x": 248, + "y": 32 + } + }, + { + "id": "076fd025-aa42-4f23-ae97-b65aec2298ce", + "type": "basic.input", + "data": { + "label": "pin" + }, + "position": { + "x": 32, + "y": 40 + } + }, + { + "id": "f96a1baf-fc8b-4c25-b132-12552605743f", + "type": "basic.input", + "data": { + "label": "oe" + }, + "position": { + "x": 32, + "y": 128 + } + }, + { + "id": "0b2a85b3-b6ac-4e8a-8b16-dd5a195fb058", + "type": "basic.output", + "data": { + "label": "dout" + }, + "position": { + "x": 760, + "y": 128 + } + }, + { + "id": "04fdb7a7-2740-4ff1-ad26-56407ef5b958", + "type": "basic.input", + "data": { + "label": "din" + }, + "position": { + "x": 32, + "y": 216 + } + } + ], + "wires": [ + { + "source": { + "block": "076fd025-aa42-4f23-ae97-b65aec2298ce", + "port": "out" + }, + "target": { + "block": "5c8e9a35-33e7-46ef-a0cc-cc27edcc99c0", + "port": "pin" + } + }, + { + "source": { + "block": "f96a1baf-fc8b-4c25-b132-12552605743f", + "port": "out" + }, + "target": { + "block": "5c8e9a35-33e7-46ef-a0cc-cc27edcc99c0", + "port": "oe" + } + }, + { + "source": { + "block": "04fdb7a7-2740-4ff1-ad26-56407ef5b958", + "port": "out" + }, + "target": { + "block": "5c8e9a35-33e7-46ef-a0cc-cc27edcc99c0", + "port": "din" + } + }, + { + "source": { + "block": "5c8e9a35-33e7-46ef-a0cc-cc27edcc99c0", + "port": "dout" + }, + "target": { + "block": "0b2a85b3-b6ac-4e8a-8b16-dd5a195fb058", + "port": "in" + } + } + ] + }, + "deps": {}, + "state": { + "pan": { + "x": 0, + "y": 0 + }, + "zoom": 1 + } + } +} \ No newline at end of file diff --git a/app/resources/blocks/config/tri_state.iceb b/app/resources/blocks/config/tri_state.iceb deleted file mode 100644 index 5e8d9f473..000000000 --- a/app/resources/blocks/config/tri_state.iceb +++ /dev/null @@ -1,122 +0,0 @@ -{ - "image": "resources/images/tri_state.svg", - "state": { - "pan": { - "x": 0, - "y": 0 - }, - "zoom": 1 - }, - "graph": { - "blocks": [ - { - "id": "5c8e9a35-33e7-46ef-a0cc-cc27edcc99c0", - "type": "basic.code", - "data": { - "code": " SB_IO #(\n .PIN_TYPE(6'b1010_01),\n .PULLUP(1'b0)\n ) triState (\n .PACKAGE_PIN(pin),\n .OUTPUT_ENABLE(oe),\n .D_OUT_0(din),\n .D_IN_0(dout)\n );", - "ports": { - "in": [ - "pin", - "oe", - "din" - ], - "out": [ - "dout" - ] - } - }, - "position": { - "x": 248, - "y": 32 - } - }, - { - "id": "076fd025-aa42-4f23-ae97-b65aec2298ce", - "type": "basic.input", - "data": { - "label": "pin" - }, - "position": { - "x": 32, - "y": 40 - } - }, - { - "id": "f96a1baf-fc8b-4c25-b132-12552605743f", - "type": "basic.input", - "data": { - "label": "oe" - }, - "position": { - "x": 32, - "y": 128 - } - }, - { - "id": "04fdb7a7-2740-4ff1-ad26-56407ef5b958", - "type": "basic.input", - "data": { - "label": "din" - }, - "position": { - "x": 32, - "y": 216 - } - }, - { - "id": "0b2a85b3-b6ac-4e8a-8b16-dd5a195fb058", - "type": "basic.output", - "data": { - "label": "dout" - }, - "position": { - "x": 760, - "y": 128 - } - } - ], - "wires": [ - { - "source": { - "block": "076fd025-aa42-4f23-ae97-b65aec2298ce", - "port": "out" - }, - "target": { - "block": "5c8e9a35-33e7-46ef-a0cc-cc27edcc99c0", - "port": "pin" - } - }, - { - "source": { - "block": "f96a1baf-fc8b-4c25-b132-12552605743f", - "port": "out" - }, - "target": { - "block": "5c8e9a35-33e7-46ef-a0cc-cc27edcc99c0", - "port": "oe" - } - }, - { - "source": { - "block": "04fdb7a7-2740-4ff1-ad26-56407ef5b958", - "port": "out" - }, - "target": { - "block": "5c8e9a35-33e7-46ef-a0cc-cc27edcc99c0", - "port": "din" - } - }, - { - "source": { - "block": "5c8e9a35-33e7-46ef-a0cc-cc27edcc99c0", - "port": "dout" - }, - "target": { - "block": "0b2a85b3-b6ac-4e8a-8b16-dd5a195fb058", - "port": "in" - } - } - ] - }, - "deps": {} -} diff --git a/app/resources/images/0.svg b/app/resources/images/0.svg deleted file mode 100644 index f5947860d..000000000 --- a/app/resources/images/0.svg +++ /dev/null @@ -1,116 +0,0 @@ - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - 0 - - diff --git a/app/resources/images/1.svg b/app/resources/images/1.svg deleted file mode 100644 index 59fd65245..000000000 --- a/app/resources/images/1.svg +++ /dev/null @@ -1,116 +0,0 @@ - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - 1 - - diff --git a/app/resources/images/pull_up.svg b/app/resources/images/pull_up.svg deleted file mode 100755 index 5deb3913a..000000000 --- a/app/resources/images/pull_up.svg +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - - diff --git a/app/resources/images/pull_up_inv.svg b/app/resources/images/pull_up_inv.svg deleted file mode 100755 index bbe7bf57e..000000000 --- a/app/resources/images/pull_up_inv.svg +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - - diff --git a/app/resources/images/tri_state.svg b/app/resources/images/tri_state.svg deleted file mode 100644 index 8be1bc03f..000000000 --- a/app/resources/images/tri_state.svg +++ /dev/null @@ -1,55 +0,0 @@ - - - -image/svg+xml \ No newline at end of file diff --git a/app/scripts/services/resources.service.js b/app/scripts/services/resources.service.js index dfff2158c..f0724c6ce 100644 --- a/app/scripts/services/resources.service.js +++ b/app/scripts/services/resources.service.js @@ -9,7 +9,7 @@ angular.module('icestudio') }; this.getMenuBlocks = function() { - return utils.getFilesRecursive(nodePath.join('resources', 'blocks'), '.iceb'); + return utils.getFilesRecursive(nodePath.join('resources', 'blocks'), '.ice'); }; }); diff --git a/app/scripts/services/utils.service.js b/app/scripts/services/utils.service.js index 0c9116494..feeca9b48 100644 --- a/app/scripts/services/utils.service.js +++ b/app/scripts/services/utils.service.js @@ -684,11 +684,11 @@ angular.module('icestudio') content.push(' '); // TODO: add Save SVG content.push('
                '); - /*// Restore values + // Restore values for (i = 0; i < n; i++) { $('#input' + i.toString()).val(values[i]); } - $('#preview-svg').attr('src', 'data:image/svg+xml,' + values[4]);*/ + $('#preview-svg').attr('src', 'data:image/svg+xml,' + values[4]); var image = ''; From c4abce334844c44dffa356f3d452c7c671473426 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jes=C3=BAs=20Arroyo=20Torrens?= Date: Fri, 16 Dec 2016 19:14:55 +0100 Subject: [PATCH 043/169] Update logic blocks --- app/resources/blocks/config/pull_up.ice | 2 +- app/resources/blocks/config/pull_up_inv.ice | 4 +- .../blocks/logic/combinational/demux_1_2.ice | 132 +++++++ .../blocks/logic/combinational/demux_1_2.iceb | 122 ------ .../blocks/logic/combinational/demux_1_4.ice | 198 ++++++++++ .../blocks/logic/combinational/demux_1_4.iceb | 188 --------- .../blocks/logic/combinational/demux_1_8.ice | 362 ++++++++++++++++++ .../blocks/logic/combinational/demux_1_8.iceb | 352 ----------------- .../logic/combinational/hex_7seg_ca.ice | 286 ++++++++++++++ .../logic/combinational/hex_7seg_ca.iceb | 276 ------------- .../logic/combinational/hex_7seg_cc.ice | 286 ++++++++++++++ .../logic/combinational/hex_7seg_cc.iceb | 276 ------------- .../blocks/logic/combinational/mux_2_1.ice | 132 +++++++ .../blocks/logic/combinational/mux_2_1.iceb | 122 ------ .../blocks/logic/combinational/mux_4_1.ice | 210 ++++++++++ .../blocks/logic/combinational/mux_4_1.iceb | 200 ---------- app/resources/blocks/logic/gate/and.ice | 110 ++++++ app/resources/blocks/logic/gate/and.iceb | 100 ----- app/resources/blocks/logic/gate/nand.ice | 110 ++++++ app/resources/blocks/logic/gate/nand.iceb | 100 ----- app/resources/blocks/logic/gate/nor.ice | 110 ++++++ app/resources/blocks/logic/gate/nor.iceb | 100 ----- app/resources/blocks/logic/gate/not.ice | 88 +++++ app/resources/blocks/logic/gate/not.iceb | 78 ---- app/resources/blocks/logic/gate/or.ice | 110 ++++++ app/resources/blocks/logic/gate/or.iceb | 100 ----- app/resources/blocks/logic/gate/xnor.ice | 110 ++++++ app/resources/blocks/logic/gate/xnor.iceb | 100 ----- app/resources/blocks/logic/gate/xor.ice | 110 ++++++ app/resources/blocks/logic/gate/xor.iceb | 100 ----- .../blocks/logic/sequential/debouncer.ice | 110 ++++++ .../blocks/logic/sequential/debouncer.iceb | 100 ----- .../blocks/logic/sequential/dff_ar.ice | 176 +++++++++ .../blocks/logic/sequential/dff_ar.iceb | 166 -------- .../blocks/logic/sequential/dff_sr.ice | 176 +++++++++ .../blocks/logic/sequential/dff_sr.iceb | 166 -------- .../blocks/logic/sequential/tff_ar.ice | 176 +++++++++ .../blocks/logic/sequential/tff_ar.iceb | 166 -------- .../blocks/logic/sequential/tff_sr.ice | 176 +++++++++ .../blocks/logic/sequential/tff_sr.iceb | 166 -------- app/resources/images/7segmentos_ANODO.svg | 96 ----- app/resources/images/7segmentos_CATODO.svg | 96 ----- app/resources/images/FF/DFF.svg | 101 ----- app/resources/images/FF/DFF_AR.svg | 111 ------ app/resources/images/FF/DFF_E.svg | 115 ------ app/resources/images/FF/DFF_E_AR.svg | 120 ------ app/resources/images/FF/DFF_E_SR.svg | 120 ------ app/resources/images/FF/DFF_SR.svg | 111 ------ app/resources/images/FF/TFF.svg | 103 ----- app/resources/images/FF/TFF_AR.svg | 111 ------ app/resources/images/FF/TFF_E.svg | 115 ------ app/resources/images/FF/TFF_E_AR.svg | 120 ------ app/resources/images/FF/TFF_E_SR.svg | 120 ------ app/resources/images/FF/TFF_SR.svg | 111 ------ app/resources/images/and.svg | 67 ---- app/resources/images/debouncer.svg | 60 --- app/resources/images/demux.svg | 38 -- app/resources/images/dff_ar.svg | 70 ---- app/resources/images/dff_sr.svg | 56 --- app/resources/images/mux.svg | 38 -- app/resources/images/nand.svg | 23 -- app/resources/images/nor.svg | 50 --- app/resources/images/not.svg | 105 ----- app/resources/images/or.svg | 167 -------- app/resources/images/tff_ar.svg | 71 ---- app/resources/images/tff_sr.svg | 56 --- app/resources/images/xnor.svg | 52 --- app/resources/images/xor.svg | 49 --- gruntfile.js | 3 - 69 files changed, 3171 insertions(+), 5436 deletions(-) create mode 100644 app/resources/blocks/logic/combinational/demux_1_2.ice delete mode 100644 app/resources/blocks/logic/combinational/demux_1_2.iceb create mode 100644 app/resources/blocks/logic/combinational/demux_1_4.ice delete mode 100644 app/resources/blocks/logic/combinational/demux_1_4.iceb create mode 100644 app/resources/blocks/logic/combinational/demux_1_8.ice delete mode 100644 app/resources/blocks/logic/combinational/demux_1_8.iceb create mode 100644 app/resources/blocks/logic/combinational/hex_7seg_ca.ice delete mode 100644 app/resources/blocks/logic/combinational/hex_7seg_ca.iceb create mode 100644 app/resources/blocks/logic/combinational/hex_7seg_cc.ice delete mode 100644 app/resources/blocks/logic/combinational/hex_7seg_cc.iceb create mode 100644 app/resources/blocks/logic/combinational/mux_2_1.ice delete mode 100644 app/resources/blocks/logic/combinational/mux_2_1.iceb create mode 100644 app/resources/blocks/logic/combinational/mux_4_1.ice delete mode 100644 app/resources/blocks/logic/combinational/mux_4_1.iceb create mode 100644 app/resources/blocks/logic/gate/and.ice delete mode 100644 app/resources/blocks/logic/gate/and.iceb create mode 100644 app/resources/blocks/logic/gate/nand.ice delete mode 100644 app/resources/blocks/logic/gate/nand.iceb create mode 100644 app/resources/blocks/logic/gate/nor.ice delete mode 100644 app/resources/blocks/logic/gate/nor.iceb create mode 100644 app/resources/blocks/logic/gate/not.ice delete mode 100644 app/resources/blocks/logic/gate/not.iceb create mode 100644 app/resources/blocks/logic/gate/or.ice delete mode 100644 app/resources/blocks/logic/gate/or.iceb create mode 100644 app/resources/blocks/logic/gate/xnor.ice delete mode 100644 app/resources/blocks/logic/gate/xnor.iceb create mode 100644 app/resources/blocks/logic/gate/xor.ice delete mode 100644 app/resources/blocks/logic/gate/xor.iceb create mode 100644 app/resources/blocks/logic/sequential/debouncer.ice delete mode 100644 app/resources/blocks/logic/sequential/debouncer.iceb create mode 100644 app/resources/blocks/logic/sequential/dff_ar.ice delete mode 100644 app/resources/blocks/logic/sequential/dff_ar.iceb create mode 100644 app/resources/blocks/logic/sequential/dff_sr.ice delete mode 100644 app/resources/blocks/logic/sequential/dff_sr.iceb create mode 100644 app/resources/blocks/logic/sequential/tff_ar.ice delete mode 100644 app/resources/blocks/logic/sequential/tff_ar.iceb create mode 100644 app/resources/blocks/logic/sequential/tff_sr.ice delete mode 100644 app/resources/blocks/logic/sequential/tff_sr.iceb delete mode 100755 app/resources/images/7segmentos_ANODO.svg delete mode 100755 app/resources/images/7segmentos_CATODO.svg delete mode 100755 app/resources/images/FF/DFF.svg delete mode 100755 app/resources/images/FF/DFF_AR.svg delete mode 100755 app/resources/images/FF/DFF_E.svg delete mode 100755 app/resources/images/FF/DFF_E_AR.svg delete mode 100644 app/resources/images/FF/DFF_E_SR.svg delete mode 100644 app/resources/images/FF/DFF_SR.svg delete mode 100755 app/resources/images/FF/TFF.svg delete mode 100644 app/resources/images/FF/TFF_AR.svg delete mode 100755 app/resources/images/FF/TFF_E.svg delete mode 100644 app/resources/images/FF/TFF_E_AR.svg delete mode 100644 app/resources/images/FF/TFF_E_SR.svg delete mode 100644 app/resources/images/FF/TFF_SR.svg delete mode 100644 app/resources/images/and.svg delete mode 100644 app/resources/images/debouncer.svg delete mode 100755 app/resources/images/demux.svg delete mode 100644 app/resources/images/dff_ar.svg delete mode 100644 app/resources/images/dff_sr.svg delete mode 100755 app/resources/images/mux.svg delete mode 100755 app/resources/images/nand.svg delete mode 100755 app/resources/images/nor.svg delete mode 100644 app/resources/images/not.svg delete mode 100644 app/resources/images/or.svg delete mode 100644 app/resources/images/tff_ar.svg delete mode 100644 app/resources/images/tff_sr.svg delete mode 100755 app/resources/images/xnor.svg delete mode 100644 app/resources/images/xor.svg diff --git a/app/resources/blocks/config/pull_up.ice b/app/resources/blocks/config/pull_up.ice index 3b8ec0127..d36960ce3 100644 --- a/app/resources/blocks/config/pull_up.ice +++ b/app/resources/blocks/config/pull_up.ice @@ -4,7 +4,7 @@ "name": "Pull up", "version": "1.0.0", "description": "FPGA internal pull up configuration on the connected input port", - "author": "Jesús Arroyo", + "author": "Juan González", "image": "%3Csvg%20id=%22svg2%22%20xmlns=%22http://www.w3.org/2000/svg%22%20viewBox=%22-265%20401.5%2063.5%2038.4%22%3E%3Cstyle%3E.st0%7Bdisplay:none%7D.st1%7Bfill:none;stroke:#000;stroke-width:.75;stroke-linejoin:round;stroke-miterlimit:10%7D.st2%7Bfill:#010002%7D%3C/style%3E%3Cpath%20class=%22st0%22%20d=%22M-242.5%20411.8v11.8h-5.4v-11.8h5.4m1-1h-7.4v13.8h7.4v-13.8z%22/%3E%3Cpath%20d=%22M-212%20425.6l-15.4-8.7v8.5h-17.4v-2.7c0-.2-.1-.4-.3-.4l-2.3-1.2%205.6-2.9c.2-.1.3-.3.3-.5s-.1-.4-.3-.4l-5.7-2.7%202.4-1.6c.1-.1.2-.2.2-.4v-2.7h3.1l-3.5-6.1-3.5%206.1h3v2.5l-2.9%202c-.1.1-.2.3-.2.5s.1.3.3.4l5.6%202.6-5.6%202.9c-.2.1-.3.3-.3.4s.1.4.3.4l2.9%201.5V425.5H-265v1.2h37.6v8.5l15.4-8.7h10.5v-.8H-212zm-33.3-20.4l2.2%203.9h-4.5l2.3-3.9zm19.2%2027.7v-13.8l12.3%206.9-12.3%206.9z%22/%3E%3C/svg%3E" }, "design": { diff --git a/app/resources/blocks/config/pull_up_inv.ice b/app/resources/blocks/config/pull_up_inv.ice index 71237e305..6d8b8a698 100644 --- a/app/resources/blocks/config/pull_up_inv.ice +++ b/app/resources/blocks/config/pull_up_inv.ice @@ -4,7 +4,7 @@ "name": "Pull up inv", "version": "1.0.0", "description": "FPGA internal pull up configuration on the connected input port plus a logic inverter", - "author": "Jesús Arroyo", + "author": "Juan González", "image": "%3Csvg%20id=%22svg2%22%20xmlns=%22http://www.w3.org/2000/svg%22%20viewBox=%22-265%20401.5%2063.5%2038.4%22%3E%3Cstyle%3E.st0%7Bdisplay:none%7D.st1%7Bfill:none;stroke:#000;stroke-width:.75;stroke-linejoin:round;stroke-miterlimit:10%7D.st2%7Bfill:#010002%7D%3C/style%3E%3Cpath%20class=%22st0%22%20d=%22M-242.5%20411.8v11.8h-5.4v-11.8h5.4m1-1h-7.4v13.8h7.4v-13.8z%22/%3E%3Cpath%20d=%22M-207.6%20425.4c-.3-.9-1.1-1.6-2.1-1.6-1.1%200-2%20.8-2.2%201.8l-15.4-8.7v8.5h-17.4v-2.7c0-.2-.1-.4-.3-.4l-2.3-1.2%205.6-2.9c.2-.1.3-.3.3-.5s-.1-.4-.3-.4l-5.7-2.7%202.4-1.6c.1-.1.2-.2.2-.4v-2.7h3.1l-3.5-6.1-3.5%206.1h3v2.5l-2.9%202c-.1.1-.2.3-.2.5s.1.3.3.4l5.6%202.6-5.6%202.9c-.2.1-.3.3-.3.4s.1.4.3.4l2.9%201.5V425.5H-265v1.2h37.6v8.5l15.4-8.7c.2%201%201.1%201.8%202.2%201.8%201%200%201.9-.7%202.1-1.6h6.1v-1.2h-6zm-37.7-20.2l2.2%203.9h-4.5l2.3-3.9zm19.2%2027.7v-13.8l12.3%206.9-12.3%206.9zm16.3-5.5c-.8%200-1.4-.6-1.4-1.4%200-.8.6-1.4%201.4-1.4s1.4.6%201.4%201.4c0%20.8-.6%201.4-1.4%201.4z%22/%3E%3C/svg%3E" }, "design": { @@ -85,4 +85,4 @@ "zoom": 1 } } -} \ No newline at end of file +} diff --git a/app/resources/blocks/logic/combinational/demux_1_2.ice b/app/resources/blocks/logic/combinational/demux_1_2.ice new file mode 100644 index 000000000..3e844f7e2 --- /dev/null +++ b/app/resources/blocks/logic/combinational/demux_1_2.ice @@ -0,0 +1,132 @@ +{ + "version": "1.0", + "package": { + "name": "Demux 1:2", + "version": "1.0.0", + "description": "Demultiplexer 1:2", + "author": "Carlos Diaz", + "image": "%3Csvg%20xmlns=%22http://www.w3.org/2000/svg%22%20viewBox=%22-252%20400.9%2090%2040%22%3E%3Cpath%20d=%22M-252%20421.9h24v7.3l41%2011.7v-9h25v-2h-25v-18h25v-2h-25v-9l-41%2011.8v7.2h-24v2zm26%205.7v-13.5l37-10.8v35l-37-10.7z%22/%3E%3C/svg%3E" + }, + "design": { + "board": "icezum", + "graph": { + "blocks": [ + { + "id": "c8fdb023-d458-4657-899c-5749a256be09", + "type": "basic.code", + "data": { + "code": "assign {out1,out0} = in0 << sel0;", + "ports": { + "in": [ + "in0", + "sel0" + ], + "out": [ + "out0", + "out1" + ] + } + }, + "position": { + "x": 208, + "y": 64 + } + }, + { + "id": "5fc9a8e9-d463-4c1f-b6a3-185d5cabb406", + "type": "basic.input", + "data": { + "label": "i" + }, + "position": { + "x": 0, + "y": 96 + } + }, + { + "id": "91e2ff2d-2430-41e5-9d21-bc9ec4082aaa", + "type": "basic.output", + "data": { + "label": "o0" + }, + "position": { + "x": 720, + "y": 96 + } + }, + { + "id": "75cafe5a-1968-49ed-9e05-70d1bc3fbd0f", + "type": "basic.input", + "data": { + "label": "sel" + }, + "position": { + "x": 0, + "y": 224 + } + }, + { + "id": "c6dc7002-dfc0-45fd-88e2-b5e5a75231f2", + "type": "basic.output", + "data": { + "label": "o1" + }, + "position": { + "x": 720, + "y": 224 + } + } + ], + "wires": [ + { + "source": { + "block": "c8fdb023-d458-4657-899c-5749a256be09", + "port": "out1" + }, + "target": { + "block": "c6dc7002-dfc0-45fd-88e2-b5e5a75231f2", + "port": "in" + } + }, + { + "source": { + "block": "c8fdb023-d458-4657-899c-5749a256be09", + "port": "out0" + }, + "target": { + "block": "91e2ff2d-2430-41e5-9d21-bc9ec4082aaa", + "port": "in" + } + }, + { + "source": { + "block": "5fc9a8e9-d463-4c1f-b6a3-185d5cabb406", + "port": "out" + }, + "target": { + "block": "c8fdb023-d458-4657-899c-5749a256be09", + "port": "in0" + } + }, + { + "source": { + "block": "75cafe5a-1968-49ed-9e05-70d1bc3fbd0f", + "port": "out" + }, + "target": { + "block": "c8fdb023-d458-4657-899c-5749a256be09", + "port": "sel0" + } + } + ] + }, + "deps": {}, + "state": { + "pan": { + "x": 104.8444188797269, + "y": 152.1580250587398 + }, + "zoom": 0.8586960682653878 + } + } +} \ No newline at end of file diff --git a/app/resources/blocks/logic/combinational/demux_1_2.iceb b/app/resources/blocks/logic/combinational/demux_1_2.iceb deleted file mode 100644 index f963ac483..000000000 --- a/app/resources/blocks/logic/combinational/demux_1_2.iceb +++ /dev/null @@ -1,122 +0,0 @@ -{ - "image": "resources/images/demux.svg", - "state": { - "pan": { - "x": 104.8444188797269, - "y": 152.1580250587398 - }, - "zoom": 0.8586960434913635 - }, - "graph": { - "blocks": [ - { - "id": "91e2ff2d-2430-41e5-9d21-bc9ec4082aaa", - "type": "basic.output", - "data": { - "label": "o0" - }, - "position": { - "x": 720, - "y": 96 - } - }, - { - "id": "c6dc7002-dfc0-45fd-88e2-b5e5a75231f2", - "type": "basic.output", - "data": { - "label": "o1" - }, - "position": { - "x": 720, - "y": 224 - } - }, - { - "id": "5fc9a8e9-d463-4c1f-b6a3-185d5cabb406", - "type": "basic.input", - "data": { - "label": "i" - }, - "position": { - "x": 0, - "y": 96 - } - }, - { - "id": "75cafe5a-1968-49ed-9e05-70d1bc3fbd0f", - "type": "basic.input", - "data": { - "label": "sel" - }, - "position": { - "x": 0, - "y": 224 - } - }, - { - "id": "c8fdb023-d458-4657-899c-5749a256be09", - "type": "basic.code", - "data": { - "code": "assign {out1,out0} = in0 << sel0;", - "ports": { - "in": [ - "in0", - "sel0" - ], - "out": [ - "out0", - "out1" - ] - } - }, - "position": { - "x": 208, - "y": 64 - } - } - ], - "wires": [ - { - "source": { - "block": "c8fdb023-d458-4657-899c-5749a256be09", - "port": "out1" - }, - "target": { - "block": "c6dc7002-dfc0-45fd-88e2-b5e5a75231f2", - "port": "in" - } - }, - { - "source": { - "block": "c8fdb023-d458-4657-899c-5749a256be09", - "port": "out0" - }, - "target": { - "block": "91e2ff2d-2430-41e5-9d21-bc9ec4082aaa", - "port": "in" - } - }, - { - "source": { - "block": "5fc9a8e9-d463-4c1f-b6a3-185d5cabb406", - "port": "out" - }, - "target": { - "block": "c8fdb023-d458-4657-899c-5749a256be09", - "port": "in0" - } - }, - { - "source": { - "block": "75cafe5a-1968-49ed-9e05-70d1bc3fbd0f", - "port": "out" - }, - "target": { - "block": "c8fdb023-d458-4657-899c-5749a256be09", - "port": "sel0" - } - } - ] - }, - "deps": {} -} diff --git a/app/resources/blocks/logic/combinational/demux_1_4.ice b/app/resources/blocks/logic/combinational/demux_1_4.ice new file mode 100644 index 000000000..8a4a6fa81 --- /dev/null +++ b/app/resources/blocks/logic/combinational/demux_1_4.ice @@ -0,0 +1,198 @@ +{ + "version": "1.0", + "package": { + "name": "Demux 1:4", + "version": "1.0.0", + "description": "Demultiplexer 1:4", + "author": "Carlos Diaz", + "image": "%3Csvg%20xmlns=%22http://www.w3.org/2000/svg%22%20viewBox=%22-252%20400.9%2090%2040%22%3E%3Cpath%20d=%22M-252%20421.9h24v7.3l41%2011.7v-9h25v-2h-25v-18h25v-2h-25v-9l-41%2011.8v7.2h-24v2zm26%205.7v-13.5l37-10.8v35l-37-10.7z%22/%3E%3C/svg%3E" + }, + "design": { + "board": "icezum", + "graph": { + "blocks": [ + { + "id": "91e2ff2d-2430-41e5-9d21-bc9ec4082aaa", + "type": "basic.output", + "data": { + "label": "o0" + }, + "position": { + "x": 760, + "y": 40 + } + }, + { + "id": "8a50b4e9-884d-49bb-98c3-3cd1e6cb3f4f", + "type": "basic.code", + "data": { + "code": "assign {out3,out2,out1,out0} = in0 << {sel1,sel0};", + "ports": { + "in": [ + "in0", + "sel0", + "sel1" + ], + "out": [ + "out0", + "out1", + "out2", + "out3" + ] + } + }, + "position": { + "x": 208, + "y": 64 + } + }, + { + "id": "5fc9a8e9-d463-4c1f-b6a3-185d5cabb406", + "type": "basic.input", + "data": { + "label": "i" + }, + "position": { + "x": 16, + "y": 72 + } + }, + { + "id": "c6dc7002-dfc0-45fd-88e2-b5e5a75231f2", + "type": "basic.output", + "data": { + "label": "o1" + }, + "position": { + "x": 760, + "y": 120 + } + }, + { + "id": "75cafe5a-1968-49ed-9e05-70d1bc3fbd0f", + "type": "basic.input", + "data": { + "label": "sel0" + }, + "position": { + "x": 16, + "y": 160 + } + }, + { + "id": "5e246f93-51ad-4d6f-83f1-4fcce69c5ae3", + "type": "basic.output", + "data": { + "label": "o2" + }, + "position": { + "x": 760, + "y": 200 + } + }, + { + "id": "657dab9e-6580-4f02-b54f-66477863f26a", + "type": "basic.input", + "data": { + "label": "sel1" + }, + "position": { + "x": 16, + "y": 248 + } + }, + { + "id": "b9d764ea-538a-420f-a8d3-45af7a8e30a2", + "type": "basic.output", + "data": { + "label": "o3" + }, + "position": { + "x": 760, + "y": 280 + } + } + ], + "wires": [ + { + "source": { + "block": "8a50b4e9-884d-49bb-98c3-3cd1e6cb3f4f", + "port": "out0" + }, + "target": { + "block": "91e2ff2d-2430-41e5-9d21-bc9ec4082aaa", + "port": "in" + } + }, + { + "source": { + "block": "8a50b4e9-884d-49bb-98c3-3cd1e6cb3f4f", + "port": "out1" + }, + "target": { + "block": "c6dc7002-dfc0-45fd-88e2-b5e5a75231f2", + "port": "in" + } + }, + { + "source": { + "block": "8a50b4e9-884d-49bb-98c3-3cd1e6cb3f4f", + "port": "out2" + }, + "target": { + "block": "5e246f93-51ad-4d6f-83f1-4fcce69c5ae3", + "port": "in" + } + }, + { + "source": { + "block": "8a50b4e9-884d-49bb-98c3-3cd1e6cb3f4f", + "port": "out3" + }, + "target": { + "block": "b9d764ea-538a-420f-a8d3-45af7a8e30a2", + "port": "in" + } + }, + { + "source": { + "block": "5fc9a8e9-d463-4c1f-b6a3-185d5cabb406", + "port": "out" + }, + "target": { + "block": "8a50b4e9-884d-49bb-98c3-3cd1e6cb3f4f", + "port": "in0" + } + }, + { + "source": { + "block": "75cafe5a-1968-49ed-9e05-70d1bc3fbd0f", + "port": "out" + }, + "target": { + "block": "8a50b4e9-884d-49bb-98c3-3cd1e6cb3f4f", + "port": "sel0" + } + }, + { + "source": { + "block": "657dab9e-6580-4f02-b54f-66477863f26a", + "port": "out" + }, + "target": { + "block": "8a50b4e9-884d-49bb-98c3-3cd1e6cb3f4f", + "port": "sel1" + } + } + ] + }, + "deps": {}, + "state": { + "pan": { + "x": 75.84442855228853, + "y": 63.15803102316195 + }, + "zoom": 0.8586960434913635 + } + } +} diff --git a/app/resources/blocks/logic/combinational/demux_1_4.iceb b/app/resources/blocks/logic/combinational/demux_1_4.iceb deleted file mode 100644 index 47aab7607..000000000 --- a/app/resources/blocks/logic/combinational/demux_1_4.iceb +++ /dev/null @@ -1,188 +0,0 @@ -{ - "image": "resources/images/demux.svg", - "state": { - "pan": { - "x": 75.84442855228853, - "y": 63.15803102316195 - }, - "zoom": 0.8586960434913635 - }, - "graph": { - "blocks": [ - { - "id": "8a50b4e9-884d-49bb-98c3-3cd1e6cb3f4f", - "type": "basic.code", - "data": { - "code": "assign {out3,out2,out1,out0} = in0 << {sel1,sel0};", - "ports": { - "in": [ - "in0", - "sel0", - "sel1" - ], - "out": [ - "out0", - "out1", - "out2", - "out3" - ] - } - }, - "position": { - "x": 208, - "y": 64 - } - }, - { - "id": "91e2ff2d-2430-41e5-9d21-bc9ec4082aaa", - "type": "basic.output", - "data": { - "label": "o0" - }, - "position": { - "x": 760, - "y": 40 - } - }, - { - "id": "c6dc7002-dfc0-45fd-88e2-b5e5a75231f2", - "type": "basic.output", - "data": { - "label": "o1" - }, - "position": { - "x": 760, - "y": 120 - } - }, - { - "id": "5e246f93-51ad-4d6f-83f1-4fcce69c5ae3", - "type": "basic.output", - "data": { - "label": "o2" - }, - "position": { - "x": 760, - "y": 200 - } - }, - { - "id": "b9d764ea-538a-420f-a8d3-45af7a8e30a2", - "type": "basic.output", - "data": { - "label": "o3" - }, - "position": { - "x": 760, - "y": 280 - } - }, - { - "id": "5fc9a8e9-d463-4c1f-b6a3-185d5cabb406", - "type": "basic.input", - "data": { - "label": "i" - }, - "position": { - "x": 16, - "y": 72 - } - }, - { - "id": "75cafe5a-1968-49ed-9e05-70d1bc3fbd0f", - "type": "basic.input", - "data": { - "label": "sel0" - }, - "position": { - "x": 16, - "y": 160 - } - }, - { - "id": "657dab9e-6580-4f02-b54f-66477863f26a", - "type": "basic.input", - "data": { - "label": "sel1" - }, - "position": { - "x": 16, - "y": 248 - } - } - ], - "wires": [ - { - "source": { - "block": "8a50b4e9-884d-49bb-98c3-3cd1e6cb3f4f", - "port": "out0" - }, - "target": { - "block": "91e2ff2d-2430-41e5-9d21-bc9ec4082aaa", - "port": "in" - } - }, - { - "source": { - "block": "8a50b4e9-884d-49bb-98c3-3cd1e6cb3f4f", - "port": "out1" - }, - "target": { - "block": "c6dc7002-dfc0-45fd-88e2-b5e5a75231f2", - "port": "in" - } - }, - { - "source": { - "block": "8a50b4e9-884d-49bb-98c3-3cd1e6cb3f4f", - "port": "out2" - }, - "target": { - "block": "5e246f93-51ad-4d6f-83f1-4fcce69c5ae3", - "port": "in" - } - }, - { - "source": { - "block": "8a50b4e9-884d-49bb-98c3-3cd1e6cb3f4f", - "port": "out3" - }, - "target": { - "block": "b9d764ea-538a-420f-a8d3-45af7a8e30a2", - "port": "in" - } - }, - { - "source": { - "block": "5fc9a8e9-d463-4c1f-b6a3-185d5cabb406", - "port": "out" - }, - "target": { - "block": "8a50b4e9-884d-49bb-98c3-3cd1e6cb3f4f", - "port": "in0" - } - }, - { - "source": { - "block": "75cafe5a-1968-49ed-9e05-70d1bc3fbd0f", - "port": "out" - }, - "target": { - "block": "8a50b4e9-884d-49bb-98c3-3cd1e6cb3f4f", - "port": "sel0" - } - }, - { - "source": { - "block": "657dab9e-6580-4f02-b54f-66477863f26a", - "port": "out" - }, - "target": { - "block": "8a50b4e9-884d-49bb-98c3-3cd1e6cb3f4f", - "port": "sel1" - } - } - ] - }, - "deps": {} -} diff --git a/app/resources/blocks/logic/combinational/demux_1_8.ice b/app/resources/blocks/logic/combinational/demux_1_8.ice new file mode 100644 index 000000000..0784a2757 --- /dev/null +++ b/app/resources/blocks/logic/combinational/demux_1_8.ice @@ -0,0 +1,362 @@ +{ + "version": "1.0", + "package": { + "name": "Demux 1:8", + "version": "1.0.0", + "description": "Demultiplexer 1:8", + "author": "Carlos Diaz", + "image": "%3Csvg%20xmlns=%22http://www.w3.org/2000/svg%22%20viewBox=%22-252%20400.9%2090%2040%22%3E%3Cpath%20d=%22M-252%20421.9h24v7.3l41%2011.7v-9h25v-2h-25v-18h25v-2h-25v-9l-41%2011.8v7.2h-24v2zm26%205.7v-13.5l37-10.8v35l-37-10.7z%22/%3E%3C/svg%3E" + }, + "design": { + "board": "icezum", + "graph": { + "blocks": [ + { + "id": "91e2ff2d-2430-41e5-9d21-bc9ec4082aaa", + "type": "basic.output", + "data": { + "label": "o0" + }, + "position": { + "x": 784, + "y": -128 + } + }, + { + "id": "c6dc7002-dfc0-45fd-88e2-b5e5a75231f2", + "type": "basic.output", + "data": { + "label": "o1" + }, + "position": { + "x": 784, + "y": -48 + } + }, + { + "id": "5e246f93-51ad-4d6f-83f1-4fcce69c5ae3", + "type": "basic.output", + "data": { + "label": "o2" + }, + "position": { + "x": 784, + "y": 32 + } + }, + { + "id": "5fc9a8e9-d463-4c1f-b6a3-185d5cabb406", + "type": "basic.input", + "data": { + "label": "i" + }, + "position": { + "x": 16, + "y": 40 + } + }, + { + "id": "1ea41d18-7010-42c0-932f-99d135efdb73", + "type": "basic.code", + "data": { + "code": "assign {out7,out6,out5,out4,out3,out2,out1,out0} = in0 << {sel2,sel1,sel0};", + "ports": { + "in": [ + "in0", + "sel0", + "sel1", + "sel2" + ], + "out": [ + "out0", + "out1", + "out2", + "out3", + "out4", + "out5", + "out6", + "out7" + ] + } + }, + "position": { + "x": 208, + "y": 64 + } + }, + { + "id": "b9d764ea-538a-420f-a8d3-45af7a8e30a2", + "type": "basic.output", + "data": { + "label": "o3" + }, + "position": { + "x": 784, + "y": 112 + } + }, + { + "id": "75cafe5a-1968-49ed-9e05-70d1bc3fbd0f", + "type": "basic.input", + "data": { + "label": "sel0" + }, + "position": { + "x": 16, + "y": 120 + } + }, + { + "id": "657dab9e-6580-4f02-b54f-66477863f26a", + "type": "basic.input", + "data": { + "label": "sel1" + }, + "position": { + "x": 16, + "y": 200 + } + }, + { + "id": "1b8510ac-d723-4226-bf28-c7329d0f73fb", + "type": "basic.output", + "data": { + "label": "o4" + }, + "position": { + "x": 784, + "y": 208 + } + }, + { + "id": "e1a156c8-5813-46f6-a4d4-c672857f3396", + "type": "basic.input", + "data": { + "label": "sel2" + }, + "position": { + "x": 16, + "y": 280 + } + }, + { + "id": "65f31fca-d607-4d5c-82cc-878a93b8e580", + "type": "basic.output", + "data": { + "label": "o5" + }, + "position": { + "x": 784, + "y": 304 + } + }, + { + "id": "c8fadd68-77e1-47be-a262-b076e878e6fd", + "type": "basic.output", + "data": { + "label": "o6" + }, + "position": { + "x": 784, + "y": 384 + } + }, + { + "id": "99ca2a23-7e0d-4c34-9ab1-988c6bf69633", + "type": "basic.output", + "data": { + "label": "o7" + }, + "position": { + "x": 784, + "y": 464 + } + } + ], + "wires": [ + { + "source": { + "block": "5fc9a8e9-d463-4c1f-b6a3-185d5cabb406", + "port": "out" + }, + "target": { + "block": "1ea41d18-7010-42c0-932f-99d135efdb73", + "port": "in0" + } + }, + { + "source": { + "block": "75cafe5a-1968-49ed-9e05-70d1bc3fbd0f", + "port": "out" + }, + "target": { + "block": "1ea41d18-7010-42c0-932f-99d135efdb73", + "port": "sel0" + } + }, + { + "source": { + "block": "657dab9e-6580-4f02-b54f-66477863f26a", + "port": "out" + }, + "target": { + "block": "1ea41d18-7010-42c0-932f-99d135efdb73", + "port": "sel1" + } + }, + { + "source": { + "block": "e1a156c8-5813-46f6-a4d4-c672857f3396", + "port": "out" + }, + "target": { + "block": "1ea41d18-7010-42c0-932f-99d135efdb73", + "port": "sel2" + } + }, + { + "source": { + "block": "1ea41d18-7010-42c0-932f-99d135efdb73", + "port": "out0" + }, + "target": { + "block": "91e2ff2d-2430-41e5-9d21-bc9ec4082aaa", + "port": "in" + }, + "vertices": [ + { + "x": 664, + "y": -24 + } + ] + }, + { + "source": { + "block": "1ea41d18-7010-42c0-932f-99d135efdb73", + "port": "out7" + }, + "target": { + "block": "99ca2a23-7e0d-4c34-9ab1-988c6bf69633", + "port": "in" + }, + "vertices": [ + { + "x": 664, + "y": 416 + } + ] + }, + { + "source": { + "block": "1ea41d18-7010-42c0-932f-99d135efdb73", + "port": "out1" + }, + "target": { + "block": "c6dc7002-dfc0-45fd-88e2-b5e5a75231f2", + "port": "in" + }, + "vertices": [ + { + "x": 680, + "y": 32 + } + ] + }, + { + "source": { + "block": "1ea41d18-7010-42c0-932f-99d135efdb73", + "port": "out2" + }, + "target": { + "block": "5e246f93-51ad-4d6f-83f1-4fcce69c5ae3", + "port": "in" + }, + "vertices": [ + { + "x": 696, + "y": 112 + } + ] + }, + { + "source": { + "block": "1ea41d18-7010-42c0-932f-99d135efdb73", + "port": "out3" + }, + "target": { + "block": "b9d764ea-538a-420f-a8d3-45af7a8e30a2", + "port": "in" + }, + "vertices": [ + { + "x": 712, + "y": 176 + } + ] + }, + { + "source": { + "block": "1ea41d18-7010-42c0-932f-99d135efdb73", + "port": "out4" + }, + "target": { + "block": "1b8510ac-d723-4226-bf28-c7329d0f73fb", + "port": "in" + } + }, + { + "source": { + "block": "1ea41d18-7010-42c0-932f-99d135efdb73", + "port": "out5" + }, + "target": { + "block": "65f31fca-d607-4d5c-82cc-878a93b8e580", + "port": "in" + }, + "vertices": [ + { + "x": 696, + "y": 288 + } + ] + }, + { + "source": { + "block": "1ea41d18-7010-42c0-932f-99d135efdb73", + "port": "out6" + }, + "target": { + "block": "c8fadd68-77e1-47be-a262-b076e878e6fd", + "port": "in" + }, + "vertices": [ + { + "x": 680, + "y": 320 + }, + { + "x": 680, + "y": 360 + }, + { + "x": 680, + "y": 376 + }, + { + "x": 688, + "y": 416 + } + ] + } + ] + }, + "deps": {}, + "state": { + "pan": { + "x": 75.69774669071234, + "y": 148.91048230054443 + }, + "zoom": 0.6331667332315369 + } + } +} diff --git a/app/resources/blocks/logic/combinational/demux_1_8.iceb b/app/resources/blocks/logic/combinational/demux_1_8.iceb deleted file mode 100644 index c8a9c43bc..000000000 --- a/app/resources/blocks/logic/combinational/demux_1_8.iceb +++ /dev/null @@ -1,352 +0,0 @@ -{ - "image": "resources/images/demux.svg", - "state": { - "pan": { - "x": 75.69774669071234, - "y": 148.91048230054443 - }, - "zoom": 0.63316672636209 - }, - "graph": { - "blocks": [ - { - "id": "91e2ff2d-2430-41e5-9d21-bc9ec4082aaa", - "type": "basic.output", - "data": { - "label": "o0" - }, - "position": { - "x": 784, - "y": -128 - } - }, - { - "id": "c6dc7002-dfc0-45fd-88e2-b5e5a75231f2", - "type": "basic.output", - "data": { - "label": "o1" - }, - "position": { - "x": 784, - "y": -48 - } - }, - { - "id": "5e246f93-51ad-4d6f-83f1-4fcce69c5ae3", - "type": "basic.output", - "data": { - "label": "o2" - }, - "position": { - "x": 784, - "y": 32 - } - }, - { - "id": "b9d764ea-538a-420f-a8d3-45af7a8e30a2", - "type": "basic.output", - "data": { - "label": "o3" - }, - "position": { - "x": 784, - "y": 112 - } - }, - { - "id": "1b8510ac-d723-4226-bf28-c7329d0f73fb", - "type": "basic.output", - "data": { - "label": "o4" - }, - "position": { - "x": 784, - "y": 208 - } - }, - { - "id": "65f31fca-d607-4d5c-82cc-878a93b8e580", - "type": "basic.output", - "data": { - "label": "o5" - }, - "position": { - "x": 784, - "y": 304 - } - }, - { - "id": "c8fadd68-77e1-47be-a262-b076e878e6fd", - "type": "basic.output", - "data": { - "label": "o6" - }, - "position": { - "x": 784, - "y": 384 - } - }, - { - "id": "99ca2a23-7e0d-4c34-9ab1-988c6bf69633", - "type": "basic.output", - "data": { - "label": "o7" - }, - "position": { - "x": 784, - "y": 464 - } - }, - { - "id": "5fc9a8e9-d463-4c1f-b6a3-185d5cabb406", - "type": "basic.input", - "data": { - "label": "i" - }, - "position": { - "x": 16, - "y": 40 - } - }, - { - "id": "75cafe5a-1968-49ed-9e05-70d1bc3fbd0f", - "type": "basic.input", - "data": { - "label": "sel0" - }, - "position": { - "x": 16, - "y": 120 - } - }, - { - "id": "657dab9e-6580-4f02-b54f-66477863f26a", - "type": "basic.input", - "data": { - "label": "sel1" - }, - "position": { - "x": 16, - "y": 200 - } - }, - { - "id": "e1a156c8-5813-46f6-a4d4-c672857f3396", - "type": "basic.input", - "data": { - "label": "sel2" - }, - "position": { - "x": 16, - "y": 280 - } - }, - { - "id": "1ea41d18-7010-42c0-932f-99d135efdb73", - "type": "basic.code", - "data": { - "code": "assign {out7,out6,out5,out4,out3,out2,out1,out0} = in0 << {sel2,sel1,sel0};", - "ports": { - "in": [ - "in0", - "sel0", - "sel1", - "sel2" - ], - "out": [ - "out0", - "out1", - "out2", - "out3", - "out4", - "out5", - "out6", - "out7" - ] - } - }, - "position": { - "x": 208, - "y": 64 - } - } - ], - "wires": [ - { - "source": { - "block": "5fc9a8e9-d463-4c1f-b6a3-185d5cabb406", - "port": "out" - }, - "target": { - "block": "1ea41d18-7010-42c0-932f-99d135efdb73", - "port": "in0" - } - }, - { - "source": { - "block": "75cafe5a-1968-49ed-9e05-70d1bc3fbd0f", - "port": "out" - }, - "target": { - "block": "1ea41d18-7010-42c0-932f-99d135efdb73", - "port": "sel0" - } - }, - { - "source": { - "block": "657dab9e-6580-4f02-b54f-66477863f26a", - "port": "out" - }, - "target": { - "block": "1ea41d18-7010-42c0-932f-99d135efdb73", - "port": "sel1" - } - }, - { - "source": { - "block": "e1a156c8-5813-46f6-a4d4-c672857f3396", - "port": "out" - }, - "target": { - "block": "1ea41d18-7010-42c0-932f-99d135efdb73", - "port": "sel2" - } - }, - { - "source": { - "block": "1ea41d18-7010-42c0-932f-99d135efdb73", - "port": "out0" - }, - "target": { - "block": "91e2ff2d-2430-41e5-9d21-bc9ec4082aaa", - "port": "in" - }, - "vertices": [ - { - "x": 664, - "y": -24 - } - ] - }, - { - "source": { - "block": "1ea41d18-7010-42c0-932f-99d135efdb73", - "port": "out7" - }, - "target": { - "block": "99ca2a23-7e0d-4c34-9ab1-988c6bf69633", - "port": "in" - }, - "vertices": [ - { - "x": 664, - "y": 416 - } - ] - }, - { - "source": { - "block": "1ea41d18-7010-42c0-932f-99d135efdb73", - "port": "out1" - }, - "target": { - "block": "c6dc7002-dfc0-45fd-88e2-b5e5a75231f2", - "port": "in" - }, - "vertices": [ - { - "x": 680, - "y": 32 - } - ] - }, - { - "source": { - "block": "1ea41d18-7010-42c0-932f-99d135efdb73", - "port": "out2" - }, - "target": { - "block": "5e246f93-51ad-4d6f-83f1-4fcce69c5ae3", - "port": "in" - }, - "vertices": [ - { - "x": 696, - "y": 112 - } - ] - }, - { - "source": { - "block": "1ea41d18-7010-42c0-932f-99d135efdb73", - "port": "out3" - }, - "target": { - "block": "b9d764ea-538a-420f-a8d3-45af7a8e30a2", - "port": "in" - }, - "vertices": [ - { - "x": 712, - "y": 176 - } - ] - }, - { - "source": { - "block": "1ea41d18-7010-42c0-932f-99d135efdb73", - "port": "out4" - }, - "target": { - "block": "1b8510ac-d723-4226-bf28-c7329d0f73fb", - "port": "in" - } - }, - { - "source": { - "block": "1ea41d18-7010-42c0-932f-99d135efdb73", - "port": "out5" - }, - "target": { - "block": "65f31fca-d607-4d5c-82cc-878a93b8e580", - "port": "in" - }, - "vertices": [ - { - "x": 696, - "y": 288 - } - ] - }, - { - "source": { - "block": "1ea41d18-7010-42c0-932f-99d135efdb73", - "port": "out6" - }, - "target": { - "block": "c8fadd68-77e1-47be-a262-b076e878e6fd", - "port": "in" - }, - "vertices": [ - { - "x": 680, - "y": 320 - }, - { - "x": 680, - "y": 360 - }, - { - "x": 680, - "y": 376 - }, - { - "x": 688, - "y": 416 - } - ] - } - ] - }, - "deps": {} -} diff --git a/app/resources/blocks/logic/combinational/hex_7seg_ca.ice b/app/resources/blocks/logic/combinational/hex_7seg_ca.ice new file mode 100644 index 000000000..6dc70db99 --- /dev/null +++ b/app/resources/blocks/logic/combinational/hex_7seg_ca.ice @@ -0,0 +1,286 @@ +{ + "version": "1.0", + "package": { + "name": "Hex 7seg CA", + "version": "1.0.0", + "description": "Display de 7 segmentos. Ánodo común", + "author": "Carlos Diaz", + "image": "%3Csvg%20xmlns=%22http://www.w3.org/2000/svg%22%20id=%22Capa_1%22%20viewBox=%220%200%2035.530029%2051.500018%22%20width=%2235.53%22%20height=%2251.5%22%3E%3Cstyle%20id=%22style4204%22%3E.st0%7Bfill:red%7D.st1%7Bfont-family:'FranklinGothic-DemiCond'%7D.st2%7Bfont-size:9.5149px%7D%3C/style%3E%3Cg%20id=%22g4206%22%20transform=%22matrix(.67676%200%200%20.67676%20-11.031%20-3.52)%22%3E%3Cpath%20class=%22st0%22%20id=%22polygon4208%22%20fill=%22red%22%20d=%22M27.7%2020v.1h25.7V20l3-3.2-2.5-2.4H28.2v.1-.1l-3.1%203.3%202.6%202.3z%22/%3E%3Cpath%20class=%22st0%22%20id=%22polygon4210%22%20fill=%22red%22%20d=%22M25.1%2050.4v.1h25.7v-.1l3-3.2-2.6-2.3v-.1H25.5v.1-.1l-3%203.3%202.5%202.3z%22/%3E%3Cpath%20class=%22st0%22%20id=%22polygon4212%22%20fill=%22red%22%20d=%22M48.9%2080.8v.1H23.2v-.1l-3-3.2%202.5-2.3v-.1h25.7v.1l3.1%203.2-2.6%202.4z%22/%3E%3Cpath%20class=%22st0%22%20id=%22polygon4214%22%20fill=%22red%22%20d=%22M19%2044.6l2.3%202.3%203.1-3.2%202-22.8-2.3-2.3-3.3%203.1z%22/%3E%3Cpath%20class=%22st0%22%20id=%22polygon4216%22%20fill=%22red%22%20d=%22M52.7%2043.9l2.3%202.4%203.1-3.2%202-22.8-2.3-2.3-3.3%203.1z%22/%3E%3Cpath%20class=%22st0%22%20id=%22polygon4218%22%20fill=%22red%22%20d=%22M16.3%2075.2l2.2%202.4%203.2-3.2%202-22.8-2.3-2.3-3.3%203.1z%22/%3E%3Cpath%20class=%22st0%22%20id=%22polygon4220%22%20fill=%22red%22%20d=%22M49.9%2074.6l2.3%202.4%203.2-3.2%202-22.8-2.3-2.3-3.4%203.1z%22/%3E%3Ccircle%20class=%22st0%22%20cx=%2265.1%22%20cy=%2277.6%22%20r=%223.7%22%20id=%22circle4222%22%20fill=%22red%22/%3E%3C/g%3E%3Ctext%20class=%22st0%20st1%20st2%22%20id=%22text4224%22%20x=%223.502%22%20y=%223.377%22%20font-size=%223.642%22%20font-family=%22FranklinGothic-DemiCond%22%20fill=%22red%22%3E%3Ctspan%20style=%22-inkscape-font-specification:sans-serif%22%20id=%22tspan4204%22%20font-family=%22sans-serif%22%20font-weight=%22400%22%20font-size=%223.75%22%3EANODO%20COM%C3%9AN%3C/tspan%3E%3C/text%3E%3C/svg%3E" + }, + "design": { + "board": "icezum", + "graph": { + "blocks": [ + { + "id": "8b73e273-3603-443a-b952-0ab9ad826a96", + "type": "basic.output", + "data": { + "label": "a" + }, + "position": { + "x": 1016, + "y": 368 + } + }, + { + "id": "f2fce5fa-be07-46fe-bee1-bb2a497fe747", + "type": "basic.output", + "data": { + "label": "b" + }, + "position": { + "x": 1016, + "y": 448 + } + }, + { + "id": "16e44a6a-853a-4264-9e9d-2269827ed136", + "type": "basic.input", + "data": { + "label": "h0" + }, + "position": { + "x": 312, + "y": 488 + } + }, + { + "id": "1d9b0829-1b10-4495-ae33-08792225f68e", + "type": "basic.code", + "data": { + "code": "// Ánodo común\n// gfe_dcba\nlocalparam BCD_0 = 7'b011_1111,\n BCD_1 = 7'b000_0110,\n BCD_2 = 7'b101_1011,\n BCD_3 = 7'b100_1111,\n BCD_4 = 7'b110_0110,\n BCD_5 = 7'b110_1101,\n BCD_6 = 7'b111_1101,\n BCD_7 = 7'b000_0111,\n BCD_8 = 7'b111_1111,\n BCD_9 = 7'b110_1111,\n BCD_A = 7'b111_0111,\n BCD_B = 7'b111_1100,\n BCD_C = 7'b011_1001,\n BCD_D = 7'b101_1110,\n BCD_E = 7'b111_1001,\n BCD_F = 7'b111_0001;\n\nreg [6:0] _o;\n\nalways @(*)\nbegin\n\n case({h3, h2, h1, h0})\n 4'h0: _o <= BCD_0;\n 4'h1: _o <= BCD_1;\n 4'h2: _o <= BCD_2;\n 4'h3: _o <= BCD_3;\n 4'h4: _o <= BCD_4;\n 4'h5: _o <= BCD_5;\n 4'h6: _o <= BCD_6;\n 4'h7: _o <= BCD_7;\n 4'h8: _o <= BCD_8;\n 4'h9: _o <= BCD_9;\n 4'hA: _o <= BCD_A;\n 4'hB: _o <= BCD_B;\n 4'hC: _o <= BCD_C;\n 4'hD: _o <= BCD_D;\n 4'hE: _o <= BCD_E;\n 4'hF: _o <= BCD_F;\n default: _o <= 0;\n endcase\nend\n\nassign {g, f, e, d, c, b, a} = ~_o;", + "ports": { + "in": [ + "h0", + "h1", + "h2", + "h3" + ], + "out": [ + "a", + "b", + "c", + "d", + "e", + "f", + "g" + ] + } + }, + "position": { + "x": 496, + "y": 512 + } + }, + { + "id": "bf0ea22e-3ac2-4756-87d5-020a6ea6a1a8", + "type": "basic.output", + "data": { + "label": "c" + }, + "position": { + "x": 1016, + "y": 528 + } + }, + { + "id": "9cdbdf9f-f086-4427-9719-e13470658d97", + "type": "basic.input", + "data": { + "label": "h1" + }, + "position": { + "x": 312, + "y": 568 + } + }, + { + "id": "4687e984-3f19-44d7-baee-ca89513f8f1a", + "type": "basic.output", + "data": { + "label": "d" + }, + "position": { + "x": 1016, + "y": 608 + } + }, + { + "id": "f40ab7a8-10e5-4e7f-94f9-cefd697d5d40", + "type": "basic.input", + "data": { + "label": "h2" + }, + "position": { + "x": 312, + "y": 648 + } + }, + { + "id": "1691b072-9102-4986-a900-fefd1a5a7b9e", + "type": "basic.output", + "data": { + "label": "e" + }, + "position": { + "x": 1016, + "y": 688 + } + }, + { + "id": "2d774807-3ec8-492c-98e2-f1c9da8d68ff", + "type": "basic.input", + "data": { + "label": "h3" + }, + "position": { + "x": 312, + "y": 728 + } + }, + { + "id": "7c14afe7-1ac0-4394-b38e-fa8a00ffa21c", + "type": "basic.output", + "data": { + "label": "f" + }, + "position": { + "x": 1016, + "y": 768 + } + }, + { + "id": "2565c42b-00b0-4b1d-92a4-66c715834b33", + "type": "basic.output", + "data": { + "label": "g" + }, + "position": { + "x": 1016, + "y": 840 + } + } + ], + "wires": [ + { + "source": { + "block": "16e44a6a-853a-4264-9e9d-2269827ed136", + "port": "out" + }, + "target": { + "block": "1d9b0829-1b10-4495-ae33-08792225f68e", + "port": "h0" + } + }, + { + "source": { + "block": "9cdbdf9f-f086-4427-9719-e13470658d97", + "port": "out" + }, + "target": { + "block": "1d9b0829-1b10-4495-ae33-08792225f68e", + "port": "h1" + } + }, + { + "source": { + "block": "f40ab7a8-10e5-4e7f-94f9-cefd697d5d40", + "port": "out" + }, + "target": { + "block": "1d9b0829-1b10-4495-ae33-08792225f68e", + "port": "h2" + } + }, + { + "source": { + "block": "2d774807-3ec8-492c-98e2-f1c9da8d68ff", + "port": "out" + }, + "target": { + "block": "1d9b0829-1b10-4495-ae33-08792225f68e", + "port": "h3" + } + }, + { + "source": { + "block": "1d9b0829-1b10-4495-ae33-08792225f68e", + "port": "d" + }, + "target": { + "block": "4687e984-3f19-44d7-baee-ca89513f8f1a", + "port": "in" + } + }, + { + "source": { + "block": "1d9b0829-1b10-4495-ae33-08792225f68e", + "port": "c" + }, + "target": { + "block": "bf0ea22e-3ac2-4756-87d5-020a6ea6a1a8", + "port": "in" + } + }, + { + "source": { + "block": "1d9b0829-1b10-4495-ae33-08792225f68e", + "port": "b" + }, + "target": { + "block": "f2fce5fa-be07-46fe-bee1-bb2a497fe747", + "port": "in" + } + }, + { + "source": { + "block": "1d9b0829-1b10-4495-ae33-08792225f68e", + "port": "a" + }, + "target": { + "block": "8b73e273-3603-443a-b952-0ab9ad826a96", + "port": "in" + } + }, + { + "source": { + "block": "1d9b0829-1b10-4495-ae33-08792225f68e", + "port": "e" + }, + "target": { + "block": "1691b072-9102-4986-a900-fefd1a5a7b9e", + "port": "in" + } + }, + { + "source": { + "block": "1d9b0829-1b10-4495-ae33-08792225f68e", + "port": "f" + }, + "target": { + "block": "7c14afe7-1ac0-4394-b38e-fa8a00ffa21c", + "port": "in" + } + }, + { + "source": { + "block": "1d9b0829-1b10-4495-ae33-08792225f68e", + "port": "g" + }, + "target": { + "block": "2565c42b-00b0-4b1d-92a4-66c715834b33", + "port": "in" + } + } + ] + }, + "deps": {}, + "state": { + "pan": { + "x": -155.98941303266986, + "y": -230.62665026580393 + }, + "zoom": 0.7823535799980164 + } + } +} diff --git a/app/resources/blocks/logic/combinational/hex_7seg_ca.iceb b/app/resources/blocks/logic/combinational/hex_7seg_ca.iceb deleted file mode 100644 index ea53c99c8..000000000 --- a/app/resources/blocks/logic/combinational/hex_7seg_ca.iceb +++ /dev/null @@ -1,276 +0,0 @@ -{ - "image": "resources/images/7segmentos_ANODO.svg", - "state": { - "pan": { - "x": -152.07320110504, - "y": -209.21075900090992 - }, - "zoom": 0.7373584520604582 - }, - "graph": { - "blocks": [ - { - "id": "8b73e273-3603-443a-b952-0ab9ad826a96", - "type": "basic.output", - "data": { - "label": "a" - }, - "position": { - "x": 1016, - "y": 368 - } - }, - { - "id": "f2fce5fa-be07-46fe-bee1-bb2a497fe747", - "type": "basic.output", - "data": { - "label": "b" - }, - "position": { - "x": 1016, - "y": 448 - } - }, - { - "id": "bf0ea22e-3ac2-4756-87d5-020a6ea6a1a8", - "type": "basic.output", - "data": { - "label": "c" - }, - "position": { - "x": 1016, - "y": 528 - } - }, - { - "id": "4687e984-3f19-44d7-baee-ca89513f8f1a", - "type": "basic.output", - "data": { - "label": "d" - }, - "position": { - "x": 1016, - "y": 608 - } - }, - { - "id": "1691b072-9102-4986-a900-fefd1a5a7b9e", - "type": "basic.output", - "data": { - "label": "e" - }, - "position": { - "x": 1016, - "y": 688 - } - }, - { - "id": "7c14afe7-1ac0-4394-b38e-fa8a00ffa21c", - "type": "basic.output", - "data": { - "label": "f" - }, - "position": { - "x": 1016, - "y": 768 - } - }, - { - "id": "2565c42b-00b0-4b1d-92a4-66c715834b33", - "type": "basic.output", - "data": { - "label": "g" - }, - "position": { - "x": 1016, - "y": 840 - } - }, - { - "id": "16e44a6a-853a-4264-9e9d-2269827ed136", - "type": "basic.input", - "data": { - "label": "h0" - }, - "position": { - "x": 312, - "y": 488 - } - }, - { - "id": "9cdbdf9f-f086-4427-9719-e13470658d97", - "type": "basic.input", - "data": { - "label": "h1" - }, - "position": { - "x": 312, - "y": 568 - } - }, - { - "id": "f40ab7a8-10e5-4e7f-94f9-cefd697d5d40", - "type": "basic.input", - "data": { - "label": "h2" - }, - "position": { - "x": 312, - "y": 648 - } - }, - { - "id": "2d774807-3ec8-492c-98e2-f1c9da8d68ff", - "type": "basic.input", - "data": { - "label": "h3" - }, - "position": { - "x": 312, - "y": 728 - } - }, - { - "id": "1d9b0829-1b10-4495-ae33-08792225f68e", - "type": "basic.code", - "data": { - "code": "// Catodo común\n// gfe_dcba\nlocalparam BCD_0 = 7'b011_1111,\n BCD_1 = 7'b000_0110,\n BCD_2 = 7'b101_1011,\n BCD_3 = 7'b100_1111,\n BCD_4 = 7'b110_0110,\n BCD_5 = 7'b110_1101,\n BCD_6 = 7'b111_1101,\n BCD_7 = 7'b000_0111,\n BCD_8 = 7'b111_1111,\n BCD_9 = 7'b110_1111,\n BCD_A = 7'b111_0111,\n BCD_B = 7'b111_1100,\n BCD_C = 7'b011_1001,\n BCD_D = 7'b101_1110,\n BCD_E = 7'b111_1001,\n BCD_F = 7'b111_0001;\n\nreg [6:0] _o;\n\nalways @(*)\nbegin\n\n case({h3, h2, h1, h0})\n 4'h0: _o <= BCD_0;\n 4'h1: _o <= BCD_1;\n 4'h2: _o <= BCD_2;\n 4'h3: _o <= BCD_3;\n 4'h4: _o <= BCD_4;\n 4'h5: _o <= BCD_5;\n 4'h6: _o <= BCD_6;\n 4'h7: _o <= BCD_7;\n 4'h8: _o <= BCD_8;\n 4'h9: _o <= BCD_9;\n 4'hA: _o <= BCD_A;\n 4'hB: _o <= BCD_B;\n 4'hC: _o <= BCD_C;\n 4'hD: _o <= BCD_D;\n 4'hE: _o <= BCD_E;\n 4'hF: _o <= BCD_F;\n default: _o <= 0;\n endcase\nend\n\nassign {g, f, e, d, c, b, a} = ~_o;", - "ports": { - "in": [ - "h0", - "h1", - "h2", - "h3" - ], - "out": [ - "a", - "b", - "c", - "d", - "e", - "f", - "g" - ] - } - }, - "position": { - "x": 496, - "y": 512 - } - } - ], - "wires": [ - { - "source": { - "block": "16e44a6a-853a-4264-9e9d-2269827ed136", - "port": "out" - }, - "target": { - "block": "1d9b0829-1b10-4495-ae33-08792225f68e", - "port": "h0" - } - }, - { - "source": { - "block": "9cdbdf9f-f086-4427-9719-e13470658d97", - "port": "out" - }, - "target": { - "block": "1d9b0829-1b10-4495-ae33-08792225f68e", - "port": "h1" - } - }, - { - "source": { - "block": "f40ab7a8-10e5-4e7f-94f9-cefd697d5d40", - "port": "out" - }, - "target": { - "block": "1d9b0829-1b10-4495-ae33-08792225f68e", - "port": "h2" - } - }, - { - "source": { - "block": "2d774807-3ec8-492c-98e2-f1c9da8d68ff", - "port": "out" - }, - "target": { - "block": "1d9b0829-1b10-4495-ae33-08792225f68e", - "port": "h3" - } - }, - { - "source": { - "block": "1d9b0829-1b10-4495-ae33-08792225f68e", - "port": "d" - }, - "target": { - "block": "4687e984-3f19-44d7-baee-ca89513f8f1a", - "port": "in" - } - }, - { - "source": { - "block": "1d9b0829-1b10-4495-ae33-08792225f68e", - "port": "c" - }, - "target": { - "block": "bf0ea22e-3ac2-4756-87d5-020a6ea6a1a8", - "port": "in" - } - }, - { - "source": { - "block": "1d9b0829-1b10-4495-ae33-08792225f68e", - "port": "b" - }, - "target": { - "block": "f2fce5fa-be07-46fe-bee1-bb2a497fe747", - "port": "in" - } - }, - { - "source": { - "block": "1d9b0829-1b10-4495-ae33-08792225f68e", - "port": "a" - }, - "target": { - "block": "8b73e273-3603-443a-b952-0ab9ad826a96", - "port": "in" - } - }, - { - "source": { - "block": "1d9b0829-1b10-4495-ae33-08792225f68e", - "port": "e" - }, - "target": { - "block": "1691b072-9102-4986-a900-fefd1a5a7b9e", - "port": "in" - } - }, - { - "source": { - "block": "1d9b0829-1b10-4495-ae33-08792225f68e", - "port": "f" - }, - "target": { - "block": "7c14afe7-1ac0-4394-b38e-fa8a00ffa21c", - "port": "in" - } - }, - { - "source": { - "block": "1d9b0829-1b10-4495-ae33-08792225f68e", - "port": "g" - }, - "target": { - "block": "2565c42b-00b0-4b1d-92a4-66c715834b33", - "port": "in" - } - } - ] - }, - "deps": {} -} diff --git a/app/resources/blocks/logic/combinational/hex_7seg_cc.ice b/app/resources/blocks/logic/combinational/hex_7seg_cc.ice new file mode 100644 index 000000000..2aa29a892 --- /dev/null +++ b/app/resources/blocks/logic/combinational/hex_7seg_cc.ice @@ -0,0 +1,286 @@ +{ + "version": "1.0", + "package": { + "name": "Hex 7seg CC", + "version": "1.0.0", + "description": "Display de 7 segmentos. Cátodo común", + "author": "Carlos Diaz", + "image": "%3Csvg%20xmlns=%22http://www.w3.org/2000/svg%22%20id=%22Capa_1%22%20viewBox=%220%200%2035.530029%2051.500018%22%20width=%2235.53%22%20height=%2251.5%22%3E%3Cstyle%20id=%22style4204%22%3E.st0%7Bfill:red%7D.st1%7Bfont-family:'FranklinGothic-DemiCond'%7D.st2%7Bfont-size:9.5149px%7D%3C/style%3E%3Cg%20id=%22g4206%22%20transform=%22matrix(.67676%200%200%20.67676%20-11.031%20-3.52)%22%3E%3Cpath%20class=%22st0%22%20id=%22polygon4208%22%20fill=%22red%22%20d=%22M27.7%2020v.1h25.7V20l3-3.2-2.5-2.4H28.2v.1-.1l-3.1%203.3%202.6%202.3z%22/%3E%3Cpath%20class=%22st0%22%20id=%22polygon4210%22%20fill=%22red%22%20d=%22M25.1%2050.4v.1h25.7v-.1l3-3.2-2.6-2.3v-.1H25.5v.1-.1l-3%203.3%202.5%202.3z%22/%3E%3Cpath%20class=%22st0%22%20id=%22polygon4212%22%20fill=%22red%22%20d=%22M48.9%2080.8v.1H23.2v-.1l-3-3.2%202.5-2.3v-.1h25.7v.1l3.1%203.2-2.6%202.4z%22/%3E%3Cpath%20class=%22st0%22%20id=%22polygon4214%22%20fill=%22red%22%20d=%22M19%2044.6l2.3%202.3%203.1-3.2%202-22.8-2.3-2.3-3.3%203.1z%22/%3E%3Cpath%20class=%22st0%22%20id=%22polygon4216%22%20fill=%22red%22%20d=%22M52.7%2043.9l2.3%202.4%203.1-3.2%202-22.8-2.3-2.3-3.3%203.1z%22/%3E%3Cpath%20class=%22st0%22%20id=%22polygon4218%22%20fill=%22red%22%20d=%22M16.3%2075.2l2.2%202.4%203.2-3.2%202-22.8-2.3-2.3-3.3%203.1z%22/%3E%3Cpath%20class=%22st0%22%20id=%22polygon4220%22%20fill=%22red%22%20d=%22M49.9%2074.6l2.3%202.4%203.2-3.2%202-22.8-2.3-2.3-3.4%203.1z%22/%3E%3Ccircle%20class=%22st0%22%20cx=%2265.1%22%20cy=%2277.6%22%20r=%223.7%22%20id=%22circle4222%22%20fill=%22red%22/%3E%3C/g%3E%3Ctext%20class=%22st0%20st1%20st2%22%20id=%22text4224%22%20x=%222.532%22%20y=%223.377%22%20style=%22-inkscape-font-specification:sans-serif%22%20font-size=%223.642%22%20font-family=%22sans-serif%22%20fill=%22red%22%20font-weight=%22400%22%3E%3Ctspan%20id=%22tspan4814%22%20font-size=%223.75%22%3ECATODO%20COM%C3%9AN%3C/tspan%3E%3C/text%3E%3C/svg%3E" + }, + "design": { + "board": "icezum", + "graph": { + "blocks": [ + { + "id": "8b73e273-3603-443a-b952-0ab9ad826a96", + "type": "basic.output", + "data": { + "label": "a" + }, + "position": { + "x": 1016, + "y": 368 + } + }, + { + "id": "f2fce5fa-be07-46fe-bee1-bb2a497fe747", + "type": "basic.output", + "data": { + "label": "b" + }, + "position": { + "x": 1016, + "y": 448 + } + }, + { + "id": "16e44a6a-853a-4264-9e9d-2269827ed136", + "type": "basic.input", + "data": { + "label": "h0" + }, + "position": { + "x": 312, + "y": 488 + } + }, + { + "id": "1d9b0829-1b10-4495-ae33-08792225f68e", + "type": "basic.code", + "data": { + "code": "// Catodo común\n// gfe_dcba\nlocalparam BCD_0 = 7'b011_1111,\n BCD_1 = 7'b000_0110,\n BCD_2 = 7'b101_1011,\n BCD_3 = 7'b100_1111,\n BCD_4 = 7'b110_0110,\n BCD_5 = 7'b110_1101,\n BCD_6 = 7'b111_1101,\n BCD_7 = 7'b000_0111,\n BCD_8 = 7'b111_1111,\n BCD_9 = 7'b110_1111,\n BCD_A = 7'b111_0111,\n BCD_B = 7'b111_1100,\n BCD_C = 7'b011_1001,\n BCD_D = 7'b101_1110,\n BCD_E = 7'b111_1001,\n BCD_F = 7'b111_0001;\n\nreg [6:0] _o;\n\nalways @(*)\nbegin\n\n case({h3, h2, h1, h0})\n 4'h0: _o <= BCD_0;\n 4'h1: _o <= BCD_1;\n 4'h2: _o <= BCD_2;\n 4'h3: _o <= BCD_3;\n 4'h4: _o <= BCD_4;\n 4'h5: _o <= BCD_5;\n 4'h6: _o <= BCD_6;\n 4'h7: _o <= BCD_7;\n 4'h8: _o <= BCD_8;\n 4'h9: _o <= BCD_9;\n 4'hA: _o <= BCD_A;\n 4'hB: _o <= BCD_B;\n 4'hC: _o <= BCD_C;\n 4'hD: _o <= BCD_D;\n 4'hE: _o <= BCD_E;\n 4'hF: _o <= BCD_F;\n default: _o <= 0;\n endcase\nend\n\nassign {g, f, e, d, c, b, a} = _o;", + "ports": { + "in": [ + "h0", + "h1", + "h2", + "h3" + ], + "out": [ + "a", + "b", + "c", + "d", + "e", + "f", + "g" + ] + } + }, + "position": { + "x": 496, + "y": 512 + } + }, + { + "id": "bf0ea22e-3ac2-4756-87d5-020a6ea6a1a8", + "type": "basic.output", + "data": { + "label": "c" + }, + "position": { + "x": 1016, + "y": 528 + } + }, + { + "id": "9cdbdf9f-f086-4427-9719-e13470658d97", + "type": "basic.input", + "data": { + "label": "h1" + }, + "position": { + "x": 312, + "y": 568 + } + }, + { + "id": "4687e984-3f19-44d7-baee-ca89513f8f1a", + "type": "basic.output", + "data": { + "label": "d" + }, + "position": { + "x": 1016, + "y": 608 + } + }, + { + "id": "f40ab7a8-10e5-4e7f-94f9-cefd697d5d40", + "type": "basic.input", + "data": { + "label": "h2" + }, + "position": { + "x": 312, + "y": 648 + } + }, + { + "id": "1691b072-9102-4986-a900-fefd1a5a7b9e", + "type": "basic.output", + "data": { + "label": "e" + }, + "position": { + "x": 1016, + "y": 688 + } + }, + { + "id": "2d774807-3ec8-492c-98e2-f1c9da8d68ff", + "type": "basic.input", + "data": { + "label": "h3" + }, + "position": { + "x": 312, + "y": 728 + } + }, + { + "id": "7c14afe7-1ac0-4394-b38e-fa8a00ffa21c", + "type": "basic.output", + "data": { + "label": "f" + }, + "position": { + "x": 1016, + "y": 768 + } + }, + { + "id": "2565c42b-00b0-4b1d-92a4-66c715834b33", + "type": "basic.output", + "data": { + "label": "g" + }, + "position": { + "x": 1016, + "y": 840 + } + } + ], + "wires": [ + { + "source": { + "block": "16e44a6a-853a-4264-9e9d-2269827ed136", + "port": "out" + }, + "target": { + "block": "1d9b0829-1b10-4495-ae33-08792225f68e", + "port": "h0" + } + }, + { + "source": { + "block": "9cdbdf9f-f086-4427-9719-e13470658d97", + "port": "out" + }, + "target": { + "block": "1d9b0829-1b10-4495-ae33-08792225f68e", + "port": "h1" + } + }, + { + "source": { + "block": "f40ab7a8-10e5-4e7f-94f9-cefd697d5d40", + "port": "out" + }, + "target": { + "block": "1d9b0829-1b10-4495-ae33-08792225f68e", + "port": "h2" + } + }, + { + "source": { + "block": "2d774807-3ec8-492c-98e2-f1c9da8d68ff", + "port": "out" + }, + "target": { + "block": "1d9b0829-1b10-4495-ae33-08792225f68e", + "port": "h3" + } + }, + { + "source": { + "block": "1d9b0829-1b10-4495-ae33-08792225f68e", + "port": "d" + }, + "target": { + "block": "4687e984-3f19-44d7-baee-ca89513f8f1a", + "port": "in" + } + }, + { + "source": { + "block": "1d9b0829-1b10-4495-ae33-08792225f68e", + "port": "c" + }, + "target": { + "block": "bf0ea22e-3ac2-4756-87d5-020a6ea6a1a8", + "port": "in" + } + }, + { + "source": { + "block": "1d9b0829-1b10-4495-ae33-08792225f68e", + "port": "b" + }, + "target": { + "block": "f2fce5fa-be07-46fe-bee1-bb2a497fe747", + "port": "in" + } + }, + { + "source": { + "block": "1d9b0829-1b10-4495-ae33-08792225f68e", + "port": "a" + }, + "target": { + "block": "8b73e273-3603-443a-b952-0ab9ad826a96", + "port": "in" + } + }, + { + "source": { + "block": "1d9b0829-1b10-4495-ae33-08792225f68e", + "port": "e" + }, + "target": { + "block": "1691b072-9102-4986-a900-fefd1a5a7b9e", + "port": "in" + } + }, + { + "source": { + "block": "1d9b0829-1b10-4495-ae33-08792225f68e", + "port": "f" + }, + "target": { + "block": "7c14afe7-1ac0-4394-b38e-fa8a00ffa21c", + "port": "in" + } + }, + { + "source": { + "block": "1d9b0829-1b10-4495-ae33-08792225f68e", + "port": "g" + }, + "target": { + "block": "2565c42b-00b0-4b1d-92a4-66c715834b33", + "port": "in" + } + } + ] + }, + "deps": {}, + "state": { + "pan": { + "x": -152.07320110504, + "y": -209.21075900090992 + }, + "zoom": 0.7373584508895874 + } + } +} \ No newline at end of file diff --git a/app/resources/blocks/logic/combinational/hex_7seg_cc.iceb b/app/resources/blocks/logic/combinational/hex_7seg_cc.iceb deleted file mode 100644 index 33f6b7c7f..000000000 --- a/app/resources/blocks/logic/combinational/hex_7seg_cc.iceb +++ /dev/null @@ -1,276 +0,0 @@ -{ - "image": "resources/images/7segmentos_CATODO.svg", - "state": { - "pan": { - "x": -152.07320110504, - "y": -209.21075900090992 - }, - "zoom": 0.7373584520604582 - }, - "graph": { - "blocks": [ - { - "id": "8b73e273-3603-443a-b952-0ab9ad826a96", - "type": "basic.output", - "data": { - "label": "a" - }, - "position": { - "x": 1016, - "y": 368 - } - }, - { - "id": "f2fce5fa-be07-46fe-bee1-bb2a497fe747", - "type": "basic.output", - "data": { - "label": "b" - }, - "position": { - "x": 1016, - "y": 448 - } - }, - { - "id": "bf0ea22e-3ac2-4756-87d5-020a6ea6a1a8", - "type": "basic.output", - "data": { - "label": "c" - }, - "position": { - "x": 1016, - "y": 528 - } - }, - { - "id": "4687e984-3f19-44d7-baee-ca89513f8f1a", - "type": "basic.output", - "data": { - "label": "d" - }, - "position": { - "x": 1016, - "y": 608 - } - }, - { - "id": "1691b072-9102-4986-a900-fefd1a5a7b9e", - "type": "basic.output", - "data": { - "label": "e" - }, - "position": { - "x": 1016, - "y": 688 - } - }, - { - "id": "7c14afe7-1ac0-4394-b38e-fa8a00ffa21c", - "type": "basic.output", - "data": { - "label": "f" - }, - "position": { - "x": 1016, - "y": 768 - } - }, - { - "id": "2565c42b-00b0-4b1d-92a4-66c715834b33", - "type": "basic.output", - "data": { - "label": "g" - }, - "position": { - "x": 1016, - "y": 840 - } - }, - { - "id": "16e44a6a-853a-4264-9e9d-2269827ed136", - "type": "basic.input", - "data": { - "label": "h0" - }, - "position": { - "x": 312, - "y": 488 - } - }, - { - "id": "9cdbdf9f-f086-4427-9719-e13470658d97", - "type": "basic.input", - "data": { - "label": "h1" - }, - "position": { - "x": 312, - "y": 568 - } - }, - { - "id": "f40ab7a8-10e5-4e7f-94f9-cefd697d5d40", - "type": "basic.input", - "data": { - "label": "h2" - }, - "position": { - "x": 312, - "y": 648 - } - }, - { - "id": "2d774807-3ec8-492c-98e2-f1c9da8d68ff", - "type": "basic.input", - "data": { - "label": "h3" - }, - "position": { - "x": 312, - "y": 728 - } - }, - { - "id": "1d9b0829-1b10-4495-ae33-08792225f68e", - "type": "basic.code", - "data": { - "code": "// Catodo común\n// gfe_dcba\nlocalparam BCD_0 = 7'b011_1111,\n BCD_1 = 7'b000_0110,\n BCD_2 = 7'b101_1011,\n BCD_3 = 7'b100_1111,\n BCD_4 = 7'b110_0110,\n BCD_5 = 7'b110_1101,\n BCD_6 = 7'b111_1101,\n BCD_7 = 7'b000_0111,\n BCD_8 = 7'b111_1111,\n BCD_9 = 7'b110_1111,\n BCD_A = 7'b111_0111,\n BCD_B = 7'b111_1100,\n BCD_C = 7'b011_1001,\n BCD_D = 7'b101_1110,\n BCD_E = 7'b111_1001,\n BCD_F = 7'b111_0001;\n\nreg [6:0] _o;\n\nalways @(*)\nbegin\n\n case({h3, h2, h1, h0})\n 4'h0: _o <= BCD_0;\n 4'h1: _o <= BCD_1;\n 4'h2: _o <= BCD_2;\n 4'h3: _o <= BCD_3;\n 4'h4: _o <= BCD_4;\n 4'h5: _o <= BCD_5;\n 4'h6: _o <= BCD_6;\n 4'h7: _o <= BCD_7;\n 4'h8: _o <= BCD_8;\n 4'h9: _o <= BCD_9;\n 4'hA: _o <= BCD_A;\n 4'hB: _o <= BCD_B;\n 4'hC: _o <= BCD_C;\n 4'hD: _o <= BCD_D;\n 4'hE: _o <= BCD_E;\n 4'hF: _o <= BCD_F;\n default: _o <= 0;\n endcase\nend\n\nassign {g, f, e, d, c, b, a} = _o;", - "ports": { - "in": [ - "h0", - "h1", - "h2", - "h3" - ], - "out": [ - "a", - "b", - "c", - "d", - "e", - "f", - "g" - ] - } - }, - "position": { - "x": 496, - "y": 512 - } - } - ], - "wires": [ - { - "source": { - "block": "16e44a6a-853a-4264-9e9d-2269827ed136", - "port": "out" - }, - "target": { - "block": "1d9b0829-1b10-4495-ae33-08792225f68e", - "port": "h0" - } - }, - { - "source": { - "block": "9cdbdf9f-f086-4427-9719-e13470658d97", - "port": "out" - }, - "target": { - "block": "1d9b0829-1b10-4495-ae33-08792225f68e", - "port": "h1" - } - }, - { - "source": { - "block": "f40ab7a8-10e5-4e7f-94f9-cefd697d5d40", - "port": "out" - }, - "target": { - "block": "1d9b0829-1b10-4495-ae33-08792225f68e", - "port": "h2" - } - }, - { - "source": { - "block": "2d774807-3ec8-492c-98e2-f1c9da8d68ff", - "port": "out" - }, - "target": { - "block": "1d9b0829-1b10-4495-ae33-08792225f68e", - "port": "h3" - } - }, - { - "source": { - "block": "1d9b0829-1b10-4495-ae33-08792225f68e", - "port": "d" - }, - "target": { - "block": "4687e984-3f19-44d7-baee-ca89513f8f1a", - "port": "in" - } - }, - { - "source": { - "block": "1d9b0829-1b10-4495-ae33-08792225f68e", - "port": "c" - }, - "target": { - "block": "bf0ea22e-3ac2-4756-87d5-020a6ea6a1a8", - "port": "in" - } - }, - { - "source": { - "block": "1d9b0829-1b10-4495-ae33-08792225f68e", - "port": "b" - }, - "target": { - "block": "f2fce5fa-be07-46fe-bee1-bb2a497fe747", - "port": "in" - } - }, - { - "source": { - "block": "1d9b0829-1b10-4495-ae33-08792225f68e", - "port": "a" - }, - "target": { - "block": "8b73e273-3603-443a-b952-0ab9ad826a96", - "port": "in" - } - }, - { - "source": { - "block": "1d9b0829-1b10-4495-ae33-08792225f68e", - "port": "e" - }, - "target": { - "block": "1691b072-9102-4986-a900-fefd1a5a7b9e", - "port": "in" - } - }, - { - "source": { - "block": "1d9b0829-1b10-4495-ae33-08792225f68e", - "port": "f" - }, - "target": { - "block": "7c14afe7-1ac0-4394-b38e-fa8a00ffa21c", - "port": "in" - } - }, - { - "source": { - "block": "1d9b0829-1b10-4495-ae33-08792225f68e", - "port": "g" - }, - "target": { - "block": "2565c42b-00b0-4b1d-92a4-66c715834b33", - "port": "in" - } - } - ] - }, - "deps": {} -} diff --git a/app/resources/blocks/logic/combinational/mux_2_1.ice b/app/resources/blocks/logic/combinational/mux_2_1.ice new file mode 100644 index 000000000..f10bd5288 --- /dev/null +++ b/app/resources/blocks/logic/combinational/mux_2_1.ice @@ -0,0 +1,132 @@ +{ + "version": "1.0", + "package": { + "name": "Mux 2:1", + "version": "1.0.0", + "description": "Multiplexer 2:1", + "author": "Carlos Diaz", + "image": "%3Csvg%20xmlns=%22http://www.w3.org/2000/svg%22%20viewBox=%22-252%20400.9%2090%2040%22%3E%3Cpath%20d=%22M-162%20419.9h-24v-7.2l-41-11.8v9h-25v2h25v18h-25v2h25v9l41-11.7v-7.4h24v-1.9zm-63%2018.5v-35l37%2010.8v13.5l-37%2010.7z%22/%3E%3C/svg%3E" + }, + "design": { + "board": "icezum", + "graph": { + "blocks": [ + { + "id": "ba573190-2ead-411a-a323-1b15a22d46db", + "type": "basic.code", + "data": { + "code": "reg _o;\n\nalways @(*) begin\n case(sel0)\n 0: _o = in0;\n 1: _o = in1;\n default: _o = in0;\n endcase\nend\n\nassign o = _o;", + "ports": { + "in": [ + "in0", + "in1", + "sel0" + ], + "out": [ + "o" + ] + } + }, + "position": { + "x": 312, + "y": 112 + } + }, + { + "id": "c3f73f68-1074-4355-b69f-6a20f7bea3e7", + "type": "basic.input", + "data": { + "label": "i0" + }, + "position": { + "x": 80, + "y": 120 + } + }, + { + "id": "5fb29465-2ee7-45bb-afa4-9a3de895c774", + "type": "basic.input", + "data": { + "label": "i1" + }, + "position": { + "x": 80, + "y": 208 + } + }, + { + "id": "061aa997-2f30-4591-8841-fb6abf5c3b2e", + "type": "basic.output", + "data": { + "label": "o" + }, + "position": { + "x": 792, + "y": 208 + } + }, + { + "id": "67ed5e09-486d-4f97-929f-aefea9c43951", + "type": "basic.input", + "data": { + "label": "sel" + }, + "position": { + "x": 80, + "y": 296 + } + } + ], + "wires": [ + { + "source": { + "block": "ba573190-2ead-411a-a323-1b15a22d46db", + "port": "o" + }, + "target": { + "block": "061aa997-2f30-4591-8841-fb6abf5c3b2e", + "port": "in" + } + }, + { + "source": { + "block": "c3f73f68-1074-4355-b69f-6a20f7bea3e7", + "port": "out" + }, + "target": { + "block": "ba573190-2ead-411a-a323-1b15a22d46db", + "port": "in0" + } + }, + { + "source": { + "block": "5fb29465-2ee7-45bb-afa4-9a3de895c774", + "port": "out" + }, + "target": { + "block": "ba573190-2ead-411a-a323-1b15a22d46db", + "port": "in1" + } + }, + { + "source": { + "block": "67ed5e09-486d-4f97-929f-aefea9c43951", + "port": "out" + }, + "target": { + "block": "ba573190-2ead-411a-a323-1b15a22d46db", + "port": "sel0" + } + } + ] + }, + "deps": {}, + "state": { + "pan": { + "x": -21.03752160981206, + "y": 29.479234822175684 + }, + "zoom": 1.000000703366588 + } + } +} diff --git a/app/resources/blocks/logic/combinational/mux_2_1.iceb b/app/resources/blocks/logic/combinational/mux_2_1.iceb deleted file mode 100644 index eb1a4cc0d..000000000 --- a/app/resources/blocks/logic/combinational/mux_2_1.iceb +++ /dev/null @@ -1,122 +0,0 @@ -{ - "image": "resources/images/mux.svg", - "state": { - "pan": { - "x": -21.03752160981206, - "y": 29.479234822175684 - }, - "zoom": 1.000000683370386 - }, - "graph": { - "blocks": [ - { - "id": "c3f73f68-1074-4355-b69f-6a20f7bea3e7", - "type": "basic.input", - "data": { - "label": "i0" - }, - "position": { - "x": 80, - "y": 120 - } - }, - { - "id": "5fb29465-2ee7-45bb-afa4-9a3de895c774", - "type": "basic.input", - "data": { - "label": "i1" - }, - "position": { - "x": 80, - "y": 208 - } - }, - { - "id": "67ed5e09-486d-4f97-929f-aefea9c43951", - "type": "basic.input", - "data": { - "label": "sel" - }, - "position": { - "x": 80, - "y": 296 - } - }, - { - "id": "061aa997-2f30-4591-8841-fb6abf5c3b2e", - "type": "basic.output", - "data": { - "label": "o" - }, - "position": { - "x": 792, - "y": 208 - } - }, - { - "id": "ba573190-2ead-411a-a323-1b15a22d46db", - "type": "basic.code", - "data": { - "code": "reg _o;\n\nalways @(*) begin\n case(sel0)\n 0: _o = in0;\n 1: _o = in1;\n default: _o = in0;\n endcase\nend\n\nassign o = _o;", - "ports": { - "in": [ - "in0", - "in1", - "sel0" - ], - "out": [ - "o" - ] - } - }, - "position": { - "x": 312, - "y": 112 - } - } - ], - "wires": [ - { - "source": { - "block": "ba573190-2ead-411a-a323-1b15a22d46db", - "port": "o" - }, - "target": { - "block": "061aa997-2f30-4591-8841-fb6abf5c3b2e", - "port": "in" - } - }, - { - "source": { - "block": "c3f73f68-1074-4355-b69f-6a20f7bea3e7", - "port": "out" - }, - "target": { - "block": "ba573190-2ead-411a-a323-1b15a22d46db", - "port": "in0" - } - }, - { - "source": { - "block": "5fb29465-2ee7-45bb-afa4-9a3de895c774", - "port": "out" - }, - "target": { - "block": "ba573190-2ead-411a-a323-1b15a22d46db", - "port": "in1" - } - }, - { - "source": { - "block": "67ed5e09-486d-4f97-929f-aefea9c43951", - "port": "out" - }, - "target": { - "block": "ba573190-2ead-411a-a323-1b15a22d46db", - "port": "sel0" - } - } - ] - }, - "deps": {} -} diff --git a/app/resources/blocks/logic/combinational/mux_4_1.ice b/app/resources/blocks/logic/combinational/mux_4_1.ice new file mode 100644 index 000000000..7480c7521 --- /dev/null +++ b/app/resources/blocks/logic/combinational/mux_4_1.ice @@ -0,0 +1,210 @@ +{ + "version": "1.0", + "package": { + "name": "Mux 4:1", + "version": "1.0.0", + "description": "Multiplexer 4:1", + "author": "Carlos Diaz", + "image": "%3Csvg%20xmlns=%22http://www.w3.org/2000/svg%22%20viewBox=%22-252%20400.9%2090%2040%22%3E%3Cpath%20d=%22M-162%20419.9h-24v-7.2l-41-11.8v9h-25v2h25v18h-25v2h25v9l41-11.7v-7.4h24v-1.9zm-63%2018.5v-35l37%2010.8v13.5l-37%2010.7z%22/%3E%3C/svg%3E" + }, + "design": { + "board": "icezum", + "graph": { + "blocks": [ + { + "id": "c3f73f68-1074-4355-b69f-6a20f7bea3e7", + "type": "basic.input", + "data": { + "label": "i0" + }, + "position": { + "x": 40, + "y": 32 + } + }, + { + "id": "5fb29465-2ee7-45bb-afa4-9a3de895c774", + "type": "basic.input", + "data": { + "label": "i1" + }, + "position": { + "x": 40, + "y": 104 + } + }, + { + "id": "e4eb896c-1039-4d73-aeb0-ce34b933f4c3", + "type": "basic.code", + "data": { + "code": "reg _o;\nwire [1:0] _sel;\n\nassign _sel = {sel1, sel0};\n\nalways @(*) begin\n case(_sel)\n 0: _o = in0;\n 1: _o = in1;\n 2: _o = in2;\n 3: _o = in3;\n default: _o = in0;\n endcase\nend\n\nassign o = _o;", + "ports": { + "in": [ + "in0", + "in1", + "in2", + "in3", + "sel0", + "sel1" + ], + "out": [ + "o" + ] + } + }, + "position": { + "x": 296, + "y": 152 + } + }, + { + "id": "67ed5e09-486d-4f97-929f-aefea9c43951", + "type": "basic.input", + "data": { + "label": "i2" + }, + "position": { + "x": 40, + "y": 184 + } + }, + { + "id": "061aa997-2f30-4591-8841-fb6abf5c3b2e", + "type": "basic.output", + "data": { + "label": "o" + }, + "position": { + "x": 776, + "y": 248 + } + }, + { + "id": "8be9cded-6d06-4b23-b73c-94c7ff311dbc", + "type": "basic.input", + "data": { + "label": "i3" + }, + "position": { + "x": 40, + "y": 256 + } + }, + { + "id": "1b7db016-c89a-4f65-b6f0-0f87c851c077", + "type": "basic.input", + "data": { + "label": "sel0" + }, + "position": { + "x": 40, + "y": 328 + } + }, + { + "id": "a014971e-5470-490b-9058-b4b00f2dd125", + "type": "basic.input", + "data": { + "label": "sel1" + }, + "position": { + "x": 40, + "y": 400 + } + } + ], + "wires": [ + { + "source": { + "block": "e4eb896c-1039-4d73-aeb0-ce34b933f4c3", + "port": "o" + }, + "target": { + "block": "061aa997-2f30-4591-8841-fb6abf5c3b2e", + "port": "in" + } + }, + { + "source": { + "block": "a014971e-5470-490b-9058-b4b00f2dd125", + "port": "out" + }, + "target": { + "block": "e4eb896c-1039-4d73-aeb0-ce34b933f4c3", + "port": "sel1" + } + }, + { + "source": { + "block": "1b7db016-c89a-4f65-b6f0-0f87c851c077", + "port": "out" + }, + "target": { + "block": "e4eb896c-1039-4d73-aeb0-ce34b933f4c3", + "port": "sel0" + } + }, + { + "source": { + "block": "8be9cded-6d06-4b23-b73c-94c7ff311dbc", + "port": "out" + }, + "target": { + "block": "e4eb896c-1039-4d73-aeb0-ce34b933f4c3", + "port": "in3" + } + }, + { + "source": { + "block": "67ed5e09-486d-4f97-929f-aefea9c43951", + "port": "out" + }, + "target": { + "block": "e4eb896c-1039-4d73-aeb0-ce34b933f4c3", + "port": "in2" + }, + "vertices": [ + { + "x": 192, + "y": 248 + } + ] + }, + { + "source": { + "block": "5fb29465-2ee7-45bb-afa4-9a3de895c774", + "port": "out" + }, + "target": { + "block": "e4eb896c-1039-4d73-aeb0-ce34b933f4c3", + "port": "in1" + }, + "vertices": [ + { + "x": 224, + "y": 168 + } + ] + }, + { + "source": { + "block": "c3f73f68-1074-4355-b69f-6a20f7bea3e7", + "port": "out" + }, + "target": { + "block": "e4eb896c-1039-4d73-aeb0-ce34b933f4c3", + "port": "in0" + } + } + ] + }, + "deps": {}, + "state": { + "pan": { + "x": 0, + "y": 0 + }, + "zoom": 0.9999999999994884 + } + } +} \ No newline at end of file diff --git a/app/resources/blocks/logic/combinational/mux_4_1.iceb b/app/resources/blocks/logic/combinational/mux_4_1.iceb deleted file mode 100644 index ac11b104c..000000000 --- a/app/resources/blocks/logic/combinational/mux_4_1.iceb +++ /dev/null @@ -1,200 +0,0 @@ -{ - "image": "resources/images/mux.svg", - "state": { - "pan": { - "x": 0, - "y": 0 - }, - "zoom": 0.9999999735145888 - }, - "graph": { - "blocks": [ - { - "id": "e4eb896c-1039-4d73-aeb0-ce34b933f4c3", - "type": "basic.code", - "data": { - "code": "reg _o;\nwire [1:0] _sel;\n\nassign _sel = {sel1, sel0};\n\nalways @(*) begin\n case(_sel)\n 0: _o = in0;\n 1: _o = in1;\n 2: _o = in2;\n 3: _o = in3;\n default: _o = in0;\n endcase\nend\n\nassign o = _o;", - "ports": { - "in": [ - "in0", - "in1", - "in2", - "in3", - "sel0", - "sel1" - ], - "out": [ - "o" - ] - } - }, - "position": { - "x": 296, - "y": 152 - } - }, - { - "id": "c3f73f68-1074-4355-b69f-6a20f7bea3e7", - "type": "basic.input", - "data": { - "label": "i0" - }, - "position": { - "x": 40, - "y": 32 - } - }, - { - "id": "5fb29465-2ee7-45bb-afa4-9a3de895c774", - "type": "basic.input", - "data": { - "label": "i1" - }, - "position": { - "x": 40, - "y": 104 - } - }, - { - "id": "67ed5e09-486d-4f97-929f-aefea9c43951", - "type": "basic.input", - "data": { - "label": "i2" - }, - "position": { - "x": 40, - "y": 184 - } - }, - { - "id": "8be9cded-6d06-4b23-b73c-94c7ff311dbc", - "type": "basic.input", - "data": { - "label": "i3" - }, - "position": { - "x": 40, - "y": 256 - } - }, - { - "id": "1b7db016-c89a-4f65-b6f0-0f87c851c077", - "type": "basic.input", - "data": { - "label": "sel0" - }, - "position": { - "x": 40, - "y": 328 - } - }, - { - "id": "a014971e-5470-490b-9058-b4b00f2dd125", - "type": "basic.input", - "data": { - "label": "sel1" - }, - "position": { - "x": 40, - "y": 400 - } - }, - { - "id": "061aa997-2f30-4591-8841-fb6abf5c3b2e", - "type": "basic.output", - "data": { - "label": "o" - }, - "position": { - "x": 776, - "y": 248 - } - } - ], - "wires": [ - { - "source": { - "block": "e4eb896c-1039-4d73-aeb0-ce34b933f4c3", - "port": "o" - }, - "target": { - "block": "061aa997-2f30-4591-8841-fb6abf5c3b2e", - "port": "in" - } - }, - { - "source": { - "block": "a014971e-5470-490b-9058-b4b00f2dd125", - "port": "out" - }, - "target": { - "block": "e4eb896c-1039-4d73-aeb0-ce34b933f4c3", - "port": "sel1" - } - }, - { - "source": { - "block": "1b7db016-c89a-4f65-b6f0-0f87c851c077", - "port": "out" - }, - "target": { - "block": "e4eb896c-1039-4d73-aeb0-ce34b933f4c3", - "port": "sel0" - } - }, - { - "source": { - "block": "8be9cded-6d06-4b23-b73c-94c7ff311dbc", - "port": "out" - }, - "target": { - "block": "e4eb896c-1039-4d73-aeb0-ce34b933f4c3", - "port": "in3" - } - }, - { - "source": { - "block": "67ed5e09-486d-4f97-929f-aefea9c43951", - "port": "out" - }, - "target": { - "block": "e4eb896c-1039-4d73-aeb0-ce34b933f4c3", - "port": "in2" - }, - "vertices": [ - { - "x": 192, - "y": 248 - } - ] - }, - { - "source": { - "block": "5fb29465-2ee7-45bb-afa4-9a3de895c774", - "port": "out" - }, - "target": { - "block": "e4eb896c-1039-4d73-aeb0-ce34b933f4c3", - "port": "in1" - }, - "vertices": [ - { - "x": 224, - "y": 168 - } - ] - }, - { - "source": { - "block": "c3f73f68-1074-4355-b69f-6a20f7bea3e7", - "port": "out" - }, - "target": { - "block": "e4eb896c-1039-4d73-aeb0-ce34b933f4c3", - "port": "in0" - } - } - ] - }, - "deps": {} -} diff --git a/app/resources/blocks/logic/gate/and.ice b/app/resources/blocks/logic/gate/and.ice new file mode 100644 index 000000000..64b081da8 --- /dev/null +++ b/app/resources/blocks/logic/gate/and.ice @@ -0,0 +1,110 @@ +{ + "version": "1.0", + "package": { + "name": "AND", + "version": "1.0.0", + "description": "AND logic gate", + "author": "Jesús Arroyo", + "image": "%3Csvg%20xmlns=%22http://www.w3.org/2000/svg%22%20viewBox=%22-252%20400.9%2090%2040%22%3E%3Cpath%20d=%22M-252%20409.9h26v2h-26zM-252%20429.9h27v2h-27z%22/%3E%3Cpath%20d=%22M-227%20400.9v39.9h20.4c11.3%200%2020-9%2020-20s-8.7-20-20-20H-227zm2.9%202.8h17.6c9.8%200%2016.7%207.6%2016.7%2017.1%200%209.5-7.4%2017.1-17.1%2017.1H-224c-.1.1-.1-34.2-.1-34.2z%22/%3E%3Cpath%20d=%22M-187.911%20419.9H-162v2h-25.911z%22/%3E%3C/svg%3E" + }, + "design": { + "board": "icezum", + "graph": { + "blocks": [ + { + "id": "00925b04-5004-4307-a737-fa4e97c8b6ab", + "type": "basic.code", + "data": { + "code": "// AND logic gate\n\nassign c = a & b;", + "ports": { + "in": [ + "a", + "b" + ], + "out": [ + "c" + ] + } + }, + "position": { + "x": 256, + "y": 48 + } + }, + { + "id": "18c2ebc7-5152-439c-9b3f-851c59bac834", + "type": "basic.input", + "data": { + "label": "" + }, + "position": { + "x": 64, + "y": 80 + } + }, + { + "id": "664caf9e-5f40-4df4-800a-b626af702e62", + "type": "basic.output", + "data": { + "label": "" + }, + "position": { + "x": 752, + "y": 144 + } + }, + { + "id": "97b51945-d716-4b6c-9db9-970d08541249", + "type": "basic.input", + "data": { + "label": "" + }, + "position": { + "x": 64, + "y": 208 + } + } + ], + "wires": [ + { + "source": { + "block": "18c2ebc7-5152-439c-9b3f-851c59bac834", + "port": "out" + }, + "target": { + "block": "00925b04-5004-4307-a737-fa4e97c8b6ab", + "port": "a" + } + }, + { + "source": { + "block": "97b51945-d716-4b6c-9db9-970d08541249", + "port": "out" + }, + "target": { + "block": "00925b04-5004-4307-a737-fa4e97c8b6ab", + "port": "b" + } + }, + { + "source": { + "block": "00925b04-5004-4307-a737-fa4e97c8b6ab", + "port": "c" + }, + "target": { + "block": "664caf9e-5f40-4df4-800a-b626af702e62", + "port": "in" + } + } + ] + }, + "deps": {}, + "state": { + "pan": { + "x": 0, + "y": 0 + }, + "zoom": 0.9999999784900666 + } + } +} diff --git a/app/resources/blocks/logic/gate/and.iceb b/app/resources/blocks/logic/gate/and.iceb deleted file mode 100644 index 0e8cfc3e4..000000000 --- a/app/resources/blocks/logic/gate/and.iceb +++ /dev/null @@ -1,100 +0,0 @@ -{ - "graph": { - "blocks": [ - { - "id": "18c2ebc7-5152-439c-9b3f-851c59bac834", - "type": "basic.input", - "data": { - "label": "" - }, - "position": { - "x": 64, - "y": 80 - } - }, - { - "id": "97b51945-d716-4b6c-9db9-970d08541249", - "type": "basic.input", - "data": { - "label": "" - }, - "position": { - "x": 64, - "y": 208 - } - }, - { - "id": "664caf9e-5f40-4df4-800a-b626af702e62", - "type": "basic.output", - "data": { - "label": "" - }, - "position": { - "x": 752, - "y": 144 - } - }, - { - "id": "00925b04-5004-4307-a737-fa4e97c8b6ab", - "type": "basic.code", - "data": { - "code": "// AND logic gate\n\nassign c = a & b;", - "ports": { - "in": [ - "a", - "b" - ], - "out": [ - "c" - ] - } - }, - "position": { - "x": 256, - "y": 48 - } - } - ], - "wires": [ - { - "source": { - "block": "18c2ebc7-5152-439c-9b3f-851c59bac834", - "port": "out" - }, - "target": { - "block": "00925b04-5004-4307-a737-fa4e97c8b6ab", - "port": "a" - } - }, - { - "source": { - "block": "97b51945-d716-4b6c-9db9-970d08541249", - "port": "out" - }, - "target": { - "block": "00925b04-5004-4307-a737-fa4e97c8b6ab", - "port": "b" - } - }, - { - "source": { - "block": "00925b04-5004-4307-a737-fa4e97c8b6ab", - "port": "c" - }, - "target": { - "block": "664caf9e-5f40-4df4-800a-b626af702e62", - "port": "in" - } - } - ] - }, - "deps": {}, - "image": "resources/images/and.svg", - "state": { - "pan": { - "x": 0, - "y": 0 - }, - "zoom": 1 - } -} diff --git a/app/resources/blocks/logic/gate/nand.ice b/app/resources/blocks/logic/gate/nand.ice new file mode 100644 index 000000000..0d5fe5a31 --- /dev/null +++ b/app/resources/blocks/logic/gate/nand.ice @@ -0,0 +1,110 @@ +{ + "version": "1.0", + "package": { + "name": "NAND", + "version": "1.0.0", + "description": "NAND logic gate", + "author": "Carlos Diaz", + "image": "%3Csvg%20xmlns=%22http://www.w3.org/2000/svg%22%20viewBox=%22-252%20400.9%2090%2040%22%3E%3Cpath%20d=%22M-252%20409.9h26v2h-26zM-252%20429.9h27v2h-27z%22/%3E%3Cpath%20d=%22M-227%20400.9v39.9h20.4c11.3%200%2020-9%2020-20s-8.7-20-20-20H-227zm2.9%202.8h17.6c9.8%200%2016.7%207.6%2016.7%2017.1%200%209.5-7.4%2017.1-17.1%2017.1H-224c-.1.1-.1-34.2-.1-34.2zM-177.3%20419.9h15.3v2h-15.3z%22/%3E%3Cpath%20d=%22M-181.4%20426.3c-2.9%200-5.3-2.4-5.3-5.3s2.4-5.3%205.3-5.3%205.3%202.4%205.3%205.3-2.4%205.3-5.3%205.3zm0-8.6c-1.8%200-3.3%201.5-3.3%203.3%200%201.8%201.5%203.3%203.3%203.3s3.3-1.5%203.3-3.3c0-1.8-1.5-3.3-3.3-3.3z%22/%3E%3C/svg%3E" + }, + "design": { + "board": "icezum", + "graph": { + "blocks": [ + { + "id": "00925b04-5004-4307-a737-fa4e97c8b6ab", + "type": "basic.code", + "data": { + "code": "// NAND logic gate\n\nassign c = ~(a & b);", + "ports": { + "in": [ + "a", + "b" + ], + "out": [ + "c" + ] + } + }, + "position": { + "x": 256, + "y": 48 + } + }, + { + "id": "18c2ebc7-5152-439c-9b3f-851c59bac834", + "type": "basic.input", + "data": { + "label": "" + }, + "position": { + "x": 64, + "y": 80 + } + }, + { + "id": "664caf9e-5f40-4df4-800a-b626af702e62", + "type": "basic.output", + "data": { + "label": "" + }, + "position": { + "x": 752, + "y": 144 + } + }, + { + "id": "97b51945-d716-4b6c-9db9-970d08541249", + "type": "basic.input", + "data": { + "label": "" + }, + "position": { + "x": 64, + "y": 208 + } + } + ], + "wires": [ + { + "source": { + "block": "18c2ebc7-5152-439c-9b3f-851c59bac834", + "port": "out" + }, + "target": { + "block": "00925b04-5004-4307-a737-fa4e97c8b6ab", + "port": "a" + } + }, + { + "source": { + "block": "97b51945-d716-4b6c-9db9-970d08541249", + "port": "out" + }, + "target": { + "block": "00925b04-5004-4307-a737-fa4e97c8b6ab", + "port": "b" + } + }, + { + "source": { + "block": "00925b04-5004-4307-a737-fa4e97c8b6ab", + "port": "c" + }, + "target": { + "block": "664caf9e-5f40-4df4-800a-b626af702e62", + "port": "in" + } + } + ] + }, + "deps": {}, + "state": { + "pan": { + "x": 0, + "y": 0 + }, + "zoom": 1 + } + } +} \ No newline at end of file diff --git a/app/resources/blocks/logic/gate/nand.iceb b/app/resources/blocks/logic/gate/nand.iceb deleted file mode 100644 index 48f695d9a..000000000 --- a/app/resources/blocks/logic/gate/nand.iceb +++ /dev/null @@ -1,100 +0,0 @@ -{ - "graph": { - "blocks": [ - { - "id": "18c2ebc7-5152-439c-9b3f-851c59bac834", - "type": "basic.input", - "data": { - "label": "" - }, - "position": { - "x": 64, - "y": 80 - } - }, - { - "id": "97b51945-d716-4b6c-9db9-970d08541249", - "type": "basic.input", - "data": { - "label": "" - }, - "position": { - "x": 64, - "y": 208 - } - }, - { - "id": "664caf9e-5f40-4df4-800a-b626af702e62", - "type": "basic.output", - "data": { - "label": "" - }, - "position": { - "x": 752, - "y": 144 - } - }, - { - "id": "00925b04-5004-4307-a737-fa4e97c8b6ab", - "type": "basic.code", - "data": { - "code": "// NAND logic gate\n\nassign c = ~(a & b);", - "ports": { - "in": [ - "a", - "b" - ], - "out": [ - "c" - ] - } - }, - "position": { - "x": 256, - "y": 48 - } - } - ], - "wires": [ - { - "source": { - "block": "18c2ebc7-5152-439c-9b3f-851c59bac834", - "port": "out" - }, - "target": { - "block": "00925b04-5004-4307-a737-fa4e97c8b6ab", - "port": "a" - } - }, - { - "source": { - "block": "97b51945-d716-4b6c-9db9-970d08541249", - "port": "out" - }, - "target": { - "block": "00925b04-5004-4307-a737-fa4e97c8b6ab", - "port": "b" - } - }, - { - "source": { - "block": "00925b04-5004-4307-a737-fa4e97c8b6ab", - "port": "c" - }, - "target": { - "block": "664caf9e-5f40-4df4-800a-b626af702e62", - "port": "in" - } - } - ] - }, - "deps": {}, - "image": "resources/images/nand.svg", - "state": { - "pan": { - "x": 0, - "y": 0 - }, - "zoom": 1 - } -} diff --git a/app/resources/blocks/logic/gate/nor.ice b/app/resources/blocks/logic/gate/nor.ice new file mode 100644 index 000000000..1d9f38242 --- /dev/null +++ b/app/resources/blocks/logic/gate/nor.ice @@ -0,0 +1,110 @@ +{ + "version": "1.0", + "package": { + "name": "NOR", + "version": "1.0.0", + "description": "NOR logic gate", + "author": "Carlos Diaz", + "image": "%3Csvg%20xmlns=%22http://www.w3.org/2000/svg%22%20viewBox=%22-252%20400.9%2090%2040%22%3E%3Cpath%20d=%22M-252%20409.9h26v2h-26zM-252%20429.9h27v2h-27zM-177.3%20419.9h15.3v2h-15.3z%22/%3E%3Cpath%20d=%22M-181.4%20426.2c-2.9%200-5.3-2.4-5.3-5.3s2.4-5.3%205.3-5.3%205.3%202.4%205.3%205.3-2.4%205.3-5.3%205.3zm0-8.6c-1.8%200-3.3%201.5-3.3%203.3%200%201.8%201.5%203.3%203.3%203.3s3.3-1.5%203.3-3.3c0-1.8-1.5-3.3-3.3-3.3z%22/%3E%3Cpath%20d=%22M-185.3%20422.6l-.3-2.1.4-1.6c-10.3-17.8-26-18-30.6-18H-233l2%202.4s5.7%207%205.7%2017.6c0%2010.6-5.7%2017.6-5.7%2017.6l-2%202.4h17.2c2.4%200%207.7%200%2013.6-2.4%205.7-2.3%2012-6.9%2017-15.7l-.1-.2zm-18.2%2013.1c-5.4%202.2-9.8%202.2-12.3%202.2H-227c1.9-3.1%204.8-9%204.8-17s-2.9-13.9-4.8-17h11.3c4.7%200%2018.3-.1%2028%2017-4.8%208.4-10.6%2012.7-15.8%2014.8z%22/%3E%3C/svg%3E" + }, + "design": { + "board": "icezum", + "graph": { + "blocks": [ + { + "id": "00925b04-5004-4307-a737-fa4e97c8b6ab", + "type": "basic.code", + "data": { + "code": "// NOR logic gate\n\nassign c = ~(a | b);", + "ports": { + "in": [ + "a", + "b" + ], + "out": [ + "c" + ] + } + }, + "position": { + "x": 256, + "y": 48 + } + }, + { + "id": "18c2ebc7-5152-439c-9b3f-851c59bac834", + "type": "basic.input", + "data": { + "label": "" + }, + "position": { + "x": 64, + "y": 80 + } + }, + { + "id": "664caf9e-5f40-4df4-800a-b626af702e62", + "type": "basic.output", + "data": { + "label": "" + }, + "position": { + "x": 752, + "y": 144 + } + }, + { + "id": "97b51945-d716-4b6c-9db9-970d08541249", + "type": "basic.input", + "data": { + "label": "" + }, + "position": { + "x": 64, + "y": 208 + } + } + ], + "wires": [ + { + "source": { + "block": "18c2ebc7-5152-439c-9b3f-851c59bac834", + "port": "out" + }, + "target": { + "block": "00925b04-5004-4307-a737-fa4e97c8b6ab", + "port": "a" + } + }, + { + "source": { + "block": "97b51945-d716-4b6c-9db9-970d08541249", + "port": "out" + }, + "target": { + "block": "00925b04-5004-4307-a737-fa4e97c8b6ab", + "port": "b" + } + }, + { + "source": { + "block": "00925b04-5004-4307-a737-fa4e97c8b6ab", + "port": "c" + }, + "target": { + "block": "664caf9e-5f40-4df4-800a-b626af702e62", + "port": "in" + } + } + ] + }, + "deps": {}, + "state": { + "pan": { + "x": 0, + "y": 0 + }, + "zoom": 1 + } + } +} diff --git a/app/resources/blocks/logic/gate/nor.iceb b/app/resources/blocks/logic/gate/nor.iceb deleted file mode 100644 index c17336847..000000000 --- a/app/resources/blocks/logic/gate/nor.iceb +++ /dev/null @@ -1,100 +0,0 @@ -{ - "graph": { - "blocks": [ - { - "id": "18c2ebc7-5152-439c-9b3f-851c59bac834", - "type": "basic.input", - "data": { - "label": "" - }, - "position": { - "x": 64, - "y": 80 - } - }, - { - "id": "97b51945-d716-4b6c-9db9-970d08541249", - "type": "basic.input", - "data": { - "label": "" - }, - "position": { - "x": 64, - "y": 208 - } - }, - { - "id": "664caf9e-5f40-4df4-800a-b626af702e62", - "type": "basic.output", - "data": { - "label": "" - }, - "position": { - "x": 752, - "y": 144 - } - }, - { - "id": "00925b04-5004-4307-a737-fa4e97c8b6ab", - "type": "basic.code", - "data": { - "code": "// NOR logic gate\n\nassign c = ~(a | b);", - "ports": { - "in": [ - "a", - "b" - ], - "out": [ - "c" - ] - } - }, - "position": { - "x": 256, - "y": 48 - } - } - ], - "wires": [ - { - "source": { - "block": "18c2ebc7-5152-439c-9b3f-851c59bac834", - "port": "out" - }, - "target": { - "block": "00925b04-5004-4307-a737-fa4e97c8b6ab", - "port": "a" - } - }, - { - "source": { - "block": "97b51945-d716-4b6c-9db9-970d08541249", - "port": "out" - }, - "target": { - "block": "00925b04-5004-4307-a737-fa4e97c8b6ab", - "port": "b" - } - }, - { - "source": { - "block": "00925b04-5004-4307-a737-fa4e97c8b6ab", - "port": "c" - }, - "target": { - "block": "664caf9e-5f40-4df4-800a-b626af702e62", - "port": "in" - } - } - ] - }, - "deps": {}, - "image": "resources/images/nor.svg", - "state": { - "pan": { - "x": 0, - "y": 0 - }, - "zoom": 1 - } -} diff --git a/app/resources/blocks/logic/gate/not.ice b/app/resources/blocks/logic/gate/not.ice new file mode 100644 index 000000000..0586db3bc --- /dev/null +++ b/app/resources/blocks/logic/gate/not.ice @@ -0,0 +1,88 @@ +{ + "version": "1.0", + "package": { + "name": "NOT", + "version": "1.0.0", + "description": "NOT logic gate", + "author": "Jesús Arroyo", + "image": "%3Csvg%20xmlns=%22http://www.w3.org/2000/svg%22%20width=%2291.33%22%20height=%2245.752%22%20version=%221%22%3E%3Cpath%20d=%22M0%2020.446h27v2H0zM70.322%2020.447h15.3v2h-15.3z%22/%3E%3Cpath%20d=%22M66.05%2026.746c-2.9%200-5.3-2.4-5.3-5.3s2.4-5.3%205.3-5.3%205.3%202.4%205.3%205.3-2.4%205.3-5.3%205.3zm0-8.6c-1.8%200-3.3%201.5-3.3%203.3%200%201.8%201.5%203.3%203.3%203.3%201.8%200%203.3-1.5%203.3-3.3%200-1.8-1.5-3.3-3.3-3.3z%22/%3E%3Cpath%20d=%22M25.962%202.563l33.624%2018.883L25.962%2040.33V2.563z%22%20fill=%22none%22%20stroke=%22#000%22%20stroke-width=%223%22/%3E%3C/svg%3E" + }, + "design": { + "board": "icezum", + "graph": { + "blocks": [ + { + "id": "5365ed8c-e5db-4445-938f-8d689830ea5c", + "type": "basic.code", + "data": { + "code": "// NOT logic gate\n\nassign c = ~ a;", + "ports": { + "in": [ + "a" + ], + "out": [ + "c" + ] + } + }, + "position": { + "x": 256, + "y": 48 + } + }, + { + "id": "18c2ebc7-5152-439c-9b3f-851c59bac834", + "type": "basic.input", + "data": { + "label": "" + }, + "position": { + "x": 64, + "y": 144 + } + }, + { + "id": "664caf9e-5f40-4df4-800a-b626af702e62", + "type": "basic.output", + "data": { + "label": "" + }, + "position": { + "x": 752, + "y": 144 + } + } + ], + "wires": [ + { + "source": { + "block": "18c2ebc7-5152-439c-9b3f-851c59bac834", + "port": "out" + }, + "target": { + "block": "5365ed8c-e5db-4445-938f-8d689830ea5c", + "port": "a" + } + }, + { + "source": { + "block": "5365ed8c-e5db-4445-938f-8d689830ea5c", + "port": "c" + }, + "target": { + "block": "664caf9e-5f40-4df4-800a-b626af702e62", + "port": "in" + } + } + ] + }, + "deps": {}, + "state": { + "pan": { + "x": 0, + "y": 0 + }, + "zoom": 1 + } + } +} \ No newline at end of file diff --git a/app/resources/blocks/logic/gate/not.iceb b/app/resources/blocks/logic/gate/not.iceb deleted file mode 100644 index f45c9860c..000000000 --- a/app/resources/blocks/logic/gate/not.iceb +++ /dev/null @@ -1,78 +0,0 @@ -{ - "graph": { - "blocks": [ - { - "id": "18c2ebc7-5152-439c-9b3f-851c59bac834", - "type": "basic.input", - "data": { - "label": "" - }, - "position": { - "x": 64, - "y": 144 - } - }, - { - "id": "664caf9e-5f40-4df4-800a-b626af702e62", - "type": "basic.output", - "data": { - "label": "" - }, - "position": { - "x": 752, - "y": 144 - } - }, - { - "id": "5365ed8c-e5db-4445-938f-8d689830ea5c", - "type": "basic.code", - "data": { - "code": "// NOT logic gate\n\nassign c = ~ a;", - "ports": { - "in": [ - "a" - ], - "out": [ - "c" - ] - } - }, - "position": { - "x": 256, - "y": 48 - } - } - ], - "wires": [ - { - "source": { - "block": "18c2ebc7-5152-439c-9b3f-851c59bac834", - "port": "out" - }, - "target": { - "block": "5365ed8c-e5db-4445-938f-8d689830ea5c", - "port": "a" - } - }, - { - "source": { - "block": "5365ed8c-e5db-4445-938f-8d689830ea5c", - "port": "c" - }, - "target": { - "block": "664caf9e-5f40-4df4-800a-b626af702e62", - "port": "in" - } - } - ] - }, - "deps": {}, - "image": "resources/images/not.svg", - "state": { - "pan": { - "x": 0, - "y": 0 - }, - "zoom": 1 - } -} \ No newline at end of file diff --git a/app/resources/blocks/logic/gate/or.ice b/app/resources/blocks/logic/gate/or.ice new file mode 100644 index 000000000..35c0f1515 --- /dev/null +++ b/app/resources/blocks/logic/gate/or.ice @@ -0,0 +1,110 @@ +{ + "version": "1.0", + "package": { + "name": "OR", + "version": "1.0.0", + "description": "OR logic gate", + "author": "Jesús Arroyo", + "image": "%3Csvg%20xmlns=%22http://www.w3.org/2000/svg%22%20width=%2290%22%20height=%2240%22%20version=%221%22%3E%3Cpath%20d=%22M65%2020h25M26%2010H0M27%2030H0%22%20fill=%22none%22%20stroke=%22#000%22%20stroke-width=%222%22/%3E%3Cpath%20d=%22M19.094%200l2%202.438s5.656%207%205.656%2017.562c0%2010.562-5.656%2017.563-5.656%2017.563l-2%202.437H36.25c2.408%200%207.69.025%2013.625-2.406s12.537-7.344%2017.688-16.875L66.25%2020l1.313-.719C57.258.216%2041.007%200%2036.25%200H19.094zm5.875%203H36.25c4.684%200%2018.287-.13%2027.969%2017-4.767%208.43-10.522%2012.684-15.719%2014.813C43.14%2037.008%2038.658%2037%2036.25%2037H25c1.874-3.108%204.75-9.05%204.75-17%200-7.973-2.909-13.9-4.781-17z%22%20fill-rule=%22evenodd%22/%3E%3C/svg%3E" + }, + "design": { + "board": "icezum", + "graph": { + "blocks": [ + { + "id": "00925b04-5004-4307-a737-fa4e97c8b6ab", + "type": "basic.code", + "data": { + "code": "// OR logic gate\n\nassign c = a | b;", + "ports": { + "in": [ + "a", + "b" + ], + "out": [ + "c" + ] + } + }, + "position": { + "x": 256, + "y": 48 + } + }, + { + "id": "18c2ebc7-5152-439c-9b3f-851c59bac834", + "type": "basic.input", + "data": { + "label": "" + }, + "position": { + "x": 64, + "y": 80 + } + }, + { + "id": "664caf9e-5f40-4df4-800a-b626af702e62", + "type": "basic.output", + "data": { + "label": "" + }, + "position": { + "x": 752, + "y": 144 + } + }, + { + "id": "97b51945-d716-4b6c-9db9-970d08541249", + "type": "basic.input", + "data": { + "label": "" + }, + "position": { + "x": 64, + "y": 208 + } + } + ], + "wires": [ + { + "source": { + "block": "18c2ebc7-5152-439c-9b3f-851c59bac834", + "port": "out" + }, + "target": { + "block": "00925b04-5004-4307-a737-fa4e97c8b6ab", + "port": "a" + } + }, + { + "source": { + "block": "97b51945-d716-4b6c-9db9-970d08541249", + "port": "out" + }, + "target": { + "block": "00925b04-5004-4307-a737-fa4e97c8b6ab", + "port": "b" + } + }, + { + "source": { + "block": "00925b04-5004-4307-a737-fa4e97c8b6ab", + "port": "c" + }, + "target": { + "block": "664caf9e-5f40-4df4-800a-b626af702e62", + "port": "in" + } + } + ] + }, + "deps": {}, + "state": { + "pan": { + "x": 0, + "y": 0 + }, + "zoom": 1 + } + } +} \ No newline at end of file diff --git a/app/resources/blocks/logic/gate/or.iceb b/app/resources/blocks/logic/gate/or.iceb deleted file mode 100644 index cbc8d1b5b..000000000 --- a/app/resources/blocks/logic/gate/or.iceb +++ /dev/null @@ -1,100 +0,0 @@ -{ - "graph": { - "blocks": [ - { - "id": "18c2ebc7-5152-439c-9b3f-851c59bac834", - "type": "basic.input", - "data": { - "label": "" - }, - "position": { - "x": 64, - "y": 80 - } - }, - { - "id": "97b51945-d716-4b6c-9db9-970d08541249", - "type": "basic.input", - "data": { - "label": "" - }, - "position": { - "x": 64, - "y": 208 - } - }, - { - "id": "664caf9e-5f40-4df4-800a-b626af702e62", - "type": "basic.output", - "data": { - "label": "" - }, - "position": { - "x": 752, - "y": 144 - } - }, - { - "id": "00925b04-5004-4307-a737-fa4e97c8b6ab", - "type": "basic.code", - "data": { - "code": "// OR logic gate\n\nassign c = a | b;", - "ports": { - "in": [ - "a", - "b" - ], - "out": [ - "c" - ] - } - }, - "position": { - "x": 256, - "y": 48 - } - } - ], - "wires": [ - { - "source": { - "block": "18c2ebc7-5152-439c-9b3f-851c59bac834", - "port": "out" - }, - "target": { - "block": "00925b04-5004-4307-a737-fa4e97c8b6ab", - "port": "a" - } - }, - { - "source": { - "block": "97b51945-d716-4b6c-9db9-970d08541249", - "port": "out" - }, - "target": { - "block": "00925b04-5004-4307-a737-fa4e97c8b6ab", - "port": "b" - } - }, - { - "source": { - "block": "00925b04-5004-4307-a737-fa4e97c8b6ab", - "port": "c" - }, - "target": { - "block": "664caf9e-5f40-4df4-800a-b626af702e62", - "port": "in" - } - } - ] - }, - "deps": {}, - "image": "resources/images/or.svg", - "state": { - "pan": { - "x": 0, - "y": 0 - }, - "zoom": 1 - } -} \ No newline at end of file diff --git a/app/resources/blocks/logic/gate/xnor.ice b/app/resources/blocks/logic/gate/xnor.ice new file mode 100644 index 000000000..f55df49ff --- /dev/null +++ b/app/resources/blocks/logic/gate/xnor.ice @@ -0,0 +1,110 @@ +{ + "version": "1.0", + "package": { + "name": "XNOR", + "version": "1.0.0", + "description": "XNOR logic gate", + "author": "Carlos Diaz", + "image": "%3Csvg%20xmlns=%22http://www.w3.org/2000/svg%22%20viewBox=%22-252%20400.9%2090%2040%22%3E%3Cpath%20d=%22M-252%20409.9h26v2h-26zM-252%20429.9h27v2h-27zM-177.3%20419.9h15.3v2h-15.3z%22/%3E%3Cpath%20d=%22M-181.4%20426.2c-2.9%200-5.3-2.4-5.3-5.3s2.4-5.3%205.3-5.3%205.3%202.4%205.3%205.3-2.4%205.3-5.3%205.3zm0-8.6c-1.8%200-3.3%201.5-3.3%203.3%200%201.8%201.5%203.3%203.3%203.3s3.3-1.5%203.3-3.3c0-1.8-1.5-3.3-3.3-3.3z%22/%3E%3Cpath%20d=%22M-185.3%20422.6l-.3-2.1.4-1.6c-10.3-17.8-26-18-30.6-18H-233l2%202.4s5.7%207%205.7%2017.6c0%2010.6-5.7%2017.6-5.7%2017.6l-2%202.4h17.2c2.4%200%207.7%200%2013.6-2.4%205.7-2.3%2012-6.9%2017-15.7l-.1-.2zm-18.2%2013.1c-5.4%202.2-9.8%202.2-12.3%202.2H-227c1.9-3.1%204.8-9%204.8-17s-2.9-13.9-4.8-17h11.3c4.7%200%2018.3-.1%2028%2017-4.8%208.4-10.6%2012.7-15.8%2014.8z%22/%3E%3Cpath%20d=%22M-238.3%20440.9h3.6c2.3-3.7%206.5-11.6%206.5-19.8%200-8.5-4.4-16.5-6.8-20.2h-3.6c1.4%202%207.4%2011%207.4%2020.2%200%208.9-5.7%2017.7-7.1%2019.8z%22/%3E%3C/svg%3E" + }, + "design": { + "board": "icezum", + "graph": { + "blocks": [ + { + "id": "00925b04-5004-4307-a737-fa4e97c8b6ab", + "type": "basic.code", + "data": { + "code": "// XNOR logic gate\n\nassign c = ~(a ^ b);", + "ports": { + "in": [ + "a", + "b" + ], + "out": [ + "c" + ] + } + }, + "position": { + "x": 256, + "y": 48 + } + }, + { + "id": "18c2ebc7-5152-439c-9b3f-851c59bac834", + "type": "basic.input", + "data": { + "label": "" + }, + "position": { + "x": 64, + "y": 80 + } + }, + { + "id": "664caf9e-5f40-4df4-800a-b626af702e62", + "type": "basic.output", + "data": { + "label": "" + }, + "position": { + "x": 752, + "y": 144 + } + }, + { + "id": "97b51945-d716-4b6c-9db9-970d08541249", + "type": "basic.input", + "data": { + "label": "" + }, + "position": { + "x": 64, + "y": 208 + } + } + ], + "wires": [ + { + "source": { + "block": "18c2ebc7-5152-439c-9b3f-851c59bac834", + "port": "out" + }, + "target": { + "block": "00925b04-5004-4307-a737-fa4e97c8b6ab", + "port": "a" + } + }, + { + "source": { + "block": "97b51945-d716-4b6c-9db9-970d08541249", + "port": "out" + }, + "target": { + "block": "00925b04-5004-4307-a737-fa4e97c8b6ab", + "port": "b" + } + }, + { + "source": { + "block": "00925b04-5004-4307-a737-fa4e97c8b6ab", + "port": "c" + }, + "target": { + "block": "664caf9e-5f40-4df4-800a-b626af702e62", + "port": "in" + } + } + ] + }, + "deps": {}, + "state": { + "pan": { + "x": 0, + "y": 0 + }, + "zoom": 1 + } + } +} diff --git a/app/resources/blocks/logic/gate/xnor.iceb b/app/resources/blocks/logic/gate/xnor.iceb deleted file mode 100644 index b50a4a821..000000000 --- a/app/resources/blocks/logic/gate/xnor.iceb +++ /dev/null @@ -1,100 +0,0 @@ -{ - "graph": { - "blocks": [ - { - "id": "18c2ebc7-5152-439c-9b3f-851c59bac834", - "type": "basic.input", - "data": { - "label": "" - }, - "position": { - "x": 64, - "y": 80 - } - }, - { - "id": "97b51945-d716-4b6c-9db9-970d08541249", - "type": "basic.input", - "data": { - "label": "" - }, - "position": { - "x": 64, - "y": 208 - } - }, - { - "id": "664caf9e-5f40-4df4-800a-b626af702e62", - "type": "basic.output", - "data": { - "label": "" - }, - "position": { - "x": 752, - "y": 144 - } - }, - { - "id": "00925b04-5004-4307-a737-fa4e97c8b6ab", - "type": "basic.code", - "data": { - "code": "// XNOR logic gate\n\nassign c = ~(a ^ b);", - "ports": { - "in": [ - "a", - "b" - ], - "out": [ - "c" - ] - } - }, - "position": { - "x": 256, - "y": 48 - } - } - ], - "wires": [ - { - "source": { - "block": "18c2ebc7-5152-439c-9b3f-851c59bac834", - "port": "out" - }, - "target": { - "block": "00925b04-5004-4307-a737-fa4e97c8b6ab", - "port": "a" - } - }, - { - "source": { - "block": "97b51945-d716-4b6c-9db9-970d08541249", - "port": "out" - }, - "target": { - "block": "00925b04-5004-4307-a737-fa4e97c8b6ab", - "port": "b" - } - }, - { - "source": { - "block": "00925b04-5004-4307-a737-fa4e97c8b6ab", - "port": "c" - }, - "target": { - "block": "664caf9e-5f40-4df4-800a-b626af702e62", - "port": "in" - } - } - ] - }, - "deps": {}, - "image": "resources/images/xnor.svg", - "state": { - "pan": { - "x": 0, - "y": 0 - }, - "zoom": 1 - } -} diff --git a/app/resources/blocks/logic/gate/xor.ice b/app/resources/blocks/logic/gate/xor.ice new file mode 100644 index 000000000..37e840d56 --- /dev/null +++ b/app/resources/blocks/logic/gate/xor.ice @@ -0,0 +1,110 @@ +{ + "version": "1.0", + "package": { + "name": "XOR", + "version": "1.0.0", + "description": "XOR logic gate", + "author": "Carlos Diaz", + "image": "%3Csvg%20xmlns=%22http://www.w3.org/2000/svg%22%20viewBox=%22-252%20400.9%2090%2040%22%3E%3Cpath%20d=%22M-252%20409.9h26v2h-26zM-252%20429.9h27v2h-27zM-186.5%20419.9h24.5v2h-24.5z%22/%3E%3Cpath%20d=%22M-184.6%20420.9c0-1-.6-2-.6-2-10.3-17.8-26-18-30.6-18H-233l2%202.4s5.7%207%205.7%2017.6c0%2010.6-5.7%2017.6-5.7%2017.6l-2%202.4h17.2c2.4%200%207.7%200%2013.6-2.4%205.7-2.3%2012-6.9%2017-15.7.1%200%20.6-1%20.6-1.9zm-18.9%2014.8c-5.4%202.2-9.8%202.2-12.3%202.2H-227c1.9-3.1%204.8-9%204.8-17s-2.9-13.9-4.8-17h11.3c4.7%200%2018.3-.1%2028%2017-4.8%208.4-10.6%2012.7-15.8%2014.8z%22/%3E%3Cpath%20d=%22M-238.3%20440.9h3.6c2.3-3.7%206.5-11.6%206.5-19.8%200-8.5-4.4-16.5-6.8-20.2h-3.6c1.4%202%207.4%2011%207.4%2020.2%200%208.9-5.7%2017.7-7.1%2019.8z%22/%3E%3C/svg%3E" + }, + "design": { + "board": "icezum", + "graph": { + "blocks": [ + { + "id": "00925b04-5004-4307-a737-fa4e97c8b6ab", + "type": "basic.code", + "data": { + "code": "// XOR logic gate\n\nassign c = a ^ b;", + "ports": { + "in": [ + "a", + "b" + ], + "out": [ + "c" + ] + } + }, + "position": { + "x": 256, + "y": 48 + } + }, + { + "id": "18c2ebc7-5152-439c-9b3f-851c59bac834", + "type": "basic.input", + "data": { + "label": "" + }, + "position": { + "x": 64, + "y": 80 + } + }, + { + "id": "664caf9e-5f40-4df4-800a-b626af702e62", + "type": "basic.output", + "data": { + "label": "" + }, + "position": { + "x": 752, + "y": 144 + } + }, + { + "id": "97b51945-d716-4b6c-9db9-970d08541249", + "type": "basic.input", + "data": { + "label": "" + }, + "position": { + "x": 64, + "y": 208 + } + } + ], + "wires": [ + { + "source": { + "block": "18c2ebc7-5152-439c-9b3f-851c59bac834", + "port": "out" + }, + "target": { + "block": "00925b04-5004-4307-a737-fa4e97c8b6ab", + "port": "a" + } + }, + { + "source": { + "block": "97b51945-d716-4b6c-9db9-970d08541249", + "port": "out" + }, + "target": { + "block": "00925b04-5004-4307-a737-fa4e97c8b6ab", + "port": "b" + } + }, + { + "source": { + "block": "00925b04-5004-4307-a737-fa4e97c8b6ab", + "port": "c" + }, + "target": { + "block": "664caf9e-5f40-4df4-800a-b626af702e62", + "port": "in" + } + } + ] + }, + "deps": {}, + "state": { + "pan": { + "x": 0, + "y": 0 + }, + "zoom": 1 + } + } +} \ No newline at end of file diff --git a/app/resources/blocks/logic/gate/xor.iceb b/app/resources/blocks/logic/gate/xor.iceb deleted file mode 100644 index eba78a403..000000000 --- a/app/resources/blocks/logic/gate/xor.iceb +++ /dev/null @@ -1,100 +0,0 @@ -{ - "graph": { - "blocks": [ - { - "id": "18c2ebc7-5152-439c-9b3f-851c59bac834", - "type": "basic.input", - "data": { - "label": "" - }, - "position": { - "x": 64, - "y": 80 - } - }, - { - "id": "97b51945-d716-4b6c-9db9-970d08541249", - "type": "basic.input", - "data": { - "label": "" - }, - "position": { - "x": 64, - "y": 208 - } - }, - { - "id": "664caf9e-5f40-4df4-800a-b626af702e62", - "type": "basic.output", - "data": { - "label": "" - }, - "position": { - "x": 752, - "y": 144 - } - }, - { - "id": "00925b04-5004-4307-a737-fa4e97c8b6ab", - "type": "basic.code", - "data": { - "code": "// XOR logic gate\n\nassign c = a ^ b;", - "ports": { - "in": [ - "a", - "b" - ], - "out": [ - "c" - ] - } - }, - "position": { - "x": 256, - "y": 48 - } - } - ], - "wires": [ - { - "source": { - "block": "18c2ebc7-5152-439c-9b3f-851c59bac834", - "port": "out" - }, - "target": { - "block": "00925b04-5004-4307-a737-fa4e97c8b6ab", - "port": "a" - } - }, - { - "source": { - "block": "97b51945-d716-4b6c-9db9-970d08541249", - "port": "out" - }, - "target": { - "block": "00925b04-5004-4307-a737-fa4e97c8b6ab", - "port": "b" - } - }, - { - "source": { - "block": "00925b04-5004-4307-a737-fa4e97c8b6ab", - "port": "c" - }, - "target": { - "block": "664caf9e-5f40-4df4-800a-b626af702e62", - "port": "in" - } - } - ] - }, - "deps": {}, - "image": "resources/images/xor.svg", - "state": { - "pan": { - "x": 0, - "y": 0 - }, - "zoom": 1 - } -} diff --git a/app/resources/blocks/logic/sequential/debouncer.ice b/app/resources/blocks/logic/sequential/debouncer.ice new file mode 100644 index 000000000..d28c6ea5c --- /dev/null +++ b/app/resources/blocks/logic/sequential/debouncer.ice @@ -0,0 +1,110 @@ +{ + "version": "1.0", + "package": { + "name": "Debouncer", + "version": "1.0.0", + "description": "Remove the rebound on a mechanical switch", + "author": "Juan González", + "image": "%3Csvg%20xmlns=%22http://www.w3.org/2000/svg%22%20viewBox=%22-252%20400.9%2090%2040%22%3E%3Cpath%20d=%22M-251.547%20436.672h22.802v-30.353h5.862v30.353h5.259v-30.353h3.447v30.353h2.984v-30.353h3.506v30.523h6.406V405.77h38.868%22%20fill=%22none%22%20stroke=%22#000%22%20stroke-width=%221.4%22%20stroke-linecap=%22round%22%20stroke-linejoin=%22round%22/%3E%3Cpath%20d=%22M-232.57%20403.877l26.946%2032.391M-205.624%20403.877l-26.946%2032.391%22%20fill=%22none%22%20stroke=%22red%22%20stroke-width=%223%22%20stroke-linecap=%22round%22/%3E%3C/svg%3E" + }, + "design": { + "board": "icezum", + "graph": { + "blocks": [ + { + "id": "92490e7e-c3ba-4e9c-a917-2a771d99f1ef", + "type": "basic.code", + "data": { + "code": "//-- Debouncer Circuit\n//-- It produces a stable output when the\n//-- input signal is bouncing\n\nreg btn_prev = 0;\nreg btn_out_r = 0;\n\nreg [16:0] counter = 0;\n\n\nalways @(posedge clk) begin\n\n //-- If btn_prev and btn_in are differents\n if (btn_prev ^ in == 1'b1) begin\n \n //-- Reset the counter\n counter <= 0;\n \n //-- Capture the button status\n btn_prev <= in;\n end\n \n //-- If no timeout, increase the counter\n else if (counter[16] == 1'b0)\n counter <= counter + 1;\n \n else\n //-- Set the output to the stable value\n btn_out_r <= btn_prev;\n\nend\n\nassign out = btn_out_r;\n", + "ports": { + "in": [ + "clk", + "in" + ], + "out": [ + "out" + ] + } + }, + "position": { + "x": 368, + "y": 120 + } + }, + { + "id": "4bf41c17-a2da-4140-95f7-2a80d51b1e1a", + "type": "basic.input", + "data": { + "label": "clk" + }, + "position": { + "x": 152, + "y": 152 + } + }, + { + "id": "22ff3fa1-943b-4d1a-bd89-36e1c054d077", + "type": "basic.output", + "data": { + "label": "out" + }, + "position": { + "x": 872, + "y": 216 + } + }, + { + "id": "c9e1af2a-6f09-4cf6-a5b3-fdf7ec2c6530", + "type": "basic.input", + "data": { + "label": "in" + }, + "position": { + "x": 152, + "y": 280 + } + } + ], + "wires": [ + { + "source": { + "block": "92490e7e-c3ba-4e9c-a917-2a771d99f1ef", + "port": "out" + }, + "target": { + "block": "22ff3fa1-943b-4d1a-bd89-36e1c054d077", + "port": "in" + } + }, + { + "source": { + "block": "4bf41c17-a2da-4140-95f7-2a80d51b1e1a", + "port": "out" + }, + "target": { + "block": "92490e7e-c3ba-4e9c-a917-2a771d99f1ef", + "port": "clk" + } + }, + { + "source": { + "block": "c9e1af2a-6f09-4cf6-a5b3-fdf7ec2c6530", + "port": "out" + }, + "target": { + "block": "92490e7e-c3ba-4e9c-a917-2a771d99f1ef", + "port": "in" + } + } + ] + }, + "deps": {}, + "state": { + "pan": { + "x": 0, + "y": 0 + }, + "zoom": 0.9999999623653131 + } + } +} \ No newline at end of file diff --git a/app/resources/blocks/logic/sequential/debouncer.iceb b/app/resources/blocks/logic/sequential/debouncer.iceb deleted file mode 100644 index ca7aca8a9..000000000 --- a/app/resources/blocks/logic/sequential/debouncer.iceb +++ /dev/null @@ -1,100 +0,0 @@ -{ - "image": "resources/images/debouncer.svg", - "state": { - "pan": { - "x": 0, - "y": 0 - }, - "zoom": 1 - }, - "graph": { - "blocks": [ - { - "id": "4bf41c17-a2da-4140-95f7-2a80d51b1e1a", - "type": "basic.input", - "data": { - "label": "clk" - }, - "position": { - "x": 152, - "y": 152 - } - }, - { - "id": "c9e1af2a-6f09-4cf6-a5b3-fdf7ec2c6530", - "type": "basic.input", - "data": { - "label": "in" - }, - "position": { - "x": 152, - "y": 280 - } - }, - { - "id": "22ff3fa1-943b-4d1a-bd89-36e1c054d077", - "type": "basic.output", - "data": { - "label": "out" - }, - "position": { - "x": 872, - "y": 216 - } - }, - { - "id": "92490e7e-c3ba-4e9c-a917-2a771d99f1ef", - "type": "basic.code", - "data": { - "code": "//-- Debouncer Circuit\n//-- It produces a stable output when the\n//-- input signal is bouncing\n\nreg btn_prev = 0;\nreg btn_out_r = 0;\n\nreg [16:0] counter = 0;\n\n\nalways @(posedge clk) begin\n\n //-- If btn_prev and btn_in are differents\n if (btn_prev ^ in == 1'b1) begin\n \n //-- Reset the counter\n counter <= 0;\n \n //-- Capture the button status\n btn_prev <= in;\n end\n \n //-- If no timeout, increase the counter\n else if (counter[16] == 1'b0)\n counter <= counter + 1;\n \n else\n //-- Set the output to the stable value\n btn_out_r <= btn_prev;\n\nend\n\nassign out = btn_out_r;\n", - "ports": { - "in": [ - "clk", - "in" - ], - "out": [ - "out" - ] - } - }, - "position": { - "x": 368, - "y": 120 - } - } - ], - "wires": [ - { - "source": { - "block": "92490e7e-c3ba-4e9c-a917-2a771d99f1ef", - "port": "out" - }, - "target": { - "block": "22ff3fa1-943b-4d1a-bd89-36e1c054d077", - "port": "in" - } - }, - { - "source": { - "block": "4bf41c17-a2da-4140-95f7-2a80d51b1e1a", - "port": "out" - }, - "target": { - "block": "92490e7e-c3ba-4e9c-a917-2a771d99f1ef", - "port": "clk" - } - }, - { - "source": { - "block": "c9e1af2a-6f09-4cf6-a5b3-fdf7ec2c6530", - "port": "out" - }, - "target": { - "block": "92490e7e-c3ba-4e9c-a917-2a771d99f1ef", - "port": "in" - } - } - ] - }, - "deps": {} -} \ No newline at end of file diff --git a/app/resources/blocks/logic/sequential/dff_ar.ice b/app/resources/blocks/logic/sequential/dff_ar.ice new file mode 100644 index 000000000..fae0d636e --- /dev/null +++ b/app/resources/blocks/logic/sequential/dff_ar.ice @@ -0,0 +1,176 @@ +{ + "version": "1.0", + "package": { + "name": "DFF async", + "version": "1.0.0", + "description": "Delay flip-flop with asynchronous reset", + "author": "Carlos Diaz", + "image": "%3Csvg%20xmlns=%22http://www.w3.org/2000/svg%22%20viewBox=%22-252%20400.9%2090%2040%22%3E%3Cg%20font-weight=%22400%22%20font-size=%2224.601%22%20font-family=%22sans-serif%22%20letter-spacing=%220%22%20word-spacing=%220%22%3E%3Ctext%20y=%22421.867%22%20x=%22-231.121%22%20style=%22line-height:125%25%22%20transform=%22translate(0%20-1.964)%22%3E%3Ctspan%20y=%22421.867%22%20x=%22-231.121%22%3EDFF%3C/tspan%3E%3C/text%3E%3Ctext%20y=%22438.935%22%20x=%22-227.001%22%20style=%22line-height:125%25%22%20transform=%22translate(0%20-1.964)%22%3E%3Ctspan%20y=%22438.935%22%20x=%22-227.001%22%20font-size=%2213.75%22%3Easync%3C/tspan%3E%3C/text%3E%3C/g%3E%3C/svg%3E" + }, + "design": { + "board": "icezum", + "graph": { + "blocks": [ + { + "id": "b32a6101-5bd1-4bcf-ae5f-e569b958a6a2", + "type": "basic.input", + "data": { + "label": "D" + }, + "position": { + "x": 168, + "y": 112 + } + }, + { + "id": "cfacb99e-850b-4ddc-a25b-fda4c93f1c5a", + "type": "basic.code", + "data": { + "code": "// D flip-flop with asynchronous reset\n\nreg _q = 1'b0;\n\nalways @(posedge clk or negedge rst_n)\nbegin\n if(rst_n == 0)\n _q = 1'b0;\n else if(en)\n _q <= d;\nend\n\nassign {q, q_n} = {_q, ~_q};\n", + "ports": { + "in": [ + "d", + "en", + "rst_n", + "clk" + ], + "out": [ + "q", + "q_n" + ] + } + }, + "position": { + "x": 344, + "y": 120 + } + }, + { + "id": "ffdd9aa2-aea3-4aa9-8431-80e799226774", + "type": "basic.output", + "data": { + "label": "Q" + }, + "position": { + "x": 824, + "y": 152 + } + }, + { + "id": "50d69ac2-949d-476e-a711-420ba9f510cd", + "type": "basic.input", + "data": { + "label": "en" + }, + "position": { + "x": 168, + "y": 184 + } + }, + { + "id": "07105e68-401b-49e9-b85f-2cddbfee9fbe", + "type": "basic.input", + "data": { + "label": "rst*" + }, + "position": { + "x": 168, + "y": 256 + } + }, + { + "id": "4a261f0b-523c-4fe0-ae1c-de05b8eb7e8a", + "type": "basic.output", + "data": { + "label": "Q*" + }, + "position": { + "x": 824, + "y": 280 + } + }, + { + "id": "6855f64f-fa1c-4371-b2e1-a98970674a96", + "type": "basic.input", + "data": { + "label": "clk" + }, + "position": { + "x": 168, + "y": 328 + } + } + ], + "wires": [ + { + "source": { + "block": "cfacb99e-850b-4ddc-a25b-fda4c93f1c5a", + "port": "q" + }, + "target": { + "block": "ffdd9aa2-aea3-4aa9-8431-80e799226774", + "port": "in" + } + }, + { + "source": { + "block": "cfacb99e-850b-4ddc-a25b-fda4c93f1c5a", + "port": "q_n" + }, + "target": { + "block": "4a261f0b-523c-4fe0-ae1c-de05b8eb7e8a", + "port": "in" + } + }, + { + "source": { + "block": "6855f64f-fa1c-4371-b2e1-a98970674a96", + "port": "out" + }, + "target": { + "block": "cfacb99e-850b-4ddc-a25b-fda4c93f1c5a", + "port": "clk" + } + }, + { + "source": { + "block": "b32a6101-5bd1-4bcf-ae5f-e569b958a6a2", + "port": "out" + }, + "target": { + "block": "cfacb99e-850b-4ddc-a25b-fda4c93f1c5a", + "port": "d" + } + }, + { + "source": { + "block": "50d69ac2-949d-476e-a711-420ba9f510cd", + "port": "out" + }, + "target": { + "block": "cfacb99e-850b-4ddc-a25b-fda4c93f1c5a", + "port": "en" + } + }, + { + "source": { + "block": "07105e68-401b-49e9-b85f-2cddbfee9fbe", + "port": "out" + }, + "target": { + "block": "cfacb99e-850b-4ddc-a25b-fda4c93f1c5a", + "port": "rst_n" + } + } + ] + }, + "deps": {}, + "state": { + "pan": { + "x": -100, + "y": 0 + }, + "zoom": 1.0000000596046377 + } + } +} diff --git a/app/resources/blocks/logic/sequential/dff_ar.iceb b/app/resources/blocks/logic/sequential/dff_ar.iceb deleted file mode 100644 index 346b5ebe0..000000000 --- a/app/resources/blocks/logic/sequential/dff_ar.iceb +++ /dev/null @@ -1,166 +0,0 @@ -{ - "image": "resources/images/dff_ar.svg", - "state": { - "pan": { - "x": -100, - "y": 0 - }, - "zoom": 1 - }, - "graph": { - "blocks": [ - { - "id": "ffdd9aa2-aea3-4aa9-8431-80e799226774", - "type": "basic.output", - "data": { - "label": "Q" - }, - "position": { - "x": 824, - "y": 152 - } - }, - { - "id": "4a261f0b-523c-4fe0-ae1c-de05b8eb7e8a", - "type": "basic.output", - "data": { - "label": "Q*" - }, - "position": { - "x": 824, - "y": 280 - } - }, - { - "id": "b32a6101-5bd1-4bcf-ae5f-e569b958a6a2", - "type": "basic.input", - "data": { - "label": "D" - }, - "position": { - "x": 168, - "y": 112 - } - }, - { - "id": "50d69ac2-949d-476e-a711-420ba9f510cd", - "type": "basic.input", - "data": { - "label": "en" - }, - "position": { - "x": 168, - "y": 184 - } - }, - { - "id": "07105e68-401b-49e9-b85f-2cddbfee9fbe", - "type": "basic.input", - "data": { - "label": "rst*" - }, - "position": { - "x": 168, - "y": 256 - } - }, - { - "id": "6855f64f-fa1c-4371-b2e1-a98970674a96", - "type": "basic.input", - "data": { - "label": "clk" - }, - "position": { - "x": 168, - "y": 328 - } - }, - { - "id": "cfacb99e-850b-4ddc-a25b-fda4c93f1c5a", - "type": "basic.code", - "data": { - "code": "// D flip-flop with asynchronous reset\n\nreg _q = 1'b0;\n\nalways @(posedge clk or negedge rst_n)\nbegin\n if(rst_n == 0)\n _q = 1'b0;\n else if(en)\n _q <= d;\nend\n\nassign {q, q_n} = {_q, ~_q};\n", - "ports": { - "in": [ - "d", - "en", - "rst_n", - "clk" - ], - "out": [ - "q", - "q_n" - ] - } - }, - "position": { - "x": 344, - "y": 120 - } - } - ], - "wires": [ - { - "source": { - "block": "cfacb99e-850b-4ddc-a25b-fda4c93f1c5a", - "port": "q" - }, - "target": { - "block": "ffdd9aa2-aea3-4aa9-8431-80e799226774", - "port": "in" - } - }, - { - "source": { - "block": "cfacb99e-850b-4ddc-a25b-fda4c93f1c5a", - "port": "q_n" - }, - "target": { - "block": "4a261f0b-523c-4fe0-ae1c-de05b8eb7e8a", - "port": "in" - } - }, - { - "source": { - "block": "6855f64f-fa1c-4371-b2e1-a98970674a96", - "port": "out" - }, - "target": { - "block": "cfacb99e-850b-4ddc-a25b-fda4c93f1c5a", - "port": "clk" - } - }, - { - "source": { - "block": "b32a6101-5bd1-4bcf-ae5f-e569b958a6a2", - "port": "out" - }, - "target": { - "block": "cfacb99e-850b-4ddc-a25b-fda4c93f1c5a", - "port": "d" - } - }, - { - "source": { - "block": "50d69ac2-949d-476e-a711-420ba9f510cd", - "port": "out" - }, - "target": { - "block": "cfacb99e-850b-4ddc-a25b-fda4c93f1c5a", - "port": "en" - } - }, - { - "source": { - "block": "07105e68-401b-49e9-b85f-2cddbfee9fbe", - "port": "out" - }, - "target": { - "block": "cfacb99e-850b-4ddc-a25b-fda4c93f1c5a", - "port": "rst_n" - } - } - ] - }, - "deps": {} -} diff --git a/app/resources/blocks/logic/sequential/dff_sr.ice b/app/resources/blocks/logic/sequential/dff_sr.ice new file mode 100644 index 000000000..2dfabb8d0 --- /dev/null +++ b/app/resources/blocks/logic/sequential/dff_sr.ice @@ -0,0 +1,176 @@ +{ + "version": "1.0", + "package": { + "name": "DFF", + "version": "1.0.0", + "description": "Delay flip-flop with synchronous reset", + "author": "Carlos Diaz", + "image": "%3Csvg%20xmlns=%22http://www.w3.org/2000/svg%22%20viewBox=%22-252%20400.9%2090%2040%22%3E%3Ctext%20style=%22line-height:125%25%22%20x=%22-231.121%22%20y=%22429.867%22%20font-weight=%22400%22%20font-size=%2224.601%22%20font-family=%22sans-serif%22%20letter-spacing=%220%22%20word-spacing=%220%22%3E%3Ctspan%20x=%22-231.121%22%20y=%22429.867%22%3EDFF%3C/tspan%3E%3C/text%3E%3C/svg%3E" + }, + "design": { + "board": "icezum", + "graph": { + "blocks": [ + { + "id": "b32a6101-5bd1-4bcf-ae5f-e569b958a6a2", + "type": "basic.input", + "data": { + "label": "D" + }, + "position": { + "x": 168, + "y": 104 + } + }, + { + "id": "17c79db9-4b5b-4a7c-9f13-c4c9f9e5a4e5", + "type": "basic.code", + "data": { + "code": "// D flip-flop with synchronous reset\n\nreg _q = 1'b0;\n\nalways @(posedge clk)\nbegin\n if(rst_n == 0)\n _q = 1'b0;\n else if(en)\n _q <= d;\nend\n\nassign {q, q_n} = {_q, ~_q};\n", + "ports": { + "in": [ + "d", + "en", + "rst_n", + "clk" + ], + "out": [ + "q", + "q_n" + ] + } + }, + "position": { + "x": 344, + "y": 120 + } + }, + { + "id": "ffdd9aa2-aea3-4aa9-8431-80e799226774", + "type": "basic.output", + "data": { + "label": "Q" + }, + "position": { + "x": 824, + "y": 152 + } + }, + { + "id": "50d69ac2-949d-476e-a711-420ba9f510cd", + "type": "basic.input", + "data": { + "label": "en" + }, + "position": { + "x": 168, + "y": 176 + } + }, + { + "id": "07105e68-401b-49e9-b85f-2cddbfee9fbe", + "type": "basic.input", + "data": { + "label": "rst*" + }, + "position": { + "x": 168, + "y": 256 + } + }, + { + "id": "4a261f0b-523c-4fe0-ae1c-de05b8eb7e8a", + "type": "basic.output", + "data": { + "label": "Q*" + }, + "position": { + "x": 824, + "y": 280 + } + }, + { + "id": "6855f64f-fa1c-4371-b2e1-a98970674a96", + "type": "basic.input", + "data": { + "label": "clk" + }, + "position": { + "x": 168, + "y": 328 + } + } + ], + "wires": [ + { + "source": { + "block": "17c79db9-4b5b-4a7c-9f13-c4c9f9e5a4e5", + "port": "q" + }, + "target": { + "block": "ffdd9aa2-aea3-4aa9-8431-80e799226774", + "port": "in" + } + }, + { + "source": { + "block": "17c79db9-4b5b-4a7c-9f13-c4c9f9e5a4e5", + "port": "q_n" + }, + "target": { + "block": "4a261f0b-523c-4fe0-ae1c-de05b8eb7e8a", + "port": "in" + } + }, + { + "source": { + "block": "b32a6101-5bd1-4bcf-ae5f-e569b958a6a2", + "port": "out" + }, + "target": { + "block": "17c79db9-4b5b-4a7c-9f13-c4c9f9e5a4e5", + "port": "d" + } + }, + { + "source": { + "block": "50d69ac2-949d-476e-a711-420ba9f510cd", + "port": "out" + }, + "target": { + "block": "17c79db9-4b5b-4a7c-9f13-c4c9f9e5a4e5", + "port": "en" + } + }, + { + "source": { + "block": "07105e68-401b-49e9-b85f-2cddbfee9fbe", + "port": "out" + }, + "target": { + "block": "17c79db9-4b5b-4a7c-9f13-c4c9f9e5a4e5", + "port": "rst_n" + } + }, + { + "source": { + "block": "6855f64f-fa1c-4371-b2e1-a98970674a96", + "port": "out" + }, + "target": { + "block": "17c79db9-4b5b-4a7c-9f13-c4c9f9e5a4e5", + "port": "clk" + } + } + ] + }, + "deps": {}, + "state": { + "pan": { + "x": -100, + "y": 0 + }, + "zoom": 1 + } + } +} diff --git a/app/resources/blocks/logic/sequential/dff_sr.iceb b/app/resources/blocks/logic/sequential/dff_sr.iceb deleted file mode 100644 index 8b7af360a..000000000 --- a/app/resources/blocks/logic/sequential/dff_sr.iceb +++ /dev/null @@ -1,166 +0,0 @@ -{ - "image": "resources/images/dff_sr.svg", - "state": { - "pan": { - "x": -100, - "y": 0 - }, - "zoom": 1 - }, - "graph": { - "blocks": [ - { - "id": "ffdd9aa2-aea3-4aa9-8431-80e799226774", - "type": "basic.output", - "data": { - "label": "Q" - }, - "position": { - "x": 824, - "y": 152 - } - }, - { - "id": "4a261f0b-523c-4fe0-ae1c-de05b8eb7e8a", - "type": "basic.output", - "data": { - "label": "Q*" - }, - "position": { - "x": 824, - "y": 280 - } - }, - { - "id": "b32a6101-5bd1-4bcf-ae5f-e569b958a6a2", - "type": "basic.input", - "data": { - "label": "D" - }, - "position": { - "x": 168, - "y": 104 - } - }, - { - "id": "50d69ac2-949d-476e-a711-420ba9f510cd", - "type": "basic.input", - "data": { - "label": "en" - }, - "position": { - "x": 168, - "y": 176 - } - }, - { - "id": "07105e68-401b-49e9-b85f-2cddbfee9fbe", - "type": "basic.input", - "data": { - "label": "rst*" - }, - "position": { - "x": 168, - "y": 256 - } - }, - { - "id": "6855f64f-fa1c-4371-b2e1-a98970674a96", - "type": "basic.input", - "data": { - "label": "clk" - }, - "position": { - "x": 168, - "y": 328 - } - }, - { - "id": "17c79db9-4b5b-4a7c-9f13-c4c9f9e5a4e5", - "type": "basic.code", - "data": { - "code": "// D flip-flop with synchronous reset\n\nreg _q = 1'b0;\n\nalways @(posedge clk)\nbegin\n if(rst_n == 0)\n _q = 1'b0;\n else if(en)\n _q <= d;\nend\n\nassign {q, q_n} = {_q, ~_q};\n", - "ports": { - "in": [ - "d", - "en", - "rst_n", - "clk" - ], - "out": [ - "q", - "q_n" - ] - } - }, - "position": { - "x": 344, - "y": 120 - } - } - ], - "wires": [ - { - "source": { - "block": "17c79db9-4b5b-4a7c-9f13-c4c9f9e5a4e5", - "port": "q" - }, - "target": { - "block": "ffdd9aa2-aea3-4aa9-8431-80e799226774", - "port": "in" - } - }, - { - "source": { - "block": "17c79db9-4b5b-4a7c-9f13-c4c9f9e5a4e5", - "port": "q_n" - }, - "target": { - "block": "4a261f0b-523c-4fe0-ae1c-de05b8eb7e8a", - "port": "in" - } - }, - { - "source": { - "block": "b32a6101-5bd1-4bcf-ae5f-e569b958a6a2", - "port": "out" - }, - "target": { - "block": "17c79db9-4b5b-4a7c-9f13-c4c9f9e5a4e5", - "port": "d" - } - }, - { - "source": { - "block": "50d69ac2-949d-476e-a711-420ba9f510cd", - "port": "out" - }, - "target": { - "block": "17c79db9-4b5b-4a7c-9f13-c4c9f9e5a4e5", - "port": "en" - } - }, - { - "source": { - "block": "07105e68-401b-49e9-b85f-2cddbfee9fbe", - "port": "out" - }, - "target": { - "block": "17c79db9-4b5b-4a7c-9f13-c4c9f9e5a4e5", - "port": "rst_n" - } - }, - { - "source": { - "block": "6855f64f-fa1c-4371-b2e1-a98970674a96", - "port": "out" - }, - "target": { - "block": "17c79db9-4b5b-4a7c-9f13-c4c9f9e5a4e5", - "port": "clk" - } - } - ] - }, - "deps": {} -} diff --git a/app/resources/blocks/logic/sequential/tff_ar.ice b/app/resources/blocks/logic/sequential/tff_ar.ice new file mode 100644 index 000000000..33e16dfc7 --- /dev/null +++ b/app/resources/blocks/logic/sequential/tff_ar.ice @@ -0,0 +1,176 @@ +{ + "version": "1.0", + "package": { + "name": "TFF async", + "version": "1.0.0", + "description": "Toggle flip-flop with asynchronous reset", + "author": "Carlos Diaz", + "image": "%3Csvg%20xmlns=%22http://www.w3.org/2000/svg%22%20viewBox=%22-252%20400.9%2090%2040%22%3E%3Cg%20font-weight=%22400%22%20font-size=%2224.601%22%20font-family=%22sans-serif%22%20letter-spacing=%220%22%20word-spacing=%220%22%3E%3Ctext%20style=%22line-height:125%25%22%20x=%22-227.932%22%20y=%22421.867%22%20transform=%22translate(0%20-1.964)%22%3E%3Ctspan%20x=%22-227.932%22%20y=%22421.867%22%3ETFF%3C/tspan%3E%3C/text%3E%3Ctext%20style=%22line-height:125%25%22%20x=%22-227.001%22%20y=%22438.935%22%20transform=%22translate(0%20-1.964)%22%3E%3Ctspan%20x=%22-227.001%22%20y=%22438.935%22%20font-size=%2213.75%22%3Easync%3C/tspan%3E%3C/text%3E%3C/g%3E%3C/svg%3E" + }, + "design": { + "board": "icezum", + "graph": { + "blocks": [ + { + "id": "b32a6101-5bd1-4bcf-ae5f-e569b958a6a2", + "type": "basic.input", + "data": { + "label": "T" + }, + "position": { + "x": 168, + "y": 112 + } + }, + { + "id": "075956ce-9af4-49ea-9123-91786feaba4d", + "type": "basic.code", + "data": { + "code": "// T flip-flop with asynchronous reset\n\nreg _q = 1'b0;\n\nalways @(posedge clk or negedge rst_n)\nbegin\n if(rst_n == 0)\n _q <= 1'b0;\n else\n if(en & t)\n _q = ~_q;\nend\n\nassign {q, q_n} = {_q, ~_q};", + "ports": { + "in": [ + "t", + "en", + "rst_n", + "clk" + ], + "out": [ + "q", + "q_n" + ] + } + }, + "position": { + "x": 344, + "y": 120 + } + }, + { + "id": "ffdd9aa2-aea3-4aa9-8431-80e799226774", + "type": "basic.output", + "data": { + "label": "Q" + }, + "position": { + "x": 824, + "y": 152 + } + }, + { + "id": "50d69ac2-949d-476e-a711-420ba9f510cd", + "type": "basic.input", + "data": { + "label": "en" + }, + "position": { + "x": 168, + "y": 184 + } + }, + { + "id": "8fa94192-fba9-4c2a-be61-b8ca88389423", + "type": "basic.input", + "data": { + "label": "rst*" + }, + "position": { + "x": 168, + "y": 256 + } + }, + { + "id": "4a261f0b-523c-4fe0-ae1c-de05b8eb7e8a", + "type": "basic.output", + "data": { + "label": "Q*" + }, + "position": { + "x": 824, + "y": 280 + } + }, + { + "id": "6855f64f-fa1c-4371-b2e1-a98970674a96", + "type": "basic.input", + "data": { + "label": "clk" + }, + "position": { + "x": 168, + "y": 328 + } + } + ], + "wires": [ + { + "source": { + "block": "075956ce-9af4-49ea-9123-91786feaba4d", + "port": "q" + }, + "target": { + "block": "ffdd9aa2-aea3-4aa9-8431-80e799226774", + "port": "in" + } + }, + { + "source": { + "block": "075956ce-9af4-49ea-9123-91786feaba4d", + "port": "q_n" + }, + "target": { + "block": "4a261f0b-523c-4fe0-ae1c-de05b8eb7e8a", + "port": "in" + } + }, + { + "source": { + "block": "6855f64f-fa1c-4371-b2e1-a98970674a96", + "port": "out" + }, + "target": { + "block": "075956ce-9af4-49ea-9123-91786feaba4d", + "port": "clk" + } + }, + { + "source": { + "block": "b32a6101-5bd1-4bcf-ae5f-e569b958a6a2", + "port": "out" + }, + "target": { + "block": "075956ce-9af4-49ea-9123-91786feaba4d", + "port": "t" + } + }, + { + "source": { + "block": "50d69ac2-949d-476e-a711-420ba9f510cd", + "port": "out" + }, + "target": { + "block": "075956ce-9af4-49ea-9123-91786feaba4d", + "port": "en" + } + }, + { + "source": { + "block": "8fa94192-fba9-4c2a-be61-b8ca88389423", + "port": "out" + }, + "target": { + "block": "075956ce-9af4-49ea-9123-91786feaba4d", + "port": "rst_n" + } + } + ] + }, + "deps": {}, + "state": { + "pan": { + "x": -100, + "y": 0 + }, + "zoom": 1 + } + } +} \ No newline at end of file diff --git a/app/resources/blocks/logic/sequential/tff_ar.iceb b/app/resources/blocks/logic/sequential/tff_ar.iceb deleted file mode 100644 index 96121cf49..000000000 --- a/app/resources/blocks/logic/sequential/tff_ar.iceb +++ /dev/null @@ -1,166 +0,0 @@ -{ - "image": "resources/images/tff_ar.svg", - "state": { - "pan": { - "x": -100, - "y": 0 - }, - "zoom": 1 - }, - "graph": { - "blocks": [ - { - "id": "ffdd9aa2-aea3-4aa9-8431-80e799226774", - "type": "basic.output", - "data": { - "label": "Q" - }, - "position": { - "x": 824, - "y": 152 - } - }, - { - "id": "4a261f0b-523c-4fe0-ae1c-de05b8eb7e8a", - "type": "basic.output", - "data": { - "label": "Q*" - }, - "position": { - "x": 824, - "y": 280 - } - }, - { - "id": "b32a6101-5bd1-4bcf-ae5f-e569b958a6a2", - "type": "basic.input", - "data": { - "label": "T" - }, - "position": { - "x": 168, - "y": 112 - } - }, - { - "id": "50d69ac2-949d-476e-a711-420ba9f510cd", - "type": "basic.input", - "data": { - "label": "en" - }, - "position": { - "x": 168, - "y": 184 - } - }, - { - "id": "8fa94192-fba9-4c2a-be61-b8ca88389423", - "type": "basic.input", - "data": { - "label": "rst*" - }, - "position": { - "x": 168, - "y": 256 - } - }, - { - "id": "6855f64f-fa1c-4371-b2e1-a98970674a96", - "type": "basic.input", - "data": { - "label": "clk" - }, - "position": { - "x": 168, - "y": 328 - } - }, - { - "id": "075956ce-9af4-49ea-9123-91786feaba4d", - "type": "basic.code", - "data": { - "code": "// T flip-flop with asynchronous reset\n\nreg _q = 1'b0;\n\nalways @(posedge clk or negedge rst_n)\nbegin\n if(rst_n == 0)\n _q <= 1'b0;\n else\n if(en & t)\n _q = ~_q;\nend\n\nassign {q, q_n} = {_q, ~_q};", - "ports": { - "in": [ - "t", - "en", - "rst_n", - "clk" - ], - "out": [ - "q", - "q_n" - ] - } - }, - "position": { - "x": 344, - "y": 120 - } - } - ], - "wires": [ - { - "source": { - "block": "075956ce-9af4-49ea-9123-91786feaba4d", - "port": "q" - }, - "target": { - "block": "ffdd9aa2-aea3-4aa9-8431-80e799226774", - "port": "in" - } - }, - { - "source": { - "block": "075956ce-9af4-49ea-9123-91786feaba4d", - "port": "q_n" - }, - "target": { - "block": "4a261f0b-523c-4fe0-ae1c-de05b8eb7e8a", - "port": "in" - } - }, - { - "source": { - "block": "6855f64f-fa1c-4371-b2e1-a98970674a96", - "port": "out" - }, - "target": { - "block": "075956ce-9af4-49ea-9123-91786feaba4d", - "port": "clk" - } - }, - { - "source": { - "block": "b32a6101-5bd1-4bcf-ae5f-e569b958a6a2", - "port": "out" - }, - "target": { - "block": "075956ce-9af4-49ea-9123-91786feaba4d", - "port": "t" - } - }, - { - "source": { - "block": "50d69ac2-949d-476e-a711-420ba9f510cd", - "port": "out" - }, - "target": { - "block": "075956ce-9af4-49ea-9123-91786feaba4d", - "port": "en" - } - }, - { - "source": { - "block": "8fa94192-fba9-4c2a-be61-b8ca88389423", - "port": "out" - }, - "target": { - "block": "075956ce-9af4-49ea-9123-91786feaba4d", - "port": "rst_n" - } - } - ] - }, - "deps": {} -} diff --git a/app/resources/blocks/logic/sequential/tff_sr.ice b/app/resources/blocks/logic/sequential/tff_sr.ice new file mode 100644 index 000000000..95267f2e8 --- /dev/null +++ b/app/resources/blocks/logic/sequential/tff_sr.ice @@ -0,0 +1,176 @@ +{ + "version": "1.0", + "package": { + "name": "TFF", + "version": "1.0.0", + "description": "Toggle flip-flop with synchronous reset", + "author": "Carlos Diaz", + "image": "%3Csvg%20xmlns=%22http://www.w3.org/2000/svg%22%20viewBox=%22-252%20400.9%2090%2040%22%3E%3Ctext%20style=%22line-height:125%25%22%20x=%22-227.932%22%20y=%22429.867%22%20font-weight=%22400%22%20font-size=%2224.601%22%20font-family=%22sans-serif%22%20letter-spacing=%220%22%20word-spacing=%220%22%3E%3Ctspan%20x=%22-227.932%22%20y=%22429.867%22%3ETFF%3C/tspan%3E%3C/text%3E%3C/svg%3E" + }, + "design": { + "board": "icezum", + "graph": { + "blocks": [ + { + "id": "b32a6101-5bd1-4bcf-ae5f-e569b958a6a2", + "type": "basic.input", + "data": { + "label": "T" + }, + "position": { + "x": 168, + "y": 104 + } + }, + { + "id": "163997db-34b5-4c61-a06c-5ab94207674a", + "type": "basic.code", + "data": { + "code": "// T flip-flop with synchronous reset\n\nreg _q = 1'b0;\n\nalways @(posedge clk)\nbegin\n if(rst_n == 0)\n _q <= 1'b0;\n else\n if(en & t)\n _q = ~_q;\nend\n\nassign {q, q_n} = {_q, ~_q};", + "ports": { + "in": [ + "t", + "en", + "rst_n", + "clk" + ], + "out": [ + "q", + "q_n" + ] + } + }, + "position": { + "x": 344, + "y": 120 + } + }, + { + "id": "ffdd9aa2-aea3-4aa9-8431-80e799226774", + "type": "basic.output", + "data": { + "label": "Q" + }, + "position": { + "x": 824, + "y": 152 + } + }, + { + "id": "50d69ac2-949d-476e-a711-420ba9f510cd", + "type": "basic.input", + "data": { + "label": "en" + }, + "position": { + "x": 168, + "y": 176 + } + }, + { + "id": "8fa94192-fba9-4c2a-be61-b8ca88389423", + "type": "basic.input", + "data": { + "label": "rst*" + }, + "position": { + "x": 168, + "y": 256 + } + }, + { + "id": "4a261f0b-523c-4fe0-ae1c-de05b8eb7e8a", + "type": "basic.output", + "data": { + "label": "Q*" + }, + "position": { + "x": 824, + "y": 280 + } + }, + { + "id": "6855f64f-fa1c-4371-b2e1-a98970674a96", + "type": "basic.input", + "data": { + "label": "clk" + }, + "position": { + "x": 168, + "y": 328 + } + } + ], + "wires": [ + { + "source": { + "block": "163997db-34b5-4c61-a06c-5ab94207674a", + "port": "q" + }, + "target": { + "block": "ffdd9aa2-aea3-4aa9-8431-80e799226774", + "port": "in" + } + }, + { + "source": { + "block": "163997db-34b5-4c61-a06c-5ab94207674a", + "port": "q_n" + }, + "target": { + "block": "4a261f0b-523c-4fe0-ae1c-de05b8eb7e8a", + "port": "in" + } + }, + { + "source": { + "block": "50d69ac2-949d-476e-a711-420ba9f510cd", + "port": "out" + }, + "target": { + "block": "163997db-34b5-4c61-a06c-5ab94207674a", + "port": "en" + } + }, + { + "source": { + "block": "8fa94192-fba9-4c2a-be61-b8ca88389423", + "port": "out" + }, + "target": { + "block": "163997db-34b5-4c61-a06c-5ab94207674a", + "port": "rst_n" + } + }, + { + "source": { + "block": "b32a6101-5bd1-4bcf-ae5f-e569b958a6a2", + "port": "out" + }, + "target": { + "block": "163997db-34b5-4c61-a06c-5ab94207674a", + "port": "t" + } + }, + { + "source": { + "block": "6855f64f-fa1c-4371-b2e1-a98970674a96", + "port": "out" + }, + "target": { + "block": "163997db-34b5-4c61-a06c-5ab94207674a", + "port": "clk" + } + } + ] + }, + "deps": {}, + "state": { + "pan": { + "x": -100, + "y": 0 + }, + "zoom": 1 + } + } +} \ No newline at end of file diff --git a/app/resources/blocks/logic/sequential/tff_sr.iceb b/app/resources/blocks/logic/sequential/tff_sr.iceb deleted file mode 100644 index 520deba8d..000000000 --- a/app/resources/blocks/logic/sequential/tff_sr.iceb +++ /dev/null @@ -1,166 +0,0 @@ -{ - "image": "resources/images/tff_sr.svg", - "state": { - "pan": { - "x": -100, - "y": 0 - }, - "zoom": 1 - }, - "graph": { - "blocks": [ - { - "id": "ffdd9aa2-aea3-4aa9-8431-80e799226774", - "type": "basic.output", - "data": { - "label": "Q" - }, - "position": { - "x": 824, - "y": 152 - } - }, - { - "id": "4a261f0b-523c-4fe0-ae1c-de05b8eb7e8a", - "type": "basic.output", - "data": { - "label": "Q*" - }, - "position": { - "x": 824, - "y": 280 - } - }, - { - "id": "b32a6101-5bd1-4bcf-ae5f-e569b958a6a2", - "type": "basic.input", - "data": { - "label": "T" - }, - "position": { - "x": 168, - "y": 104 - } - }, - { - "id": "50d69ac2-949d-476e-a711-420ba9f510cd", - "type": "basic.input", - "data": { - "label": "en" - }, - "position": { - "x": 168, - "y": 176 - } - }, - { - "id": "8fa94192-fba9-4c2a-be61-b8ca88389423", - "type": "basic.input", - "data": { - "label": "rst*" - }, - "position": { - "x": 168, - "y": 256 - } - }, - { - "id": "6855f64f-fa1c-4371-b2e1-a98970674a96", - "type": "basic.input", - "data": { - "label": "clk" - }, - "position": { - "x": 168, - "y": 328 - } - }, - { - "id": "163997db-34b5-4c61-a06c-5ab94207674a", - "type": "basic.code", - "data": { - "code": "// T flip-flop with synchronous reset\n\nreg _q = 1'b0;\n\nalways @(posedge clk)\nbegin\n if(rst_n == 0)\n _q <= 1'b0;\n else\n if(en & t)\n _q = ~_q;\nend\n\nassign {q, q_n} = {_q, ~_q};", - "ports": { - "in": [ - "t", - "en", - "rst_n", - "clk" - ], - "out": [ - "q", - "q_n" - ] - } - }, - "position": { - "x": 344, - "y": 120 - } - } - ], - "wires": [ - { - "source": { - "block": "163997db-34b5-4c61-a06c-5ab94207674a", - "port": "q" - }, - "target": { - "block": "ffdd9aa2-aea3-4aa9-8431-80e799226774", - "port": "in" - } - }, - { - "source": { - "block": "163997db-34b5-4c61-a06c-5ab94207674a", - "port": "q_n" - }, - "target": { - "block": "4a261f0b-523c-4fe0-ae1c-de05b8eb7e8a", - "port": "in" - } - }, - { - "source": { - "block": "50d69ac2-949d-476e-a711-420ba9f510cd", - "port": "out" - }, - "target": { - "block": "163997db-34b5-4c61-a06c-5ab94207674a", - "port": "en" - } - }, - { - "source": { - "block": "8fa94192-fba9-4c2a-be61-b8ca88389423", - "port": "out" - }, - "target": { - "block": "163997db-34b5-4c61-a06c-5ab94207674a", - "port": "rst_n" - } - }, - { - "source": { - "block": "b32a6101-5bd1-4bcf-ae5f-e569b958a6a2", - "port": "out" - }, - "target": { - "block": "163997db-34b5-4c61-a06c-5ab94207674a", - "port": "t" - } - }, - { - "source": { - "block": "6855f64f-fa1c-4371-b2e1-a98970674a96", - "port": "out" - }, - "target": { - "block": "163997db-34b5-4c61-a06c-5ab94207674a", - "port": "clk" - } - } - ] - }, - "deps": {} -} diff --git a/app/resources/images/7segmentos_ANODO.svg b/app/resources/images/7segmentos_ANODO.svg deleted file mode 100755 index 52a1fa524..000000000 --- a/app/resources/images/7segmentos_ANODO.svg +++ /dev/null @@ -1,96 +0,0 @@ - - - -image/svg+xmlANODO COMÚN - \ No newline at end of file diff --git a/app/resources/images/7segmentos_CATODO.svg b/app/resources/images/7segmentos_CATODO.svg deleted file mode 100755 index 24ffca138..000000000 --- a/app/resources/images/7segmentos_CATODO.svg +++ /dev/null @@ -1,96 +0,0 @@ - - - -image/svg+xmlCATODO COMÚN - \ No newline at end of file diff --git a/app/resources/images/FF/DFF.svg b/app/resources/images/FF/DFF.svg deleted file mode 100755 index 94b2dc2da..000000000 --- a/app/resources/images/FF/DFF.svg +++ /dev/null @@ -1,101 +0,0 @@ - - - -image/svg+xmlDFF -D -CLK -Q -Q - \ No newline at end of file diff --git a/app/resources/images/FF/DFF_AR.svg b/app/resources/images/FF/DFF_AR.svg deleted file mode 100755 index 637626d6e..000000000 --- a/app/resources/images/FF/DFF_AR.svg +++ /dev/null @@ -1,111 +0,0 @@ - - - -image/svg+xmlDFF_AR -D -RST -CLK -Q -Q - \ No newline at end of file diff --git a/app/resources/images/FF/DFF_E.svg b/app/resources/images/FF/DFF_E.svg deleted file mode 100755 index 5c3896340..000000000 --- a/app/resources/images/FF/DFF_E.svg +++ /dev/null @@ -1,115 +0,0 @@ - - - -image/svg+xmlDFF -D -EN -CLK -Q -Q - \ No newline at end of file diff --git a/app/resources/images/FF/DFF_E_AR.svg b/app/resources/images/FF/DFF_E_AR.svg deleted file mode 100755 index a8971a20e..000000000 --- a/app/resources/images/FF/DFF_E_AR.svg +++ /dev/null @@ -1,120 +0,0 @@ - - - -image/svg+xmlDFF_AR -D -EN -RST -CLK -Q -Q - \ No newline at end of file diff --git a/app/resources/images/FF/DFF_E_SR.svg b/app/resources/images/FF/DFF_E_SR.svg deleted file mode 100644 index ad050f7ea..000000000 --- a/app/resources/images/FF/DFF_E_SR.svg +++ /dev/null @@ -1,120 +0,0 @@ - - - -image/svg+xmlDFF_SR -D -EN -RST -CLK -Q -Q - \ No newline at end of file diff --git a/app/resources/images/FF/DFF_SR.svg b/app/resources/images/FF/DFF_SR.svg deleted file mode 100644 index 6161c3987..000000000 --- a/app/resources/images/FF/DFF_SR.svg +++ /dev/null @@ -1,111 +0,0 @@ - - - -image/svg+xmlDFF_SR -D -RST -CLK -Q -Q - \ No newline at end of file diff --git a/app/resources/images/FF/TFF.svg b/app/resources/images/FF/TFF.svg deleted file mode 100755 index 2444f0584..000000000 --- a/app/resources/images/FF/TFF.svg +++ /dev/null @@ -1,103 +0,0 @@ - - - -image/svg+xmlTFF -T -CLK -Q -Q - \ No newline at end of file diff --git a/app/resources/images/FF/TFF_AR.svg b/app/resources/images/FF/TFF_AR.svg deleted file mode 100644 index 44af56a8a..000000000 --- a/app/resources/images/FF/TFF_AR.svg +++ /dev/null @@ -1,111 +0,0 @@ - - - -image/svg+xmlTFF_AR -T -RST -CLK -Q -Q - \ No newline at end of file diff --git a/app/resources/images/FF/TFF_E.svg b/app/resources/images/FF/TFF_E.svg deleted file mode 100755 index 6e784eca9..000000000 --- a/app/resources/images/FF/TFF_E.svg +++ /dev/null @@ -1,115 +0,0 @@ - - - -image/svg+xmlTFF -T -EN -CLK -Q -Q - \ No newline at end of file diff --git a/app/resources/images/FF/TFF_E_AR.svg b/app/resources/images/FF/TFF_E_AR.svg deleted file mode 100644 index c5a839ffa..000000000 --- a/app/resources/images/FF/TFF_E_AR.svg +++ /dev/null @@ -1,120 +0,0 @@ - - - -image/svg+xmlTFF_AR -T -EN -RST -CLK -Q -Q - \ No newline at end of file diff --git a/app/resources/images/FF/TFF_E_SR.svg b/app/resources/images/FF/TFF_E_SR.svg deleted file mode 100644 index 3d6bc9c6f..000000000 --- a/app/resources/images/FF/TFF_E_SR.svg +++ /dev/null @@ -1,120 +0,0 @@ - - - -image/svg+xmlTFF_SR -T -EN -RST -CLK -Q -Q - \ No newline at end of file diff --git a/app/resources/images/FF/TFF_SR.svg b/app/resources/images/FF/TFF_SR.svg deleted file mode 100644 index f8b069372..000000000 --- a/app/resources/images/FF/TFF_SR.svg +++ /dev/null @@ -1,111 +0,0 @@ - - - -image/svg+xmlTFF_SR -T -RST -CLK -Q -Q - \ No newline at end of file diff --git a/app/resources/images/and.svg b/app/resources/images/and.svg deleted file mode 100644 index 6d4834f6c..000000000 --- a/app/resources/images/and.svg +++ /dev/null @@ -1,67 +0,0 @@ - - - -image/svg+xml \ No newline at end of file diff --git a/app/resources/images/debouncer.svg b/app/resources/images/debouncer.svg deleted file mode 100644 index 0a5def855..000000000 --- a/app/resources/images/debouncer.svg +++ /dev/null @@ -1,60 +0,0 @@ - - - -image/svg+xml \ No newline at end of file diff --git a/app/resources/images/demux.svg b/app/resources/images/demux.svg deleted file mode 100755 index 6fbfbab86..000000000 --- a/app/resources/images/demux.svg +++ /dev/null @@ -1,38 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/app/resources/images/dff_ar.svg b/app/resources/images/dff_ar.svg deleted file mode 100644 index f5c1614d1..000000000 --- a/app/resources/images/dff_ar.svg +++ /dev/null @@ -1,70 +0,0 @@ - - - -image/svg+xmlDFF -async - \ No newline at end of file diff --git a/app/resources/images/dff_sr.svg b/app/resources/images/dff_sr.svg deleted file mode 100644 index 25ec7cdcf..000000000 --- a/app/resources/images/dff_sr.svg +++ /dev/null @@ -1,56 +0,0 @@ - - - -image/svg+xmlDFF - \ No newline at end of file diff --git a/app/resources/images/mux.svg b/app/resources/images/mux.svg deleted file mode 100755 index b6e991970..000000000 --- a/app/resources/images/mux.svg +++ /dev/null @@ -1,38 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/app/resources/images/nand.svg b/app/resources/images/nand.svg deleted file mode 100755 index 14fee55d2..000000000 --- a/app/resources/images/nand.svg +++ /dev/null @@ -1,23 +0,0 @@ - - - - - - - - - - - - - - - - - diff --git a/app/resources/images/nor.svg b/app/resources/images/nor.svg deleted file mode 100755 index 98ec8066e..000000000 --- a/app/resources/images/nor.svg +++ /dev/null @@ -1,50 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/app/resources/images/not.svg b/app/resources/images/not.svg deleted file mode 100644 index ea675b8a6..000000000 --- a/app/resources/images/not.svg +++ /dev/null @@ -1,105 +0,0 @@ - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/app/resources/images/or.svg b/app/resources/images/or.svg deleted file mode 100644 index 02e9f2954..000000000 --- a/app/resources/images/or.svg +++ /dev/null @@ -1,167 +0,0 @@ - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - diff --git a/app/resources/images/tff_ar.svg b/app/resources/images/tff_ar.svg deleted file mode 100644 index 6bcd9837e..000000000 --- a/app/resources/images/tff_ar.svg +++ /dev/null @@ -1,71 +0,0 @@ - - - -image/svg+xmlTFF -async - \ No newline at end of file diff --git a/app/resources/images/tff_sr.svg b/app/resources/images/tff_sr.svg deleted file mode 100644 index 7b1fd3cdf..000000000 --- a/app/resources/images/tff_sr.svg +++ /dev/null @@ -1,56 +0,0 @@ - - - -image/svg+xmlTFF - \ No newline at end of file diff --git a/app/resources/images/xnor.svg b/app/resources/images/xnor.svg deleted file mode 100755 index 4314c5b9c..000000000 --- a/app/resources/images/xnor.svg +++ /dev/null @@ -1,52 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/app/resources/images/xor.svg b/app/resources/images/xor.svg deleted file mode 100644 index 383007edb..000000000 --- a/app/resources/images/xor.svg +++ /dev/null @@ -1,49 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/gruntfile.js b/gruntfile.js index c92c741c9..365964e7b 100644 --- a/gruntfile.js +++ b/gruntfile.js @@ -83,9 +83,6 @@ module.exports = function(grunt) { }, ice: { files: 'dist/tmp/resources/**/*.ice' - }, - iceb: { - files: 'dist/tmp/resources/**/*.iceb' } }, From 48d69553c69d71f17f8e53ea28d39ae94e48d49c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jes=C3=BAs=20Arroyo=20Torrens?= Date: Sat, 17 Dec 2016 10:44:29 +0100 Subject: [PATCH 044/169] Add "Save SVG" in Project information --- app/.jshintrc | 1 + app/resources/blocks/config/tri_state.ice | 2 +- app/resources/blocks/labels.js | 57 +++++++++++------------ app/scripts/services/utils.service.js | 43 +++++++++++++---- 4 files changed, 64 insertions(+), 39 deletions(-) diff --git a/app/.jshintrc b/app/.jshintrc index c44f120b1..173f232e2 100644 --- a/app/.jshintrc +++ b/app/.jshintrc @@ -31,6 +31,7 @@ "svgPanZoom": false, "Backbone": false, "async": false, + "gettext": false, "ace": false, "g": false, "V": false diff --git a/app/resources/blocks/config/tri_state.ice b/app/resources/blocks/config/tri_state.ice index 9936f1e07..6a673429d 100644 --- a/app/resources/blocks/config/tri_state.ice +++ b/app/resources/blocks/config/tri_state.ice @@ -5,7 +5,7 @@ "version": "1.0.0", "description": "Tri-state logic block", "author": "Salvador E. Tropea", - "image": "%3Csvg%20xmlns=%22http://www.w3.org/2000/svg%22%20viewBox=%22-265%20401.5%2063.5%2038.4%22%20id=%22svg2%22%3E%3Cstyle%20id=%22style3%22/%3E%3Cpath%20d=%22M-168.164%20460.895l-15.4-8.7v8.5c-14.685-.007-22.294.1-37.6.1v1.2h37.6v8.5l15.4-8.7h10.5v-.8h-10.5zm-14.1%207.3v-13.8l12.3%206.9z%22%20id=%22path7%22/%3E%3Cpath%20d=%22M-180.515%20415.613l15.4%208.7v-8.5c14.685.007%2022.294-.1%2037.6-.1l-7.823.145%207.823-1.145v-.2h-37.6v-8.5l-15.4%208.7h-10.5v.8h10.5zm14.1-7.3v13.8l-12.3-6.9z%22%20id=%22path7-3%22/%3E%3Cpath%20d=%22M-9.78%203.538l-4.214%2024.984-19.53-16.141z%22%20transform=%22matrix(.62422%20-.11476%20.1058%20.67701%20-219.33%20413.046)%22%20id=%22path3008%22%20fill=%22none%22%20stroke=%22#0b0b0b%22%20stroke-width=%221.885%22/%3E%3Cpath%20d=%22M-9.78%203.538l-4.214%2024.984-19.53-16.141z%22%20transform=%22matrix(-.62422%20-.11476%20-.1058%20.67701%20-244.991%20400.53)%22%20id=%22path3008-6%22%20fill=%22none%22%20stroke=%22#0b0b0b%22%20stroke-width=%221.885%22/%3E%3Cpath%20d=%22M40.154%2011.247H63.74%22%20transform=%22translate(-265%20401.5)%22%20id=%22path3800%22%20fill=%22none%22%20stroke=%22#000%22/%3E%3Cpath%20d=%22M25.945%2023.73l-7.364.058V11.305h7.076%22%20transform=%22translate(-265%20401.5)%22%20id=%22path3802%22%20fill=%22none%22%20stroke=%22#000%22/%3E%3Cpath%20d=%22M-265.029%20412.747l18.582.058%22%20id=%22path3804%22%20fill=%22none%22%20stroke=%22#000%22/%3E%3Cpath%20d=%22M.081%2023.919h12.936v7.566h19.037V27.58%22%20transform=%22translate(-265%20401.5)%22%20id=%22path3806%22%20fill=%22none%22%20stroke=%22#000%22/%3E%3Cpath%20d=%22M0%2035.96h49.302V24.162h-9.356%22%20transform=%22translate(-265%20401.5)%22%20id=%22path3812%22%20fill=%22none%22%20stroke=%22#000%22/%3E%3C/svg%3E" + "image": "%3Csvg%20xmlns=%22http://www.w3.org/2000/svg%22%20viewBox=%22-265%20401.5%2063.5%2038.4%22%20id=%22svg2%22%3E%3Cstyle%20id=%22style3%22/%3E%3Cpath%20d=%22M-9.78%203.538l-4.214%2024.984-19.53-16.141z%22%20transform=%22matrix(.62422%20-.11476%20.1058%20.67701%20-219.33%20413.046)%22%20id=%22path3008%22%20fill=%22none%22%20stroke=%22#0b0b0b%22%20stroke-width=%221.885%22/%3E%3Cpath%20d=%22M-9.78%203.538l-4.214%2024.984-19.53-16.141z%22%20transform=%22matrix(-.62422%20-.11476%20-.1058%20.67701%20-244.991%20400.53)%22%20id=%22path3008-6%22%20fill=%22none%22%20stroke=%22#0b0b0b%22%20stroke-width=%221.885%22/%3E%3Cpath%20d=%22M40.154%2011.247H63.74%22%20transform=%22translate(-265%20401.5)%22%20id=%22path3800%22%20fill=%22none%22%20stroke=%22#000%22/%3E%3Cpath%20d=%22M25.945%2023.73l-7.364.058V11.305h7.076%22%20transform=%22translate(-265%20401.5)%22%20id=%22path3802%22%20fill=%22none%22%20stroke=%22#000%22/%3E%3Cpath%20d=%22M-265.029%20412.747l18.582.058%22%20id=%22path3804%22%20fill=%22none%22%20stroke=%22#000%22/%3E%3Cpath%20d=%22M.081%2023.919h12.936v7.566h19.037V27.58%22%20transform=%22translate(-265%20401.5)%22%20id=%22path3806%22%20fill=%22none%22%20stroke=%22#000%22/%3E%3Cpath%20d=%22M0%2035.96h49.302V24.162h-9.356%22%20transform=%22translate(-265%20401.5)%22%20id=%22path3812%22%20fill=%22none%22%20stroke=%22#000%22/%3E%3C/svg%3E" }, "design": { "board": "icezum", diff --git a/app/resources/blocks/labels.js b/app/resources/blocks/labels.js index 8c70e2216..f45415c3d 100644 --- a/app/resources/blocks/labels.js +++ b/app/resources/blocks/labels.js @@ -1,59 +1,58 @@ // In this file the blocks labels are annotated for translation /// Bit -gettext('bit') +gettext('bit'); /// Config -gettext('config') +gettext('config'); /// Pull up -gettext('pull_up') +gettext('pull_up'); /// Pull up inv -gettext('pull_up_inv') +gettext('pull_up_inv'); /// Tri-state -gettext('tri_state') +gettext('tri_state'); /// Logic -gettext('logic') +gettext('logic'); /// Combinational -gettext('combinational') +gettext('combinational'); /// Demux 1:2 -gettext('demux_1_2') +gettext('demux_1_2'); /// Demux 1:4 -gettext('demux_1_4') +gettext('demux_1_4'); /// Demux 1:8 -gettext('demux_1_8') +gettext('demux_1_8'); /// Hex 7 Segment CC -gettext('hex_7seg_cc') +gettext('hex_7seg_cc'); /// Hex 7 Segment CA -gettext('hex_7seg_ca') +gettext('hex_7seg_ca'); /// Mux 2:1 -gettext('mux_2_1') +gettext('mux_2_1'); /// Mux 4:1 -gettext('mux_4_1') +gettext('mux_4_1'); /// Gate -gettext('gate') +gettext('gate'); /// And -gettext('and') +gettext('and'); /// Nand -gettext('nand') +gettext('nand'); /// Nor -gettext('nor') +gettext('nor'); /// Not -gettext('not') +gettext('not'); /// Or -gettext('or') +gettext('or'); /// Xnor -gettext('xnor') +gettext('xnor'); /// Xor -gettext('xor') +gettext('xor'); /// Sequential -gettext('sequential') +gettext('sequential'); /// D flip-flop async -gettext('dff_ar') +gettext('dff_ar'); /// D flip-flop async -gettext('dff_sr') +gettext('dff_sr'); /// T flip-flop async -gettext('tff_ar') +gettext('tff_ar'); /// T flip-flop -gettext('tff_sr') +gettext('tff_sr'); /// Debouncer -gettext('debouncer') - +gettext('debouncer'); diff --git a/app/scripts/services/utils.service.js b/app/scripts/services/utils.service.js index feeca9b48..d26a63899 100644 --- a/app/scripts/services/utils.service.js +++ b/app/scripts/services/utils.service.js @@ -671,6 +671,7 @@ angular.module('icestudio') gettextCatalog.getString('Author') ]; var n = messages.length; + var image = values[4]; content.push('
                '); for (i in messages) { if (i > 0) { @@ -680,23 +681,30 @@ angular.module('icestudio') content.push(' '); } content.push('

                ' + gettextCatalog.getString('Image') + '

                '); - content.push(' '); - content.push(' '); - // TODO: add Save SVG + content.push(' '); + content.push(' '); + content.push('
                '); + content.push(' '); + content.push('
                '); + content.push('
                '); + content.push(' '); + content.push(' '); + content.push('
                '); content.push('
                '); // Restore values for (i = 0; i < n; i++) { $('#input' + i.toString()).val(values[i]); } - $('#preview-svg').attr('src', 'data:image/svg+xml,' + values[4]); - - var image = ''; + if (image) { + $('#preview-svg').attr('src', 'data:image/svg+xml,' + image); + } alertify.confirm() .set('onshow', function() { - var chooser = $('#input-open-svg'); - chooser.unbind('change'); - chooser.change(function(/*evt*/) { + // Open SVG + var chooserOpen = $('#input-open-svg'); + chooserOpen.unbind('change'); + chooserOpen.change(function(/*evt*/) { var filepath = $(this).val(); var svgo = new SVGO(); nodeFs.readFile(filepath, 'utf8', function(err, data) { @@ -706,9 +714,26 @@ angular.module('icestudio') svgo.optimize(data, function(result) { image = encodeURI(result.data); $('#preview-svg').attr('src', 'data:image/svg+xml,' + image); + //$('#input-save-svg').attr('nwsaveas', $('#input-open-svg').val()); }); }); }); + // Save SVG + var chooserSave = $('#input-save-svg'); + chooserSave.unbind('change'); + chooserSave.change(function(/*evt*/) { + if (image) { + var filepath = $(this).val(); + if (!filepath.endsWith('.svg')) { + filepath += '.svg'; + } + nodeFs.writeFile(filepath, decodeURI(image), function(err) { + if (err) { + throw err; + } + }); + } + }); }); alertify.confirm(content.join('\n')) From 5ef86edbce148d857e4a53e1c8e153e16e85be81 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jes=C3=BAs=20Arroyo=20Torrens?= Date: Sat, 17 Dec 2016 11:33:14 +0100 Subject: [PATCH 045/169] Add "Reset SVG" in Project information --- app/package.json | 2 +- app/scripts/services/utils.service.js | 69 ++++++++++++++++++++------- 2 files changed, 53 insertions(+), 18 deletions(-) diff --git a/app/package.json b/app/package.json index 4ee3ebdaa..5f1dcefe8 100644 --- a/app/package.json +++ b/app/package.json @@ -8,7 +8,7 @@ "main": "index.html", "window": { "width": 900, - "height": 600, + "height": 620, "min_width": 800, "min_height": 200, "toolbar": false, diff --git a/app/scripts/services/utils.service.js b/app/scripts/services/utils.service.js index d26a63899..d08a0578d 100644 --- a/app/scripts/services/utils.service.js +++ b/app/scripts/services/utils.service.js @@ -672,6 +672,7 @@ angular.module('icestudio') ]; var n = messages.length; var image = values[4]; + var blankImage = 'data:image/gif;base64,R0lGODlhAQABAAD/ACwAAAAAAQABAAACADs='; content.push('
                '); for (i in messages) { if (i > 0) { @@ -684,11 +685,12 @@ angular.module('icestudio') content.push(' '); content.push(' '); content.push('
                '); - content.push(' '); + content.push(' '); content.push('
                '); content.push('
                '); content.push(' '); - content.push(' '); + content.push(' '); + content.push(' '); content.push('
                '); content.push('
                '); // Restore values @@ -698,9 +700,18 @@ angular.module('icestudio') if (image) { $('#preview-svg').attr('src', 'data:image/svg+xml,' + image); } + else { + $('#preview-svg').attr('src', blankImage); + } alertify.confirm() .set('onshow', function() { + registerOpen(); + registerSave(); + registerReset(); + }); + + function registerOpen() { // Open SVG var chooserOpen = $('#input-open-svg'); chooserOpen.unbind('change'); @@ -713,28 +724,52 @@ angular.module('icestudio') } svgo.optimize(data, function(result) { image = encodeURI(result.data); + registerSave(); $('#preview-svg').attr('src', 'data:image/svg+xml,' + image); - //$('#input-save-svg').attr('nwsaveas', $('#input-open-svg').val()); }); }); + $(this).val(''); }); + } + + function registerSave() { // Save SVG - var chooserSave = $('#input-save-svg'); - chooserSave.unbind('change'); - chooserSave.change(function(/*evt*/) { - if (image) { - var filepath = $(this).val(); - if (!filepath.endsWith('.svg')) { - filepath += '.svg'; - } - nodeFs.writeFile(filepath, decodeURI(image), function(err) { - if (err) { - throw err; + var label = $('#save-svg'); + if (image) { + label.removeClass('disabled'); + label.attr('for', 'input-save-svg'); + var chooserSave = $('#input-save-svg'); + chooserSave.unbind('change'); + chooserSave.change(function(/*evt*/) { + if (image) { + var filepath = $(this).val(); + if (!filepath.endsWith('.svg')) { + filepath += '.svg'; } - }); - } + nodeFs.writeFile(filepath, decodeURI(image), function(err) { + if (err) { + throw err; + } + }); + $(this).val(''); + } + }); + } + else { + label.addClass('disabled'); + label.attr('for', ''); + } + } + + function registerReset() { + // Reset SVG + var reset = $('#reset-svg'); + reset.click(function(/*evt*/) { + image = ''; + registerSave(); + $('#preview-svg').attr('src', blankImage); }); - }); + } alertify.confirm(content.join('\n')) .set('onok', function(evt) { From 56ce28d5e1ad6e427bdf79716d56e14059eff4f8 Mon Sep 17 00:00:00 2001 From: C47D Date: Sat, 17 Dec 2016 13:47:59 -0600 Subject: [PATCH 046/169] counters and labels updated --- app/resources/blocks/labels.js | 4 + .../logic/combinational/contadorAsc.ice | 335 ++++++++++++++++++ .../logic/combinational/contadorDes.ice | 335 ++++++++++++++++++ 3 files changed, 674 insertions(+) create mode 100644 app/resources/blocks/logic/combinational/contadorAsc.ice create mode 100644 app/resources/blocks/logic/combinational/contadorDes.ice diff --git a/app/resources/blocks/labels.js b/app/resources/blocks/labels.js index f45415c3d..6915fe19f 100644 --- a/app/resources/blocks/labels.js +++ b/app/resources/blocks/labels.js @@ -56,3 +56,7 @@ gettext('tff_ar'); gettext('tff_sr'); /// Debouncer gettext('debouncer'); +/// contadorAsc +gettext('contadorAsc'); +/// contadorDes +gettext('contadorDes'); diff --git a/app/resources/blocks/logic/combinational/contadorAsc.ice b/app/resources/blocks/logic/combinational/contadorAsc.ice new file mode 100644 index 000000000..e8f31b70b --- /dev/null +++ b/app/resources/blocks/logic/combinational/contadorAsc.ice @@ -0,0 +1,335 @@ +{ + "version": "1.0", + "package": { + "name": "contadorAsc", + "version": "0.1", + "description": "Contador ascendente de 4bits", + "author": "Carlos Diaz", + "image": "" + }, + "design": { + "board": "icestick", + "graph": { + "blocks": [ + { + "id": "579cff99-2d27-41d4-a20b-262ca8a93ca9", + "type": "basic.constant", + "data": { + "label": "INIT_CNT", + "local": false, + "value": "4'h2" + }, + "position": { + "x": 160, + "y": 32 + } + }, + { + "id": "c299b4e2-ec25-4472-a58c-5dc46056c414", + "type": "basic.constant", + "data": { + "label": "FIN_CNT", + "local": false, + "value": "4'h5" + }, + "position": { + "x": 352, + "y": 32 + } + }, + { + "id": "c1e3529f-d1eb-4ae5-8345-a43512f21577", + "type": "basic.output", + "data": { + "label": "out0", + "pin": { + "name": "D1", + "value": "99" + } + }, + "position": { + "x": 592, + "y": 128 + } + }, + { + "id": "86492073-e297-4c25-9678-30ab6dd1fa10", + "type": "basic.code", + "data": { + "code": "// INIT_CNT: Valor inicial de la cuenta\n// FIN_CNT: Valor final de la cuenta\n\n// El registro interno inicia su\n// cuenta a partir del valor del\n// parametro INIT_CNT\nreg [3:0] _o = INIT_CNT;\n\nalways @(posedge clk) begin\n if (en) begin\n _o <= _o + 1;\n // cuando _o vale igual que\n // el parametro FIN_CNT\n // se \"reinicia\" la cuenta\n // a partir de INIT_CNT\n if (_o == FIN_CNT || _o == 4'hFF) begin\n _o <= INIT_CNT;\n end\n end\nend\n\nassign {o3, o2, o1, o0} = _o;\n\n// (tc) terminal count, un clk de ancho a\n// la salida cuando termina _o vale FIN_CNT o 0\nwire tc = ((_o == FIN_CNT || _o == 4'hFF) ? 1 : 0);", + "params": [ + "INIT_CNT", + "FIN_CNT" + ], + "ports": { + "in": [ + "en", + "clk" + ], + "out": [ + "o0", + "o1", + "o2", + "o3", + "tc" + ] + } + }, + "position": { + "x": 112, + "y": 176 + } + }, + { + "id": "1e21f6ca-9956-475d-a933-5bb01829f464", + "type": "basic.output", + "data": { + "label": "out1", + "pin": { + "name": "D2", + "value": "98" + } + }, + "position": { + "x": 592, + "y": 200 + } + }, + { + "id": "13b692a2-7ad9-44f7-afb9-83210bd94f28", + "type": "bit.1", + "data": {}, + "position": { + "x": -72, + "y": 208 + } + }, + { + "id": "e83e3ae9-0616-4a17-a145-f14954f3f6e0", + "type": "basic.output", + "data": { + "label": "out2", + "pin": { + "name": "D3", + "value": "97" + } + }, + "position": { + "x": 592, + "y": 272 + } + }, + { + "id": "8d6dece9-e3b8-42d4-b8eb-386c90440923", + "type": "basic.input", + "data": { + "label": "clk", + "pin": { + "name": "CLK", + "value": "21" + } + }, + "position": { + "x": -80, + "y": 336 + } + }, + { + "id": "1f036705-53b5-4833-83ed-adf0a7bf3b98", + "type": "basic.output", + "data": { + "label": "out3", + "pin": { + "name": "TR8", + "value": "117" + } + }, + "position": { + "x": 592, + "y": 344 + } + }, + { + "id": "a9409df4-b096-4ad0-a1c6-c6eb9bfa1d89", + "type": "basic.output", + "data": { + "label": "tc", + "pin": { + "name": "D4", + "value": "96" + } + }, + "position": { + "x": 592, + "y": 416 + } + } + ], + "wires": [ + { + "source": { + "block": "13b692a2-7ad9-44f7-afb9-83210bd94f28", + "port": "19c8f68d-5022-487f-9ab0-f0a3cd58bead" + }, + "target": { + "block": "86492073-e297-4c25-9678-30ab6dd1fa10", + "port": "en" + } + }, + { + "source": { + "block": "86492073-e297-4c25-9678-30ab6dd1fa10", + "port": "o0" + }, + "target": { + "block": "c1e3529f-d1eb-4ae5-8345-a43512f21577", + "port": "in" + } + }, + { + "source": { + "block": "86492073-e297-4c25-9678-30ab6dd1fa10", + "port": "o1" + }, + "target": { + "block": "1e21f6ca-9956-475d-a933-5bb01829f464", + "port": "in" + } + }, + { + "source": { + "block": "86492073-e297-4c25-9678-30ab6dd1fa10", + "port": "o2" + }, + "target": { + "block": "e83e3ae9-0616-4a17-a145-f14954f3f6e0", + "port": "in" + } + }, + { + "source": { + "block": "86492073-e297-4c25-9678-30ab6dd1fa10", + "port": "o3" + }, + "target": { + "block": "1f036705-53b5-4833-83ed-adf0a7bf3b98", + "port": "in" + } + }, + { + "source": { + "block": "86492073-e297-4c25-9678-30ab6dd1fa10", + "port": "tc" + }, + "target": { + "block": "a9409df4-b096-4ad0-a1c6-c6eb9bfa1d89", + "port": "in" + } + }, + { + "source": { + "block": "579cff99-2d27-41d4-a20b-262ca8a93ca9", + "port": "constant-out" + }, + "target": { + "block": "86492073-e297-4c25-9678-30ab6dd1fa10", + "port": "INIT_CNT" + } + }, + { + "source": { + "block": "c299b4e2-ec25-4472-a58c-5dc46056c414", + "port": "constant-out" + }, + "target": { + "block": "86492073-e297-4c25-9678-30ab6dd1fa10", + "port": "FIN_CNT" + } + }, + { + "source": { + "block": "8d6dece9-e3b8-42d4-b8eb-386c90440923", + "port": "out" + }, + "target": { + "block": "86492073-e297-4c25-9678-30ab6dd1fa10", + "port": "clk" + } + } + ] + }, + "deps": { + "bit.1": { + "version": "1.0", + "package": { + "name": "", + "version": "", + "description": "", + "author": "", + "image": "" + }, + "design": { + "graph": { + "blocks": [ + { + "id": "b959fb96-ac67-4aea-90b3-ed35a4c17bf5", + "type": "basic.code", + "data": { + "code": "// Bit 1\n\nassign v = 1'b1;", + "ports": { + "in": [], + "out": [ + "v" + ] + } + }, + "position": { + "x": 96, + "y": 96 + } + }, + { + "id": "19c8f68d-5022-487f-9ab0-f0a3cd58bead", + "type": "basic.output", + "data": { + "label": "" + }, + "position": { + "x": 608, + "y": 192 + } + } + ], + "wires": [ + { + "source": { + "block": "b959fb96-ac67-4aea-90b3-ed35a4c17bf5", + "port": "v" + }, + "target": { + "block": "19c8f68d-5022-487f-9ab0-f0a3cd58bead", + "port": "in" + } + } + ] + }, + "deps": {}, + "state": { + "pan": { + "x": 0, + "y": 0 + }, + "zoom": 1 + } + } + } + }, + "state": { + "pan": { + "x": 194.09767648117244, + "y": 17.47600388566561 + }, + "zoom": 0.9124844670295715 + } + } +} \ No newline at end of file diff --git a/app/resources/blocks/logic/combinational/contadorDes.ice b/app/resources/blocks/logic/combinational/contadorDes.ice new file mode 100644 index 000000000..a95ded233 --- /dev/null +++ b/app/resources/blocks/logic/combinational/contadorDes.ice @@ -0,0 +1,335 @@ +{ + "version": "1.0", + "package": { + "name": "contadorDes", + "version": "0.1", + "description": "Contador descendente de 4bits", + "author": "Carlos Diaz", + "image": "" + }, + "design": { + "board": "icestick", + "graph": { + "blocks": [ + { + "id": "579cff99-2d27-41d4-a20b-262ca8a93ca9", + "type": "basic.constant", + "data": { + "label": "INIT_CNT", + "local": false, + "value": "4'h6" + }, + "position": { + "x": 160, + "y": 32 + } + }, + { + "id": "587cbcbb-9779-4bd4-a6da-501087ccf9d5", + "type": "basic.constant", + "data": { + "label": "FIN_CNT", + "value": "", + "local": false + }, + "position": { + "x": 352, + "y": 32 + } + }, + { + "id": "c1e3529f-d1eb-4ae5-8345-a43512f21577", + "type": "basic.output", + "data": { + "label": "out0", + "pin": { + "name": "D1", + "value": "99" + } + }, + "position": { + "x": 592, + "y": 128 + } + }, + { + "id": "75566233-6418-463a-a42b-1e975f6caf7c", + "type": "basic.code", + "data": { + "code": "// INIT_CNT: Valor inicial de la cuenta\n// FIN_CNT: Valor final de la cuenta\n\n// El registro interno inicia su\n// cuenta a partir del valor del\n// parametro INIT_CNT\nreg [3:0] _o = INIT_CNT;\n\nalways @(posedge clk) begin\n if (en) begin\n _o <= _o - 1;\n // si _o es igual a 0 o al valor\n // de FIN_CNT se reinicia\n // la cuenta\n if (_o == FIN_CNT || _o == 0) begin\n _o <= INIT_CNT;\n end\n end\nend\n\nassign {o3, o2, o1, o0} = _o;\n\n// (tc) terminal count, un clk de ancho a\n// la salida cuando termina _o vale FIN_CNT o 0\nwire tc = ((_o == FIN_CNT || _o == 0) ? 1 : 0);", + "params": [ + "INIT_CNT", + "FIN_CNT" + ], + "ports": { + "in": [ + "en", + "clk" + ], + "out": [ + "o0", + "o1", + "o2", + "o3", + "tc" + ] + } + }, + "position": { + "x": 112, + "y": 176 + } + }, + { + "id": "1e21f6ca-9956-475d-a933-5bb01829f464", + "type": "basic.output", + "data": { + "label": "out1", + "pin": { + "name": "D2", + "value": "98" + } + }, + "position": { + "x": 592, + "y": 200 + } + }, + { + "id": "13b692a2-7ad9-44f7-afb9-83210bd94f28", + "type": "bit.1", + "data": {}, + "position": { + "x": -88, + "y": 208 + } + }, + { + "id": "e83e3ae9-0616-4a17-a145-f14954f3f6e0", + "type": "basic.output", + "data": { + "label": "out2", + "pin": { + "name": "D3", + "value": "97" + } + }, + "position": { + "x": 592, + "y": 272 + } + }, + { + "id": "8d6dece9-e3b8-42d4-b8eb-386c90440923", + "type": "basic.input", + "data": { + "label": "clk", + "pin": { + "name": "CLK", + "value": "21" + } + }, + "position": { + "x": -80, + "y": 336 + } + }, + { + "id": "1f036705-53b5-4833-83ed-adf0a7bf3b98", + "type": "basic.output", + "data": { + "label": "out3", + "pin": { + "name": "TR8", + "value": "117" + } + }, + "position": { + "x": 592, + "y": 344 + } + }, + { + "id": "a9409df4-b096-4ad0-a1c6-c6eb9bfa1d89", + "type": "basic.output", + "data": { + "label": "tc", + "pin": { + "name": "D4", + "value": "96" + } + }, + "position": { + "x": 592, + "y": 416 + } + } + ], + "wires": [ + { + "source": { + "block": "587cbcbb-9779-4bd4-a6da-501087ccf9d5", + "port": "constant-out" + }, + "target": { + "block": "75566233-6418-463a-a42b-1e975f6caf7c", + "port": "FIN_CNT" + } + }, + { + "source": { + "block": "579cff99-2d27-41d4-a20b-262ca8a93ca9", + "port": "constant-out" + }, + "target": { + "block": "75566233-6418-463a-a42b-1e975f6caf7c", + "port": "INIT_CNT" + } + }, + { + "source": { + "block": "13b692a2-7ad9-44f7-afb9-83210bd94f28", + "port": "19c8f68d-5022-487f-9ab0-f0a3cd58bead" + }, + "target": { + "block": "75566233-6418-463a-a42b-1e975f6caf7c", + "port": "en" + } + }, + { + "source": { + "block": "75566233-6418-463a-a42b-1e975f6caf7c", + "port": "o0" + }, + "target": { + "block": "c1e3529f-d1eb-4ae5-8345-a43512f21577", + "port": "in" + } + }, + { + "source": { + "block": "75566233-6418-463a-a42b-1e975f6caf7c", + "port": "o1" + }, + "target": { + "block": "1e21f6ca-9956-475d-a933-5bb01829f464", + "port": "in" + } + }, + { + "source": { + "block": "75566233-6418-463a-a42b-1e975f6caf7c", + "port": "o2" + }, + "target": { + "block": "e83e3ae9-0616-4a17-a145-f14954f3f6e0", + "port": "in" + } + }, + { + "source": { + "block": "75566233-6418-463a-a42b-1e975f6caf7c", + "port": "o3" + }, + "target": { + "block": "1f036705-53b5-4833-83ed-adf0a7bf3b98", + "port": "in" + } + }, + { + "source": { + "block": "75566233-6418-463a-a42b-1e975f6caf7c", + "port": "tc" + }, + "target": { + "block": "a9409df4-b096-4ad0-a1c6-c6eb9bfa1d89", + "port": "in" + } + }, + { + "source": { + "block": "8d6dece9-e3b8-42d4-b8eb-386c90440923", + "port": "out" + }, + "target": { + "block": "75566233-6418-463a-a42b-1e975f6caf7c", + "port": "clk" + } + } + ] + }, + "deps": { + "bit.1": { + "version": "1.0", + "package": { + "name": "", + "version": "", + "description": "", + "author": "", + "image": "" + }, + "design": { + "graph": { + "blocks": [ + { + "id": "b959fb96-ac67-4aea-90b3-ed35a4c17bf5", + "type": "basic.code", + "data": { + "code": "// Bit 1\n\nassign v = 1'b1;", + "ports": { + "in": [], + "out": [ + "v" + ] + } + }, + "position": { + "x": 96, + "y": 96 + } + }, + { + "id": "19c8f68d-5022-487f-9ab0-f0a3cd58bead", + "type": "basic.output", + "data": { + "label": "" + }, + "position": { + "x": 608, + "y": 192 + } + } + ], + "wires": [ + { + "source": { + "block": "b959fb96-ac67-4aea-90b3-ed35a4c17bf5", + "port": "v" + }, + "target": { + "block": "19c8f68d-5022-487f-9ab0-f0a3cd58bead", + "port": "in" + } + } + ] + }, + "deps": {}, + "state": { + "pan": { + "x": 0, + "y": 0 + }, + "zoom": 1 + } + } + } + }, + "state": { + "pan": { + "x": 299.1610720840899, + "y": 65.30744435772274 + }, + "zoom": 0.7185669634733571 + } + } +} \ No newline at end of file From b5ce60ed24ee56c73f29994aeadb8efe5230ed12 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jes=C3=BAs=20Arroyo=20Torrens?= Date: Sun, 18 Dec 2016 09:58:35 +0100 Subject: [PATCH 047/169] Add Virtual-FGPA I/O ports management --- app/index.html | 2 +- app/scripts/plugins/shapes/joint.shapes.js | 94 ++++++++++++++-------- app/scripts/services/compiler.service.js | 4 +- app/scripts/services/graph.service.js | 48 ++++++----- app/scripts/services/project.service.js | 1 + app/scripts/services/utils.service.js | 9 +-- app/styles/{project.css => design.css} | 29 +++++-- 7 files changed, 120 insertions(+), 67 deletions(-) rename app/styles/{project.css => design.css} (92%) diff --git a/app/index.html b/app/index.html index 3e2ff3b32..c48401b00 100644 --- a/app/index.html +++ b/app/index.html @@ -16,7 +16,7 @@ - + diff --git a/app/scripts/plugins/shapes/joint.shapes.js b/app/scripts/plugins/shapes/joint.shapes.js index f7699e8f9..5ee639e52 100644 --- a/app/scripts/plugins/shapes/joint.shapes.js +++ b/app/scripts/plugins/shapes/joint.shapes.js @@ -327,59 +327,89 @@ joint.shapes.ice.Output = joint.shapes.ice.Model.extend({ joint.shapes.ice.IOView = joint.shapes.ice.ModelView.extend({ - template: '\ -
                \ - \ - \ - \ -
                \ - ', + id: '', initialize: function() { joint.shapes.ice.ModelView.prototype.initialize.apply(this, arguments); - // Prevent paper from handling pointerdown. - this.$box.find('.io-combo').on('mousedown click', function(evt) { evt.stopPropagation(); }); + this.id = sha1(this.model.get('id')).toString().substring(0, 6); + var virtualPortId = 'virtualPort' + this.id; + var fpgaPortId = 'fpgaPort' + this.id; + var comboId = 'combo' + this.id; + var connected = this.model.get('data').connected; + this.$box = $(joint.util.template( + '\ +
                \ + \ +
                \ +
                \ + \ + \ + \ +
                \ + ' + )()); + + this.$box.find('#' + virtualPortId); - this.$box.find('.io-combo').on('change', _.bind(function(evt) { + // Prevent paper from handling pointerdown. + var comboSelector = this.$box.find('#' + comboId); + comboSelector.on('mousedown click', function(evt) { evt.stopPropagation(); }); + comboSelector.on('change', _.bind(function(evt) { this.model.attributes.data.pin.name = $(evt.target).find('option:selected').text(); this.model.attributes.data.pin.value = $(evt.target).val(); }, this)); }, - renderLabel: function () { - var name = this.model.attributes.data.label; - this.$box.find('label').text(name); + renderChoides: function() { + var comboId = '#combo' + this.id; + var comboSelector = this.$box.find(comboId); + var choices = this.model.get('choices'); + + comboSelector.empty(); + comboSelector.append(''); + for (var c in choices) { + comboSelector.append(''); + } }, - renderChoices: function() { - if (this.model.get('disabled')) { - this.$box.find('.io-combo').removeClass('select2'); - this.$box.find('.io-combo').css({'display': 'none'}); + renderBlock: function() { + var virtualPortId = '#virtualPort' + this.id; + var fpgaPortId = '#fpgaPort' + this.id; + var name = this.model.get('data').label; + + this.$box.find('label').text(name); + + if (this.model.get('data').connected) { + // FPGA I/O port (yellow) + $(virtualPortId).addClass('hidden'); + $(fpgaPortId).removeClass('hidden'); } else { - var choices = this.model.get('choices'); - var $select = this.$box.find('.io-combo').empty(); - - $select.append(''); - for (var c in choices) { - $select.append(''); - } + // Virtual port (green) + $(fpgaPortId).addClass('hidden'); + $(virtualPortId).removeClass('hidden'); + } + }, + renderValue: function() { + var comboId = '#combo' + this.id; + var comboSelector = this.$box.find(comboId); - if (this.model.get('data').pin) { - this.$box.find('.io-combo').val(this.model.get('data').pin.value); - } + if (this.model.get('data').pin) { + comboSelector.val(this.model.get('data').pin.value); } }, clearValue: function () { + var comboId = '#combo' + this.id; this.model.attributes.data.pin.name = ''; this.model.attributes.data.pin.value = 0; - this.$box.find('.io-combo').val(''); + this.$box.find(comboId).val(''); }, update: function () { - this.renderLabel(); this.renderPorts(); - this.renderChoices(); + this.renderBlock(); + this.renderChoides(); + this.renderValue(); joint.dia.ElementView.prototype.update.apply(this, arguments); } }); diff --git a/app/scripts/services/compiler.service.js b/app/scripts/services/compiler.service.js index ae135d599..374525988 100644 --- a/app/scripts/services/compiler.service.js +++ b/app/scripts/services/compiler.service.js @@ -377,7 +377,9 @@ angular.module('icestudio') code += 'set_io '; code += digestId(block.id); code += ' '; - code += block.data.pin.value; + if (block.data.connected) { + code += block.data.pin.value; + } code += '\n'; } } diff --git a/app/scripts/services/graph.service.js b/app/scripts/services/graph.service.js index 986026ff3..6a09a316b 100644 --- a/app/scripts/services/graph.service.js +++ b/app/scripts/services/graph.service.js @@ -280,25 +280,32 @@ angular.module('icestudio') if (data.blockType === 'basic.input' || data.blockType === 'basic.output') { if (paper.options.enabled) { - alertify.prompt(gettextCatalog.getString('Update the port label'), data.data.label ? ' ' + data.data.label + ' ' : '', - function(evt, label) { - label = label.replace(/ /g, ''); + utils.inputcheckboxprompt([ + gettextCatalog.getString('Update the port label'), + gettextCatalog.getString('Connect to an FPGA port') + ], [ + data.data.label ? data.data.label : '', + data.data.connected ? data.data.connected : false + ], + function(evt, values) { + var label = values[0].replace(/ /g, ''); if (data.data.label !== label) { data.data.label = label; - cellView.renderLabel(); - alertify.success(gettextCatalog.getString('Label updated')); + alertify.success(gettextCatalog.getString('Block updated')); } + var connected = values[1]; + data.data.connected = connected; + cellView.renderBlock(); }); } } else if (data.blockType === 'basic.constant') { if (paper.options.enabled) { - utils.constantprompt([ + utils.inputcheckboxprompt([ gettextCatalog.getString('Update the block label'), - gettextCatalog.getString('Update the block status'), gettextCatalog.getString('Local parameter') ], [ - data.data.label ? ' ' + data.data.label + ' ' : '', + data.data.label ? data.data.label : '', data.data.local ? data.data.local : false ], function(evt, values) { @@ -306,7 +313,7 @@ angular.module('icestudio') if (data.data.label !== label) { data.data.label = label; cellView.renderLabel(); - alertify.success(gettextCatalog.getString('Label updated')); + alertify.success(gettextCatalog.getString('Block updated')); } var local = values[1]; data.data.local = local; @@ -444,17 +451,17 @@ angular.module('icestudio') if (type === 'basic.code') { var defaultValues = [ - ' a , b ', - ' c , d ', + 'a , b', + 'c , d', '' ]; if (block && block.data) { if (block.data.ports) { - defaultValues[0] = ' ' + block.data.ports.in.join(' , ') + ' '; - defaultValues[1] = ' ' + block.data.ports.out.join(' , ') + ' '; + defaultValues[0] = block.data.ports.in.join(' , '); + defaultValues[1] = block.data.ports.out.join(' , '); } if (block.data.params) { - defaultValues[2] = ' ' + block.data.params.join(' , ') + ' '; + defaultValues[2] = block.data.params.join(' , '); } } utils.multiprompt( @@ -539,7 +546,7 @@ angular.module('icestudio') } } else if (type === 'basic.input') { - alertify.prompt(gettextCatalog.getString('Enter the input ports'), ' in ', + alertify.prompt(gettextCatalog.getString('Enter the input ports'), 'in', function(evt, name) { if (name) { var names = name.replace(/ /g, '').split(','); @@ -579,7 +586,7 @@ angular.module('icestudio') }); } else if (type === 'basic.output') { - alertify.prompt(gettextCatalog.getString('Enter the output ports'), ' out ', + alertify.prompt(gettextCatalog.getString('Enter the output ports'), 'out', function(evt, name) { if (name) { var names = name.replace(/ /g, '').split(','); @@ -621,7 +628,7 @@ angular.module('icestudio') }); } else if (type === 'basic.constant') { - alertify.prompt(gettextCatalog.getString('Enter the constant blocks'), ' C ', + alertify.prompt(gettextCatalog.getString('Enter the constant blocks'), 'C', function(evt, name) { if (name) { var names = name.replace(/ /g, '').split(','); @@ -854,9 +861,8 @@ angular.module('icestudio') id: blockInstances.id, blockType: blockInstances.type, data: blockInstances.data, - label: blockInstances.data.label, position: blockInstances.position, - disabled: disabled, + disabled: disabled, // Not used choices: boards.getPinout() }); @@ -869,9 +875,8 @@ angular.module('icestudio') id: blockInstances.id, blockType: blockInstances.type, data: blockInstances.data, - label: blockInstances.data.label, position: blockInstances.position, - disabled: disabled, + disabled: disabled, // Not used choices: boards.getPinout() }); @@ -884,7 +889,6 @@ angular.module('icestudio') id: blockInstances.id, blockType: blockInstances.type, data: blockInstances.data, - label: blockInstances.data.label, position: blockInstances.position, disabled: disabled }); diff --git a/app/scripts/services/project.service.js b/app/scripts/services/project.service.js index b7ffa1833..ac73c8153 100644 --- a/app/scripts/services/project.service.js +++ b/app/scripts/services/project.service.js @@ -224,6 +224,7 @@ angular.module('icestudio') if (block.design.graph.blocks[i].type === 'basic.input' || block.design.graph.blocks[i].type === 'basic.output') { delete block.design.graph.blocks[i].data.pin; + delete block.design.graph.blocks[i].data.connected; } } // Add block diff --git a/app/scripts/services/utils.service.js b/app/scripts/services/utils.service.js index d08a0578d..f7ee0918a 100644 --- a/app/scripts/services/utils.service.js +++ b/app/scripts/services/utils.service.js @@ -633,16 +633,13 @@ angular.module('icestudio') }); }; - this.constantprompt = function(messages, values, callback) { + this.inputcheckboxprompt = function(messages, values, callback) { var content = []; content.push('
                '); content.push('

                ' + messages[0] + '

                '); - content.push(' '); + content.push(' '); content.push('
                '); - content.push('

                ' + messages[1] + '

                '); - content.push('
                  '); - content.push('

                • ' + messages[2] + '

                  • '); - content.push('
                '); + content.push('
                '); content.push('
                '); // Restore values $('#label').val(values[0]); diff --git a/app/styles/project.css b/app/styles/design.css similarity index 92% rename from app/styles/project.css rename to app/styles/design.css index 1ed356620..d27f9524c 100644 --- a/app/styles/project.css +++ b/app/styles/design.css @@ -104,9 +104,28 @@ color: #444; } -.io-block { +.virtual-port { position: absolute; - background: #fafacd; + background: #E2FBC9; + border-radius: 5px; + border: 2px solid #888; + pointer-events: none; + -webkit-user-select: none; + user-select: none; + z-index: 0; +} + +.virtual-port label { + display: block; + margin-top: 20px; + text-align: center; + font-size: 1em; + color: #444; +} + +.fpga-port { + position: absolute; + background: #FBFBC9; border-radius: 5px; border: 2px solid #888; pointer-events: none; @@ -115,7 +134,7 @@ z-index: 0; } -.io-block label { +.fpga-port label { display: block; margin-top: 4px; text-align: center; @@ -123,7 +142,7 @@ color: #444; } -.io-block .select2 { +.select2 { position: absolute; left: 5px; bottom: 5px; @@ -133,7 +152,7 @@ .constant-block { position: absolute; - background: #faeaaf; + background: #FBF0C9; border-radius: 5px; border: 2px solid #888; pointer-events: none; From 6732b6d06e1ca2cc2a7244a8e157a1818ab5b272 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jes=C3=BAs=20Arroyo=20Torrens?= Date: Sun, 18 Dec 2016 11:33:53 +0100 Subject: [PATCH 048/169] User virtual flag in ports --- app/scripts/plugins/shapes/joint.shapes.js | 27 +++++++++-------- app/scripts/services/graph.service.js | 34 ++++++++++++++-------- app/scripts/services/project.service.js | 1 - 3 files changed, 37 insertions(+), 25 deletions(-) diff --git a/app/scripts/plugins/shapes/joint.shapes.js b/app/scripts/plugins/shapes/joint.shapes.js index 5ee639e52..bb4d3c003 100644 --- a/app/scripts/plugins/shapes/joint.shapes.js +++ b/app/scripts/plugins/shapes/joint.shapes.js @@ -283,7 +283,7 @@ joint.shapes.ice.GenericView = joint.shapes.ice.ModelView.extend({ this.$box.find('label').addClass('hidden'); } else { - this.$box.find('label').text(name); + this.$box.find('label').html(name); this.$box.find('img').addClass('hidden'); this.$box.find('label').removeClass('hidden'); } @@ -336,13 +336,13 @@ joint.shapes.ice.IOView = joint.shapes.ice.ModelView.extend({ var virtualPortId = 'virtualPort' + this.id; var fpgaPortId = 'fpgaPort' + this.id; var comboId = 'combo' + this.id; - var connected = this.model.get('data').connected; + var virtual = this.model.get('data').virtual || this.model.get('disabled'); this.$box = $(joint.util.template( '\ -
                \ +
                \ \
                \ -
                \ +
                \ \ \ - + diff --git a/app/scripts/plugins/shapes/joint.shapes.js b/app/scripts/plugins/shapes/joint.shapes.js index d60ef76ea..e376fcf0e 100644 --- a/app/scripts/plugins/shapes/joint.shapes.js +++ b/app/scripts/plugins/shapes/joint.shapes.js @@ -330,6 +330,7 @@ joint.shapes.ice.Output = joint.shapes.ice.Model.extend({ joint.shapes.ice.IOView = joint.shapes.ice.ModelView.extend({ id: '', + pins: [], initialize: function() { joint.shapes.ice.ModelView.prototype.initialize.apply(this, arguments); @@ -339,6 +340,25 @@ joint.shapes.ice.IOView = joint.shapes.ice.ModelView.extend({ var fpgaPortId = 'fpgaPort' + this.id; var comboId = 'combo' + this.id; var virtual = this.model.get('data').virtual || this.model.get('disabled'); + + var selectCode = ''; + var selectScript = ''; + this.pins = this.model.attributes.data.pins; + + // a,b[0:1],c[0:2],d[0:3] + + if (this.pins) { + for (var i in this.pins) { + //selectCode += '

                ' + this.pins[i].index + '

                '; + selectCode +=''; + + selectScript += '$("#' + comboId + this.pins[i].index + '").select2('; + selectScript += '{placeholder: "", allowClear: true, dropdownCssClass: "bigdrop"});'; + } + } + this.$box = $(joint.util.template( '\
                \ @@ -346,33 +366,27 @@ joint.shapes.ice.IOView = joint.shapes.ice.ModelView.extend({
                \
                \ \ - \ - \ +
                ' + selectCode + '
                \ + \
                \ ' )()); - this.$box.find('#' + virtualPortId); - // Prevent paper from handling pointerdown. - var comboSelector = this.$box.find('#' + comboId); + var comboSelector = this.$box.find('.select2'); comboSelector.on('mousedown click', function(evt) { evt.stopPropagation(); }); comboSelector.on('change', _.bind(function(evt) { - this.model.attributes.data.pin.name = $(evt.target).find('option:selected').text(); - this.model.attributes.data.pin.value = $(evt.target).val(); + var target = $(evt.target); + var index = target.attr('index'); + this.model.attributes.data.pins[index].name = target.find('option:selected').text(); + this.model.attributes.data.pins[index].value = target.val(); }, this)); }, renderChoides: function() { - var comboId = '#combo' + this.id; - var comboSelector = this.$box.find(comboId); - var choices = this.model.get('choices'); - - comboSelector.empty(); - comboSelector.append(''); - for (var c in choices) { - comboSelector.append(''); + if (this.pins) { + for (var i in this.pins) { + this.$box.find('#combo' + this.id + this.pins[i].index).empty().append(this.model.get('choices')); + } } }, renderBlock: function() { @@ -387,19 +401,22 @@ joint.shapes.ice.IOView = joint.shapes.ice.ModelView.extend({ // Virtual port (green) $(fpgaPortId).addClass('hidden'); $(virtualPortId).removeClass('hidden'); + this.model.attributes.size.height = 64; } else { // FPGA I/O port (yellow) $(virtualPortId).addClass('hidden'); $(fpgaPortId).removeClass('hidden'); + if (this.pins) { + this.model.attributes.size.height = 32 + 32 * this.pins.length; + } } }, renderValue: function() { - var comboId = '#combo' + this.id; - var comboSelector = this.$box.find(comboId); - - if (this.model.get('data').pin) { - comboSelector.val(this.model.get('data').pin.value); + if (this.pins) { + for (var i in this.pins) { + this.$box.find('#combo' + this.id + this.pins[i].index).val(this.pins[i].value); + } } }, clearValue: function () { @@ -691,7 +708,7 @@ joint.shapes.ice.Wire = joint.dia.Link.extend({ bifurcationMarkup: [ '', - '', + '', '' ].join(''), @@ -741,12 +758,14 @@ joint.shapes.ice.WireView = joint.dia.LinkView.extend({ // console.log('render'); var pins = this.sourceView.model.attributes.data.pins; + var wireDot = (pins && pins.length > 1) ? 8 : 4; var wireWidth = (pins && pins.length > 1) ? 8 : 2; var wireLabel = (pins && pins.length > 1) ? '' + pins.length + '' : ''; // Set up the wire this.$('.connection').css('stroke-width', wireWidth); this.model.label(0, {attrs: { text: { text: wireLabel } } }); + this.model.bifurcationMarkup = this.model.bifurcationMarkup.replace(/<%= r %>/g, wireDot); return this; }, diff --git a/app/scripts/services/boards.service.js b/app/scripts/services/boards.service.js index 3b2dfc654..62ade991b 100644 --- a/app/scripts/services/boards.service.js +++ b/app/scripts/services/boards.service.js @@ -3,7 +3,7 @@ angular.module('icestudio') .service('boards', function(nodeFs, nodePath) { - + this.pinoutHTML = ''; this.selectedBoard = null; this.currentBoards = loadBoards(nodePath.join('resources', 'boards')); @@ -41,6 +41,7 @@ angular.module('icestudio') for (var i in this.currentBoards) { if (name === this.currentBoards[i].name) { this.selectedBoard = this.currentBoards[i]; + this.pinoutHTML = generateHTMLOptions(this.selectedBoard.pinout); break; } } @@ -53,8 +54,17 @@ angular.module('icestudio') return this.currentBoards; }; - this.getPinout = function() { - return this.selectedBoard.pinout; + this.getPinoutHTML = function() { + return this.pinoutHTML; }; + function generateHTMLOptions(pinout) { + var code = ''; + } + code += ''; + return code; + } + }); diff --git a/app/scripts/services/graph.service.js b/app/scripts/services/graph.service.js index d409634e0..9e6d9eddc 100644 --- a/app/scripts/services/graph.service.js +++ b/app/scripts/services/graph.service.js @@ -295,7 +295,7 @@ angular.module('icestudio') } var virtual = values[1]; data.data.virtual = virtual; - cellView.renderBlock(); + cellView.render(); }); } } @@ -552,7 +552,6 @@ angular.module('icestudio') var labels = input.replace(/ /g, '').split(','); for (var l in labels) { var portInfo = utils.parsePortLabel(labels[l]); - console.log(portInfo); if (portInfo) { evt.cancel = false; var pins = []; @@ -567,7 +566,7 @@ angular.module('icestudio') } else { pins.push({ - index: '', + index: '0', name: '', value: 0 }); @@ -724,7 +723,7 @@ angular.module('icestudio') var cell = cells[i]; var type = cell.attributes.blockType; if (type === 'basic.input' || type === 'basic.output') { - cell.attributes.choices = boards.getPinout(); + cell.attributes.choices = boards.getPinoutHTML(); var view = paper.findViewByModel(cell.id); view.renderChoices(); view.clearValue(); @@ -888,7 +887,7 @@ angular.module('icestudio') data: blockInstances.data, position: blockInstances.position, disabled: disabled, - choices: boards.getPinout() + choices: boards.getPinoutHTML() }); addCell(cell); @@ -902,7 +901,7 @@ angular.module('icestudio') data: blockInstances.data, position: blockInstances.position, disabled: disabled, - choices: boards.getPinout() + choices: boards.getPinoutHTML() }); addCell(cell); diff --git a/app/styles/design.css b/app/styles/design.css index d27f9524c..2d6e27a0f 100644 --- a/app/styles/design.css +++ b/app/styles/design.css @@ -136,20 +136,32 @@ .fpga-port label { display: block; - margin-top: 4px; + margin-top: 3px; + margin-bottom: 4px; text-align: center; font-size: 1em; color: #444; } -.select2 { - position: absolute; - left: 5px; - bottom: 5px; +.fpga-port div p { + position: relative; + top: 0px; + left: -20px; + float: left; +} + +.fpga-port div .select2 { + position: relative; width: 82px; + left: 5px; + margin-bottom: 4px; pointer-events: auto; } +.bigdrop { + width: 96px !important; +} + .constant-block { position: absolute; background: #FBF0C9; From aa895970667b6d3ffca90a0e6105851ec248876a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jes=C3=BAs=20Arroyo=20Torrens?= Date: Mon, 19 Dec 2016 19:32:54 +0100 Subject: [PATCH 054/169] Add bus backward compat. Update demo projects --- app/scripts/plugins/shapes/joint.shapes.js | 3 +- app/scripts/services/graph.service.js | 8 +- app/scripts/services/project.service.js | 16 ++++ demo/complex.ice | 92 +++++++++++++++++----- demo/constant-code-block.ice | 14 +++- demo/constant-generic-block.ice | 28 +++++-- demo/constant-io-code-block.ice | 42 +++++++--- demo/div.ice | 30 ++++--- demo/input-output.ice | 30 ++++--- demo/multi-block-block.ice | 68 ++++++++++++---- demo/multi-block-output.ice | 68 ++++++++++++---- demo/multi-constant-generic-block.ice | 42 +++++++--- demo/multi-input-output.ice | 46 +++++++---- tasks/toolchain_builder.js | 34 ++++---- 14 files changed, 386 insertions(+), 135 deletions(-) diff --git a/app/scripts/plugins/shapes/joint.shapes.js b/app/scripts/plugins/shapes/joint.shapes.js index e376fcf0e..92c646c3a 100644 --- a/app/scripts/plugins/shapes/joint.shapes.js +++ b/app/scripts/plugins/shapes/joint.shapes.js @@ -395,7 +395,7 @@ joint.shapes.ice.IOView = joint.shapes.ice.ModelView.extend({ var name = this.model.get('data').label; var virtual = this.model.get('data').virtual || this.model.get('disabled'); - this.$box.find('label').text(name); + this.$box.find('label').text(name ? name : ' '); if (virtual) { // Virtual port (green) @@ -766,6 +766,7 @@ joint.shapes.ice.WireView = joint.dia.LinkView.extend({ this.$('.connection').css('stroke-width', wireWidth); this.model.label(0, {attrs: { text: { text: wireLabel } } }); this.model.bifurcationMarkup = this.model.bifurcationMarkup.replace(/<%= r %>/g, wireDot); + this.update(); return this; }, diff --git a/app/scripts/services/graph.service.js b/app/scripts/services/graph.service.js index 9e6d9eddc..425639c7d 100644 --- a/app/scripts/services/graph.service.js +++ b/app/scripts/services/graph.service.js @@ -284,8 +284,8 @@ angular.module('icestudio') gettextCatalog.getString('Update the port label'), gettextCatalog.getString('Virtual port') ], [ - data.data.label ? data.data.label : '', - data.data.virtual ? data.data.virtual : false + data.data.label, + data.data.virtual ], function(evt, values) { var label = values[0].replace(/ /g, ''); @@ -305,8 +305,8 @@ angular.module('icestudio') gettextCatalog.getString('Update the block label'), gettextCatalog.getString('Local parameter') ], [ - data.data.label ? data.data.label : '', - data.data.local ? data.data.local : false + data.data.label, + data.data.local ], function(evt, values) { var label = values[0].replace(/ /g, ''); diff --git a/app/scripts/services/project.service.js b/app/scripts/services/project.service.js index b91ded4d9..06b63b53d 100644 --- a/app/scripts/services/project.service.js +++ b/app/scripts/services/project.service.js @@ -80,6 +80,22 @@ angular.module('icestudio') project = data; break; default: + var blocks = data.graph.blocks; + for (var b in blocks) { + var block = blocks[b]; + if (block.type === 'basic.input' || + block.type === 'basic.output') { + block.data.name = block.data.label; + block.data.range = ''; + block.data.pins = [{ + index: '0', + name: block.data.pin ? block.data.pin.name : '', + value: block.data.pin ? block.data.pin.value : 0 + }]; + block.data.virtual = false; + delete block.data.pin; + } + } project = _default(); project.design.board = data.board; project.design.graph = data.graph; diff --git a/demo/complex.ice b/demo/complex.ice index a6f74fb67..344dafe77 100644 --- a/demo/complex.ice +++ b/demo/complex.ice @@ -16,10 +16,16 @@ "type": "basic.output", "data": { "label": "a", - "pin": { - "name": "LED0", - "value": "95" - } + "name": "a", + "range": "", + "pins": [ + { + "index": "0", + "name": "LED0", + "value": "95" + } + ], + "virtual": false }, "position": { "x": 216, @@ -43,10 +49,16 @@ "type": "basic.output", "data": { "label": "c", - "pin": { - "name": "LED2", - "value": "97" - } + "name": "c", + "range": "", + "pins": [ + { + "index": "0", + "name": "LED2", + "value": "97" + } + ], + "virtual": false }, "position": { "x": 760, @@ -58,10 +70,16 @@ "type": "basic.input", "data": { "label": "in", - "pin": { - "name": "SW1", - "value": "10" - } + "name": "in", + "range": "", + "pins": [ + { + "index": "0", + "name": "SW1", + "value": "10" + } + ], + "virtual": false }, "position": { "x": 48, @@ -91,10 +109,16 @@ "type": "basic.output", "data": { "label": "d", - "pin": { - "name": "LED3", - "value": "98" - } + "name": "d", + "range": "", + "pins": [ + { + "index": "0", + "name": "LED3", + "value": "98" + } + ], + "virtual": false }, "position": { "x": 768, @@ -250,7 +274,17 @@ "id": "94e9a915-defe-4437-8abd-d3e57dafbb45", "type": "basic.output", "data": { - "label": "out" + "label": "out", + "name": "out", + "range": "", + "pins": [ + { + "index": "0", + "name": "", + "value": 0 + } + ], + "virtual": false }, "position": { "x": 712, @@ -283,7 +317,17 @@ "id": "a8faca21-4b86-4bb1-8cd1-8c5252d4038f", "type": "basic.input", "data": { - "label": "in" + "label": "in", + "name": "in", + "range": "", + "pins": [ + { + "index": "0", + "name": "", + "value": 0 + } + ], + "virtual": false }, "position": { "x": 24, @@ -294,7 +338,17 @@ "id": "9051bd8c-0c39-4b19-bb08-71ac0ba8e9bf", "type": "basic.input", "data": { - "label": "" + "label": "", + "name": "", + "range": "", + "pins": [ + { + "index": "0", + "name": "", + "value": 0 + } + ], + "virtual": false }, "position": { "x": 24, diff --git a/demo/constant-code-block.ice b/demo/constant-code-block.ice index 8348859d9..db4de8682 100644 --- a/demo/constant-code-block.ice +++ b/demo/constant-code-block.ice @@ -48,10 +48,16 @@ "type": "basic.output", "data": { "label": "led", - "pin": { - "name": "LED0", - "value": "95" - } + "name": "led", + "range": "", + "pins": [ + { + "index": "0", + "name": "LED0", + "value": "95" + } + ], + "virtual": false }, "position": { "x": 624, diff --git a/demo/constant-generic-block.ice b/demo/constant-generic-block.ice index b793e3dee..dcc1ccca4 100644 --- a/demo/constant-generic-block.ice +++ b/demo/constant-generic-block.ice @@ -37,10 +37,16 @@ "type": "basic.output", "data": { "label": "led", - "pin": { - "name": "LED0", - "value": "95" - } + "name": "led", + "range": "", + "pins": [ + { + "index": "0", + "name": "LED0", + "value": "95" + } + ], + "virtual": false }, "position": { "x": 536, @@ -100,7 +106,17 @@ "id": "94e9a915-defe-4437-8abd-d3e57dafbb45", "type": "basic.output", "data": { - "label": "led" + "label": "led", + "name": "led", + "range": "", + "pins": [ + { + "index": "0", + "name": "", + "value": 0 + } + ], + "virtual": false }, "position": { "x": 624, @@ -167,7 +183,7 @@ "x": -21, "y": 66 }, - "zoom": 1 + "zoom": 0.9999999999999893 } } } \ No newline at end of file diff --git a/demo/constant-io-code-block.ice b/demo/constant-io-code-block.ice index c664221dd..941351292 100644 --- a/demo/constant-io-code-block.ice +++ b/demo/constant-io-code-block.ice @@ -50,10 +50,16 @@ "type": "basic.input", "data": { "label": "in", - "pin": { - "name": "SW1", - "value": "10" - } + "name": "in", + "range": "", + "pins": [ + { + "index": "0", + "name": "SW1", + "value": "10" + } + ], + "virtual": false }, "position": { "x": 24, @@ -65,10 +71,16 @@ "type": "basic.output", "data": { "label": "out", - "pin": { - "name": "LED0", - "value": "95" - } + "name": "out", + "range": "", + "pins": [ + { + "index": "0", + "name": "LED0", + "value": "95" + } + ], + "virtual": false }, "position": { "x": 712, @@ -80,10 +92,16 @@ "type": "basic.input", "data": { "label": "", - "pin": { - "name": "", - "value": 0 - } + "name": "", + "range": "", + "pins": [ + { + "index": "0", + "name": "", + "value": 0 + } + ], + "virtual": false }, "position": { "x": 24, diff --git a/demo/div.ice b/demo/div.ice index 0d0634a64..0a83e14c5 100644 --- a/demo/div.ice +++ b/demo/div.ice @@ -50,10 +50,16 @@ "type": "basic.input", "data": { "label": "clk", - "pin": { - "name": "CLK", - "value": "21" - } + "name": "clk", + "range": "", + "pins": [ + { + "index": "0", + "name": "CLK", + "value": "21" + } + ], + "virtual": false }, "position": { "x": 64, @@ -65,10 +71,16 @@ "type": "basic.output", "data": { "label": "", - "pin": { - "name": "LED0", - "value": "95" - } + "name": "", + "range": "", + "pins": [ + { + "index": "0", + "name": "LED0", + "value": "95" + } + ], + "virtual": false }, "position": { "x": 752, @@ -115,7 +127,7 @@ "x": 3, "y": 145 }, - "zoom": 0.9999999638409349 + "zoom": 0.9999999403953552 } } } \ No newline at end of file diff --git a/demo/input-output.ice b/demo/input-output.ice index 2f4578734..275d36de2 100644 --- a/demo/input-output.ice +++ b/demo/input-output.ice @@ -16,10 +16,16 @@ "type": "basic.input", "data": { "label": "in", - "pin": { - "name": "SW1", - "value": "10" - } + "name": "in", + "range": "", + "pins": [ + { + "index": "0", + "name": "SW1", + "value": "10" + } + ], + "virtual": false }, "position": { "x": 104, @@ -31,10 +37,16 @@ "type": "basic.output", "data": { "label": "out", - "pin": { - "name": "LED0", - "value": "95" - } + "name": "out", + "range": "", + "pins": [ + { + "index": "0", + "name": "LED0", + "value": "95" + } + ], + "virtual": false }, "position": { "x": 344, @@ -61,7 +73,7 @@ "x": 0, "y": 0 }, - "zoom": 0.9999999638409349 + "zoom": 0.9999999403953552 } } } \ No newline at end of file diff --git a/demo/multi-block-block.ice b/demo/multi-block-block.ice index be6d94fbf..390f96c24 100644 --- a/demo/multi-block-block.ice +++ b/demo/multi-block-block.ice @@ -25,10 +25,16 @@ "type": "basic.output", "data": { "label": "out", - "pin": { - "name": "LED0", - "value": "95" - } + "name": "out", + "range": "", + "pins": [ + { + "index": "0", + "name": "LED0", + "value": "95" + } + ], + "virtual": false }, "position": { "x": 632, @@ -40,10 +46,16 @@ "type": "basic.input", "data": { "label": "in", - "pin": { - "name": "SW1", - "value": "10" - } + "name": "in", + "range": "", + "pins": [ + { + "index": "0", + "name": "SW1", + "value": "10" + } + ], + "virtual": false }, "position": { "x": 96, @@ -73,10 +85,16 @@ "type": "basic.output", "data": { "label": "out", - "pin": { - "name": "LED1", - "value": "96" - } + "name": "out", + "range": "", + "pins": [ + { + "index": "0", + "name": "LED1", + "value": "96" + } + ], + "virtual": false }, "position": { "x": 632, @@ -174,7 +192,17 @@ "id": "18c2ebc7-5152-439c-9b3f-851c59bac834", "type": "basic.input", "data": { - "label": "" + "label": "", + "name": "", + "range": "", + "pins": [ + { + "index": "0", + "name": "", + "value": 0 + } + ], + "virtual": false }, "position": { "x": 64, @@ -185,7 +213,17 @@ "id": "664caf9e-5f40-4df4-800a-b626af702e62", "type": "basic.output", "data": { - "label": "" + "label": "", + "name": "", + "range": "", + "pins": [ + { + "index": "0", + "name": "", + "value": 0 + } + ], + "virtual": false }, "position": { "x": 752, @@ -232,7 +270,7 @@ "x": 0, "y": 0 }, - "zoom": 0.9999999638409349 + "zoom": 0.9999999403953552 } } } \ No newline at end of file diff --git a/demo/multi-block-output.ice b/demo/multi-block-output.ice index e8bc59fe0..b50f500c9 100644 --- a/demo/multi-block-output.ice +++ b/demo/multi-block-output.ice @@ -16,10 +16,16 @@ "type": "basic.output", "data": { "label": "out", - "pin": { - "name": "LED0", - "value": "95" - } + "name": "out", + "range": "", + "pins": [ + { + "index": "0", + "name": "LED0", + "value": "95" + } + ], + "virtual": false }, "position": { "x": 464, @@ -31,10 +37,16 @@ "type": "basic.input", "data": { "label": "in", - "pin": { - "name": "SW1", - "value": "10" - } + "name": "in", + "range": "", + "pins": [ + { + "index": "0", + "name": "SW1", + "value": "10" + } + ], + "virtual": false }, "position": { "x": 96, @@ -55,10 +67,16 @@ "type": "basic.output", "data": { "label": "out", - "pin": { - "name": "LED1", - "value": "96" - } + "name": "out", + "range": "", + "pins": [ + { + "index": "0", + "name": "LED1", + "value": "96" + } + ], + "virtual": false }, "position": { "x": 464, @@ -136,7 +154,17 @@ "id": "18c2ebc7-5152-439c-9b3f-851c59bac834", "type": "basic.input", "data": { - "label": "" + "label": "", + "name": "", + "range": "", + "pins": [ + { + "index": "0", + "name": "", + "value": 0 + } + ], + "virtual": false }, "position": { "x": 64, @@ -147,7 +175,17 @@ "id": "664caf9e-5f40-4df4-800a-b626af702e62", "type": "basic.output", "data": { - "label": "" + "label": "", + "name": "", + "range": "", + "pins": [ + { + "index": "0", + "name": "", + "value": 0 + } + ], + "virtual": false }, "position": { "x": 752, @@ -194,7 +232,7 @@ "x": 0, "y": 0 }, - "zoom": 0.9999999638409349 + "zoom": 0.9999999403953552 } } } \ No newline at end of file diff --git a/demo/multi-constant-generic-block.ice b/demo/multi-constant-generic-block.ice index ccf421b28..c37737af3 100644 --- a/demo/multi-constant-generic-block.ice +++ b/demo/multi-constant-generic-block.ice @@ -37,10 +37,16 @@ "type": "basic.output", "data": { "label": "led", - "pin": { - "name": "LED0", - "value": "95" - } + "name": "led", + "range": "", + "pins": [ + { + "index": "0", + "name": "LED0", + "value": "95" + } + ], + "virtual": false }, "position": { "x": 536, @@ -61,10 +67,16 @@ "type": "basic.output", "data": { "label": "led", - "pin": { - "name": "LED1", - "value": "96" - } + "name": "led", + "range": "", + "pins": [ + { + "index": "0", + "name": "LED1", + "value": "96" + } + ], + "virtual": false }, "position": { "x": 680, @@ -150,7 +162,17 @@ "id": "94e9a915-defe-4437-8abd-d3e57dafbb45", "type": "basic.output", "data": { - "label": "led" + "label": "led", + "name": "led", + "range": "", + "pins": [ + { + "index": "0", + "name": "", + "value": 0 + } + ], + "virtual": false }, "position": { "x": 624, @@ -217,7 +239,7 @@ "x": -139, "y": 20 }, - "zoom": 0.9999999638409349 + "zoom": 0.9999999403953552 } } } \ No newline at end of file diff --git a/demo/multi-input-output.ice b/demo/multi-input-output.ice index fb2a84d05..9bb7b741e 100644 --- a/demo/multi-input-output.ice +++ b/demo/multi-input-output.ice @@ -16,10 +16,16 @@ "type": "basic.input", "data": { "label": "in", - "pin": { - "name": "SW1", - "value": "10" - } + "name": "in", + "range": "", + "pins": [ + { + "index": "0", + "name": "SW1", + "value": "10" + } + ], + "virtual": false }, "position": { "x": 168, @@ -31,10 +37,16 @@ "type": "basic.output", "data": { "label": "out", - "pin": { - "name": "LED0", - "value": "95" - } + "name": "out", + "range": "", + "pins": [ + { + "index": "0", + "name": "LED0", + "value": "95" + } + ], + "virtual": false }, "position": { "x": 480, @@ -46,13 +58,19 @@ "type": "basic.output", "data": { "label": "out", - "pin": { - "name": "LED1", - "value": "96" - } + "name": "out", + "range": "", + "pins": [ + { + "index": "0", + "name": "LED1", + "value": "96" + } + ], + "virtual": false }, "position": { - "x": 408, + "x": 400, "y": 232 } } @@ -86,7 +104,7 @@ "x": 0, "y": 0 }, - "zoom": 0.9999999638409349 + "zoom": 0.9999999403953552 } } } \ No newline at end of file diff --git a/tasks/toolchain_builder.js b/tasks/toolchain_builder.js index e8381aeaa..6b03cdcbd 100644 --- a/tasks/toolchain_builder.js +++ b/tasks/toolchain_builder.js @@ -25,7 +25,7 @@ function ToolchainBuilder(options) { // Assign options this.options = _.defaults(options, defaults); - if (this.options.platforms.length == 0) + if (this.options.platforms.length === 0) throw new Error('No platform to build!'); var venvRelease = 'virtualenv-15.0.1'; @@ -40,8 +40,8 @@ function ToolchainBuilder(options) { this.options.venvDir = path.join(this.options.toolchainDir, 'venv'); this.options.venvBinDir = path.join(this.options.venvDir, (process.platform === 'win32' ? 'Scripts' : 'bin')); - this.options.venvPip = path.join(this.options.venvBinDir, 'pip') - this.options.venvApio = path.join(this.options.venvBinDir, 'apio') + this.options.venvPip = path.join(this.options.venvBinDir, 'pip'); + this.options.venvApio = path.join(this.options.venvBinDir, 'apio'); } @@ -78,14 +78,14 @@ ToolchainBuilder.prototype.build = function (callback) { }); return hasCallback ? true : done.promise; -} +}; ToolchainBuilder.prototype.ensurePythonIsAvailable = function () { return new Promise(function(resolve, reject) { if (getPythonExecutable()) { resolve(); } else { reject('Python 2.7 is not available'); } }); -} +}; ToolchainBuilder.prototype.extractVirtualenv = function () { var self = this; @@ -94,9 +94,9 @@ ToolchainBuilder.prototype.extractVirtualenv = function () { targz().extract(self.options.venvTarPath, self.options.toolchainDir, function (error) { if (error) { reject(error); } else { resolve(); } - }) + }); }); -} +}; ToolchainBuilder.prototype.createVirtualenv = function () { var self = this; @@ -114,7 +114,7 @@ ToolchainBuilder.prototype.createVirtualenv = function () { } ); }); -} +}; ToolchainBuilder.prototype.downloadApio = function () { var self = this; @@ -131,7 +131,7 @@ ToolchainBuilder.prototype.downloadApio = function () { } ); }); -} +}; ToolchainBuilder.prototype.installApio = function () { var self = this; @@ -150,9 +150,9 @@ ToolchainBuilder.prototype.installApio = function () { } ); } - }) }); -} + }); +}; ToolchainBuilder.prototype.downloadApioPackages = function () { var self = this; @@ -163,7 +163,7 @@ ToolchainBuilder.prototype.downloadApioPackages = function () { return [ (process.platform === 'win32' ? 'set' : 'export'), 'APIO_HOME_DIR=' + dest + (process.platform === 'win32' ? '&' : ';'), self.options.venvApio, 'install', '--platform', platform ].concat(packages); - }; + } self.pFound = []; self.options.platforms.forEach(function(platform) { var p = getRealPlatform(platform); @@ -180,7 +180,7 @@ ToolchainBuilder.prototype.downloadApioPackages = function () { }); resolve(); }); -} +}; ToolchainBuilder.prototype.packageApio = function () { var self = this; @@ -194,7 +194,7 @@ ToolchainBuilder.prototype.packageApio = function () { else { resolve(); } }); }); -} +}; ToolchainBuilder.prototype.packageApioPackages = function () { var self = this; @@ -211,7 +211,7 @@ ToolchainBuilder.prototype.packageApioPackages = function () { path.join(self.options.apioPackagesDir, p), path.join(self.options.toolchainDir, 'default-apio-packages-' + p + '.tar.gz'), function (error) { - if (error) { reject(error) } + if (error) { reject(error); } callback(); } ); @@ -224,7 +224,7 @@ ToolchainBuilder.prototype.packageApioPackages = function () { resolve(); }); }); -} +}; ToolchainBuilder.prototype.createDefaultToolchains = function () { var self = this; @@ -252,7 +252,7 @@ ToolchainBuilder.prototype.createDefaultToolchains = function () { }); resolve(); }); -} +}; // Auxiliar functions From f2a71098e4425f48c8b3d0a5e5ef994b55cf516f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jes=C3=BAs=20Arroyo=20Torrens?= Date: Mon, 19 Dec 2016 19:58:20 +0100 Subject: [PATCH 055/169] Implement multi-io ports in the verilog/pcf compiler --- app/scripts/services/compiler.service.js | 38 ++++++++++++++++++------ app/scripts/services/graph.service.js | 1 + app/scripts/services/utils.service.js | 1 + 3 files changed, 31 insertions(+), 9 deletions(-) diff --git a/app/scripts/services/compiler.service.js b/app/scripts/services/compiler.service.js index 9f4d8373a..28022f2c6 100644 --- a/app/scripts/services/compiler.service.js +++ b/app/scripts/services/compiler.service.js @@ -80,10 +80,12 @@ angular.module('icestudio') var ports = []; for (var i in data.ports.in) { - ports.push(' input ' + data.ports.in[i]); + var _in = data.ports.in[i]; + ports.push(' input ' + _in.range + (_in.range ? ' ' : '') + _in.name); } for (var o in data.ports.out) { - ports.push(' output ' + data.ports.out[o]); + var _out = data.ports.out[o]; + ports.push(' output ' + _out.range + (_out.range ? ' ' : '') + _out.name); } if (ports.length > 0) { @@ -142,10 +144,16 @@ angular.module('icestudio') for (var i in graph.blocks) { var block = graph.blocks[i]; if (block.type === 'basic.input') { - ports.in.push(digestId(block.id)); + ports.in.push({ + name: digestId(block.id), + range: block.data.range ? block.data.range : '' + }); } else if (block.type === 'basic.output') { - ports.out.push(digestId(block.id)); + ports.out.push({ + name: digestId(block.id), + range: block.data.range ? block.data.range : '' + }); } } @@ -374,13 +382,25 @@ angular.module('icestudio') var block = graph.blocks[i]; if (block.type === 'basic.input' || block.type === 'basic.output') { - code += 'set_io '; - code += digestId(block.id); - code += ' '; if (!block.data.virtual) { - code += block.data.pin.value; + if (block.data.pins.length > 1) { + for (var p in block.data.pins) { + var pin = block.data.pins[p]; + code += 'set_io '; + code += digestId(block.id); + code += '[' + pin.index + '] '; + code += pin.value; + code += '\n'; + } + } + else { + code += 'set_io '; + code += digestId(block.id); + code += ' '; + code += block.data.pins[0].value; + code += '\n'; + } } - code += '\n'; } } diff --git a/app/scripts/services/graph.service.js b/app/scripts/services/graph.service.js index 425639c7d..f0f908d70 100644 --- a/app/scripts/services/graph.service.js +++ b/app/scripts/services/graph.service.js @@ -574,6 +574,7 @@ angular.module('icestudio') blockInstance.data = { label: portInfo.input, name: portInfo.name, + range: portInfo.rangestr ? portInfo.rangestr : '', pins: pins, virtual: true }; diff --git a/app/scripts/services/utils.service.js b/app/scripts/services/utils.service.js index d70436305..818088283 100644 --- a/app/scripts/services/utils.service.js +++ b/app/scripts/services/utils.service.js @@ -874,6 +874,7 @@ angular.module('icestudio') if (match && (match[0] === match.input)) { ret.input = match[0]; ret.name = match[1]; + ret.rangestr = match[2]; if (match[2]) { if (match[3] > match[4]) { ret.range = _.range(match[3], parseInt(match[4])-1, -1); From 26ce30bf9279aa472ab022dfd23706e25310e584 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jes=C3=BAs=20Arroyo=20Torrens?= Date: Tue, 20 Dec 2016 10:28:35 +0100 Subject: [PATCH 056/169] Minor improvements in IO block --- app/scripts/plugins/shapes/joint.shapes.js | 30 ++++++++++++++-------- app/scripts/services/boards.service.js | 3 +-- app/scripts/services/compiler.service.js | 27 ++++++++++--------- app/styles/design.css | 3 ++- 4 files changed, 35 insertions(+), 28 deletions(-) diff --git a/app/scripts/plugins/shapes/joint.shapes.js b/app/scripts/plugins/shapes/joint.shapes.js index 92c646c3a..357dc44f2 100644 --- a/app/scripts/plugins/shapes/joint.shapes.js +++ b/app/scripts/plugins/shapes/joint.shapes.js @@ -329,9 +329,6 @@ joint.shapes.ice.Output = joint.shapes.ice.Model.extend({ joint.shapes.ice.IOView = joint.shapes.ice.ModelView.extend({ - id: '', - pins: [], - initialize: function() { joint.shapes.ice.ModelView.prototype.initialize.apply(this, arguments); @@ -378,11 +375,19 @@ joint.shapes.ice.IOView = joint.shapes.ice.ModelView.extend({ comboSelector.on('change', _.bind(function(evt) { var target = $(evt.target); var index = target.attr('index'); - this.model.attributes.data.pins[index].name = target.find('option:selected').text(); - this.model.attributes.data.pins[index].value = target.val(); + var name = target.find('option:selected').text(); + var value = target.val(); + this.model.attributes.data.pins[index].name = name; + this.model.attributes.data.pins[index].value = value; + this.$box.find('.select2-selection').css('font-size', computeFontSize(name)); }, this)); + + function computeFontSize(name) { + var n = name.length; + return Math.min(13, 17-n).toString() + 'px'; + } }, - renderChoides: function() { + renderChoices: function() { if (this.pins) { for (var i in this.pins) { this.$box.find('#combo' + this.id + this.pins[i].index).empty().append(this.model.get('choices')); @@ -420,16 +425,19 @@ joint.shapes.ice.IOView = joint.shapes.ice.ModelView.extend({ } }, clearValue: function () { - var comboId = '#combo' + this.id; - this.model.attributes.data.pin.name = ''; - this.model.attributes.data.pin.value = 0; - this.$box.find(comboId).val(''); + if (this.pins) { + for (var i in this.pins) { + this.$box.find('#combo' + this.id + this.pins[i].index).val(''); + this.model.attributes.data.pins[i.toString()].name = ''; + this.model.attributes.data.pins[i.toString()].value = 0; + } + } }, update: function () { this.renderPorts(); this.renderBlock(); if (!this.model.get('disabled')) { - this.renderChoides(); + this.renderChoices(); this.renderValue(); } joint.dia.ElementView.prototype.update.apply(this, arguments); diff --git a/app/scripts/services/boards.service.js b/app/scripts/services/boards.service.js index 62ade991b..565bdc338 100644 --- a/app/scripts/services/boards.service.js +++ b/app/scripts/services/boards.service.js @@ -59,11 +59,10 @@ angular.module('icestudio') }; function generateHTMLOptions(pinout) { - var code = ''; for (var i in pinout) { code += ''; } - code += ''; return code; } diff --git a/app/scripts/services/compiler.service.js b/app/scripts/services/compiler.service.js index 28022f2c6..a1e740afa 100644 --- a/app/scripts/services/compiler.service.js +++ b/app/scripts/services/compiler.service.js @@ -382,25 +382,24 @@ angular.module('icestudio') var block = graph.blocks[i]; if (block.type === 'basic.input' || block.type === 'basic.output') { - if (!block.data.virtual) { - if (block.data.pins.length > 1) { - for (var p in block.data.pins) { - var pin = block.data.pins[p]; - code += 'set_io '; - code += digestId(block.id); - code += '[' + pin.index + '] '; - code += pin.value; - code += '\n'; - } - } - else { + + if (block.data.pins.length > 1) { + for (var p in block.data.pins) { + var pin = block.data.pins[p]; code += 'set_io '; code += digestId(block.id); - code += ' '; - code += block.data.pins[0].value; + code += '[' + pin.index + '] '; + code += block.data.virtual ? '' : pin.value; code += '\n'; } } + else { + code += 'set_io '; + code += digestId(block.id); + code += ' '; + code += block.data.virtual ? '' : block.data.pins[0].value; + code += '\n'; + } } } diff --git a/app/styles/design.css b/app/styles/design.css index 2d6e27a0f..01c2f8405 100644 --- a/app/styles/design.css +++ b/app/styles/design.css @@ -159,7 +159,8 @@ } .bigdrop { - width: 96px !important; + width: 86px !important; + font-size: 12px; } .constant-block { From fe7486719494115641d4e50331e1a55efc90641d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jes=C3=BAs=20Arroyo=20Torrens?= Date: Tue, 20 Dec 2016 11:50:29 +0100 Subject: [PATCH 057/169] Add blocks service. Add multi-output port --- app/index.html | 21 +- app/scripts/services/blocks.service.js | 303 ++++++++++++++++++ app/scripts/services/graph.service.js | 408 +++---------------------- 3 files changed, 356 insertions(+), 376 deletions(-) create mode 100644 app/scripts/services/blocks.service.js diff --git a/app/index.html b/app/index.html index 31496e0af..3c8ecbce2 100644 --- a/app/index.html +++ b/app/index.html @@ -49,24 +49,25 @@ + - - + - - - - - - - - + + + + + + + + + diff --git a/app/scripts/services/blocks.service.js b/app/scripts/services/blocks.service.js new file mode 100644 index 000000000..709c1478d --- /dev/null +++ b/app/scripts/services/blocks.service.js @@ -0,0 +1,303 @@ +'use strict'; + +angular.module('icestudio') + .service('blocks', function(joint, + boards, + utils, + gettextCatalog) { + var gridsize = 8; + + this.new = function(type, block, addCellcallback) { + switch(type) { + case 'basic.input': + case 'basic.output': + return newBasicIO(type, addCellcallback); + } + }; + + this.loadBasicInput = loadBasicInput; + this.loadBasicOutput = loadBasicOutput; + + function loadBasicInput(instance, disabled) { + var cell = new joint.shapes.ice.Input({ + id: instance.id, + blockType: instance.type, + data: instance.data, + position: instance.position, + disabled: disabled, + choices: boards.getPinoutHTML() + }); + return cell; + } + + function loadBasicOutput(instance, disabled) { + var cell = new joint.shapes.ice.Output({ + id: instance.id, + blockType: instance.type, + data: instance.data, + position: instance.position, + disabled: disabled, + choices: boards.getPinoutHTML() + }); + return cell; + } + + this.basicConstant = function(instance, disabled) { + var cell = new joint.shapes.ice.Constant({ + id: instance.id, + blockType: instance.type, + data: instance.data, + position: instance.position, + disabled: disabled + }); + return cell; + }; + + this.basicCode = function(instance, disabled) { + var leftPorts = []; + var rightPorts = []; + var topPorts = []; + + for (var i in instance.data.ports.in) { + leftPorts.push({ + id: instance.data.ports.in[i], + label: instance.data.ports.in[i], + gridUnits: 32 + }); + } + + for (var o in instance.data.ports.out) { + rightPorts.push({ + id: instance.data.ports.out[o], + label: instance.data.ports.out[o], + gridUnits: 32 + }); + } + + for (var p in instance.data.params) { + topPorts.push({ + id: instance.data.params[p], + label: instance.data.params[p], + gridUnits: 48 + }); + } + + var cell = new joint.shapes.ice.Code({ + id: instance.id, + blockType: instance.type, + data: instance.data, + position: instance.position, + disabled: disabled, + leftPorts: leftPorts, + rightPorts: rightPorts, + topPorts: topPorts + }); + return cell; + }; + + this.basicInfo = function(instance, disabled) { + var cell = new joint.shapes.ice.Info({ + id: instance.id, + blockType: instance.type, + data: instance.data, + position: instance.position, + disabled: disabled + }); + return cell; + }; + + this.generic = function(instance, block) { + var i; + var leftPorts = []; + var rightPorts = []; + var topPorts = []; + var bottomPorts = []; + var gridsize = 8; + + for (i in block.design.graph.blocks) { + var item = block.design.graph.blocks[i]; + if (item.type === 'basic.input') { + leftPorts.push({ + id: item.id, + label: item.data.label + }); + } + else if (item.type === 'basic.output') { + rightPorts.push({ + id: item.id, + label: item.data.label + }); + } + else if (item.type === 'basic.constant') { + if (!item.data.local) { + topPorts.push({ + id: item.id, + label: item.data.label + }); + } + } + } + + var numPortsHeight = Math.max(leftPorts.length, rightPorts.length); + var numPortsWidth = Math.max(topPorts.length, bottomPorts.length); + + var height = 8 * gridsize; + height = Math.max(4 * gridsize * numPortsHeight, height); + var blockLabel = instance.type.toUpperCase(); + var blockLabels = instance.type.split('.'); + var maxBlockLabel = ''; + var width = 12 * gridsize; + + for (var l in blockLabels) { + if (blockLabels[l].length > maxBlockLabel.length) { + maxBlockLabel = blockLabels[l]; + } + } + if (maxBlockLabel.length > 4) { + width = Math.min((maxBlockLabel.length + 8) * gridsize, 24 * gridsize); + } + width = Math.max(4 * gridsize * numPortsWidth, width); + + var gridUnitsHeight = height / gridsize; + var gridUnitsWidth = width / gridsize; + + for (i in leftPorts) { + leftPorts[i].gridUnits = gridUnitsHeight; + } + for (i in rightPorts) { + rightPorts[i].gridUnits = gridUnitsHeight; + } + for (i in topPorts) { + topPorts[i].gridUnits = gridUnitsWidth; + } + for (i in bottomPorts) { + bottomPorts[i].gridUnits = gridUnitsWidth; + } + + if (blockLabels.length > 1) { + blockLabel = blockLabels.join('
                ').toUpperCase(); + } + + var blockImage = ''; + if (block.package.image) { + width = 12 * gridsize; + if (block.package.image.startsWith('%3Csvg')) { + blockImage = block.package.image; + } + else if (block.package.image.startsWith(' maxBlockLabel.length) { - maxBlockLabel = blockLabels[l]; - } - } - if (maxBlockLabel.length > 4) { - width = Math.min((maxBlockLabel.length + 8) * gridsize, 24 * gridsize); - } - width = Math.max(4 * gridsize * numPortsWidth, width); - - var gridUnitsHeight = height / gridsize; - var gridUnitsWidth = width / gridsize; - - for (i in leftPorts) { - leftPorts[i].gridUnits = gridUnitsHeight; - } - for (i in rightPorts) { - rightPorts[i].gridUnits = gridUnitsHeight; - } - for (i in topPorts) { - topPorts[i].gridUnits = gridUnitsWidth; - } - for (i in bottomPorts) { - bottomPorts[i].gridUnits = gridUnitsWidth; - } - - if (blockLabels.length > 1) { - blockLabel = blockLabels.join('
                ').toUpperCase(); - } - - var blockImage = ''; - if (block.package.image) { - width = 12 * gridsize; - if (block.package.image.startsWith('%3Csvg')) { - blockImage = block.package.image; - } - else if (block.package.image.startsWith(' Date: Tue, 20 Dec 2016 12:55:06 +0100 Subject: [PATCH 058/169] Move all basic blocks to "blocks service" --- app/scripts/services/blocks.service.js | 207 +++++++++++++++++++-- app/scripts/services/graph.service.js | 233 +++--------------------- app/scripts/services/project.service.js | 2 +- 3 files changed, 220 insertions(+), 222 deletions(-) diff --git a/app/scripts/services/blocks.service.js b/app/scripts/services/blocks.service.js index 709c1478d..41c18a66f 100644 --- a/app/scripts/services/blocks.service.js +++ b/app/scripts/services/blocks.service.js @@ -7,16 +7,45 @@ angular.module('icestudio') gettextCatalog) { var gridsize = 8; - this.new = function(type, block, addCellcallback) { + this.newBasic = function(type, block, addCellCallback) { switch(type) { case 'basic.input': case 'basic.output': - return newBasicIO(type, addCellcallback); + newBasicIO(type, addCellCallback); + break; + case 'basic.constant': + newBasicConstant(addCellCallback); + break; + case 'basic.code': + newBasicCode(block, addCellCallback); // block + break; + case 'basic.info': + newBasicInfo(addCellCallback); + break; + default: + break; } }; + this.newGeneric = newGeneric; - this.loadBasicInput = loadBasicInput; - this.loadBasicOutput = loadBasicOutput; + this.loadBasic = function(instance, disabled) { + switch(instance.type) { + case 'basic.input': + return loadBasicInput(instance, disabled); + case 'basic.output': + return loadBasicOutput(instance, disabled); + case 'basic.constant': + return loadBasicConstant(instance, disabled); + case 'basic.code': + return loadBasicCode(instance, disabled); + case 'basic.info': + return loadBasicInfo(instance, disabled); + default: + break; + } + }; + this.loadGeneric = loadGeneric; + this.loadWire = loadWire; function loadBasicInput(instance, disabled) { var cell = new joint.shapes.ice.Input({ @@ -42,7 +71,7 @@ angular.module('icestudio') return cell; } - this.basicConstant = function(instance, disabled) { + function loadBasicConstant(instance, disabled) { var cell = new joint.shapes.ice.Constant({ id: instance.id, blockType: instance.type, @@ -51,9 +80,9 @@ angular.module('icestudio') disabled: disabled }); return cell; - }; + } - this.basicCode = function(instance, disabled) { + function loadBasicCode(instance, disabled) { var leftPorts = []; var rightPorts = []; var topPorts = []; @@ -93,9 +122,9 @@ angular.module('icestudio') topPorts: topPorts }); return cell; - }; + } - this.basicInfo = function(instance, disabled) { + function loadBasicInfo(instance, disabled) { var cell = new joint.shapes.ice.Info({ id: instance.id, blockType: instance.type, @@ -104,9 +133,9 @@ angular.module('icestudio') disabled: disabled }); return cell; - }; + } - this.generic = function(instance, block) { + function loadGeneric(instance, block) { var i; var leftPorts = []; var rightPorts = []; @@ -205,9 +234,9 @@ angular.module('icestudio') } }); return cell; - }; + } - this.wire = function(instance, source, target) { + function loadWire(instance, source, target) { // Find selectors var sourceSelector, targetSelector; @@ -238,7 +267,7 @@ angular.module('icestudio') vertices: instance.vertices }); return _wire; - }; + } function newBasicIO(type, addCellCallback) { var config = null; @@ -278,7 +307,7 @@ angular.module('icestudio') } else { evt.cancel = true; - alertify.notify(gettextCatalog.getString('Wrong port name {{name}}', {name: labels[l]}), 'warning', 3); + alertify.notify(gettextCatalog.getString('Wrong port name {{name}}', { name: labels[l] }), 'warning', 3); break; } } @@ -300,4 +329,152 @@ angular.module('icestudio') return pins; } + function newBasicConstant(addCellCallback) { + var blockInstance = { + id: null, + data: {}, + type: 'basic.constant', + position: { x: 20 * gridsize, y: 4 * gridsize } + }; + alertify.prompt(gettextCatalog.getString('Enter the constant blocks'), 'C', + function(evt, name) { + if (name) { + var names = name.replace(/ /g, '').split(','); + for (var n in names) { + if (names[n]) { + blockInstance.data = { + label: names[n], + local: false, + value: '' + }; + if (addCellCallback) { + addCellCallback(loadBasicConstant(blockInstance)); + } + blockInstance.position.x += 15 * gridsize; + } + } + } + }); + } + + function newBasicCode(block, addCellCallback) { + var blockInstance = { + id: null, + data: {}, + type: 'basic.code', + position: { x: 4 * gridsize, y: 4 * gridsize } + }; + var defaultValues = [ + 'a , b', + 'c , d', + '' + ]; + if (block && block.data) { + if (block.data.ports) { + defaultValues[0] = block.data.ports.in.join(' , '); + defaultValues[1] = block.data.ports.out.join(' , '); + } + if (block.data.params) { + defaultValues[2] = block.data.params.join(' , '); + } + } + utils.multiprompt( + [ gettextCatalog.getString('Enter the input ports'), + gettextCatalog.getString('Enter the output ports'), + gettextCatalog.getString('Enter the parameters') ], + defaultValues, + function(evt, ports) { + if (ports && (ports[0].length || ports[1].length)) { + blockInstance.data = { + code: '', + params: [], + ports: { in: [], out: [] } + }; + // Parse ports + var inPorts = []; + var outPorts = []; + var params = []; + if (ports.length > 0) { + inPorts = ports[0].replace(/ /g, '').split(','); + } + if (ports.length > 1) { + outPorts = ports[1].replace(/ /g, '').split(','); + } + if (ports.length > 2) { + params = ports[2].replace(/ /g, '').split(','); + } + + for (var i in inPorts) { + if (inPorts[i]) { + blockInstance.data.ports.in.push(inPorts[i]); + } + } + for (var o in outPorts) { + if (outPorts[o]) { + blockInstance.data.ports.out.push(outPorts[o]); + } + } + for (var p in params) { + if (params[p]) { + blockInstance.data.params.push(params[p]); + } + } + blockInstance.position.x = 31 * gridsize; + blockInstance.position.y = 24 * gridsize; + + var allAttrs= inPorts.concat(outPorts, params); + var numAttrs = allAttrs.length; + + // Check duplicated attributes + if (numAttrs === $.unique(allAttrs).length) { + evt.cancel = false; + if (block) { + blockInstance.data.code = block.data.code; + blockInstance.position = block.position; + } + if (addCellCallback) { + addCellCallback(loadBasicCode(blockInstance)); + } + } + else { + evt.cancel = true; + alertify.notify(gettextCatalog.getString('Duplicated block attributes'), 'warning', 3); + } + } + }); + } + + function newBasicInfo(addCellCallback) { + var blockInstance = { + id: null, + data: { info: '' }, + type: 'basic.info', + position: { x: 4 * gridsize, y: 30 * gridsize } + }; + if (addCellCallback) { + addCellCallback(loadBasicInfo(blockInstance)); + } + } + + function newGeneric(type, block, addCellCallback) { + var blockInstance = { + id: null, + type: type, + position: { x: 6 * gridsize, y: 16 * gridsize } + }; + if (block && + block.design && + block.design.graph && + block.design.graph.blocks && + block.design.graph.wires && + block.design.deps) { + if (addCellCallback) { + addCellCallback(loadGeneric(blockInstance, block)); + } + } + else { + alertify.notify(gettextCatalog.getString('Wrong block format: {{type}}', { type: type }), 'error', 30); + } + } + }); diff --git a/app/scripts/services/graph.service.js b/app/scripts/services/graph.service.js index 324ccaf77..50afccd4e 100644 --- a/app/scripts/services/graph.service.js +++ b/app/scripts/services/graph.service.js @@ -64,9 +64,7 @@ angular.module('icestudio') this.breadcrumbs = [{ name: name }]; } this.breadcrumbs[0].name = name; - if(!$rootScope.$$phase) { - $rootScope.$apply(); - } + utils.rootScopeSafeApply(); }; this.createPaper = function(element) { @@ -339,9 +337,7 @@ angular.module('icestudio') } else if (data.type !== 'ice.Wire' && data.type !== 'ice.Info') { self.breadcrumbs.push({ name: data.blockType }); - if(!$rootScope.$$phase) { - $rootScope.$apply(); - } + utils.rootScopeSafeApply(); zIndex = 1; if (self.breadcrumbs.length === 2) { $rootScope.$broadcast('updateProject', function() { @@ -443,165 +439,20 @@ angular.module('icestudio') }; this.createBlock = function(type, block, callback) { - blocks.new(type, block, function(cell) { + if (type.indexOf('basic.') !== -1) { + blocks.newBasic(type, block, addCellCallback); + } + else { + dependencies[type] = block; + blocks.newGeneric(type, block, addCellCallback); + } + + var addCellCallback = function(cell) { addCell(cell); if (callback) { callback(); } - }); - - /*var blockInstance = { - id: null, - data: {}, - type: type, - position: { x: 4 * gridsize, y: 4 * gridsize } }; - - if (type === 'basic.code') { - var defaultValues = [ - 'a , b', - 'c , d', - '' - ]; - if (block && block.data) { - if (block.data.ports) { - defaultValues[0] = block.data.ports.in.join(' , '); - defaultValues[1] = block.data.ports.out.join(' , '); - } - if (block.data.params) { - defaultValues[2] = block.data.params.join(' , '); - } - } - utils.multiprompt( - [ gettextCatalog.getString('Enter the input ports'), - gettextCatalog.getString('Enter the output ports'), - gettextCatalog.getString('Enter the parameters') ], - defaultValues, - function(evt, ports) { - if (ports && (ports[0].length || ports[1].length)) { - blockInstance.data = { - code: '', - params: [], - ports: { in: [], out: [] } - }; - // Parse ports - var inPorts = []; - var outPorts = []; - var params = []; - if (ports.length > 0) { - inPorts = ports[0].replace(/ /g, '').split(','); - } - if (ports.length > 1) { - outPorts = ports[1].replace(/ /g, '').split(','); - } - if (ports.length > 2) { - params = ports[2].replace(/ /g, '').split(','); - } - - for (var i in inPorts) { - if (inPorts[i]) { - blockInstance.data.ports.in.push(inPorts[i]); - } - } - for (var o in outPorts) { - if (outPorts[o]) { - blockInstance.data.ports.out.push(outPorts[o]); - } - } - for (var p in params) { - if (params[p]) { - blockInstance.data.params.push(params[p]); - } - } - blockInstance.position.x = 31 * gridsize; - blockInstance.position.y = 24 * gridsize; - - var allAttrs= inPorts.concat(outPorts, params); - var numAttrs = allAttrs.length; - - // Check duplicated attributes - if (numAttrs === $.unique(allAttrs).length) { - evt.cancel = false; - if (block) { - blockInstance.data.code = block.data.code; - blockInstance.position = block.position; - } - var cell = blocks.basicCode(blockInstance); - addCell(cell); - var cellView = paper.findViewByModel(cell); - if (cellView.$box.css('z-index') < zIndex) { - cellView.$box.css('z-index', ++zIndex); - } - if (callback) { - callback(); - } - } - else { - evt.cancel = true; - alertify.notify(gettextCatalog.getString('Duplicated block attributes'), 'warning', 3); - } - } - }); - } - else if (type === 'basic.info') { - blockInstance.data = { - info: '' - }; - blockInstance.position.y = 30 * gridsize; - var cell = blocks.basicInfo(blockInstance); - addCell(cell); - var cellView = paper.findViewByModel(cell); - if (cellView.$box.css('z-index') < zIndex) { - cellView.$box.css('z-index', ++zIndex); - } - } - else if (type === 'basic.constant') { - alertify.prompt(gettextCatalog.getString('Enter the constant blocks'), 'C', - function(evt, name) { - if (name) { - var names = name.replace(/ /g, '').split(','); - blockInstance.position.x = 20 * gridsize; - for (var n in names) { - if (names[n]) { - blockInstance.data = { - label: names[n], - local: false, - value: '' - }; - var cell = addCell(blocks.basicConstant(blockInstance)); - var cellView = paper.findViewByModel(cell); - if (cellView.$box.css('z-index') < zIndex) { - cellView.$box.css('z-index', ++zIndex); - } - blockInstance.position.x += 15 * gridsize; - } - } - } - else { - } - }); - } - else { - if (block && - block.design && - block.design.graph && - block.design.graph.blocks && - block.design.graph.wires && - block.design.deps) { - dependencies[type] = block; - blockInstance.position.x = 6 * gridsize; - blockInstance.position.y = 16 * gridsize; - var _cell = blocks.generic(blockInstance, block); - addCell(_cell); - var _cellView = paper.findViewByModel(_cell); - if (_cellView.$box.css('z-index') < zIndex) { - _cellView.$box.css('z-index', ++zIndex); - } - } - else { - alertify.notify(gettextCatalog.getString('Wrong block format: {{type}}', { type: type }), 'error', 30); - } - }*/ }; this.toJSON = function() { @@ -627,7 +478,8 @@ angular.module('icestudio') for (var i in cells) { var cell = cells[i]; var type = cell.attributes.blockType; - if (type === 'basic.input' || type === 'basic.output') { + if (type === 'basic.input' || + type === 'basic.output') { cell.attributes.choices = boards.getPinoutHTML(); var view = paper.findViewByModel(cell.id); view.renderChoices(); @@ -654,10 +506,6 @@ angular.module('icestudio') if (type.indexOf('config.') !== -1) { paper.findViewByModel(newCell).$box.addClass('config-block'); } - var cellView = paper.findViewByModel(newCell); - if (cellView.$box.css('z-index') < zIndex) { - cellView.$box.css('z-index', ++zIndex); - } selection.reset(selection.without(cell)); selectionView.cancelSelection(); }); @@ -730,27 +578,12 @@ angular.module('icestudio') // Blocks for (i in blockInstances) { var blockInstance = blockInstances[i]; - if (blockInstance.type === 'basic.input') { - cell = blocks.loadBasicInput(blockInstance, disabled); - } - else if (blockInstance.type === 'basic.output') { - cell = blocks.loadBasicOutput(blockInstance, disabled); - } - else if (blockInstance.type === 'basic.code') { - cell = blocks.basicCode(blockInstance, disabled); - } - else if (blockInstance.type === 'basic.info') { - cell = blocks.basicInfo(blockInstance, disabled); - } - else if (blockInstance.type === 'basic.constant') { - cell = blocks.basicConstant(blockInstance, disabled); + if (blockInstance.type.indexOf('basic.') !== -1) { + cell = blocks.loadBasic(blockInstance, disabled); } else { if (deps && deps[blockInstance.type]) { - cell = blocks.generic(blockInstance, deps[blockInstance.type]); - if (blockInstance.type.indexOf('config.') !== -1) { - paper.findViewByModel(cell).$box.addClass('config-block'); - } + cell = blocks.loadGeneric(blockInstance, deps[blockInstance.type]); } } addCell(cell); @@ -758,14 +591,13 @@ angular.module('icestudio') // Wires for (i in wires) { - cell = blocks.wire(wires[i], - graph.getCell(wires[i].source.block), - graph.getCell(wires[i].target.block)); + var source = graph.getCell(wires[i].source.block); + var target = graph.getCell(wires[i].target.block); + cell = blocks.loadWire(wires[i], source, target); addCell(cell); } self.appEnable(!disabled); - $('body').removeClass('waiting'); if (callback) { @@ -778,28 +610,17 @@ angular.module('icestudio') } }; - this.importBlock = function(type, block) { - var blockInstance = { - id: null, - data: {}, - type: type, - position: { x: 6 * gridsize, y: 16 * gridsize } - }; - dependencies[type] = block; - var cell = blocks.generic(blockInstance, block); - addCell(cell); - var cellView = paper.findViewByModel(cell); - if (cellView.$box.css('z-index') < zIndex) { - cellView.$box.css('z-index', ++zIndex); - } - }; - function addCell(cell) { cell.attributes.state = state; graph.addCell(cell); - var cellView = paper.findViewByModel(cell); - if (cellView.$box.css('z-index') < zIndex) { - cellView.$box.css('z-index', ++zIndex); + if (!cell.isLink()) { + var cellView = paper.findViewByModel(cell); + if (cellView.$box.css('z-index') < zIndex) { + cellView.$box.css('z-index', ++zIndex); + } + if (cell.attributes.blockType.indexOf('config.') !== -1) { + cellView.$box.addClass('config-block'); + } } } diff --git a/app/scripts/services/project.service.js b/app/scripts/services/project.service.js index 06b63b53d..07a059e81 100644 --- a/app/scripts/services/project.service.js +++ b/app/scripts/services/project.service.js @@ -249,7 +249,7 @@ angular.module('icestudio') } } // Add block - graph.importBlock(name, block); + graph.createBlock(name, block); self.project.design.deps[name] = block; alertify.success(gettextCatalog.getString('Block {{name}} imported', { name: utils.bold(name) })); } From 15699c4384eb6c601a29f04731e1b0923d543548 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jes=C3=BAs=20Arroyo=20Torrens?= Date: Tue, 20 Dec 2016 13:02:20 +0100 Subject: [PATCH 059/169] Update examples --- .../examples/icestick/1_basic/1_led_on.ice | 253 +++++----- .../examples/icezum/1_basic/1_led_on.ice | 253 +++++----- .../examples/icezum/1_basic/2_switch_led.ice | 181 +++---- .../icezum/1_basic/3_switch_and_gate.ice | 441 ++++++++++-------- app/scripts/services/graph.service.js | 13 +- app/scripts/services/project.service.js | 4 +- 6 files changed, 626 insertions(+), 519 deletions(-) diff --git a/app/resources/examples/icestick/1_basic/1_led_on.ice b/app/resources/examples/icestick/1_basic/1_led_on.ice index a4aad45ce..d6022735f 100644 --- a/app/resources/examples/icestick/1_basic/1_led_on.ice +++ b/app/resources/examples/icestick/1_basic/1_led_on.ice @@ -1,130 +1,155 @@ { - "image": "", - "state": { - "pan": { - "x": 0, - "y": 0 - }, - "zoom": 1 + "version": "1.0", + "package": { + "name": "", + "version": "", + "description": "", + "author": "", + "image": "" }, - "board": "icestick", - "graph": { - "blocks": [ - { - "id": "a538a5b4-d5d5-4ace-a593-efb1fa9b930c", - "type": "basic.info", - "data": { - "info": "LED-ON Hello world circuit example!\n\nThe simplest digital circuit that turns a \nled on\n\nA bit set to 1 is wired directly to the\noutput FPGA pin, where the led is connected\n\nThe blue box is the bit (set to 1)\nIt is inside the FPGA\n\nThe yellow box is the output FPGA pin. Using\nthe bottom menu the pin can be changed\n\nEXERCISE 1: Upload this circuit into your \nFPGA board and watch the led. \nIt should be turned on\n\nEXERCISE 2: Change the pin number to turn\nanother led on and upload it again" + "design": { + "board": "icestick", + "graph": { + "blocks": [ + { + "id": "f9239f87-12a4-4141-85f7-c3862615af3a", + "type": "bit.1", + "data": {}, + "position": { + "x": 80, + "y": 64 + } }, - "position": { - "x": 40, - "y": 208 - } - }, - { - "id": "0d05784e-8e32-4c80-b85d-cde4e892dbf3", - "type": "basic.info", - "data": { - "info": "Ejemplo de circuito Hola mundo: LED-ON\n\nEs el circuito digital más sencillo que\nenciende un led\n\nUn bit a 1 se cablea directamente a una\nsalida de la FPGA, donde está conectado\nel LED\n\nLa caja azul es el bit a 1\nEstá dentro de la FPGA\n\nLa caja amarilla es el pin de salida de\nla FPGA. Por medio del menú desplegable\ninferior se puede cambiar el pin\n\nEJERCICIO 1: Carga este circuito en la FPGA\ny observa el LED0. Debe estar encendido\n\nEJERCICIO 2: Cambia el pin de salida para\nencender otro led (por ejemplo el LED1)\ny cárgalo en la FPGA de nuevo" + { + "id": "949075cb-26c0-49da-ba76-2496ea9aa7cc", + "type": "basic.output", + "data": { + "label": "led", + "name": "led", + "range": "", + "pins": [ + { + "index": "0", + "name": "D1", + "value": "99" + } + ], + "virtual": false + }, + "position": { + "x": 352, + "y": 64 + } }, - "position": { - "x": 464, - "y": 208 - } - }, - { - "id": "e657ee6f-9430-4fce-a539-72d12d32f5bb", - "type": "bit.1", - "data": {}, - "position": { - "x": 80, - "y": 64 - } - }, - { - "id": "949075cb-26c0-49da-ba76-2496ea9aa7cc", - "type": "basic.output", - "data": { - "label": "led", - "pin": { - "name": "D1", - "value": "99" + { + "id": "a538a5b4-d5d5-4ace-a593-efb1fa9b930c", + "type": "basic.info", + "data": { + "info": "LED-ON Hello world circuit example!\n\nThe simplest digital circuit that turns a \nled on\n\nA bit set to 1 is wired directly to the\noutput FPGA pin, where the led is connected\n\nThe blue box is the bit (set to 1)\nIt is inside the FPGA\n\nThe yellow box is the output FPGA pin. Using\nthe bottom menu the pin can be changed\n\nEXERCISE 1: Upload this circuit into your \nFPGA board and watch the led. \nIt should be turned on\n\nEXERCISE 2: Change the pin number to turn\nanother led on and upload it again" + }, + "position": { + "x": 40, + "y": 208 } }, - "position": { - "x": 352, - "y": 64 + { + "id": "0d05784e-8e32-4c80-b85d-cde4e892dbf3", + "type": "basic.info", + "data": { + "info": "Ejemplo de circuito Hola mundo: LED-ON\n\nEs el circuito digital más sencillo que\nenciende un led\n\nUn bit a 1 se cablea directamente a una\nsalida de la FPGA, donde está conectado\nel LED\n\nLa caja azul es el bit a 1\nEstá dentro de la FPGA\n\nLa caja amarilla es el pin de salida de\nla FPGA. Por medio del menú desplegable\ninferior se puede cambiar el pin\n\nEJERCICIO 1: Carga este circuito en la FPGA\ny observa el LED0. Debe estar encendido\n\nEJERCICIO 2: Cambia el pin de salida para\nencender otro led (por ejemplo el LED1)\ny cárgalo en la FPGA de nuevo" + }, + "position": { + "x": 464, + "y": 208 + } } - } - ], - "wires": [ - { - "source": { - "block": "e657ee6f-9430-4fce-a539-72d12d32f5bb", - "port": "19c8f68d-5022-487f-9ab0-f0a3cd58bead" - }, - "target": { - "block": "949075cb-26c0-49da-ba76-2496ea9aa7cc", - "port": "in" + ], + "wires": [ + { + "source": { + "block": "f9239f87-12a4-4141-85f7-c3862615af3a", + "port": "19c8f68d-5022-487f-9ab0-f0a3cd58bead" + }, + "target": { + "block": "949075cb-26c0-49da-ba76-2496ea9aa7cc", + "port": "in" + } } - } - ] - }, - "deps": { - "bit.1": { - "graph": { - "blocks": [ - { - "id": "b959fb96-ac67-4aea-90b3-ed35a4c17bf5", - "type": "basic.code", - "data": { - "code": "// Bit 1\n\nassign v = 1'b1;", - "ports": { - "in": [], - "out": [ - "v" - ] + ] + }, + "deps": { + "bit.1": { + "version": "1.0", + "package": { + "name": "Bit 1", + "version": "1.0.0", + "description": "Assign 1 to the output wire", + "author": "Jesús Arroyo", + "image": "%3Csvg%20xmlns=%22http://www.w3.org/2000/svg%22%20width=%2247.303%22%20height=%2227.648%22%20viewBox=%220%200%2044.346456%2025.919999%22%3E%3Ctext%20style=%22line-height:125%25%22%20x=%22325.218%22%20y=%22315.455%22%20font-weight=%22400%22%20font-size=%2212.669%22%20font-family=%22sans-serif%22%20letter-spacing=%220%22%20word-spacing=%220%22%20transform=%22translate(-307.01%20-298.51)%22%3E%3Ctspan%20x=%22325.218%22%20y=%22315.455%22%20style=%22-inkscape-font-specification:'Courier%2010%20Pitch'%22%20font-family=%22Courier%2010%20Pitch%22%3E1%3C/tspan%3E%3C/text%3E%3C/svg%3E" + }, + "design": { + "board": "icezum", + "graph": { + "blocks": [ + { + "id": "b959fb96-ac67-4aea-90b3-ed35a4c17bf5", + "type": "basic.code", + "data": { + "code": "// Bit 1\n\nassign v = 1'b1;", + "ports": { + "in": [], + "out": [ + "v" + ] + } + }, + "position": { + "x": 96, + "y": 96 + } + }, + { + "id": "19c8f68d-5022-487f-9ab0-f0a3cd58bead", + "type": "basic.output", + "data": { + "label": "" + }, + "position": { + "x": 608, + "y": 192 + } } - }, - "position": { - "x": 96, - "y": 96 - } + ], + "wires": [ + { + "source": { + "block": "b959fb96-ac67-4aea-90b3-ed35a4c17bf5", + "port": "v" + }, + "target": { + "block": "19c8f68d-5022-487f-9ab0-f0a3cd58bead", + "port": "in" + } + } + ] }, - { - "id": "19c8f68d-5022-487f-9ab0-f0a3cd58bead", - "type": "basic.output", - "data": { - "label": "" + "deps": {}, + "state": { + "pan": { + "x": 0, + "y": 0 }, - "position": { - "x": 608, - "y": 192 - } + "zoom": 1 } - ], - "wires": [ - { - "source": { - "block": "b959fb96-ac67-4aea-90b3-ed35a4c17bf5", - "port": "v" - }, - "target": { - "block": "19c8f68d-5022-487f-9ab0-f0a3cd58bead", - "port": "in" - } - } - ] - }, - "deps": {}, - "image": "resources/images/1.svg", - "state": { - "pan": { - "x": 0, - "y": 0 - }, - "zoom": 1 + } } + }, + "state": { + "pan": { + "x": 0, + "y": 0 + }, + "zoom": 1 } } } \ No newline at end of file diff --git a/app/resources/examples/icezum/1_basic/1_led_on.ice b/app/resources/examples/icezum/1_basic/1_led_on.ice index 672560ecc..185c1ade2 100644 --- a/app/resources/examples/icezum/1_basic/1_led_on.ice +++ b/app/resources/examples/icezum/1_basic/1_led_on.ice @@ -1,130 +1,155 @@ { - "image": "", - "state": { - "pan": { - "x": 0, - "y": 0 - }, - "zoom": 0.9999999813303895 + "version": "1.0", + "package": { + "name": "", + "version": "", + "description": "", + "author": "", + "image": "" }, - "board": "icezum", - "graph": { - "blocks": [ - { - "id": "a538a5b4-d5d5-4ace-a593-efb1fa9b930c", - "type": "basic.info", - "data": { - "info": "LED-ON Hello world circuit example!\n\nThe simplest digital circuit that turns a \nled on\n\nA bit set to 1 is wired directly to the\noutput FPGA pin, where the led is connected\n\nThe blue box is the bit (set to 1)\nIt is inside the FPGA\n\nThe yellow box is the output FPGA pin. Using\nthe bottom menu the pin can be changed\n\nEXERCISE 1: Upload this circuit into your \nFPGA board and watch the led. \nIt should be turned on\n\nEXERCISE 2: Change the pin number to turn\nanother led on and upload it again" + "design": { + "board": "icezum", + "graph": { + "blocks": [ + { + "id": "8c3d15a4-2311-4a24-8321-6036eb0eb92b", + "type": "bit.1", + "data": {}, + "position": { + "x": 80, + "y": 64 + } }, - "position": { - "x": 40, - "y": 208 - } - }, - { - "id": "0d05784e-8e32-4c80-b85d-cde4e892dbf3", - "type": "basic.info", - "data": { - "info": "Ejemplo de circuito Hola mundo: LED-ON\n\nEs el circuito digital más sencillo que\nenciende un led\n\nUn bit a 1 se cablea directamente a una\nsalida de la FPGA, donde está conectado\nel LED\n\nLa caja azul es el bit a 1\nEstá dentro de la FPGA\n\nLa caja amarilla es el pin de salida de\nla FPGA. Por medio del menú desplegable\ninferior se puede cambiar el pin\n\nEJERCICIO 1: Carga este circuito en la FPGA\ny observa el LED0. Debe estar encendido\n\nEJERCICIO 2: Cambia el pin de salida para\nencender otro led (por ejemplo el LED1)\ny cárgalo en la FPGA de nuevo" + { + "id": "949075cb-26c0-49da-ba76-2496ea9aa7cc", + "type": "basic.output", + "data": { + "label": "led", + "name": "led", + "range": "", + "pins": [ + { + "index": "0", + "name": "LED0", + "value": "95" + } + ], + "virtual": false + }, + "position": { + "x": 352, + "y": 64 + } }, - "position": { - "x": 464, - "y": 208 - } - }, - { - "id": "e657ee6f-9430-4fce-a539-72d12d32f5bb", - "type": "bit.1", - "data": {}, - "position": { - "x": 80, - "y": 64 - } - }, - { - "id": "949075cb-26c0-49da-ba76-2496ea9aa7cc", - "type": "basic.output", - "data": { - "label": "led", - "pin": { - "name": "LED0", - "value": "95" + { + "id": "a538a5b4-d5d5-4ace-a593-efb1fa9b930c", + "type": "basic.info", + "data": { + "info": "LED-ON Hello world circuit example!\n\nThe simplest digital circuit that turns a \nled on\n\nA bit set to 1 is wired directly to the\noutput FPGA pin, where the led is connected\n\nThe blue box is the bit (set to 1)\nIt is inside the FPGA\n\nThe yellow box is the output FPGA pin. Using\nthe bottom menu the pin can be changed\n\nEXERCISE 1: Upload this circuit into your \nFPGA board and watch the led. \nIt should be turned on\n\nEXERCISE 2: Change the pin number to turn\nanother led on and upload it again" + }, + "position": { + "x": 40, + "y": 208 } }, - "position": { - "x": 352, - "y": 64 + { + "id": "0d05784e-8e32-4c80-b85d-cde4e892dbf3", + "type": "basic.info", + "data": { + "info": "Ejemplo de circuito Hola mundo: LED-ON\n\nEs el circuito digital más sencillo que\nenciende un led\n\nUn bit a 1 se cablea directamente a una\nsalida de la FPGA, donde está conectado\nel LED\n\nLa caja azul es el bit a 1\nEstá dentro de la FPGA\n\nLa caja amarilla es el pin de salida de\nla FPGA. Por medio del menú desplegable\ninferior se puede cambiar el pin\n\nEJERCICIO 1: Carga este circuito en la FPGA\ny observa el LED0. Debe estar encendido\n\nEJERCICIO 2: Cambia el pin de salida para\nencender otro led (por ejemplo el LED1)\ny cárgalo en la FPGA de nuevo" + }, + "position": { + "x": 464, + "y": 208 + } } - } - ], - "wires": [ - { - "source": { - "block": "e657ee6f-9430-4fce-a539-72d12d32f5bb", - "port": "19c8f68d-5022-487f-9ab0-f0a3cd58bead" - }, - "target": { - "block": "949075cb-26c0-49da-ba76-2496ea9aa7cc", - "port": "in" + ], + "wires": [ + { + "source": { + "block": "8c3d15a4-2311-4a24-8321-6036eb0eb92b", + "port": "19c8f68d-5022-487f-9ab0-f0a3cd58bead" + }, + "target": { + "block": "949075cb-26c0-49da-ba76-2496ea9aa7cc", + "port": "in" + } } - } - ] - }, - "deps": { - "bit.1": { - "graph": { - "blocks": [ - { - "id": "b959fb96-ac67-4aea-90b3-ed35a4c17bf5", - "type": "basic.code", - "data": { - "code": "// Bit 1\n\nassign v = 1'b1;", - "ports": { - "in": [], - "out": [ - "v" - ] + ] + }, + "deps": { + "bit.1": { + "version": "1.0", + "package": { + "name": "Bit 1", + "version": "1.0.0", + "description": "Assign 1 to the output wire", + "author": "Jesús Arroyo", + "image": "%3Csvg%20xmlns=%22http://www.w3.org/2000/svg%22%20width=%2247.303%22%20height=%2227.648%22%20viewBox=%220%200%2044.346456%2025.919999%22%3E%3Ctext%20style=%22line-height:125%25%22%20x=%22325.218%22%20y=%22315.455%22%20font-weight=%22400%22%20font-size=%2212.669%22%20font-family=%22sans-serif%22%20letter-spacing=%220%22%20word-spacing=%220%22%20transform=%22translate(-307.01%20-298.51)%22%3E%3Ctspan%20x=%22325.218%22%20y=%22315.455%22%20style=%22-inkscape-font-specification:'Courier%2010%20Pitch'%22%20font-family=%22Courier%2010%20Pitch%22%3E1%3C/tspan%3E%3C/text%3E%3C/svg%3E" + }, + "design": { + "board": "icezum", + "graph": { + "blocks": [ + { + "id": "b959fb96-ac67-4aea-90b3-ed35a4c17bf5", + "type": "basic.code", + "data": { + "code": "// Bit 1\n\nassign v = 1'b1;", + "ports": { + "in": [], + "out": [ + "v" + ] + } + }, + "position": { + "x": 96, + "y": 96 + } + }, + { + "id": "19c8f68d-5022-487f-9ab0-f0a3cd58bead", + "type": "basic.output", + "data": { + "label": "" + }, + "position": { + "x": 608, + "y": 192 + } } - }, - "position": { - "x": 96, - "y": 96 - } + ], + "wires": [ + { + "source": { + "block": "b959fb96-ac67-4aea-90b3-ed35a4c17bf5", + "port": "v" + }, + "target": { + "block": "19c8f68d-5022-487f-9ab0-f0a3cd58bead", + "port": "in" + } + } + ] }, - { - "id": "19c8f68d-5022-487f-9ab0-f0a3cd58bead", - "type": "basic.output", - "data": { - "label": "" + "deps": {}, + "state": { + "pan": { + "x": 0, + "y": 0 }, - "position": { - "x": 608, - "y": 192 - } + "zoom": 1 } - ], - "wires": [ - { - "source": { - "block": "b959fb96-ac67-4aea-90b3-ed35a4c17bf5", - "port": "v" - }, - "target": { - "block": "19c8f68d-5022-487f-9ab0-f0a3cd58bead", - "port": "in" - } - } - ] - }, - "deps": {}, - "image": "resources/images/1.svg", - "state": { - "pan": { - "x": 0, - "y": 0 - }, - "zoom": 1 + } } + }, + "state": { + "pan": { + "x": 0, + "y": 0 + }, + "zoom": 1 } } } \ No newline at end of file diff --git a/app/resources/examples/icezum/1_basic/2_switch_led.ice b/app/resources/examples/icezum/1_basic/2_switch_led.ice index 3adf6917a..7b42bc6ae 100644 --- a/app/resources/examples/icezum/1_basic/2_switch_led.ice +++ b/app/resources/examples/icezum/1_basic/2_switch_led.ice @@ -1,91 +1,112 @@ { - "image": "", - "state": { - "pan": { - "x": 0, - "y": 0 - }, - "zoom": 0.9999999883960295 + "version": "1.0", + "package": { + "name": "", + "version": "", + "description": "", + "author": "", + "image": "" }, - "board": "icezum", - "graph": { - "blocks": [ - { - "id": "aac1b394-533e-4410-9f35-ba80af8abd63", - "type": "basic.input", - "data": { - "label": "button", - "pin": { - "name": "SW1", - "value": "10" + "design": { + "board": "icezum", + "graph": { + "blocks": [ + { + "id": "aac1b394-533e-4410-9f35-ba80af8abd63", + "type": "basic.input", + "data": { + "label": "button", + "name": "button", + "range": "", + "pins": [ + { + "index": "0", + "name": "SW1", + "value": "10" + } + ], + "virtual": false + }, + "position": { + "x": 48, + "y": 80 } }, - "position": { - "x": 48, - "y": 80 - } - }, - { - "id": "30a83e46-176d-40a8-ac0e-f19a131ea9d9", - "type": "basic.output", - "data": { - "label": "led", - "pin": { - "name": "LED0", - "value": "95" + { + "id": "30a83e46-176d-40a8-ac0e-f19a131ea9d9", + "type": "basic.output", + "data": { + "label": "led", + "name": "led", + "range": "", + "pins": [ + { + "index": "0", + "name": "LED0", + "value": "95" + } + ], + "virtual": false + }, + "position": { + "x": 320, + "y": 80 } }, - "position": { - "x": 320, - "y": 80 - } - }, - { - "id": "9e124703-5a80-4d0d-8c31-945447862085", - "type": "basic.info", - "data": { - "info": "Switch-led basic example\n\nA simple circuit that connects the input pin,\nwhere there is a button switch, with the\noutpun pin, where there is a led\n\nWhen the button is pressed (1), the led is\nturned on. When the button is released (0), the\nled is turned off\n\nNotice the blue box with a gear. It is a\nconfiguration block for activating the \nFPGA internal pull-up resistor in the SW1 pin" - }, - "position": { - "x": 32, - "y": 224 - } - }, - { - "id": "f76f55d3-ba32-42d8-8c16-9f4cbbd9d27c", - "type": "basic.info", - "data": { - "info": "Ejemplo básico switch-led\n\nSencillo circuito que conecta directamente\nun pin de entrada de la FPGA, donde hay\nun pulsador, con el pin de salida, donde está\nel led\n\nCuando se aprieta el pulsador (1), se enciende\nel led. Cuando se suelta (0) se apaga\n\nFíjate en la caja azul con el engranaje. Es un\nbloque de configuración que permite activar la\nresistencia de pull-up interna del pin de la \nFPGA" + { + "id": "9e124703-5a80-4d0d-8c31-945447862085", + "type": "basic.info", + "data": { + "info": "Switch-led basic example\n\nA simple circuit that connects the input pin,\nwhere there is a button switch, with the\noutpun pin, where there is a led\n\nWhen the button is pressed (1), the led is\nturned on. When the button is released (0), the\nled is turned off\n\nNotice the blue box with a gear. It is a\nconfiguration block for activating the \nFPGA internal pull-up resistor in the SW1 pin" + }, + "position": { + "x": 32, + "y": 224 + } }, - "position": { - "x": 448, - "y": 224 - } - }, - { - "id": "d556c4f6-736a-41a9-9f64-badf2b790010", - "type": "basic.info", - "data": { - "info": "EXERCISE 1: Upload the circuit into your FPGA\nboard and test it!\n\nEXERCISE 2: Change the button to SW2 and test\nit again\n\n---------------------------------------------\nEjercicio 1: Carga el circuito en la FPGA y\n¡pruébalo!\n\nEJERCICIO 2: Cambia el pulsador al SW2 y\npruébalo de nuevo" + { + "id": "f76f55d3-ba32-42d8-8c16-9f4cbbd9d27c", + "type": "basic.info", + "data": { + "info": "Ejemplo básico switch-led\n\nSencillo circuito que conecta directamente\nun pin de entrada de la FPGA, donde hay\nun pulsador, con el pin de salida, donde está\nel led\n\nCuando se aprieta el pulsador (1), se enciende\nel led. Cuando se suelta (0) se apaga\n\nFíjate en la caja azul con el engranaje. Es un\nbloque de configuración que permite activar la\nresistencia de pull-up interna del pin de la \nFPGA" + }, + "position": { + "x": 448, + "y": 224 + } }, - "position": { - "x": 864, - "y": 224 + { + "id": "d556c4f6-736a-41a9-9f64-badf2b790010", + "type": "basic.info", + "data": { + "info": "EXERCISE 1: Upload the circuit into your FPGA\nboard and test it!\n\nEXERCISE 2: Change the button to SW2 and test\nit again\n\n---------------------------------------------\nEjercicio 1: Carga el circuito en la FPGA y\n¡pruébalo!\n\nEJERCICIO 2: Cambia el pulsador al SW2 y\npruébalo de nuevo" + }, + "position": { + "x": 864, + "y": 224 + } } - } - ], - "wires": [ - { - "source": { - "block": "aac1b394-533e-4410-9f35-ba80af8abd63", - "port": "out" - }, - "target": { - "block": "30a83e46-176d-40a8-ac0e-f19a131ea9d9", - "port": "in" + ], + "wires": [ + { + "source": { + "block": "aac1b394-533e-4410-9f35-ba80af8abd63", + "port": "out" + }, + "target": { + "block": "30a83e46-176d-40a8-ac0e-f19a131ea9d9", + "port": "in" + } } - } - ] - }, - "deps": {} + ] + }, + "deps": {}, + "state": { + "pan": { + "x": 0, + "y": 0 + }, + "zoom": 1 + } + } } \ No newline at end of file diff --git a/app/resources/examples/icezum/1_basic/3_switch_and_gate.ice b/app/resources/examples/icezum/1_basic/3_switch_and_gate.ice index 50c4778b9..6edbb2630 100644 --- a/app/resources/examples/icezum/1_basic/3_switch_and_gate.ice +++ b/app/resources/examples/icezum/1_basic/3_switch_and_gate.ice @@ -1,225 +1,262 @@ { - "image": "", - "state": { - "pan": { - "x": 0, - "y": 0 - }, - "zoom": 0.9999999999999751 + "version": "1.0", + "package": { + "name": "", + "version": "", + "description": "", + "author": "", + "image": "" }, - "board": "icezum", - "graph": { - "blocks": [ - { - "id": "aa8bab8b-61e4-4e28-b444-0e68d9484ea1", - "type": "basic.input", - "data": { - "label": "button1", - "pin": { - "name": "SW1", - "value": "10" + "design": { + "board": "icezum", + "graph": { + "blocks": [ + { + "id": "aa8bab8b-61e4-4e28-b444-0e68d9484ea1", + "type": "basic.input", + "data": { + "label": "button1", + "name": "button1", + "range": "", + "pins": [ + { + "index": "0", + "name": "SW1", + "value": "10" + } + ], + "virtual": false + }, + "position": { + "x": 40, + "y": 32 } }, - "position": { - "x": 40, - "y": 32 - } - }, - { - "id": "5d1b4f33-ae65-4154-b4f4-ff1403437600", - "type": "basic.input", - "data": { - "label": "button2", - "pin": { - "name": "SW2", - "value": "11" + { + "id": "81f8eceb-3742-4350-8833-78fef262c542", + "type": "logic.gate.and", + "data": {}, + "position": { + "x": 248, + "y": 80 } }, - "position": { - "x": 40, - "y": 128 - } - }, - { - "id": "3cad6e72-e7d3-4273-be1c-ce5f9b4c020a", - "type": "basic.output", - "data": { - "label": "led", - "pin": { - "name": "LED7", - "value": "104" + { + "id": "3cad6e72-e7d3-4273-be1c-ce5f9b4c020a", + "type": "basic.output", + "data": { + "label": "led", + "name": "led", + "range": "", + "pins": [ + { + "index": "0", + "name": "LED7", + "value": "104" + } + ], + "virtual": false + }, + "position": { + "x": 440, + "y": 80 } }, - "position": { - "x": 440, - "y": 80 - } - }, - { - "id": "cb5b06e5-0d7d-4c89-9c17-0cd7892369c1", - "type": "logic.and", - "data": {}, - "position": { - "x": 264, - "y": 80 - } - }, - { - "id": "cce8504a-dc1f-4deb-9ee3-5f215ac88408", - "type": "basic.info", - "data": { - "info": "Basic AND gate circuit\n\nA 2-inputs AND logic gate is used to turn on\nthe LED7 only when the 2 input buttons\nare pressed\n\nThis example shows the basic behaviour of\nthe AND gate\n\nEXERCISE: Upload this circuit into the FPGA\nboard and play with it" + { + "id": "5d1b4f33-ae65-4154-b4f4-ff1403437600", + "type": "basic.input", + "data": { + "label": "button2", + "name": "button2", + "range": "", + "pins": [ + { + "index": "0", + "name": "SW2", + "value": "11" + } + ], + "virtual": false + }, + "position": { + "x": 40, + "y": 128 + } }, - "position": { - "x": 40, - "y": 232 - } - }, - { - "id": "edf3b438-4271-45f7-bb14-2a6d040880dd", - "type": "basic.info", - "data": { - "info": "Circuito básico con puerta AND\n\nUna puerta lógica AND de 2 entradas se usa\npara encender un led solo cuando los dos\npulsadores de entrada están apretados\n\nEste ejemplo muestra el comportamiento básico\nde una puerta AND\n\nEJERCICIO: Carga este circuito en la FPGA y \njuega con él" + { + "id": "cce8504a-dc1f-4deb-9ee3-5f215ac88408", + "type": "basic.info", + "data": { + "info": "Basic AND gate circuit\n\nA 2-inputs AND logic gate is used to turn on\nthe LED7 only when the 2 input buttons\nare pressed\n\nThis example shows the basic behaviour of\nthe AND gate\n\nEXERCISE: Upload this circuit into the FPGA\nboard and play with it" + }, + "position": { + "x": 40, + "y": 232 + } }, - "position": { - "x": 464, - "y": 232 + { + "id": "edf3b438-4271-45f7-bb14-2a6d040880dd", + "type": "basic.info", + "data": { + "info": "Circuito básico con puerta AND\n\nUna puerta lógica AND de 2 entradas se usa\npara encender un led solo cuando los dos\npulsadores de entrada están apretados\n\nEste ejemplo muestra el comportamiento básico\nde una puerta AND\n\nEJERCICIO: Carga este circuito en la FPGA y \njuega con él" + }, + "position": { + "x": 464, + "y": 232 + } } - } - ], - "wires": [ - { - "source": { - "block": "cb5b06e5-0d7d-4c89-9c17-0cd7892369c1", - "port": "664caf9e-5f40-4df4-800a-b626af702e62" + ], + "wires": [ + { + "source": { + "block": "aa8bab8b-61e4-4e28-b444-0e68d9484ea1", + "port": "out" + }, + "target": { + "block": "81f8eceb-3742-4350-8833-78fef262c542", + "port": "18c2ebc7-5152-439c-9b3f-851c59bac834" + } }, - "target": { - "block": "3cad6e72-e7d3-4273-be1c-ce5f9b4c020a", - "port": "in" - } - }, - { - "source": { - "block": "aa8bab8b-61e4-4e28-b444-0e68d9484ea1", - "port": "out" + { + "source": { + "block": "5d1b4f33-ae65-4154-b4f4-ff1403437600", + "port": "out" + }, + "target": { + "block": "81f8eceb-3742-4350-8833-78fef262c542", + "port": "97b51945-d716-4b6c-9db9-970d08541249" + } }, - "target": { - "block": "cb5b06e5-0d7d-4c89-9c17-0cd7892369c1", - "port": "18c2ebc7-5152-439c-9b3f-851c59bac834" + { + "source": { + "block": "81f8eceb-3742-4350-8833-78fef262c542", + "port": "664caf9e-5f40-4df4-800a-b626af702e62" + }, + "target": { + "block": "3cad6e72-e7d3-4273-be1c-ce5f9b4c020a", + "port": "in" + } } - }, - { - "source": { - "block": "5d1b4f33-ae65-4154-b4f4-ff1403437600", - "port": "out" + ] + }, + "deps": { + "logic.gate.and": { + "version": "1.0", + "package": { + "name": "AND", + "version": "1.0.0", + "description": "AND logic gate", + "author": "Jesús Arroyo", + "image": "%3Csvg%20xmlns=%22http://www.w3.org/2000/svg%22%20viewBox=%22-252%20400.9%2090%2040%22%3E%3Cpath%20d=%22M-252%20409.9h26v2h-26zM-252%20429.9h27v2h-27z%22/%3E%3Cpath%20d=%22M-227%20400.9v39.9h20.4c11.3%200%2020-9%2020-20s-8.7-20-20-20H-227zm2.9%202.8h17.6c9.8%200%2016.7%207.6%2016.7%2017.1%200%209.5-7.4%2017.1-17.1%2017.1H-224c-.1.1-.1-34.2-.1-34.2z%22/%3E%3Cpath%20d=%22M-187.911%20419.9H-162v2h-25.911z%22/%3E%3C/svg%3E" }, - "target": { - "block": "cb5b06e5-0d7d-4c89-9c17-0cd7892369c1", - "port": "97b51945-d716-4b6c-9db9-970d08541249" - } - } - ] - }, - "deps": { - "logic.and": { - "graph": { - "blocks": [ - { - "id": "18c2ebc7-5152-439c-9b3f-851c59bac834", - "type": "basic.input", - "data": { - "label": "" - }, - "position": { - "x": 64, - "y": 80 - } - }, - { - "id": "97b51945-d716-4b6c-9db9-970d08541249", - "type": "basic.input", - "data": { - "label": "" - }, - "position": { - "x": 64, - "y": 208 - } - }, - { - "id": "664caf9e-5f40-4df4-800a-b626af702e62", - "type": "basic.output", - "data": { - "label": "" - }, - "position": { - "x": 752, - "y": 144 - } - }, - { - "id": "00925b04-5004-4307-a737-fa4e97c8b6ab", - "type": "basic.code", - "data": { - "code": "// AND logic gate\n\nassign c = a & b;", - "ports": { - "in": [ - "a", - "b" - ], - "out": [ - "c" - ] + "design": { + "board": "icezum", + "graph": { + "blocks": [ + { + "id": "00925b04-5004-4307-a737-fa4e97c8b6ab", + "type": "basic.code", + "data": { + "code": "// AND logic gate\n\nassign c = a & b;", + "ports": { + "in": [ + "a", + "b" + ], + "out": [ + "c" + ] + } + }, + "position": { + "x": 256, + "y": 48 + } + }, + { + "id": "18c2ebc7-5152-439c-9b3f-851c59bac834", + "type": "basic.input", + "data": { + "label": "" + }, + "position": { + "x": 64, + "y": 80 + } + }, + { + "id": "664caf9e-5f40-4df4-800a-b626af702e62", + "type": "basic.output", + "data": { + "label": "" + }, + "position": { + "x": 752, + "y": 144 + } + }, + { + "id": "97b51945-d716-4b6c-9db9-970d08541249", + "type": "basic.input", + "data": { + "label": "" + }, + "position": { + "x": 64, + "y": 208 + } } - }, - "position": { - "x": 256, - "y": 48 - } - } - ], - "wires": [ - { - "source": { - "block": "18c2ebc7-5152-439c-9b3f-851c59bac834", - "port": "out" - }, - "target": { - "block": "00925b04-5004-4307-a737-fa4e97c8b6ab", - "port": "a" - } - }, - { - "source": { - "block": "97b51945-d716-4b6c-9db9-970d08541249", - "port": "out" - }, - "target": { - "block": "00925b04-5004-4307-a737-fa4e97c8b6ab", - "port": "b" - } + ], + "wires": [ + { + "source": { + "block": "18c2ebc7-5152-439c-9b3f-851c59bac834", + "port": "out" + }, + "target": { + "block": "00925b04-5004-4307-a737-fa4e97c8b6ab", + "port": "a" + } + }, + { + "source": { + "block": "97b51945-d716-4b6c-9db9-970d08541249", + "port": "out" + }, + "target": { + "block": "00925b04-5004-4307-a737-fa4e97c8b6ab", + "port": "b" + } + }, + { + "source": { + "block": "00925b04-5004-4307-a737-fa4e97c8b6ab", + "port": "c" + }, + "target": { + "block": "664caf9e-5f40-4df4-800a-b626af702e62", + "port": "in" + } + } + ] }, - { - "source": { - "block": "00925b04-5004-4307-a737-fa4e97c8b6ab", - "port": "c" + "deps": {}, + "state": { + "pan": { + "x": 0, + "y": 0 }, - "target": { - "block": "664caf9e-5f40-4df4-800a-b626af702e62", - "port": "in" - } + "zoom": 0.9999999784900666 } - ] - }, - "deps": {}, - "image": "resources/images/and.svg", - "state": { - "pan": { - "x": 0, - "y": 0 - }, - "zoom": 1 + } } + }, + "state": { + "pan": { + "x": 0, + "y": 0 + }, + "zoom": 1 } } } \ No newline at end of file diff --git a/app/scripts/services/graph.service.js b/app/scripts/services/graph.service.js index 50afccd4e..4e6faeff3 100644 --- a/app/scripts/services/graph.service.js +++ b/app/scripts/services/graph.service.js @@ -439,6 +439,12 @@ angular.module('icestudio') }; this.createBlock = function(type, block, callback) { + var addCellCallback = function(cell) { + addCell(cell); + if (callback) { + callback(); + } + }; if (type.indexOf('basic.') !== -1) { blocks.newBasic(type, block, addCellCallback); } @@ -446,13 +452,6 @@ angular.module('icestudio') dependencies[type] = block; blocks.newGeneric(type, block, addCellCallback); } - - var addCellCallback = function(cell) { - addCell(cell); - if (callback) { - callback(); - } - }; }; this.toJSON = function() { diff --git a/app/scripts/services/project.service.js b/app/scripts/services/project.service.js index 07a059e81..9c7fc5d3b 100644 --- a/app/scripts/services/project.service.js +++ b/app/scripts/services/project.service.js @@ -57,7 +57,7 @@ angular.module('icestudio') this.load = function(name, data) { if (!data.version) { - alertify.notify(gettextCatalog.getString('Old project format'), 'warning', 3); + alertify.notify(gettextCatalog.getString('Old project format'), 'warning', 5); } this.project = _safeLoad(data); var ret = graph.loadDesign(this.project.design, false, function() { @@ -146,7 +146,7 @@ angular.module('icestudio') var self = this; utils.readFile(filepath, function(data) { if (!data.version) { - alertify.notify(gettextCatalog.getString('Old project format'), 'warning', 3); + alertify.notify(gettextCatalog.getString('Old project format'), 'warning', 5); } var block = _safeLoad(data); if (block) { From 96bbb304d7ead6347be1bf7d6f0fb55d87721d1c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jes=C3=BAs=20Arroyo=20Torrens?= Date: Tue, 20 Dec 2016 14:48:02 +0100 Subject: [PATCH 060/169] Edit multi-io blocks --- app/scripts/services/blocks.service.js | 481 +++++++++++++++---------- app/scripts/services/graph.service.js | 18 +- 2 files changed, 283 insertions(+), 216 deletions(-) diff --git a/app/scripts/services/blocks.service.js b/app/scripts/services/blocks.service.js index 41c18a66f..3b13a4c15 100644 --- a/app/scripts/services/blocks.service.js +++ b/app/scripts/services/blocks.service.js @@ -28,7 +28,235 @@ angular.module('icestudio') }; this.newGeneric = newGeneric; - this.loadBasic = function(instance, disabled) { + this.loadBasic = loadBasic; + this.loadGeneric = loadGeneric; + this.loadWire = loadWire; + + + this.editBasicIO = editBasicIO; + + + //-- New + + function newBasicIO(type, addCellCallback) { + var config = null; + if (type === 'basic.input') { + config = { type: type, _default: 'in', x: 4 }; + } + else if (type === 'basic.output') { + config = { type: type, _default: 'out', x: 95 }; + } + if (config) { + var blockInstance = { + id: null, + data: {}, + type: config.type, + position: { x: config.x * gridsize, y: 4 * gridsize } + }; + alertify.prompt(gettextCatalog.getString('Enter the ports'), config._default, + function(evt, input) { + if (input) { + var labels = input.replace(/ /g, '').split(','); + var portInfo, portInfos = []; + // Validate input + for (var l in labels) { + portInfo = utils.parsePortLabel(labels[l]); + if (portInfo) { + evt.cancel = false; + portInfos.push(portInfo); + } + else { + evt.cancel = true; + alertify.notify(gettextCatalog.getString('Wrong port name {{name}}', { name: labels[l] }), 'warning', 3); + return; + } + } + // Create blocks + for (var p in portInfos) { + portInfo = portInfos[p]; + blockInstance.data = { + label: portInfo.input, + name: portInfo.name, + range: portInfo.rangestr ? portInfo.rangestr : '', + pins: getPins(portInfo), + virtual: true + }; + if (addCellCallback) { + addCellCallback(loadBasic(blockInstance)); + } + // Next block position + blockInstance.position.y += 10 * gridsize; + } + } + }); + } + } + + function getPins(portInfo) { + var pins = []; + if (portInfo.range) { + for (var r in portInfo.range) { + pins.push({ index: portInfo.range[r].toString(), name: '', value: 0 }); + } + } + else { + pins.push({ index: '0', name: '', value: 0 }); + } + return pins; + } + + function newBasicConstant(addCellCallback) { + var blockInstance = { + id: null, + data: {}, + type: 'basic.constant', + position: { x: 20 * gridsize, y: 4 * gridsize } + }; + alertify.prompt(gettextCatalog.getString('Enter the constant blocks'), 'C', + function(evt, name) { + if (name) { + var names = name.replace(/ /g, '').split(','); + for (var n in names) { + if (names[n]) { + blockInstance.data = { + label: names[n], + local: false, + value: '' + }; + if (addCellCallback) { + addCellCallback(loadBasicConstant(blockInstance)); + } + blockInstance.position.x += 15 * gridsize; + } + } + } + }); + } + + function newBasicCode(block, addCellCallback) { + var blockInstance = { + id: null, + data: {}, + type: 'basic.code', + position: { x: 4 * gridsize, y: 4 * gridsize } + }; + var defaultValues = [ + 'a , b', + 'c , d', + '' + ]; + if (block && block.data) { + if (block.data.ports) { + defaultValues[0] = block.data.ports.in.join(' , '); + defaultValues[1] = block.data.ports.out.join(' , '); + } + if (block.data.params) { + defaultValues[2] = block.data.params.join(' , '); + } + } + utils.multiprompt( + [ gettextCatalog.getString('Enter the input ports'), + gettextCatalog.getString('Enter the output ports'), + gettextCatalog.getString('Enter the parameters') ], + defaultValues, + function(evt, ports) { + if (ports && (ports[0].length || ports[1].length)) { + blockInstance.data = { + code: '', + params: [], + ports: { in: [], out: [] } + }; + // Parse ports + var inPorts = []; + var outPorts = []; + var params = []; + if (ports.length > 0) { + inPorts = ports[0].replace(/ /g, '').split(','); + } + if (ports.length > 1) { + outPorts = ports[1].replace(/ /g, '').split(','); + } + if (ports.length > 2) { + params = ports[2].replace(/ /g, '').split(','); + } + + for (var i in inPorts) { + if (inPorts[i]) { + blockInstance.data.ports.in.push(inPorts[i]); + } + } + for (var o in outPorts) { + if (outPorts[o]) { + blockInstance.data.ports.out.push(outPorts[o]); + } + } + for (var p in params) { + if (params[p]) { + blockInstance.data.params.push(params[p]); + } + } + blockInstance.position.x = 31 * gridsize; + blockInstance.position.y = 24 * gridsize; + + var allAttrs= inPorts.concat(outPorts, params); + var numAttrs = allAttrs.length; + + // Check duplicated attributes + if (numAttrs === $.unique(allAttrs).length) { + evt.cancel = false; + if (block) { + blockInstance.data.code = block.data.code; + blockInstance.position = block.position; + } + if (addCellCallback) { + addCellCallback(loadBasicCode(blockInstance)); + } + } + else { + evt.cancel = true; + alertify.notify(gettextCatalog.getString('Duplicated block attributes'), 'warning', 3); + } + } + }); + } + + function newBasicInfo(addCellCallback) { + var blockInstance = { + id: null, + data: { info: '' }, + type: 'basic.info', + position: { x: 4 * gridsize, y: 30 * gridsize } + }; + if (addCellCallback) { + addCellCallback(loadBasicInfo(blockInstance)); + } + } + + function newGeneric(type, block, addCellCallback) { + var blockInstance = { + id: null, + type: type, + position: { x: 6 * gridsize, y: 16 * gridsize } + }; + if (block && + block.design && + block.design.graph && + block.design.graph.blocks && + block.design.graph.wires && + block.design.deps) { + if (addCellCallback) { + addCellCallback(loadGeneric(blockInstance, block)); + } + } + else { + alertify.notify(gettextCatalog.getString('Wrong block format: {{type}}', { type: type }), 'error', 30); + } + } + + + //-- Load + + function loadBasic(instance, disabled) { switch(instance.type) { case 'basic.input': return loadBasicInput(instance, disabled); @@ -43,9 +271,7 @@ angular.module('icestudio') default: break; } - }; - this.loadGeneric = loadGeneric; - this.loadWire = loadWire; + } function loadBasicInput(instance, disabled) { var cell = new joint.shapes.ice.Input({ @@ -269,212 +495,67 @@ angular.module('icestudio') return _wire; } - function newBasicIO(type, addCellCallback) { - var config = null; - if (type === 'basic.input') { - config = { type: type, _default: 'in', loadFunction: loadBasicInput, x: 4 }; - } - else if (type === 'basic.output') { - config = { type: type, _default: 'out',loadFunction: loadBasicOutput, x: 95 }; - } - if (config) { - var blockInstance = { - id: null, - data: {}, - type: config.type, - position: { x: config.x * gridsize, y: 4 * gridsize } - }; - alertify.prompt(gettextCatalog.getString('Enter the ports'), config._default, - function(evt, input) { - if (input) { - var labels = input.replace(/ /g, '').split(','); - for (var l in labels) { - var portInfo = utils.parsePortLabel(labels[l]); - if (portInfo) { - evt.cancel = false; - blockInstance.data = { + + //-- Edit + + function editBasicIO(cellView, addCellCallback) { + var block = cellView.model.attributes; + utils.inputcheckboxprompt([ + gettextCatalog.getString('Update the port'), + gettextCatalog.getString('Virtual port') + ], [ + block.data.label, + block.data.virtual + ], + function(evt, values) { + var label = values[0].replace(/ /g, ''); + var virtual = values[1]; + // Validate input + var portInfo = utils.parsePortLabel(label); + if (portInfo) { + evt.cancel = false; + if (!block.data.range) { + block.data.range = ''; + } + if (!portInfo.rangestr) { + portInfo.rangestr = ''; + } + if (block.data.range !== portInfo.rangestr) { + // Create new block + var blockInstance = { + id: null, + data: { label: portInfo.input, name: portInfo.name, range: portInfo.rangestr ? portInfo.rangestr : '', pins: getPins(portInfo), - virtual: true - }; - if (addCellCallback) { - addCellCallback(config.loadFunction(blockInstance)); - } - // Next block position - blockInstance.position.y += 10 * gridsize; - } - else { - evt.cancel = true; - alertify.notify(gettextCatalog.getString('Wrong port name {{name}}', { name: labels[l] }), 'warning', 3); - break; - } - } - } - }); - } - } - - function getPins(portInfo) { - var pins = []; - if (portInfo.range) { - for (var r in portInfo.range) { - pins.push({ index: portInfo.range[r].toString(), name: '', value: 0 }); - } - } - else { - pins.push({ index: '0', name: '', value: 0 }); - } - return pins; - } - - function newBasicConstant(addCellCallback) { - var blockInstance = { - id: null, - data: {}, - type: 'basic.constant', - position: { x: 20 * gridsize, y: 4 * gridsize } - }; - alertify.prompt(gettextCatalog.getString('Enter the constant blocks'), 'C', - function(evt, name) { - if (name) { - var names = name.replace(/ /g, '').split(','); - for (var n in names) { - if (names[n]) { - blockInstance.data = { - label: names[n], - local: false, - value: '' - }; - if (addCellCallback) { - addCellCallback(loadBasicConstant(blockInstance)); - } - blockInstance.position.x += 15 * gridsize; - } - } - } - }); - } - - function newBasicCode(block, addCellCallback) { - var blockInstance = { - id: null, - data: {}, - type: 'basic.code', - position: { x: 4 * gridsize, y: 4 * gridsize } - }; - var defaultValues = [ - 'a , b', - 'c , d', - '' - ]; - if (block && block.data) { - if (block.data.ports) { - defaultValues[0] = block.data.ports.in.join(' , '); - defaultValues[1] = block.data.ports.out.join(' , '); - } - if (block.data.params) { - defaultValues[2] = block.data.params.join(' , '); - } - } - utils.multiprompt( - [ gettextCatalog.getString('Enter the input ports'), - gettextCatalog.getString('Enter the output ports'), - gettextCatalog.getString('Enter the parameters') ], - defaultValues, - function(evt, ports) { - if (ports && (ports[0].length || ports[1].length)) { - blockInstance.data = { - code: '', - params: [], - ports: { in: [], out: [] } - }; - // Parse ports - var inPorts = []; - var outPorts = []; - var params = []; - if (ports.length > 0) { - inPorts = ports[0].replace(/ /g, '').split(','); - } - if (ports.length > 1) { - outPorts = ports[1].replace(/ /g, '').split(','); - } - if (ports.length > 2) { - params = ports[2].replace(/ /g, '').split(','); - } - - for (var i in inPorts) { - if (inPorts[i]) { - blockInstance.data.ports.in.push(inPorts[i]); - } - } - for (var o in outPorts) { - if (outPorts[o]) { - blockInstance.data.ports.out.push(outPorts[o]); - } - } - for (var p in params) { - if (params[p]) { - blockInstance.data.params.push(params[p]); - } - } - blockInstance.position.x = 31 * gridsize; - blockInstance.position.y = 24 * gridsize; - - var allAttrs= inPorts.concat(outPorts, params); - var numAttrs = allAttrs.length; - - // Check duplicated attributes - if (numAttrs === $.unique(allAttrs).length) { - evt.cancel = false; - if (block) { - blockInstance.data.code = block.data.code; - blockInstance.position = block.position; - } + virtual: virtual + }, + type: block.blockType, + position: block.position + }; if (addCellCallback) { - addCellCallback(loadBasicCode(blockInstance)); + addCellCallback(loadBasic(blockInstance)); + cellView.model.remove(); + alertify.success(gettextCatalog.getString('Block updated: create')); } } - else { - evt.cancel = true; - alertify.notify(gettextCatalog.getString('Duplicated block attributes'), 'warning', 3); + else if (block.data.name !== portInfo.name || + block.data.virtual !== virtual) { + // Edit block + block.data.label = portInfo.input; + block.data.name = portInfo.name; + block.data.pins = getPins(portInfo); + block.data.virtual = virtual; + cellView.render(); + alertify.success(gettextCatalog.getString('Block updated: edit')); } } + else { + evt.cancel = true; + alertify.notify(gettextCatalog.getString('Wrong port name {{name}}', { name: label }), 'warning', 3); + } }); } - function newBasicInfo(addCellCallback) { - var blockInstance = { - id: null, - data: { info: '' }, - type: 'basic.info', - position: { x: 4 * gridsize, y: 30 * gridsize } - }; - if (addCellCallback) { - addCellCallback(loadBasicInfo(blockInstance)); - } - } - - function newGeneric(type, block, addCellCallback) { - var blockInstance = { - id: null, - type: type, - position: { x: 6 * gridsize, y: 16 * gridsize } - }; - if (block && - block.design && - block.design.graph && - block.design.graph.blocks && - block.design.graph.wires && - block.design.deps) { - if (addCellCallback) { - addCellCallback(loadGeneric(blockInstance, block)); - } - } - else { - alertify.notify(gettextCatalog.getString('Wrong block format: {{type}}', { type: type }), 'error', 30); - } - } - }); diff --git a/app/scripts/services/graph.service.js b/app/scripts/services/graph.service.js index 4e6faeff3..b375df8ea 100644 --- a/app/scripts/services/graph.service.js +++ b/app/scripts/services/graph.service.js @@ -279,22 +279,8 @@ angular.module('icestudio') if (data.blockType === 'basic.input' || data.blockType === 'basic.output') { if (paper.options.enabled) { - utils.inputcheckboxprompt([ - gettextCatalog.getString('Update the port label'), - gettextCatalog.getString('Virtual port') - ], [ - data.data.label, - data.data.virtual - ], - function(evt, values) { - var label = values[0].replace(/ /g, ''); - if (data.data.label !== label) { - data.data.label = label; - alertify.success(gettextCatalog.getString('Block updated')); - } - var virtual = values[1]; - data.data.virtual = virtual; - cellView.render(); + blocks.editBasicIO(cellView, function(cell) { + addCell(cell); }); } } From bf59b2d24e937ae98e1919edd40d02393145c25d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jes=C3=BAs=20Arroyo=20Torrens?= Date: Tue, 20 Dec 2016 17:54:30 +0100 Subject: [PATCH 061/169] Add bus wires into the compiler. Minor io block fix --- app/scripts/plugins/shapes/joint.shapes.js | 55 ++++---- app/scripts/services/blocks.service.js | 5 +- app/scripts/services/compiler.service.js | 3 +- app/scripts/services/project.service.js | 1 + app/styles/design.css | 8 +- demo/bus-input-output.ice | 142 +++++++++++++++++++++ 6 files changed, 184 insertions(+), 30 deletions(-) create mode 100644 demo/bus-input-output.ice diff --git a/app/scripts/plugins/shapes/joint.shapes.js b/app/scripts/plugins/shapes/joint.shapes.js index 357dc44f2..c5b4626b1 100644 --- a/app/scripts/plugins/shapes/joint.shapes.js +++ b/app/scripts/plugins/shapes/joint.shapes.js @@ -342,13 +342,11 @@ joint.shapes.ice.IOView = joint.shapes.ice.ModelView.extend({ var selectScript = ''; this.pins = this.model.attributes.data.pins; - // a,b[0:1],c[0:2],d[0:3] - if (this.pins) { for (var i in this.pins) { //selectCode += '

                ' + this.pins[i].index + '

                '; selectCode +=''; selectScript += '$("#' + comboId + this.pins[i].index + '").select2('; @@ -374,24 +372,18 @@ joint.shapes.ice.IOView = joint.shapes.ice.ModelView.extend({ comboSelector.on('mousedown click', function(evt) { evt.stopPropagation(); }); comboSelector.on('change', _.bind(function(evt) { var target = $(evt.target); - var index = target.attr('index'); + var i = target.attr('i'); var name = target.find('option:selected').text(); var value = target.val(); - this.model.attributes.data.pins[index].name = name; - this.model.attributes.data.pins[index].value = value; - this.$box.find('.select2-selection').css('font-size', computeFontSize(name)); + this.model.attributes.data.pins[i].name = name; + this.model.attributes.data.pins[i].value = value; + //comboSelector.find('.select2-selection').css('font-size', this.computeFontSize(name)); }, this)); - function computeFontSize(name) { - var n = name.length; - return Math.min(13, 17-n).toString() + 'px'; - } - }, - renderChoices: function() { - if (this.pins) { - for (var i in this.pins) { - this.$box.find('#combo' + this.id + this.pins[i].index).empty().append(this.model.get('choices')); - } + // Render data + if (!this.model.get('disabled')) { + this.renderChoices(); + this.renderValue(); } }, renderBlock: function() { @@ -417,10 +409,22 @@ joint.shapes.ice.IOView = joint.shapes.ice.ModelView.extend({ } } }, + renderChoices: function() { + if (this.pins) { + for (var i in this.pins) { + this.$box.find('#combo' + this.id + this.pins[i].index).empty().append(this.model.get('choices')); + } + } + }, renderValue: function() { if (this.pins) { for (var i in this.pins) { - this.$box.find('#combo' + this.id + this.pins[i].index).val(this.pins[i].value); + var index = this.pins[i].index; + var comboId = 'combo' + this.id + index; + var comboSelector = this.$box.find('#' + comboId); + comboSelector.val(this.pins[i].value); + //var fontSize = this.computeFontSize(this.pins[i].name); + //$('#select2-' + comboId + '-container').css('font-size', fontSize); } } }, @@ -428,18 +432,18 @@ joint.shapes.ice.IOView = joint.shapes.ice.ModelView.extend({ if (this.pins) { for (var i in this.pins) { this.$box.find('#combo' + this.id + this.pins[i].index).val(''); - this.model.attributes.data.pins[i.toString()].name = ''; - this.model.attributes.data.pins[i.toString()].value = 0; + this.model.attributes.data.pins[i].name = ''; + this.model.attributes.data.pins[i].value = 0; } } }, + computeFontSize: function(name) { + var n = name.length; + return Math.min(13, 17-n).toString() + 'px'; + }, update: function () { this.renderPorts(); this.renderBlock(); - if (!this.model.get('disabled')) { - this.renderChoices(); - this.renderValue(); - } joint.dia.ElementView.prototype.update.apply(this, arguments); } }); @@ -773,6 +777,9 @@ joint.shapes.ice.WireView = joint.dia.LinkView.extend({ // Set up the wire this.$('.connection').css('stroke-width', wireWidth); this.model.label(0, {attrs: { text: { text: wireLabel } } }); + if (pins && pins.length > 1) { + this.model.attributes.size = pins.length; + } this.model.bifurcationMarkup = this.model.bifurcationMarkup.replace(/<%= r %>/g, wireDot); this.update(); diff --git a/app/scripts/services/blocks.service.js b/app/scripts/services/blocks.service.js index 3b13a4c15..c2b5a7fb6 100644 --- a/app/scripts/services/blocks.service.js +++ b/app/scripts/services/blocks.service.js @@ -537,7 +537,7 @@ angular.module('icestudio') if (addCellCallback) { addCellCallback(loadBasic(blockInstance)); cellView.model.remove(); - alertify.success(gettextCatalog.getString('Block updated: create')); + alertify.success(gettextCatalog.getString('Block updated')); } } else if (block.data.name !== portInfo.name || @@ -545,10 +545,9 @@ angular.module('icestudio') // Edit block block.data.label = portInfo.input; block.data.name = portInfo.name; - block.data.pins = getPins(portInfo); block.data.virtual = virtual; cellView.render(); - alertify.success(gettextCatalog.getString('Block updated: edit')); + alertify.success(gettextCatalog.getString('Block updated')); } } else { diff --git a/app/scripts/services/compiler.service.js b/app/scripts/services/compiler.service.js index a1e740afa..3ec7abf92 100644 --- a/app/scripts/services/compiler.service.js +++ b/app/scripts/services/compiler.service.js @@ -182,7 +182,8 @@ angular.module('icestudio') } else { // Wires - connections.wire.push('wire w' + w + ';'); + var range = wire.size ? '[0:' + (wire.size-1) +'] ' : ' '; + connections.wire.push('wire ' + range + 'w' + w + ';'); } // Assignations for (i in graph.blocks) { diff --git a/app/scripts/services/project.service.js b/app/scripts/services/project.service.js index 9c7fc5d3b..9d1370e08 100644 --- a/app/scripts/services/project.service.js +++ b/app/scripts/services/project.service.js @@ -288,6 +288,7 @@ angular.module('icestudio') var wire = {}; wire.source = { block: cell.source.id, port: cell.source.port }; wire.target = { block: cell.target.id, port: cell.target.port }; + wire.size = cell.size; wire.vertices = cell.vertices; wires.push(wire); } diff --git a/app/styles/design.css b/app/styles/design.css index 01c2f8405..d8dccf49a 100644 --- a/app/styles/design.css +++ b/app/styles/design.css @@ -158,9 +158,13 @@ pointer-events: auto; } +.select2-selection__rendered { + font-size: 13px; +} + .bigdrop { - width: 86px !important; - font-size: 12px; + width: 92px !important; + font-size: 13px; } .constant-block { diff --git a/demo/bus-input-output.ice b/demo/bus-input-output.ice new file mode 100644 index 000000000..c8e17d9ae --- /dev/null +++ b/demo/bus-input-output.ice @@ -0,0 +1,142 @@ +{ + "version": "1.0", + "package": { + "name": "", + "version": "", + "description": "", + "author": "", + "image": "" + }, + "design": { + "board": "icezum", + "graph": { + "blocks": [ + { + "id": "a63cb442-f0cf-4802-8542-0b50bf859a3c", + "type": "basic.input", + "data": { + "label": "buttons[0:1]", + "name": "buttons", + "range": "[0:1]", + "pins": [ + { + "index": "0", + "name": "SW1", + "value": "10" + }, + { + "index": "1", + "name": "SW2", + "value": "11" + } + ], + "virtual": false + }, + "position": { + "x": 128, + "y": 64 + } + }, + { + "id": "39d544a4-e8fd-4c59-909e-61cddd5e7f98", + "type": "basic.output", + "data": { + "label": "leds[1:0]", + "name": "leds", + "range": "[1:0]", + "pins": [ + { + "index": "1", + "name": "LED0", + "value": "95" + }, + { + "index": "0", + "name": "LED1", + "value": "96" + } + ], + "virtual": false + }, + "position": { + "x": 408, + "y": 64 + } + }, + { + "id": "99ebca85-09ff-456a-8caa-cfa78955e25f", + "type": "basic.input", + "data": { + "label": "in", + "name": "in", + "range": "", + "pins": [ + { + "index": "0", + "name": "D10", + "value": "141" + } + ], + "virtual": false + }, + "position": { + "x": 184, + "y": 248 + } + }, + { + "id": "5b81602a-731c-42bd-9f81-3bec86dbe75c", + "type": "basic.output", + "data": { + "label": "out", + "name": "out", + "range": "", + "pins": [ + { + "index": "0", + "name": "LED2", + "value": "97" + } + ], + "virtual": false + }, + "position": { + "x": 384, + "y": 248 + } + } + ], + "wires": [ + { + "source": { + "block": "a63cb442-f0cf-4802-8542-0b50bf859a3c", + "port": "out" + }, + "target": { + "block": "39d544a4-e8fd-4c59-909e-61cddd5e7f98", + "port": "in" + }, + "size": 2 + }, + { + "source": { + "block": "99ebca85-09ff-456a-8caa-cfa78955e25f", + "port": "out" + }, + "target": { + "block": "5b81602a-731c-42bd-9f81-3bec86dbe75c", + "port": "in" + } + } + ] + }, + "deps": {}, + "state": { + "pan": { + "x": 0, + "y": 0 + }, + "zoom": 1 + } + } +} \ No newline at end of file From 01e9a1f03d79ff4c45e772344c491623c8edd8a8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jes=C3=BAs=20Arroyo=20Torrens?= Date: Tue, 20 Dec 2016 18:06:15 +0100 Subject: [PATCH 062/169] Move editBasicConstant function to blocks service --- app/scripts/services/blocks.service.js | 26 ++++++++++++++++++++++++++ app/scripts/services/graph.service.js | 20 ++------------------ 2 files changed, 28 insertions(+), 18 deletions(-) diff --git a/app/scripts/services/blocks.service.js b/app/scripts/services/blocks.service.js index c2b5a7fb6..983029b93 100644 --- a/app/scripts/services/blocks.service.js +++ b/app/scripts/services/blocks.service.js @@ -34,6 +34,7 @@ angular.module('icestudio') this.editBasicIO = editBasicIO; + this.editBasicConstant = editBasicConstant; //-- New @@ -557,4 +558,29 @@ angular.module('icestudio') }); } + function editBasicConstant(cellView) { + var block = cellView.model.attributes; + utils.inputcheckboxprompt([ + gettextCatalog.getString('Update the block label'), + gettextCatalog.getString('Local parameter') + ], [ + block.data.label, + block.data.local + ], + function(evt, values) { + var label = values[0].replace(/ /g, ''); + var local = values[1]; + // Edit block + if (block.data.name !== label || + block.data.local !== local) { + // Edit block + block.data.label = label; + block.data.local = local; + cellView.renderLabel(); + cellView.renderLocal(); + alertify.success(gettextCatalog.getString('Block updated')); + } + }); + } + }); diff --git a/app/scripts/services/graph.service.js b/app/scripts/services/graph.service.js index b375df8ea..bca8143f0 100644 --- a/app/scripts/services/graph.service.js +++ b/app/scripts/services/graph.service.js @@ -276,6 +276,7 @@ angular.module('icestudio') paper.on('cell:pointerdblclick', function(cellView/*, evt, x, y*/) { var data = cellView.model.attributes; + // TODO: move to blocks.service edit function if (data.blockType === 'basic.input' || data.blockType === 'basic.output') { if (paper.options.enabled) { @@ -286,24 +287,7 @@ angular.module('icestudio') } else if (data.blockType === 'basic.constant') { if (paper.options.enabled) { - utils.inputcheckboxprompt([ - gettextCatalog.getString('Update the block label'), - gettextCatalog.getString('Local parameter') - ], [ - data.data.label, - data.data.local - ], - function(evt, values) { - var label = values[0].replace(/ /g, ''); - if (data.data.label !== label) { - data.data.label = label; - cellView.renderLabel(); - alertify.success(gettextCatalog.getString('Block updated')); - } - var local = values[1]; - data.data.local = local; - cellView.renderLocal(); - }); + blocks.editBasicConstant(cellView); } } else if (data.blockType === 'basic.code') { From 075ba80f74b219a6ecc6623df65d1ade38b76fea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jes=C3=BAs=20Arroyo=20Torrens?= Date: Tue, 20 Dec 2016 18:30:46 +0100 Subject: [PATCH 063/169] Prevent different size connections --- app/scripts/plugins/shapes/joint.shapes.js | 4 +--- app/scripts/services/graph.service.js | 7 +++++++ app/scripts/services/project.service.js | 4 +++- 3 files changed, 11 insertions(+), 4 deletions(-) diff --git a/app/scripts/plugins/shapes/joint.shapes.js b/app/scripts/plugins/shapes/joint.shapes.js index c5b4626b1..f3e0401ca 100644 --- a/app/scripts/plugins/shapes/joint.shapes.js +++ b/app/scripts/plugins/shapes/joint.shapes.js @@ -776,10 +776,8 @@ joint.shapes.ice.WireView = joint.dia.LinkView.extend({ // Set up the wire this.$('.connection').css('stroke-width', wireWidth); + this.model.attributes.size = pins.length; this.model.label(0, {attrs: { text: { text: wireLabel } } }); - if (pins && pins.length > 1) { - this.model.attributes.size = pins.length; - } this.model.bifurcationMarkup = this.model.bifurcationMarkup.replace(/<%= r %>/g, wireDot); this.update(); diff --git a/app/scripts/services/graph.service.js b/app/scripts/services/graph.service.js index bca8143f0..79cb388b4 100644 --- a/app/scripts/services/graph.service.js +++ b/app/scripts/services/graph.service.js @@ -98,6 +98,13 @@ angular.module('icestudio') } return false; } + // Prevent different size connections + var tsize = cellViewT.model.attributes.data.pins.length; + var lsize = linkView.model.attributes.size; + if (tsize !== lsize) { + warning(gettextCatalog.getString('Invalid connection: ' + lsize + ' → ' + tsize)); + return false; + } // Ensure right -> left connections if (magnetS.getAttribute('pos') === 'right') { if (magnetT.getAttribute('pos') !== 'left') { diff --git a/app/scripts/services/project.service.js b/app/scripts/services/project.service.js index 9d1370e08..a487d412c 100644 --- a/app/scripts/services/project.service.js +++ b/app/scripts/services/project.service.js @@ -288,7 +288,9 @@ angular.module('icestudio') var wire = {}; wire.source = { block: cell.source.id, port: cell.source.port }; wire.target = { block: cell.target.id, port: cell.target.port }; - wire.size = cell.size; + if (cell.size > 1) { + wire.size = cell.size; + } wire.vertices = cell.vertices; wires.push(wire); } From 53429f627df91eb9eff7060f3d6d023bb165f43b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jes=C3=BAs=20Arroyo=20Torrens?= Date: Wed, 21 Dec 2016 09:16:45 +0100 Subject: [PATCH 064/169] Improve I/O and Constant blocks creation prompt --- app/scripts/services/blocks.service.js | 61 +++++++++++++++----------- app/scripts/services/graph.service.js | 3 +- app/scripts/services/utils.service.js | 2 +- app/styles/design.css | 1 + app/styles/main.css | 4 +- 5 files changed, 42 insertions(+), 29 deletions(-) diff --git a/app/scripts/services/blocks.service.js b/app/scripts/services/blocks.service.js index 983029b93..9567cb8fb 100644 --- a/app/scripts/services/blocks.service.js +++ b/app/scripts/services/blocks.service.js @@ -54,12 +54,18 @@ angular.module('icestudio') type: config.type, position: { x: config.x * gridsize, y: 4 * gridsize } }; - alertify.prompt(gettextCatalog.getString('Enter the ports'), config._default, - function(evt, input) { - if (input) { - var labels = input.replace(/ /g, '').split(','); + utils.inputcheckboxprompt([ + gettextCatalog.getString('Enter the ports'), + gettextCatalog.getString('Virtual port') + ], [ + config._default, + true + ], + function(evt, values) { + var labels = values[0].replace(/ /g, '').split(','); + var virtual = values[1]; + // Validate values var portInfo, portInfos = []; - // Validate input for (var l in labels) { portInfo = utils.parsePortLabel(labels[l]); if (portInfo) { @@ -75,20 +81,20 @@ angular.module('icestudio') // Create blocks for (var p in portInfos) { portInfo = portInfos[p]; + var pins = getPins(portInfo); blockInstance.data = { label: portInfo.input, name: portInfo.name, range: portInfo.rangestr ? portInfo.rangestr : '', - pins: getPins(portInfo), - virtual: true + pins: pins, + virtual: virtual }; if (addCellCallback) { addCellCallback(loadBasic(blockInstance)); } // Next block position - blockInstance.position.y += 10 * gridsize; + blockInstance.position.y += (virtual ? 10 : (6 + 4 * pins.length)) * gridsize; } - } }); } } @@ -113,22 +119,27 @@ angular.module('icestudio') type: 'basic.constant', position: { x: 20 * gridsize, y: 4 * gridsize } }; - alertify.prompt(gettextCatalog.getString('Enter the constant blocks'), 'C', - function(evt, name) { - if (name) { - var names = name.replace(/ /g, '').split(','); - for (var n in names) { - if (names[n]) { - blockInstance.data = { - label: names[n], - local: false, - value: '' - }; - if (addCellCallback) { - addCellCallback(loadBasicConstant(blockInstance)); - } - blockInstance.position.x += 15 * gridsize; + utils.inputcheckboxprompt([ + gettextCatalog.getString('Enter the constant blocks'), + gettextCatalog.getString('Local parameter') + ], [ + 'C', + false + ], + function(evt, values) { + var labels = values[0].replace(/ /g, '').split(','); + var local = values[1]; + for (var l in labels) { + if (labels[l]) { + blockInstance.data = { + label: labels[l], + local: local, + value: '' + }; + if (addCellCallback) { + addCellCallback(loadBasicConstant(blockInstance)); } + blockInstance.position.x += 15 * gridsize; } } }); @@ -511,7 +522,7 @@ angular.module('icestudio') function(evt, values) { var label = values[0].replace(/ /g, ''); var virtual = values[1]; - // Validate input + // Validate values var portInfo = utils.parsePortLabel(label); if (portInfo) { evt.cancel = false; diff --git a/app/scripts/services/graph.service.js b/app/scripts/services/graph.service.js index 79cb388b4..38150f25c 100644 --- a/app/scripts/services/graph.service.js +++ b/app/scripts/services/graph.service.js @@ -99,7 +99,8 @@ angular.module('icestudio') return false; } // Prevent different size connections - var tsize = cellViewT.model.attributes.data.pins.length; + var pins = cellViewT.model.attributes.data.pins; + var tsize = pins ? pins.length : 1; var lsize = linkView.model.attributes.size; if (tsize !== lsize) { warning(gettextCatalog.getString('Invalid connection: ' + lsize + ' → ' + tsize)); diff --git a/app/scripts/services/utils.service.js b/app/scripts/services/utils.service.js index 818088283..4f2deb5aa 100644 --- a/app/scripts/services/utils.service.js +++ b/app/scripts/services/utils.service.js @@ -869,7 +869,7 @@ angular.module('icestudio') this.parsePortLabel = function(data) { // e.g: name[x:y] var match, ret = {}; - var pattern = /([A-Za-z0-9_]+)(\[([0-9]+):([0-9]+)\]){0,1}/g; + var pattern = /([A-Za-z0-9_]*)(\[([0-9]+):([0-9]+)\]){0,1}/g; match = pattern.exec(data); if (match && (match[0] === match.input)) { ret.input = match[0]; diff --git a/app/styles/design.css b/app/styles/design.css index d8dccf49a..f3cbba2d0 100644 --- a/app/styles/design.css +++ b/app/styles/design.css @@ -200,6 +200,7 @@ left: 5px; bottom: 5px; width: 82px; + font-size: 13px; pointer-events: auto; } diff --git a/app/styles/main.css b/app/styles/main.css index 2f7bdd540..dd51c137c 100644 --- a/app/styles/main.css +++ b/app/styles/main.css @@ -26,11 +26,11 @@ body { cursor: progress; } -.alertify-notifier .ajs-right { +.alertify-notifier.ajs-right { bottom: 45px; } -.alertify-notifier .ajs-bottom { +.alertify-notifier.ajs-bottom { bottom: 45px; } From 44fd91ced57c81344f8630cd182a7932d628f355 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jes=C3=BAs=20Arroyo=20Torrens?= Date: Wed, 21 Dec 2016 10:21:37 +0100 Subject: [PATCH 065/169] Add bus detection in Code block creation --- app/scripts/services/blocks.service.js | 220 ++++++++++++++----------- app/scripts/services/graph.service.js | 2 +- 2 files changed, 125 insertions(+), 97 deletions(-) diff --git a/app/scripts/services/blocks.service.js b/app/scripts/services/blocks.service.js index 9567cb8fb..951477065 100644 --- a/app/scripts/services/blocks.service.js +++ b/app/scripts/services/blocks.service.js @@ -7,7 +7,7 @@ angular.module('icestudio') gettextCatalog) { var gridsize = 8; - this.newBasic = function(type, block, addCellCallback) { + this.newBasic = function(type, addCellCallback) { switch(type) { case 'basic.input': case 'basic.output': @@ -17,7 +17,7 @@ angular.module('icestudio') newBasicConstant(addCellCallback); break; case 'basic.code': - newBasicCode(block, addCellCallback); // block + newBasicCode(addCellCallback); break; case 'basic.info': newBasicInfo(addCellCallback); @@ -40,33 +40,33 @@ angular.module('icestudio') //-- New function newBasicIO(type, addCellCallback) { - var config = null; + var config; if (type === 'basic.input') { config = { type: type, _default: 'in', x: 4 }; } - else if (type === 'basic.output') { + else { // 'basic.output' config = { type: type, _default: 'out', x: 95 }; } - if (config) { - var blockInstance = { - id: null, - data: {}, - type: config.type, - position: { x: config.x * gridsize, y: 4 * gridsize } - }; - utils.inputcheckboxprompt([ - gettextCatalog.getString('Enter the ports'), - gettextCatalog.getString('Virtual port') - ], [ - config._default, - true - ], - function(evt, values) { - var labels = values[0].replace(/ /g, '').split(','); - var virtual = values[1]; - // Validate values - var portInfo, portInfos = []; - for (var l in labels) { + var blockInstance = { + id: null, + data: {}, + type: config.type, + position: { x: config.x * gridsize, y: 4 * gridsize } + }; + utils.inputcheckboxprompt([ + gettextCatalog.getString('Enter the ports'), + gettextCatalog.getString('Virtual port') + ], [ + config._default, + true + ], + function(evt, values) { + var labels = values[0].replace(/ /g, '').split(','); + var virtual = values[1]; + // Validate values + var portInfo, portInfos = []; + for (var l in labels) { + if (labels[l]) { portInfo = utils.parsePortLabel(labels[l]); if (portInfo) { evt.cancel = false; @@ -78,25 +78,25 @@ angular.module('icestudio') return; } } - // Create blocks - for (var p in portInfos) { - portInfo = portInfos[p]; - var pins = getPins(portInfo); - blockInstance.data = { - label: portInfo.input, - name: portInfo.name, - range: portInfo.rangestr ? portInfo.rangestr : '', - pins: pins, - virtual: virtual - }; - if (addCellCallback) { - addCellCallback(loadBasic(blockInstance)); - } - // Next block position - blockInstance.position.y += (virtual ? 10 : (6 + 4 * pins.length)) * gridsize; + } + // Create blocks + for (var p in portInfos) { + portInfo = portInfos[p]; + var pins = getPins(portInfo); + blockInstance.data = { + label: portInfo.input, + name: portInfo.name, + range: portInfo.rangestr ? portInfo.rangestr : '', + pins: pins, + virtual: virtual + }; + if (addCellCallback) { + addCellCallback(loadBasic(blockInstance)); } - }); - } + // Next block position + blockInstance.position.y += (virtual ? 10 : (6 + 4 * pins.length)) * gridsize; + } + }); } function getPins(portInfo) { @@ -145,19 +145,19 @@ angular.module('icestudio') }); } - function newBasicCode(block, addCellCallback) { + function newBasicCode(addCellCallback) { var blockInstance = { id: null, data: {}, type: 'basic.code', - position: { x: 4 * gridsize, y: 4 * gridsize } + position: { x: 31 * gridsize, y: 24 * gridsize } }; var defaultValues = [ 'a , b', 'c , d', '' ]; - if (block && block.data) { + /*if (block && block.data) { if (block.data.ports) { defaultValues[0] = block.data.ports.in.join(' , '); defaultValues[1] = block.data.ports.out.join(' , '); @@ -165,70 +165,98 @@ angular.module('icestudio') if (block.data.params) { defaultValues[2] = block.data.params.join(' , '); } - } + }*/ utils.multiprompt( [ gettextCatalog.getString('Enter the input ports'), gettextCatalog.getString('Enter the output ports'), gettextCatalog.getString('Enter the parameters') ], defaultValues, - function(evt, ports) { - if (ports && (ports[0].length || ports[1].length)) { - blockInstance.data = { - code: '', - params: [], - ports: { in: [], out: [] } - }; - // Parse ports - var inPorts = []; - var outPorts = []; - var params = []; - if (ports.length > 0) { - inPorts = ports[0].replace(/ /g, '').split(','); - } - if (ports.length > 1) { - outPorts = ports[1].replace(/ /g, '').split(','); - } - if (ports.length > 2) { - params = ports[2].replace(/ /g, '').split(','); - } - - for (var i in inPorts) { - if (inPorts[i]) { - blockInstance.data.ports.in.push(inPorts[i]); - } - } - for (var o in outPorts) { - if (outPorts[o]) { - blockInstance.data.ports.out.push(outPorts[o]); + function(evt, values) { + var inPorts = values[0].replace(/ /g, '').split(','); + var outPorts = values[1].replace(/ /g, '').split(','); + var params = values[2].replace(/ /g, '').split(','); + var allNames = []; + // Validate values + var i, inPortInfo, inPortInfos = []; + for (i in inPorts) { + if (inPorts[i]) { + inPortInfo = utils.parsePortLabel(inPorts[i]); + if (inPortInfo) { + evt.cancel = false; + inPortInfos.push(inPortInfo); } - } - for (var p in params) { - if (params[p]) { - blockInstance.data.params.push(params[p]); + else { + evt.cancel = true; + alertify.notify(gettextCatalog.getString('Wrong port name {{name}}', { name: inPorts[i] }), 'warning', 3); + return; } } - blockInstance.position.x = 31 * gridsize; - blockInstance.position.y = 24 * gridsize; - - var allAttrs= inPorts.concat(outPorts, params); - var numAttrs = allAttrs.length; - - // Check duplicated attributes - if (numAttrs === $.unique(allAttrs).length) { - evt.cancel = false; - if (block) { - blockInstance.data.code = block.data.code; - blockInstance.position = block.position; + } + var o, outPortInfo, outPortInfos = []; + for (o in outPorts) { + if (outPorts[o]) { + outPortInfo = utils.parsePortLabel(outPorts[o]); + if (outPortInfo) { + evt.cancel = false; + outPortInfos.push(outPortInfo); } - if (addCellCallback) { - addCellCallback(loadBasicCode(blockInstance)); + else { + evt.cancel = true; + alertify.notify(gettextCatalog.getString('Wrong port name {{name}}', { name: outPorts[o] }), 'warning', 3); + return; } } - else { - evt.cancel = true; - alertify.notify(gettextCatalog.getString('Duplicated block attributes'), 'warning', 3); + } + // Create ports + blockInstance.data = { + code: '', + params: [], + ports: { in: [], out: [] } + }; + var pins; + for (i in inPortInfos) { + if (inPortInfos[i]) { + pins = getPins(inPortInfos[i]); + blockInstance.data.ports.in.push({ + label: inPortInfos[i].input, + name: inPortInfos[i].name, + size: pins.length + }); + allNames.push(inPortInfos[i].name); + } + } + for (o in outPortInfos) { + if (outPortInfos[o]) { + pins = getPins(outPortInfos[o]); + blockInstance.data.ports.out.push({ + label: outPortInfos[o].input, + name: outPortInfos[o].name, + size: pins.length + }); + allNames.push(outPortInfos[o].name); + } + } + for (var p in params) { + if (params[p]) { + blockInstance.data.params.push({ + label: params[p], + name: params[p] + }); + allNames.push(params[p]); + } + } + // Check duplicated attributes + var numNames = allNames.length; + if (numNames === $.unique(allNames).length) { + evt.cancel = false; + if (addCellCallback) { + addCellCallback(loadBasicCode(blockInstance)); } } + else { + evt.cancel = true; + alertify.notify(gettextCatalog.getString('Duplicated block attributes'), 'warning', 3); + } }); } diff --git a/app/scripts/services/graph.service.js b/app/scripts/services/graph.service.js index 38150f25c..0300895e4 100644 --- a/app/scripts/services/graph.service.js +++ b/app/scripts/services/graph.service.js @@ -424,7 +424,7 @@ angular.module('icestudio') } }; if (type.indexOf('basic.') !== -1) { - blocks.newBasic(type, block, addCellCallback); + blocks.newBasic(type, addCellCallback); } else { dependencies[type] = block; From 736032e1d0e61a7a70d3154ad10aa535cc7234a6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jes=C3=BAs=20Arroyo=20Torrens?= Date: Wed, 21 Dec 2016 12:39:27 +0100 Subject: [PATCH 066/169] Render buses in Code block --- app/scripts/plugins/shapes/joint.shapes.js | 72 +++++++++++++++++----- app/scripts/services/blocks.service.js | 14 +++-- app/scripts/services/graph.service.js | 1 + 3 files changed, 65 insertions(+), 22 deletions(-) diff --git a/app/scripts/plugins/shapes/joint.shapes.js b/app/scripts/plugins/shapes/joint.shapes.js index f3e0401ca..f5fa59c30 100644 --- a/app/scripts/plugins/shapes/joint.shapes.js +++ b/app/scripts/plugins/shapes/joint.shapes.js @@ -18,7 +18,7 @@ joint.shapes.ice = {}; joint.shapes.ice.Model = joint.shapes.basic.Generic.extend({ markup: '', - portMarkup: '', + portMarkup: '', defaults: joint.util.deepSupplement({ type: 'ice.Model', @@ -587,24 +587,41 @@ joint.shapes.ice.CodeView = joint.shapes.ice.ModelView.extend({ this.$box.find('#' + editorLabel).append(this.model.attributes.data.code); this.$box.find('#' + contentLabel).append(this.model.attributes.data.code); }, - update: function () { - this.renderPorts(); + renderValue: function() { var id = sha1(this.model.get('id')).toString().substring(0, 6); var editorLabel = 'editor' + id; var editor = ace.edit(this.$box.find('#' + editorLabel)[0]); editor.setReadOnly(this.model.get('disabled')); + }, + update: function () { + this.renderPorts(); + this.renderValue(); joint.dia.ElementView.prototype.update.apply(this, arguments); }, updateBox: function() { + var port, wireWidth; var bbox = this.model.getBBox(); var state = this.model.attributes.state; + var data = this.model.attributes.data; + // Render ports width this.$('.port-wire').css('stroke-width', 2 * state.zoom); + for (var i in data.ports.in) { + port = data.ports.in[i]; + wireWidth = (port.size > 1) ? 8 : 2; + this.$('#port-wire-' + port.name).css('stroke-width', wireWidth * state.zoom); + } + for (var o in data.ports.out) { + port = data.ports.out[o]; + wireWidth = (port.size > 1) ? 8 : 2; + this.$('#port-wire-' + port.name).css('stroke-width', wireWidth * state.zoom); + } this.$box.css({ width: bbox.width * state.zoom, height: bbox.height * state.zoom, left: bbox.x * state.zoom + state.pan.x, top: bbox.y * state.zoom + state.pan.y }); + // 'border-width': 2 * state.zoom: problem int instead of float } }); @@ -765,22 +782,45 @@ joint.shapes.ice.Wire = joint.dia.Link.extend({ joint.shapes.ice.WireView = joint.dia.LinkView.extend({ + initialize: function() { + joint.dia.LinkView.prototype.initialize.apply(this, arguments); + + var self = this; + setTimeout(function() { + var portName = self.model.attributes.source.port; + var dataSource = self.sourceView.model.attributes.data; + + // Initialize wire properties + var size; + if (dataSource.pins) { + // I/O port block + size = dataSource.pins.length; + } + else { + // Code/Generic block + var port; + for (var o in dataSource.ports.out) { + port = dataSource.ports.out[o]; + if (portName === port.name) { + size = port.size; + break; + } + } + } + if (size) { + self.model.attributes.size = size; // For wire size connection validation + self.$('.connection').css('stroke-width', (size > 1) ? 8 : 2); + self.model.label(0, {attrs: { text: { text: (size > 1) ? '' + size + '' : '' } } }); + self.model.bifurcationMarkup = self.model.bifurcationMarkup.replace(/<%= r %>/g, (size > 1) ? 8 : 4); + } + self.update(); + + }, 0); + + }, render: function() { joint.dia.LinkView.prototype.render.apply(this, arguments); // console.log('render'); - - var pins = this.sourceView.model.attributes.data.pins; - var wireDot = (pins && pins.length > 1) ? 8 : 4; - var wireWidth = (pins && pins.length > 1) ? 8 : 2; - var wireLabel = (pins && pins.length > 1) ? '' + pins.length + '' : ''; - - // Set up the wire - this.$('.connection').css('stroke-width', wireWidth); - this.model.attributes.size = pins.length; - this.model.label(0, {attrs: { text: { text: wireLabel } } }); - this.model.bifurcationMarkup = this.model.bifurcationMarkup.replace(/<%= r %>/g, wireDot); - this.update(); - return this; }, diff --git a/app/scripts/services/blocks.service.js b/app/scripts/services/blocks.service.js index 951477065..ddfba178f 100644 --- a/app/scripts/services/blocks.service.js +++ b/app/scripts/services/blocks.service.js @@ -355,24 +355,26 @@ angular.module('icestudio') for (var i in instance.data.ports.in) { leftPorts.push({ - id: instance.data.ports.in[i], - label: instance.data.ports.in[i], + id: instance.data.ports.in[i].name, + label: instance.data.ports.in[i].label, + size: instance.data.ports.in[i].size, gridUnits: 32 }); } for (var o in instance.data.ports.out) { rightPorts.push({ - id: instance.data.ports.out[o], - label: instance.data.ports.out[o], + id: instance.data.ports.out[o].name, + label: instance.data.ports.out[o].label, + size: instance.data.ports.out[o].size, gridUnits: 32 }); } for (var p in instance.data.params) { topPorts.push({ - id: instance.data.params[p], - label: instance.data.params[p], + id: instance.data.params[p].name, + label: instance.data.params[p].label, gridUnits: 48 }); } diff --git a/app/scripts/services/graph.service.js b/app/scripts/services/graph.service.js index 0300895e4..eec5930da 100644 --- a/app/scripts/services/graph.service.js +++ b/app/scripts/services/graph.service.js @@ -99,6 +99,7 @@ angular.module('icestudio') return false; } // Prevent different size connections + // TODO: block port target var pins = cellViewT.model.attributes.data.pins; var tsize = pins ? pins.length : 1; var lsize = linkView.model.attributes.size; From 0b40f373602f1ac17019b13ef4d78d727152a93e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jes=C3=BAs=20Arroyo=20Torrens?= Date: Wed, 21 Dec 2016 13:01:12 +0100 Subject: [PATCH 067/169] Check wire size connections for Code block port target --- app/scripts/services/graph.service.js | 36 +++++++++++++++++++-------- 1 file changed, 26 insertions(+), 10 deletions(-) diff --git a/app/scripts/services/graph.service.js b/app/scripts/services/graph.service.js index eec5930da..b70ab341c 100644 --- a/app/scripts/services/graph.service.js +++ b/app/scripts/services/graph.service.js @@ -98,15 +98,6 @@ angular.module('icestudio') } return false; } - // Prevent different size connections - // TODO: block port target - var pins = cellViewT.model.attributes.data.pins; - var tsize = pins ? pins.length : 1; - var lsize = linkView.model.attributes.size; - if (tsize !== lsize) { - warning(gettextCatalog.getString('Invalid connection: ' + lsize + ' → ' + tsize)); - return false; - } // Ensure right -> left connections if (magnetS.getAttribute('pos') === 'right') { if (magnetT.getAttribute('pos') !== 'left') { @@ -121,8 +112,9 @@ angular.module('icestudio') return false; } } + var i; var links = graph.getLinks(); - for (var i in links) { + for (i in links) { var linkIView = links[i].findView(paper); if (linkView === linkIView) { //Skip the wire the user is drawing @@ -158,6 +150,30 @@ angular.module('icestudio') } return ret; } + // Prevent different size connections + var tsize; + var lsize = linkView.model.attributes.size; + var tdata = cellViewT.model.attributes.data; + var portName = magnetT.getAttribute('port'); + if (tdata.pins) { + // I/O port block + tsize = tdata.pins ? tdata.pins.length : 1; + } + else { + // Code/Generic block + var port; + for (i in tdata.ports.in) { + port = tdata.ports.in[i]; + if (portName === port.name) { + tsize = port.size; + break; + } + } + } + if (tsize !== lsize) { + warning(gettextCatalog.getString('Invalid connection: ' + lsize + ' → ' + tsize)); + return false; + } // Prevent loop links return magnetS !== magnetT; } From 43df5184524a2303d83fe787b9eadf08d64f56ff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jes=C3=BAs=20Arroyo=20Torrens?= Date: Wed, 21 Dec 2016 13:28:27 +0100 Subject: [PATCH 068/169] Validate Constant block names --- app/scripts/services/blocks.service.js | 57 ++++++++++++++++++++------ app/scripts/services/utils.service.js | 15 ++++++- 2 files changed, 58 insertions(+), 14 deletions(-) diff --git a/app/scripts/services/blocks.service.js b/app/scripts/services/blocks.service.js index ddfba178f..ae57cec92 100644 --- a/app/scripts/services/blocks.service.js +++ b/app/scripts/services/blocks.service.js @@ -129,19 +129,35 @@ angular.module('icestudio') function(evt, values) { var labels = values[0].replace(/ /g, '').split(','); var local = values[1]; + // Validate values + var paramInfo, paramInfos = []; for (var l in labels) { if (labels[l]) { - blockInstance.data = { - label: labels[l], - local: local, - value: '' - }; - if (addCellCallback) { - addCellCallback(loadBasicConstant(blockInstance)); + paramInfo = utils.parseParamLabel(labels[l]); + if (paramInfo) { + evt.cancel = false; + paramInfos.push(paramInfo); + } + else { + evt.cancel = true; + alertify.notify(gettextCatalog.getString('Wrong parameter name {{name}}', { name: labels[l] }), 'warning', 3); + return; } - blockInstance.position.x += 15 * gridsize; } } + // Create blocks + for (var p in paramInfos) { + paramInfo = paramInfos[p]; + blockInstance.data = { + label: paramInfo.input, + local: local, + value: '' + }; + if (addCellCallback) { + addCellCallback(loadBasicConstant(blockInstance)); + } + blockInstance.position.x += 15 * gridsize; + } }); } @@ -207,6 +223,21 @@ angular.module('icestudio') } } } + var p, paramInfo, paramInfos = []; + for (p in params) { + if (params[p]) { + paramInfo = utils.parseParamLabel(params[p]); + if (paramInfo) { + evt.cancel = false; + paramInfos.push(paramInfo); + } + else { + evt.cancel = true; + alertify.notify(gettextCatalog.getString('Wrong parameter name {{name}}', { name: params[p] }), 'warning', 3); + return; + } + } + } // Create ports blockInstance.data = { code: '', @@ -236,13 +267,13 @@ angular.module('icestudio') allNames.push(outPortInfos[o].name); } } - for (var p in params) { - if (params[p]) { + for (p in paramInfos) { + if (paramInfos[p]) { blockInstance.data.params.push({ - label: params[p], - name: params[p] + label: paramInfos[p].input, + name: paramInfos[p].name }); - allNames.push(params[p]); + allNames.push(paramInfos[p].name); } } // Check duplicated attributes diff --git a/app/scripts/services/utils.service.js b/app/scripts/services/utils.service.js index 4f2deb5aa..eff998b19 100644 --- a/app/scripts/services/utils.service.js +++ b/app/scripts/services/utils.service.js @@ -869,7 +869,7 @@ angular.module('icestudio') this.parsePortLabel = function(data) { // e.g: name[x:y] var match, ret = {}; - var pattern = /([A-Za-z0-9_]*)(\[([0-9]+):([0-9]+)\]){0,1}/g; + var pattern = /([A-Za-z_]+[A-Za-z_0-9]*){0,1}(\[([0-9]+):([0-9]+)\]){0,1}/g; match = pattern.exec(data); if (match && (match[0] === match.input)) { ret.input = match[0]; @@ -888,4 +888,17 @@ angular.module('icestudio') return null; }; + this.parseParamLabel = function(data) { + // e.g: name + var match, ret = {}; + var pattern = /[A-Za-z_]+[A-Za-z_0-9]*/g; + match = pattern.exec(data); + if (match && (match[0] === match.input)) { + ret.input = match[0]; + ret.name = match[0]; + return ret; + } + return null; + }; + }); From f03dd0fce4d8466f23f0e37ff4ea4891fb2e32cc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jes=C3=BAs=20Arroyo=20Torrens?= Date: Wed, 21 Dec 2016 14:42:28 +0100 Subject: [PATCH 069/169] Edit multi-Code blocks --- app/scripts/services/blocks.service.js | 103 ++++++++++++++++++------- app/scripts/services/graph.service.js | 56 +++++--------- 2 files changed, 95 insertions(+), 64 deletions(-) diff --git a/app/scripts/services/blocks.service.js b/app/scripts/services/blocks.service.js index ae57cec92..3d45f265a 100644 --- a/app/scripts/services/blocks.service.js +++ b/app/scripts/services/blocks.service.js @@ -7,7 +7,19 @@ angular.module('icestudio') gettextCatalog) { var gridsize = 8; - this.newBasic = function(type, addCellCallback) { + this.newBasic = newBasic; + this.newGeneric = newGeneric; + + this.loadBasic = loadBasic; + this.loadGeneric = loadGeneric; + this.loadWire = loadWire; + + this.editBasic = editBasic; + + + //-- New + + function newBasic(type, addCellCallback) { switch(type) { case 'basic.input': case 'basic.output': @@ -25,19 +37,7 @@ angular.module('icestudio') default: break; } - }; - this.newGeneric = newGeneric; - - this.loadBasic = loadBasic; - this.loadGeneric = loadGeneric; - this.loadWire = loadWire; - - - this.editBasicIO = editBasicIO; - this.editBasicConstant = editBasicConstant; - - - //-- New + } function newBasicIO(type, addCellCallback) { var config; @@ -161,10 +161,14 @@ angular.module('icestudio') }); } - function newBasicCode(addCellCallback) { + function newBasicCode(addCellCallback, block) { var blockInstance = { id: null, - data: {}, + data: { + code: '', + params: [], + ports: { in: [], out: [] } + }, type: 'basic.code', position: { x: 31 * gridsize, y: 24 * gridsize } }; @@ -173,15 +177,29 @@ angular.module('icestudio') 'c , d', '' ]; - /*if (block && block.data) { + if (block) { + blockInstance = block; + var index; if (block.data.ports) { - defaultValues[0] = block.data.ports.in.join(' , '); - defaultValues[1] = block.data.ports.out.join(' , '); + var inPorts = []; + for (index in block.data.ports.in) { + inPorts.push(block.data.ports.in[index].label); + } + defaultValues[0] = inPorts.join(' , '); + var outPorts = []; + for (index in block.data.ports.out) { + outPorts.push(block.data.ports.out[index].label); + } + defaultValues[1] = outPorts.join(' , '); } if (block.data.params) { - defaultValues[2] = block.data.params.join(' , '); + var params = []; + for (index in block.data.params) { + params.push(block.data.params[index].label); + } + defaultValues[2] = params.join(' , '); } - }*/ + } utils.multiprompt( [ gettextCatalog.getString('Enter the input ports'), gettextCatalog.getString('Enter the output ports'), @@ -239,12 +257,8 @@ angular.module('icestudio') } } // Create ports - blockInstance.data = { - code: '', - params: [], - ports: { in: [], out: [] } - }; var pins; + blockInstance.data.ports.in = []; for (i in inPortInfos) { if (inPortInfos[i]) { pins = getPins(inPortInfos[i]); @@ -256,6 +270,7 @@ angular.module('icestudio') allNames.push(inPortInfos[i].name); } } + blockInstance.data.ports.out = []; for (o in outPortInfos) { if (outPortInfos[o]) { pins = getPins(outPortInfos[o]); @@ -267,6 +282,7 @@ angular.module('icestudio') allNames.push(outPortInfos[o].name); } } + blockInstance.data.params = []; for (p in paramInfos) { if (paramInfos[p]) { blockInstance.data.params.push({ @@ -280,6 +296,7 @@ angular.module('icestudio') var numNames = allNames.length; if (numNames === $.unique(allNames).length) { evt.cancel = false; + // Create block if (addCellCallback) { addCellCallback(loadBasicCode(blockInstance)); } @@ -571,6 +588,23 @@ angular.module('icestudio') //-- Edit + function editBasic(type, cellView, addCellCallback) { + switch(type) { + case 'basic.input': + case 'basic.output': + editBasicIO(cellView, addCellCallback); + break; + case 'basic.constant': + editBasicConstant(cellView, addCellCallback); + break; + case 'basic.code': + editBasicCode(cellView, addCellCallback); + break; + default: + break; + } + } + function editBasicIO(cellView, addCellCallback) { var block = cellView.model.attributes; utils.inputcheckboxprompt([ @@ -655,4 +689,21 @@ angular.module('icestudio') }); } + function editBasicCode(cellView, addCellCallback) { + var block = cellView.model.attributes; + var blockInstance = { + id: null, + data: block.data, + type: 'basic.code', + position: block.position + }; + newBasicCode(function(cell) { + if (addCellCallback) { + addCellCallback(cell); + cellView.model.remove(); + alertify.success(gettextCatalog.getString('Block updated')); + } + }, blockInstance); + } + }); diff --git a/app/scripts/services/graph.service.js b/app/scripts/services/graph.service.js index b70ab341c..c850f35fc 100644 --- a/app/scripts/services/graph.service.js +++ b/app/scripts/services/graph.service.js @@ -300,47 +300,29 @@ angular.module('icestudio') }); paper.on('cell:pointerdblclick', function(cellView/*, evt, x, y*/) { - var data = cellView.model.attributes; - // TODO: move to blocks.service edit function - if (data.blockType === 'basic.input' || - data.blockType === 'basic.output') { + var type = cellView.model.attributes.blockType; + if (type.indexOf('basic.') !== -1) { if (paper.options.enabled) { - blocks.editBasicIO(cellView, function(cell) { + if (type === 'basic.code') { + var content = self.getContent(cellView.model.id); + cellView.model.attributes.data.code = content; + } + blocks.editBasic(type, cellView, function(cell) { addCell(cell); }); } } - else if (data.blockType === 'basic.constant') { - if (paper.options.enabled) { - blocks.editBasicConstant(cellView); - } - } - else if (data.blockType === 'basic.code') { - if (paper.options.enabled) { - var block = { - data: { - code: self.getContent(cellView.model.id), - params: data.data.params, - ports: data.data.ports - }, - position: cellView.model.attributes.position - }; - self.createBlock('basic.code', block, function() { - cellView.model.remove(); - }); - } - } - else if (data.type !== 'ice.Wire' && data.type !== 'ice.Info') { - self.breadcrumbs.push({ name: data.blockType }); + else { + self.breadcrumbs.push({ name: type }); utils.rootScopeSafeApply(); zIndex = 1; if (self.breadcrumbs.length === 2) { $rootScope.$broadcast('updateProject', function() { - self.loadDesign(dependencies[data.blockType].design, true); + self.loadDesign(dependencies[type].design, true); }); } else { - self.loadDesign(dependencies[data.blockType].design, true); + self.loadDesign(dependencies[type].design, true); } } }); @@ -433,19 +415,17 @@ angular.module('icestudio') } }; - this.createBlock = function(type, block, callback) { - var addCellCallback = function(cell) { - addCell(cell); - if (callback) { - callback(); - } - }; + this.createBlock = function(type, block) { if (type.indexOf('basic.') !== -1) { - blocks.newBasic(type, addCellCallback); + blocks.newBasic(type, function(cell) { + addCell(cell); + }); } else { dependencies[type] = block; - blocks.newGeneric(type, block, addCellCallback); + blocks.newGeneric(type, block, function(cell) { + addCell(cell); + }); } }; From 46ffcf290c78a948752c2d2657e8499540f36691 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jes=C3=BAs=20Arroyo=20Torrens?= Date: Wed, 21 Dec 2016 16:19:16 +0100 Subject: [PATCH 070/169] Add code bus ports in the compiler --- app/scripts/plugins/shapes/joint.shapes.js | 2 +- app/scripts/services/blocks.service.js | 2 + app/scripts/services/compiler.service.js | 9 +- app/scripts/services/graph.service.js | 2 + demo/constant-code-bus.ice | 125 +++++++++++++++++++++ 5 files changed, 132 insertions(+), 8 deletions(-) create mode 100644 demo/constant-code-bus.ice diff --git a/app/scripts/plugins/shapes/joint.shapes.js b/app/scripts/plugins/shapes/joint.shapes.js index f5fa59c30..0598a58d8 100644 --- a/app/scripts/plugins/shapes/joint.shapes.js +++ b/app/scripts/plugins/shapes/joint.shapes.js @@ -796,7 +796,7 @@ joint.shapes.ice.WireView = joint.dia.LinkView.extend({ // I/O port block size = dataSource.pins.length; } - else { + else if (dataSource.ports) { // Code/Generic block var port; for (var o in dataSource.ports.out) { diff --git a/app/scripts/services/blocks.service.js b/app/scripts/services/blocks.service.js index 3d45f265a..e0cebbe7a 100644 --- a/app/scripts/services/blocks.service.js +++ b/app/scripts/services/blocks.service.js @@ -265,6 +265,7 @@ angular.module('icestudio') blockInstance.data.ports.in.push({ label: inPortInfos[i].input, name: inPortInfos[i].name, + range: inPortInfos[i].rangestr, size: pins.length }); allNames.push(inPortInfos[i].name); @@ -277,6 +278,7 @@ angular.module('icestudio') blockInstance.data.ports.out.push({ label: outPortInfos[o].input, name: outPortInfos[o].name, + range: outPortInfos[o].rangestr, size: pins.length }); allNames.push(outPortInfos[o].name); diff --git a/app/scripts/services/compiler.service.js b/app/scripts/services/compiler.service.js index 3ec7abf92..af0d01b3a 100644 --- a/app/scripts/services/compiler.service.js +++ b/app/scripts/services/compiler.service.js @@ -61,13 +61,8 @@ angular.module('icestudio') var params = []; for (var p in data.params) { if (data.params[p] instanceof Object) { - // Generic block params.push(' parameter ' + data.params[p].name + ' = ' + (data.params[p].value ? data.params[p].value : '0')); } - else { - // Code block - params.push(' parameter ' + data.params[p] + ' = 0'); - } } if (params.length > 0) { @@ -81,11 +76,11 @@ angular.module('icestudio') var ports = []; for (var i in data.ports.in) { var _in = data.ports.in[i]; - ports.push(' input ' + _in.range + (_in.range ? ' ' : '') + _in.name); + ports.push(' input ' + (_in.range ? (_in.range + ' ') : '') + _in.name); } for (var o in data.ports.out) { var _out = data.ports.out[o]; - ports.push(' output ' + _out.range + (_out.range ? ' ' : '') + _out.name); + ports.push(' output ' + (_out.range ? (_out.range + ' ') : '') + _out.name); } if (ports.length > 0) { diff --git a/app/scripts/services/graph.service.js b/app/scripts/services/graph.service.js index c850f35fc..5d84ce789 100644 --- a/app/scripts/services/graph.service.js +++ b/app/scripts/services/graph.service.js @@ -170,6 +170,8 @@ angular.module('icestudio') } } } + tsize = tsize || 1; + lsize = lsize || 1; if (tsize !== lsize) { warning(gettextCatalog.getString('Invalid connection: ' + lsize + ' → ' + tsize)); return false; diff --git a/demo/constant-code-bus.ice b/demo/constant-code-bus.ice new file mode 100644 index 000000000..1742c5850 --- /dev/null +++ b/demo/constant-code-bus.ice @@ -0,0 +1,125 @@ +{ + "version": "1.0", + "package": { + "name": "", + "version": "", + "description": "", + "author": "", + "image": "" + }, + "design": { + "board": "icezum", + "graph": { + "blocks": [ + { + "id": "04b316b2-452b-4e2f-bdc6-26d1a204c675", + "type": "basic.constant", + "data": { + "label": "C", + "local": false, + "value": "5" + }, + "position": { + "x": 232, + "y": 32 + } + }, + { + "id": "3d5412cf-96ac-4429-9a22-01d5095f0981", + "type": "basic.code", + "data": { + "code": "// Assign constant parameter\n\nassign out = value;", + "params": [ + { + "label": "value", + "name": "value" + } + ], + "ports": { + "in": [], + "out": [ + { + "label": "out[3:0]", + "name": "out", + "range": "[3:0]", + "size": 4 + } + ] + } + }, + "position": { + "x": 88, + "y": 176 + } + }, + { + "id": "6d4f9130-37c5-48d2-b481-b803d818c3c7", + "type": "basic.output", + "data": { + "label": "leds[3:0]", + "name": "leds", + "range": "[3:0]", + "pins": [ + { + "index": "3", + "name": "LED3", + "value": "98" + }, + { + "index": "2", + "name": "LED2", + "value": "97" + }, + { + "index": "1", + "name": "LED1", + "value": "96" + }, + { + "index": "0", + "name": "LED0", + "value": "95" + } + ], + "virtual": false + }, + "position": { + "x": 624, + "y": 224 + } + } + ], + "wires": [ + { + "source": { + "block": "04b316b2-452b-4e2f-bdc6-26d1a204c675", + "port": "constant-out" + }, + "target": { + "block": "3d5412cf-96ac-4429-9a22-01d5095f0981", + "port": "value" + } + }, + { + "source": { + "block": "3d5412cf-96ac-4429-9a22-01d5095f0981", + "port": "out" + }, + "target": { + "block": "6d4f9130-37c5-48d2-b481-b803d818c3c7", + "port": "in" + }, + "size": 4 + } + ] + }, + "deps": {}, + "state": { + "pan": { + "x": -7, + "y": 13 + }, + "zoom": 1 + } + } +} \ No newline at end of file From 52bc416b0e383edbf7998b0dc43662fd1f2b7ca4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jes=C3=BAs=20Arroyo=20Torrens?= Date: Wed, 21 Dec 2016 17:35:37 +0100 Subject: [PATCH 071/169] Minor compiler improvement. Bit blocks updated --- app/resources/blocks/bit/0.ice | 32 ++++++++++++----- app/resources/blocks/bit/1.ice | 28 +++++++++++---- app/scripts/plugins/shapes/joint.shapes.js | 5 ++- app/scripts/services/compiler.service.js | 34 +++++++++---------- ...-input-output.ice => input-output-bus.ice} | 2 +- 5 files changed, 65 insertions(+), 36 deletions(-) rename demo/{bus-input-output.ice => input-output-bus.ice} (99%) diff --git a/app/resources/blocks/bit/0.ice b/app/resources/blocks/bit/0.ice index 12afc6a86..ae9f54780 100644 --- a/app/resources/blocks/bit/0.ice +++ b/app/resources/blocks/bit/0.ice @@ -12,16 +12,21 @@ "graph": { "blocks": [ { - "id": "b959fb96-ac67-4aea-90b3-ed35a4c17bf5", + "id": "1a748af9-e00b-40ae-a3d9-030da7397247", "type": "basic.code", "data": { "code": "// Bit 0\n\nassign v = 1'b0;", "ports": { "in": [], "out": [ - "v" + { + "label": "v", + "name": "v", + "size": 1 + } ] - } + }, + "params": [] }, "position": { "x": 96, @@ -29,10 +34,19 @@ } }, { - "id": "19c8f68d-5022-487f-9ab0-f0a3cd58bead", + "id": "355855e8-69a6-472a-9212-dd5c3bece567", "type": "basic.output", "data": { - "label": "" + "label": "", + "range": "", + "pins": [ + { + "index": "0", + "name": "", + "value": 0 + } + ], + "virtual": true }, "position": { "x": 608, @@ -43,11 +57,11 @@ "wires": [ { "source": { - "block": "b959fb96-ac67-4aea-90b3-ed35a4c17bf5", + "block": "1a748af9-e00b-40ae-a3d9-030da7397247", "port": "v" }, "target": { - "block": "19c8f68d-5022-487f-9ab0-f0a3cd58bead", + "block": "355855e8-69a6-472a-9212-dd5c3bece567", "port": "in" } } @@ -59,7 +73,7 @@ "x": 0, "y": 0 }, - "zoom": 1 + "zoom": 1.0000000353093697 } } -} +} \ No newline at end of file diff --git a/app/resources/blocks/bit/1.ice b/app/resources/blocks/bit/1.ice index ed3410f62..4ae355e75 100644 --- a/app/resources/blocks/bit/1.ice +++ b/app/resources/blocks/bit/1.ice @@ -12,16 +12,21 @@ "graph": { "blocks": [ { - "id": "b959fb96-ac67-4aea-90b3-ed35a4c17bf5", + "id": "12170bab-1206-41e6-9b74-da1c86af6019", "type": "basic.code", "data": { "code": "// Bit 1\n\nassign v = 1'b1;", "ports": { "in": [], "out": [ - "v" + { + "label": "v", + "name": "v", + "size": 1 + } ] - } + }, + "params": [] }, "position": { "x": 96, @@ -29,10 +34,19 @@ } }, { - "id": "19c8f68d-5022-487f-9ab0-f0a3cd58bead", + "id": "34f97cd9-8ec6-4ae3-a19e-606a977e1517", "type": "basic.output", "data": { - "label": "" + "label": "", + "range": "", + "pins": [ + { + "index": "0", + "name": "", + "value": 0 + } + ], + "virtual": true }, "position": { "x": 608, @@ -43,11 +57,11 @@ "wires": [ { "source": { - "block": "b959fb96-ac67-4aea-90b3-ed35a4c17bf5", + "block": "12170bab-1206-41e6-9b74-da1c86af6019", "port": "v" }, "target": { - "block": "19c8f68d-5022-487f-9ab0-f0a3cd58bead", + "block": "34f97cd9-8ec6-4ae3-a19e-606a977e1517", "port": "in" } } diff --git a/app/scripts/plugins/shapes/joint.shapes.js b/app/scripts/plugins/shapes/joint.shapes.js index 0598a58d8..7bab4f9d9 100644 --- a/app/scripts/plugins/shapes/joint.shapes.js +++ b/app/scripts/plugins/shapes/joint.shapes.js @@ -406,6 +406,9 @@ joint.shapes.ice.IOView = joint.shapes.ice.ModelView.extend({ $(fpgaPortId).removeClass('hidden'); if (this.pins) { this.model.attributes.size.height = 32 + 32 * this.pins.length; + var bbox = this.model.getBBox(); + var state = this.model.attributes.state; + this.$box.css({ top: bbox.y * state.zoom + state.pan.y }); } } }, @@ -810,7 +813,7 @@ joint.shapes.ice.WireView = joint.dia.LinkView.extend({ if (size) { self.model.attributes.size = size; // For wire size connection validation self.$('.connection').css('stroke-width', (size > 1) ? 8 : 2); - self.model.label(0, {attrs: { text: { text: (size > 1) ? '' + size + '' : '' } } }); + self.model.label(0, {attrs: { text: { text: (size > 1) ? '|' + size + '|' : '' } } }); self.model.bifurcationMarkup = self.model.bifurcationMarkup.replace(/<%= r %>/g, (size > 1) ? 8 : 4); } self.update(); diff --git a/app/scripts/services/compiler.service.js b/app/scripts/services/compiler.service.js index af0d01b3a..828ef6f88 100644 --- a/app/scripts/services/compiler.service.js +++ b/app/scripts/services/compiler.service.js @@ -39,13 +39,13 @@ angular.module('icestudio') return header; } - function digestId(id, force) { - if (id.indexOf('-') !== -1 || force) { - return 'v' + nodeSha1(id).toString().substring(0, 6); - } - else { - return id.replace('.', '_'); - } + function digestId(id) { + if (id.indexOf('-') !== -1) { + return 'v' + nodeSha1(id).toString().substring(0, 6); + } + else { + return id.replace('.', '_'); + } } function module(data) { @@ -177,8 +177,8 @@ angular.module('icestudio') } else { // Wires - var range = wire.size ? '[0:' + (wire.size-1) +'] ' : ' '; - connections.wire.push('wire ' + range + 'w' + w + ';'); + var range = wire.size ? ' [0:' + (wire.size-1) +'] ' : ' '; + connections.wire.push('wire' + range + 'w' + w + ';'); } // Assignations for (i in graph.blocks) { @@ -243,11 +243,13 @@ angular.module('icestudio') // Header - var id = digestId(block.type, true); + instance += name; if (block.type === 'basic.code') { - id += '_' + digestId(block.id); + instance += '_' + digestId(block.id); + } + else { + instance += '_' + digestId(block.type); } - instance += name + '_' + digestId(id); //-- Parameters @@ -327,10 +329,6 @@ angular.module('icestudio') var graph = project.design.graph; var deps = project.design.deps; - // Scape dot in name - - name = digestId(name); - // Main module if (name) { @@ -346,7 +344,7 @@ angular.module('icestudio') // Dependencies modules for (var d in deps) { - code += verilogCompiler(name + '_' + digestId(d, true), deps[d]); + code += verilogCompiler(name + '_' + digestId(d), deps[d]); } // Code modules @@ -356,7 +354,7 @@ angular.module('icestudio') if (block) { if (block.type === 'basic.code') { data = { - name: name + '_' + digestId(block.type, true) + '_' + digestId(block.id), + name: name + '_' + digestId(block.id), params: block.data.params, ports: block.data.ports, content: block.data.code diff --git a/demo/bus-input-output.ice b/demo/input-output-bus.ice similarity index 99% rename from demo/bus-input-output.ice rename to demo/input-output-bus.ice index c8e17d9ae..b20c6243f 100644 --- a/demo/bus-input-output.ice +++ b/demo/input-output-bus.ice @@ -139,4 +139,4 @@ "zoom": 1 } } -} \ No newline at end of file +} From b37702950b934d518b67c9ef3b681c667a6e0b1a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jes=C3=BAs=20Arroyo=20Torrens?= Date: Wed, 21 Dec 2016 18:20:50 +0100 Subject: [PATCH 072/169] Render buses in Generic blocks --- app/scripts/plugins/shapes/joint.shapes.js | 44 ++++++++++++++++++---- app/scripts/services/blocks.service.js | 6 ++- app/scripts/services/graph.service.js | 9 +++-- 3 files changed, 46 insertions(+), 13 deletions(-) diff --git a/app/scripts/plugins/shapes/joint.shapes.js b/app/scripts/plugins/shapes/joint.shapes.js index 7bab4f9d9..11da08c4f 100644 --- a/app/scripts/plugins/shapes/joint.shapes.js +++ b/app/scripts/plugins/shapes/joint.shapes.js @@ -289,6 +289,34 @@ joint.shapes.ice.GenericView = joint.shapes.ice.ModelView.extend({ this.$box.find('img').addClass('hidden'); this.$box.find('label').removeClass('hidden'); } + }, + updateBox: function() { + var port, wireWidth; + var bbox = this.model.getBBox(); + var state = this.model.attributes.state; + var leftPorts = this.model.attributes.leftPorts; + var rightPorts = this.model.attributes.rightPorts; + + // Render ports width + this.$('.port-wire').css('stroke-width', 2 * state.zoom); + for (var i in leftPorts) { + port = leftPorts[i]; + wireWidth = (port.size > 1) ? 8 : 2; + this.$('#port-wire-' + port.id).css('stroke-width', wireWidth * state.zoom); + } + for (var o in rightPorts) { + port = rightPorts[o]; + wireWidth = (port.size > 1) ? 8 : 2; + this.$('#port-wire-' + port.id).css('stroke-width', wireWidth * state.zoom); + } + + this.$box.css({ + left: bbox.x * state.zoom + state.pan.x + bbox.width / 2.0 * (state.zoom - 1), + top: bbox.y * state.zoom + state.pan.y + bbox.height / 2.0 * (state.zoom - 1), + width: bbox.width, + height: bbox.height, + transform: 'scale(' + state.zoom + ')' + }); } }); @@ -406,9 +434,10 @@ joint.shapes.ice.IOView = joint.shapes.ice.ModelView.extend({ $(fpgaPortId).removeClass('hidden'); if (this.pins) { this.model.attributes.size.height = 32 + 32 * this.pins.length; - var bbox = this.model.getBBox(); - var state = this.model.attributes.state; - this.$box.css({ top: bbox.y * state.zoom + state.pan.y }); + // TODO: move block and wire + //var bbox = this.model.getBBox(); + //var state = this.model.attributes.state; + //this.$box.css({ top: bbox.y * state.zoom + state.pan.y }); } } }, @@ -792,6 +821,7 @@ joint.shapes.ice.WireView = joint.dia.LinkView.extend({ setTimeout(function() { var portName = self.model.attributes.source.port; var dataSource = self.sourceView.model.attributes.data; + var rightPorts = self.sourceView.model.attributes.rightPorts; // Initialize wire properties var size; @@ -799,12 +829,12 @@ joint.shapes.ice.WireView = joint.dia.LinkView.extend({ // I/O port block size = dataSource.pins.length; } - else if (dataSource.ports) { + else { // Code/Generic block var port; - for (var o in dataSource.ports.out) { - port = dataSource.ports.out[o]; - if (portName === port.name) { + for (var o in rightPorts) { + port = rightPorts[o]; + if (portName === port.id) { size = port.size; break; } diff --git a/app/scripts/services/blocks.service.js b/app/scripts/services/blocks.service.js index e0cebbe7a..3b9a88cf9 100644 --- a/app/scripts/services/blocks.service.js +++ b/app/scripts/services/blocks.service.js @@ -466,13 +466,15 @@ angular.module('icestudio') if (item.type === 'basic.input') { leftPorts.push({ id: item.id, - label: item.data.label + label: item.data.label, + size: block.design.graph.blocks[i].data.pins.length }); } else if (item.type === 'basic.output') { rightPorts.push({ id: item.id, - label: item.data.label + label: item.data.label, + size: block.design.graph.blocks[i].data.pins.length }); } else if (item.type === 'basic.constant') { diff --git a/app/scripts/services/graph.service.js b/app/scripts/services/graph.service.js index 5d84ce789..5d27acb09 100644 --- a/app/scripts/services/graph.service.js +++ b/app/scripts/services/graph.service.js @@ -154,7 +154,8 @@ angular.module('icestudio') var tsize; var lsize = linkView.model.attributes.size; var tdata = cellViewT.model.attributes.data; - var portName = magnetT.getAttribute('port'); + var tLeftPorts = cellViewT.model.attributes.leftPorts; + var portId = magnetT.getAttribute('port'); if (tdata.pins) { // I/O port block tsize = tdata.pins ? tdata.pins.length : 1; @@ -162,9 +163,9 @@ angular.module('icestudio') else { // Code/Generic block var port; - for (i in tdata.ports.in) { - port = tdata.ports.in[i]; - if (portName === port.name) { + for (i in tLeftPorts) { + port = tLeftPorts[i]; + if (portId === port.id) { tsize = port.size; break; } From 4dc723b6ab51dff80477144ca4b081a3e177634b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jes=C3=BAs=20Arroyo=20Torrens?= Date: Thu, 22 Dec 2016 07:40:57 +0100 Subject: [PATCH 073/169] Update indentation in joint.shapes --- app/scripts/plugins/shapes/joint.shapes.js | 825 +++++++++++---------- demo/constant-code-bus.ice | 2 +- 2 files changed, 424 insertions(+), 403 deletions(-) diff --git a/app/scripts/plugins/shapes/joint.shapes.js b/app/scripts/plugins/shapes/joint.shapes.js index 11da08c4f..b6a79406c 100644 --- a/app/scripts/plugins/shapes/joint.shapes.js +++ b/app/scripts/plugins/shapes/joint.shapes.js @@ -183,76 +183,76 @@ joint.shapes.ice.Model = joint.shapes.basic.Generic.extend({ joint.shapes.ice.ModelView = joint.dia.ElementView.extend({ - template: '', + template: '', - initialize: function() { - _.bindAll(this, 'updateBox'); - joint.dia.ElementView.prototype.initialize.apply(this, arguments); - - this.$box = $(joint.util.template(this.template)()); + initialize: function() { + _.bindAll(this, 'updateBox'); + joint.dia.ElementView.prototype.initialize.apply(this, arguments); - this.model.on('change', this.updateBox, this); - this.model.on('remove', this.removeBox, this); + this.$box = $(joint.util.template(this.template)()); - this.updateBox(); - - this.listenTo(this.model, 'process:ports', this.update); - joint.dia.ElementView.prototype.initialize.apply(this, arguments); - }, - - render: function() { - joint.dia.ElementView.prototype.render.apply(this, arguments); - this.paper.$el.append(this.$box); - this.updateBox(); - return this; - }, + this.model.on('change', this.updateBox, this); + this.model.on('remove', this.removeBox, this); - renderPorts: function() { - var $leftPorts = this.$('.leftPorts').empty(); - var $rightPorts = this.$('.rightPorts').empty(); - var $topPorts = this.$('.topPorts').empty(); - var $bottomPorts = this.$('.bottomPorts').empty(); - var portTemplate = _.template(this.model.portMarkup); + this.updateBox(); - _.each(_.filter(this.model.ports, function (p) { return p.type === 'left'; }), function (port, index) { - $leftPorts.append(V(portTemplate({ id: index, port: port })).node); - }); - _.each(_.filter(this.model.ports, function (p) { return p.type === 'right'; }), function (port, index) { - $rightPorts.append(V(portTemplate({ id: index, port: port })).node); - }); - _.each(_.filter(this.model.ports, function (p) { return p.type === 'top'; }), function (port, index) { - $topPorts.append(V(portTemplate({ id: index, port: port })).node); - }); - _.each(_.filter(this.model.ports, function (p) { return p.type === 'bottom'; }), function (port, index) { - $bottomPorts.append(V(portTemplate({ id: index, port: port })).node); - }); - }, + this.listenTo(this.model, 'process:ports', this.update); + joint.dia.ElementView.prototype.initialize.apply(this, arguments); + }, - update: function() { - this.renderPorts(); - joint.dia.ElementView.prototype.update.apply(this, arguments); - }, + render: function() { + joint.dia.ElementView.prototype.render.apply(this, arguments); + this.paper.$el.append(this.$box); + this.updateBox(); + return this; + }, - updateBox: function() { - var bbox = this.model.getBBox(); - var state = this.model.attributes.state; - var pins = this.model.attributes.data.pins; - var wireWidth = (pins && pins.length > 1) ? 8 : 2; + renderPorts: function() { + var $leftPorts = this.$('.leftPorts').empty(); + var $rightPorts = this.$('.rightPorts').empty(); + var $topPorts = this.$('.topPorts').empty(); + var $bottomPorts = this.$('.bottomPorts').empty(); + var portTemplate = _.template(this.model.portMarkup); + + _.each(_.filter(this.model.ports, function (p) { return p.type === 'left'; }), function (port, index) { + $leftPorts.append(V(portTemplate({ id: index, port: port })).node); + }); + _.each(_.filter(this.model.ports, function (p) { return p.type === 'right'; }), function (port, index) { + $rightPorts.append(V(portTemplate({ id: index, port: port })).node); + }); + _.each(_.filter(this.model.ports, function (p) { return p.type === 'top'; }), function (port, index) { + $topPorts.append(V(portTemplate({ id: index, port: port })).node); + }); + _.each(_.filter(this.model.ports, function (p) { return p.type === 'bottom'; }), function (port, index) { + $bottomPorts.append(V(portTemplate({ id: index, port: port })).node); + }); + }, - this.$('.port-wire').css('stroke-width', wireWidth * state.zoom); + update: function() { + this.renderPorts(); + joint.dia.ElementView.prototype.update.apply(this, arguments); + }, - this.$box.css({ - left: bbox.x * state.zoom + state.pan.x + bbox.width / 2.0 * (state.zoom - 1), - top: bbox.y * state.zoom + state.pan.y + bbox.height / 2.0 * (state.zoom - 1), - width: bbox.width, - height: bbox.height, - transform: 'scale(' + state.zoom + ')' - }); - }, + updateBox: function() { + var bbox = this.model.getBBox(); + var state = this.model.attributes.state; + var pins = this.model.attributes.data.pins; + var wireWidth = (pins && pins.length > 1) ? 8 : 2; + + this.$('.port-wire').css('stroke-width', wireWidth * state.zoom); + + this.$box.css({ + left: bbox.x * state.zoom + state.pan.x + bbox.width / 2.0 * (state.zoom - 1), + top: bbox.y * state.zoom + state.pan.y + bbox.height / 2.0 * (state.zoom - 1), + width: bbox.width, + height: bbox.height, + transform: 'scale(' + state.zoom + ')' + }); + }, - removeBox: function(/*evt*/) { - this.$box.remove(); - } + removeBox: function(/*evt*/) { + this.$box.remove(); + } }); @@ -266,58 +266,59 @@ joint.shapes.ice.Generic = joint.shapes.ice.Model.extend({ joint.shapes.ice.GenericView = joint.shapes.ice.ModelView.extend({ - template: '\ -
                \ - \ - \ -
                \ - ', + template: '\ +
                \ + \ + \ +
                \ + ', - initialize: function() { - joint.shapes.ice.ModelView.prototype.initialize.apply(this, arguments); + initialize: function() { + joint.shapes.ice.ModelView.prototype.initialize.apply(this, arguments); - var image = this.model.get('image'); - var name = this.model.get('label'); + var image = this.model.get('image'); + var name = this.model.get('label'); - if (image) { - this.$box.find('img').attr('src', 'data:image/svg+xml,' + image); - this.$box.find('img').removeClass('hidden'); - this.$box.find('label').addClass('hidden'); - } - else { - this.$box.find('label').html(name); - this.$box.find('img').addClass('hidden'); - this.$box.find('label').removeClass('hidden'); - } - }, - updateBox: function() { - var port, wireWidth; - var bbox = this.model.getBBox(); - var state = this.model.attributes.state; - var leftPorts = this.model.attributes.leftPorts; - var rightPorts = this.model.attributes.rightPorts; - - // Render ports width - this.$('.port-wire').css('stroke-width', 2 * state.zoom); - for (var i in leftPorts) { - port = leftPorts[i]; - wireWidth = (port.size > 1) ? 8 : 2; - this.$('#port-wire-' + port.id).css('stroke-width', wireWidth * state.zoom); - } - for (var o in rightPorts) { - port = rightPorts[o]; - wireWidth = (port.size > 1) ? 8 : 2; - this.$('#port-wire-' + port.id).css('stroke-width', wireWidth * state.zoom); - } + if (image) { + this.$box.find('img').attr('src', 'data:image/svg+xml,' + image); + this.$box.find('img').removeClass('hidden'); + this.$box.find('label').addClass('hidden'); + } + else { + this.$box.find('label').html(name); + this.$box.find('img').addClass('hidden'); + this.$box.find('label').removeClass('hidden'); + } + }, - this.$box.css({ - left: bbox.x * state.zoom + state.pan.x + bbox.width / 2.0 * (state.zoom - 1), - top: bbox.y * state.zoom + state.pan.y + bbox.height / 2.0 * (state.zoom - 1), - width: bbox.width, - height: bbox.height, - transform: 'scale(' + state.zoom + ')' - }); + updateBox: function() { + var port, wireWidth; + var bbox = this.model.getBBox(); + var state = this.model.attributes.state; + var leftPorts = this.model.attributes.leftPorts; + var rightPorts = this.model.attributes.rightPorts; + + // Render ports width + this.$('.port-wire').css('stroke-width', 2 * state.zoom); + for (var i in leftPorts) { + port = leftPorts[i]; + wireWidth = (port.size > 1) ? 8 : 2; + this.$('#port-wire-' + port.id).css('stroke-width', wireWidth * state.zoom); + } + for (var o in rightPorts) { + port = rightPorts[o]; + wireWidth = (port.size > 1) ? 8 : 2; + this.$('#port-wire-' + port.id).css('stroke-width', wireWidth * state.zoom); } + + this.$box.css({ + left: bbox.x * state.zoom + state.pan.x + bbox.width / 2.0 * (state.zoom - 1), + top: bbox.y * state.zoom + state.pan.y + bbox.height / 2.0 * (state.zoom - 1), + width: bbox.width, + height: bbox.height, + transform: 'scale(' + state.zoom + ')' + }); + } }); // I/O blocks @@ -357,127 +358,136 @@ joint.shapes.ice.Output = joint.shapes.ice.Model.extend({ joint.shapes.ice.IOView = joint.shapes.ice.ModelView.extend({ - initialize: function() { - joint.shapes.ice.ModelView.prototype.initialize.apply(this, arguments); + initialize: function() { + joint.shapes.ice.ModelView.prototype.initialize.apply(this, arguments); + + this.id = sha1(this.model.get('id')).toString().substring(0, 6); + var virtualPortId = 'virtualPort' + this.id; + var fpgaPortId = 'fpgaPort' + this.id; + var comboId = 'combo' + this.id; + var virtual = this.model.get('data').virtual || this.model.get('disabled'); + + var selectCode = ''; + var selectScript = ''; + this.pins = this.model.attributes.data.pins; + + if (this.pins) { + for (var i in this.pins) { + //selectCode += '

                ' + this.pins[i].index + '

                '; + selectCode +=''; + + selectScript += '$("#' + comboId + this.pins[i].index + '").select2('; + selectScript += '{placeholder: "", allowClear: true, dropdownCssClass: "bigdrop"});'; + } + } + + this.$box = $(joint.util.template( + '\ +
                \ + \ +
                \ +
                \ + \ +
                ' + selectCode + '
                \ + \ +
                \ + ' + )()); + + // Prevent paper from handling pointerdown. + var comboSelector = this.$box.find('.select2'); + comboSelector.on('mousedown click', function(evt) { evt.stopPropagation(); }); + comboSelector.on('change', _.bind(function(evt) { + var target = $(evt.target); + var i = target.attr('i'); + var name = target.find('option:selected').text(); + var value = target.val(); + this.model.attributes.data.pins[i].name = name; + this.model.attributes.data.pins[i].value = value; + //comboSelector.find('.select2-selection').css('font-size', this.computeFontSize(name)); + }, this)); + + // Render data + if (!this.model.get('disabled')) { + this.renderChoices(); + this.renderValue(); + } + }, - this.id = sha1(this.model.get('id')).toString().substring(0, 6); - var virtualPortId = 'virtualPort' + this.id; - var fpgaPortId = 'fpgaPort' + this.id; - var comboId = 'combo' + this.id; - var virtual = this.model.get('data').virtual || this.model.get('disabled'); + renderBlock: function() { + var virtualPortId = '#virtualPort' + this.id; + var fpgaPortId = '#fpgaPort' + this.id; + var name = this.model.get('data').label; + var virtual = this.model.get('data').virtual || this.model.get('disabled'); - var selectCode = ''; - var selectScript = ''; - this.pins = this.model.attributes.data.pins; + this.$box.find('label').text(name ? name : ' '); + // Virtual -> FPGA I/O + // FPGA I/O -> Virtual + + if (virtual) { + // Virtual port (green) + $(fpgaPortId).addClass('hidden'); + $(virtualPortId).removeClass('hidden'); + this.model.attributes.size.height = 64; + } + else { + // FPGA I/O port (yellow) + $(virtualPortId).addClass('hidden'); + $(fpgaPortId).removeClass('hidden'); if (this.pins) { - for (var i in this.pins) { - //selectCode += '

                ' + this.pins[i].index + '

                '; - selectCode +=''; - - selectScript += '$("#' + comboId + this.pins[i].index + '").select2('; - selectScript += '{placeholder: "", allowClear: true, dropdownCssClass: "bigdrop"});'; - } + this.model.attributes.size.height = 32 + 32 * this.pins.length; + // TODO: move block and wire + //var bbox = this.model.getBBox(); + //var state = this.model.attributes.state; + //this.$box.css({ top: bbox.y * state.zoom + state.pan.y }); } + } + }, - this.$box = $(joint.util.template( - '\ -
                \ - \ -
                \ -
                \ - \ -
                ' + selectCode + '
                \ - \ -
                \ - ' - )()); - - // Prevent paper from handling pointerdown. - var comboSelector = this.$box.find('.select2'); - comboSelector.on('mousedown click', function(evt) { evt.stopPropagation(); }); - comboSelector.on('change', _.bind(function(evt) { - var target = $(evt.target); - var i = target.attr('i'); - var name = target.find('option:selected').text(); - var value = target.val(); - this.model.attributes.data.pins[i].name = name; - this.model.attributes.data.pins[i].value = value; - //comboSelector.find('.select2-selection').css('font-size', this.computeFontSize(name)); - }, this)); - - // Render data - if (!this.model.get('disabled')) { - this.renderChoices(); - this.renderValue(); - } - }, - renderBlock: function() { - var virtualPortId = '#virtualPort' + this.id; - var fpgaPortId = '#fpgaPort' + this.id; - var name = this.model.get('data').label; - var virtual = this.model.get('data').virtual || this.model.get('disabled'); - - this.$box.find('label').text(name ? name : ' '); - - if (virtual) { - // Virtual port (green) - $(fpgaPortId).addClass('hidden'); - $(virtualPortId).removeClass('hidden'); - this.model.attributes.size.height = 64; + renderChoices: function() { + if (this.pins) { + for (var i in this.pins) { + this.$box.find('#combo' + this.id + this.pins[i].index).empty().append(this.model.get('choices')); } - else { - // FPGA I/O port (yellow) - $(virtualPortId).addClass('hidden'); - $(fpgaPortId).removeClass('hidden'); - if (this.pins) { - this.model.attributes.size.height = 32 + 32 * this.pins.length; - // TODO: move block and wire - //var bbox = this.model.getBBox(); - //var state = this.model.attributes.state; - //this.$box.css({ top: bbox.y * state.zoom + state.pan.y }); - } - } - }, - renderChoices: function() { - if (this.pins) { - for (var i in this.pins) { - this.$box.find('#combo' + this.id + this.pins[i].index).empty().append(this.model.get('choices')); - } - } - }, - renderValue: function() { - if (this.pins) { - for (var i in this.pins) { - var index = this.pins[i].index; - var comboId = 'combo' + this.id + index; - var comboSelector = this.$box.find('#' + comboId); - comboSelector.val(this.pins[i].value); - //var fontSize = this.computeFontSize(this.pins[i].name); - //$('#select2-' + comboId + '-container').css('font-size', fontSize); - } + } + }, + + renderValue: function() { + if (this.pins) { + for (var i in this.pins) { + var index = this.pins[i].index; + var comboId = 'combo' + this.id + index; + var comboSelector = this.$box.find('#' + comboId); + comboSelector.val(this.pins[i].value); + //var fontSize = this.computeFontSize(this.pins[i].name); + //$('#select2-' + comboId + '-container').css('font-size', fontSize); } - }, - clearValue: function () { - if (this.pins) { - for (var i in this.pins) { - this.$box.find('#combo' + this.id + this.pins[i].index).val(''); - this.model.attributes.data.pins[i].name = ''; - this.model.attributes.data.pins[i].value = 0; - } + } + }, + + clearValue: function () { + if (this.pins) { + for (var i in this.pins) { + this.$box.find('#combo' + this.id + this.pins[i].index).val(''); + this.model.attributes.data.pins[i].name = ''; + this.model.attributes.data.pins[i].value = 0; } - }, - computeFontSize: function(name) { - var n = name.length; - return Math.min(13, 17-n).toString() + 'px'; - }, - update: function () { - this.renderPorts(); - this.renderBlock(); - joint.dia.ElementView.prototype.update.apply(this, arguments); } + }, + + computeFontSize: function(name) { + var n = name.length; + return Math.min(13, 17-n).toString() + 'px'; + }, + + update: function () { + this.renderPorts(); + this.renderBlock(); + joint.dia.ElementView.prototype.update.apply(this, arguments); + } }); joint.shapes.ice.InputView = joint.shapes.ice.IOView; @@ -504,52 +514,57 @@ joint.shapes.ice.Constant = joint.shapes.ice.Model.extend({ joint.shapes.ice.ConstantView = joint.shapes.ice.ModelView.extend({ - template: '\ -
                \ -

                *

                \ - \ - \ -
                \ - ', + template: '\ +
                \ +

                *

                \ + \ + \ +
                \ + ', - initialize: function() { - joint.shapes.ice.ModelView.prototype.initialize.apply(this, arguments); + initialize: function() { + joint.shapes.ice.ModelView.prototype.initialize.apply(this, arguments); - // Prevent paper from handling pointerdown. - this.$box.find('.constant-input').on('mousedown click', function(evt) { evt.stopPropagation(); }); + // Prevent paper from handling pointerdown. + this.$box.find('.constant-input').on('mousedown click', function(evt) { evt.stopPropagation(); }); - this.$box.find('.constant-input').on('input', _.bind(function(evt) { - this.model.attributes.data.value = $(evt.target).val(); - }, this)); - }, - renderLocal: function() { - if (this.model.get('data').local) { - this.$box.find('p').removeClass('hidden'); - } - else { - this.$box.find('p').addClass('hidden'); - } - }, - renderLabel: function () { - var name = this.model.attributes.data.label; - this.$box.find('label').text(name); - }, - renderValue: function() { - if (this.model.get('disabled')) { - this.$box.find('.constant-input').css({'pointer-events': 'none'}); - } - this.$box.find('.constant-input').val(this.model.get('data').value); - }, - clearValue: function () { - this.$box.find('.constant-input').val(''); - }, - update: function () { - this.renderLocal(); - this.renderLabel(); - this.renderPorts(); - this.renderValue(); - joint.dia.ElementView.prototype.update.apply(this, arguments); + this.$box.find('.constant-input').on('input', _.bind(function(evt) { + this.model.attributes.data.value = $(evt.target).val(); + }, this)); + }, + + renderLocal: function() { + if (this.model.get('data').local) { + this.$box.find('p').removeClass('hidden'); } + else { + this.$box.find('p').addClass('hidden'); + } + }, + + renderLabel: function () { + var name = this.model.attributes.data.label; + this.$box.find('label').text(name); + }, + + renderValue: function() { + if (this.model.get('disabled')) { + this.$box.find('.constant-input').css({'pointer-events': 'none'}); + } + this.$box.find('.constant-input').val(this.model.get('data').value); + }, + + clearValue: function () { + this.$box.find('.constant-input').val(''); + }, + + update: function () { + this.renderLocal(); + this.renderLabel(); + this.renderPorts(); + this.renderValue(); + joint.dia.ElementView.prototype.update.apply(this, arguments); + } }); @@ -574,87 +589,90 @@ joint.shapes.ice.Code = joint.shapes.ice.Model.extend({ joint.shapes.ice.CodeView = joint.shapes.ice.ModelView.extend({ - initialize: function() { - _.bindAll(this, 'updateBox'); - joint.dia.ElementView.prototype.initialize.apply(this, arguments); - - var id = sha1(this.model.get('id')).toString().substring(0, 6); - var blockLabel = 'block' + id; - var editorLabel = 'editor' + id; - var contentLabel = 'content' + id; - this.$box = $(joint.util.template( - '\ -
                \ -
                \ - \ - \ -
                \ - ' - )()); - - this.model.on('change', this.updateBox, this); - this.model.on('remove', this.removeBox, this); - - this.updateBox(); - - this.listenTo(this.model, 'process:ports', this.update); - joint.dia.ElementView.prototype.initialize.apply(this, arguments); + initialize: function() { + _.bindAll(this, 'updateBox'); + joint.dia.ElementView.prototype.initialize.apply(this, arguments); + + var id = sha1(this.model.get('id')).toString().substring(0, 6); + var blockLabel = 'block' + id; + var editorLabel = 'editor' + id; + var contentLabel = 'content' + id; + this.$box = $(joint.util.template( + '\ +
                \ +
                \ + \ + \ +
                \ + ' + )()); + + this.model.on('change', this.updateBox, this); + this.model.on('remove', this.removeBox, this); + + this.updateBox(); + + this.listenTo(this.model, 'process:ports', this.update); + joint.dia.ElementView.prototype.initialize.apply(this, arguments); + + // Prevent paper from handling pointerdown. + this.$box.find('#' + editorLabel).on('mousedown click', function(evt) { evt.stopPropagation(); }); + + this.$box.find('#' + editorLabel).append(this.model.attributes.data.code); + this.$box.find('#' + contentLabel).append(this.model.attributes.data.code); + }, - // Prevent paper from handling pointerdown. - this.$box.find('#' + editorLabel).on('mousedown click', function(evt) { evt.stopPropagation(); }); + renderValue: function() { + var id = sha1(this.model.get('id')).toString().substring(0, 6); + var editorLabel = 'editor' + id; + var editor = ace.edit(this.$box.find('#' + editorLabel)[0]); + editor.setReadOnly(this.model.get('disabled')); + }, - this.$box.find('#' + editorLabel).append(this.model.attributes.data.code); - this.$box.find('#' + contentLabel).append(this.model.attributes.data.code); - }, - renderValue: function() { - var id = sha1(this.model.get('id')).toString().substring(0, 6); - var editorLabel = 'editor' + id; - var editor = ace.edit(this.$box.find('#' + editorLabel)[0]); - editor.setReadOnly(this.model.get('disabled')); - }, - update: function () { - this.renderPorts(); - this.renderValue(); - joint.dia.ElementView.prototype.update.apply(this, arguments); - }, - updateBox: function() { - var port, wireWidth; - var bbox = this.model.getBBox(); - var state = this.model.attributes.state; - var data = this.model.attributes.data; - - // Render ports width - this.$('.port-wire').css('stroke-width', 2 * state.zoom); - for (var i in data.ports.in) { - port = data.ports.in[i]; - wireWidth = (port.size > 1) ? 8 : 2; - this.$('#port-wire-' + port.name).css('stroke-width', wireWidth * state.zoom); - } - for (var o in data.ports.out) { - port = data.ports.out[o]; - wireWidth = (port.size > 1) ? 8 : 2; - this.$('#port-wire-' + port.name).css('stroke-width', wireWidth * state.zoom); - } + update: function () { + this.renderPorts(); + this.renderValue(); + joint.dia.ElementView.prototype.update.apply(this, arguments); + }, - this.$box.css({ width: bbox.width * state.zoom, - height: bbox.height * state.zoom, - left: bbox.x * state.zoom + state.pan.x, - top: bbox.y * state.zoom + state.pan.y }); - // 'border-width': 2 * state.zoom: problem int instead of float + updateBox: function() { + var port, wireWidth; + var bbox = this.model.getBBox(); + var state = this.model.attributes.state; + var data = this.model.attributes.data; + + // Render ports width + this.$('.port-wire').css('stroke-width', 2 * state.zoom); + for (var i in data.ports.in) { + port = data.ports.in[i]; + wireWidth = (port.size > 1) ? 8 : 2; + this.$('#port-wire-' + port.name).css('stroke-width', wireWidth * state.zoom); } + for (var o in data.ports.out) { + port = data.ports.out[o]; + wireWidth = (port.size > 1) ? 8 : 2; + this.$('#port-wire-' + port.name).css('stroke-width', wireWidth * state.zoom); + } + + this.$box.css({ width: bbox.width * state.zoom, + height: bbox.height * state.zoom, + left: bbox.x * state.zoom + state.pan.x, + top: bbox.y * state.zoom + state.pan.y }); + // 'border-width': 2 * state.zoom: problem int instead of float + } }); @@ -682,72 +700,76 @@ joint.shapes.ice.Info = joint.shapes.basic.Rect.extend({ joint.shapes.ice.InfoView = joint.dia.ElementView.extend({ - initialize: function() { - _.bindAll(this, 'updateBox'); - joint.dia.ElementView.prototype.initialize.apply(this, arguments); - - var id = sha1(this.model.get('id')).toString().substring(0, 6); - var blockLabel = 'block' + id; - var editorLabel = 'editor' + id; - var contentLabel = 'content' + id; - this.$box = $(joint.util.template( - '\ -
                \ -
                \ - \ - \ -
                \ - ' - )()); - - this.model.on('change', this.updateBox, this); - this.model.on('remove', this.removeBox, this); + initialize: function() { + _.bindAll(this, 'updateBox'); + joint.dia.ElementView.prototype.initialize.apply(this, arguments); + + var id = sha1(this.model.get('id')).toString().substring(0, 6); + var blockLabel = 'block' + id; + var editorLabel = 'editor' + id; + var contentLabel = 'content' + id; + this.$box = $(joint.util.template( + '\ +
                \ +
                \ + \ + \ +
                \ + ' + )()); + + this.model.on('change', this.updateBox, this); + this.model.on('remove', this.removeBox, this); + + this.updateBox(); + + // Prevent paper from handling pointerdown. + this.$box.find('#' + editorLabel).on('mousedown click', function(evt) { evt.stopPropagation(); }); + + this.$box.find('#' + editorLabel).append(this.model.attributes.data.info); + this.$box.find('#' + contentLabel).append(this.model.attributes.data.info); + }, + render: function () { + joint.dia.ElementView.prototype.render.apply(this, arguments); + this.paper.$el.append(this.$box); this.updateBox(); + return this; + }, - // Prevent paper from handling pointerdown. - this.$box.find('#' + editorLabel).on('mousedown click', function(evt) { evt.stopPropagation(); }); + update: function () { + var id = sha1(this.model.get('id')).toString().substring(0, 6); + var editorLabel = 'editor' + id; + var editor = ace.edit(this.$box.find('#' + editorLabel)[0]); + editor.setReadOnly(this.model.get('disabled')); + joint.dia.ElementView.prototype.update.apply(this, arguments); + }, - this.$box.find('#' + editorLabel).append(this.model.attributes.data.info); - this.$box.find('#' + contentLabel).append(this.model.attributes.data.info); - }, - render: function () { - joint.dia.ElementView.prototype.render.apply(this, arguments); - this.paper.$el.append(this.$box); - this.updateBox(); - return this; - }, - update: function () { - var id = sha1(this.model.get('id')).toString().substring(0, 6); - var editorLabel = 'editor' + id; - var editor = ace.edit(this.$box.find('#' + editorLabel)[0]); - editor.setReadOnly(this.model.get('disabled')); - joint.dia.ElementView.prototype.update.apply(this, arguments); - }, - updateBox: function() { - var bbox = this.model.getBBox(); - var state = this.model.attributes.state; - - this.$box.css({ width: bbox.width * state.zoom, - height: bbox.height * state.zoom, - left: bbox.x * state.zoom + state.pan.x, - top: bbox.y * state.zoom + state.pan.y }); - }, - removeBox: function(/*evt*/) { - this.$box.remove(); - } + updateBox: function() { + var bbox = this.model.getBBox(); + var state = this.model.attributes.state; + + this.$box.css({ width: bbox.width * state.zoom, + height: bbox.height * state.zoom, + left: bbox.x * state.zoom + state.pan.x, + top: bbox.y * state.zoom + state.pan.y }); + }, + + removeBox: function(/*evt*/) { + this.$box.remove(); + } }); @@ -843,14 +865,13 @@ joint.shapes.ice.WireView = joint.dia.LinkView.extend({ if (size) { self.model.attributes.size = size; // For wire size connection validation self.$('.connection').css('stroke-width', (size > 1) ? 8 : 2); - self.model.label(0, {attrs: { text: { text: (size > 1) ? '|' + size + '|' : '' } } }); + self.model.label(0, {attrs: { text: { text: (size > 1) ? '' + size + '' : '' } } }); self.model.bifurcationMarkup = self.model.bifurcationMarkup.replace(/<%= r %>/g, (size > 1) ? 8 : 4); } self.update(); - }, 0); - }, + render: function() { joint.dia.LinkView.prototype.render.apply(this, arguments); // console.log('render'); diff --git a/demo/constant-code-bus.ice b/demo/constant-code-bus.ice index 1742c5850..2756f76d4 100644 --- a/demo/constant-code-bus.ice +++ b/demo/constant-code-bus.ice @@ -16,7 +16,7 @@ "type": "basic.constant", "data": { "label": "C", - "local": false, + "local": true, "value": "5" }, "position": { From 0de843ff20ed14e3a0c4777ba668e31c5c6fb281 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jes=C3=BAs=20Arroyo=20Torrens?= Date: Thu, 22 Dec 2016 08:25:42 +0100 Subject: [PATCH 074/169] Refactor wire size render --- app/scripts/plugins/shapes/joint.shapes.js | 141 +++++++-------------- app/scripts/services/blocks.service.js | 23 +++- app/scripts/services/graph.service.js | 21 +-- 3 files changed, 76 insertions(+), 109 deletions(-) diff --git a/app/scripts/plugins/shapes/joint.shapes.js b/app/scripts/plugins/shapes/joint.shapes.js index b6a79406c..3a0fcf11a 100644 --- a/app/scripts/plugins/shapes/joint.shapes.js +++ b/app/scripts/plugins/shapes/joint.shapes.js @@ -234,12 +234,24 @@ joint.shapes.ice.ModelView = joint.dia.ElementView.extend({ }, updateBox: function() { + var port, wireWidth; var bbox = this.model.getBBox(); - var state = this.model.attributes.state; - var pins = this.model.attributes.data.pins; - var wireWidth = (pins && pins.length > 1) ? 8 : 2; + var state = this.model.get('state'); + var leftPorts = this.model.get('leftPorts'); + var rightPorts = this.model.get('rightPorts'); - this.$('.port-wire').css('stroke-width', wireWidth * state.zoom); + // Render ports width + this.$('.port-wire').css('stroke-width', 2 * state.zoom); + for (var i in leftPorts) { + port = leftPorts[i]; + wireWidth = (port.size > 1) ? 8 : 2; + this.$('#port-wire-' + port.id).css('stroke-width', wireWidth * state.zoom); + } + for (var o in rightPorts) { + port = rightPorts[o]; + wireWidth = (port.size > 1) ? 8 : 2; + this.$('#port-wire-' + port.id).css('stroke-width', wireWidth * state.zoom); + } this.$box.css({ left: bbox.x * state.zoom + state.pan.x + bbox.width / 2.0 * (state.zoom - 1), @@ -289,35 +301,6 @@ joint.shapes.ice.GenericView = joint.shapes.ice.ModelView.extend({ this.$box.find('img').addClass('hidden'); this.$box.find('label').removeClass('hidden'); } - }, - - updateBox: function() { - var port, wireWidth; - var bbox = this.model.getBBox(); - var state = this.model.attributes.state; - var leftPorts = this.model.attributes.leftPorts; - var rightPorts = this.model.attributes.rightPorts; - - // Render ports width - this.$('.port-wire').css('stroke-width', 2 * state.zoom); - for (var i in leftPorts) { - port = leftPorts[i]; - wireWidth = (port.size > 1) ? 8 : 2; - this.$('#port-wire-' + port.id).css('stroke-width', wireWidth * state.zoom); - } - for (var o in rightPorts) { - port = rightPorts[o]; - wireWidth = (port.size > 1) ? 8 : 2; - this.$('#port-wire-' + port.id).css('stroke-width', wireWidth * state.zoom); - } - - this.$box.css({ - left: bbox.x * state.zoom + state.pan.x + bbox.width / 2.0 * (state.zoom - 1), - top: bbox.y * state.zoom + state.pan.y + bbox.height / 2.0 * (state.zoom - 1), - width: bbox.width, - height: bbox.height, - transform: 'scale(' + state.zoom + ')' - }); } }); @@ -326,12 +309,6 @@ joint.shapes.ice.GenericView = joint.shapes.ice.ModelView.extend({ joint.shapes.ice.Input = joint.shapes.ice.Model.extend({ defaults: joint.util.deepSupplement({ type: 'ice.Input', - choices: [], - rightPorts: [{ - id: 'out', - label: '', - gridUnits: 8 - }], size: { width: 96, height: 64 @@ -342,12 +319,6 @@ joint.shapes.ice.Input = joint.shapes.ice.Model.extend({ joint.shapes.ice.Output = joint.shapes.ice.Model.extend({ defaults: joint.util.deepSupplement({ type: 'ice.Output', - choices: [], - leftPorts: [{ - id: 'in', - label: '', - gridUnits: 8 - }], size: { width: 96, height: 64 @@ -369,7 +340,7 @@ joint.shapes.ice.IOView = joint.shapes.ice.ModelView.extend({ var selectCode = ''; var selectScript = ''; - this.pins = this.model.attributes.data.pins; + this.pins = this.model.get('data').pins; if (this.pins) { for (var i in this.pins) { @@ -499,11 +470,6 @@ joint.shapes.ice.OutputView = joint.shapes.ice.IOView; joint.shapes.ice.Constant = joint.shapes.ice.Model.extend({ defaults: joint.util.deepSupplement({ type: 'ice.Constant', - bottomPorts: [{ - id: 'constant-out', - label: '', - gridUnits: 8 - }], size: { width: 96, height: 64 @@ -543,7 +509,7 @@ joint.shapes.ice.ConstantView = joint.shapes.ice.ModelView.extend({ }, renderLabel: function () { - var name = this.model.attributes.data.label; + var name = this.model.get('data').label; this.$box.find('label').text(name); }, @@ -631,8 +597,8 @@ joint.shapes.ice.CodeView = joint.shapes.ice.ModelView.extend({ // Prevent paper from handling pointerdown. this.$box.find('#' + editorLabel).on('mousedown click', function(evt) { evt.stopPropagation(); }); - this.$box.find('#' + editorLabel).append(this.model.attributes.data.code); - this.$box.find('#' + contentLabel).append(this.model.attributes.data.code); + this.$box.find('#' + editorLabel).append(this.model.get('data').code); + this.$box.find('#' + contentLabel).append(this.model.get('data').code); }, renderValue: function() { @@ -651,20 +617,21 @@ joint.shapes.ice.CodeView = joint.shapes.ice.ModelView.extend({ updateBox: function() { var port, wireWidth; var bbox = this.model.getBBox(); - var state = this.model.attributes.state; - var data = this.model.attributes.data; + var state = this.model.get('state'); + var leftPorts = this.model.get('leftPorts'); + var rightPorts = this.model.get('rightPorts'); // Render ports width this.$('.port-wire').css('stroke-width', 2 * state.zoom); - for (var i in data.ports.in) { - port = data.ports.in[i]; + for (var i in leftPorts) { + port = leftPorts[i]; wireWidth = (port.size > 1) ? 8 : 2; - this.$('#port-wire-' + port.name).css('stroke-width', wireWidth * state.zoom); + this.$('#port-wire-' + port.id).css('stroke-width', wireWidth * state.zoom); } - for (var o in data.ports.out) { - port = data.ports.out[o]; + for (var o in rightPorts) { + port = rightPorts[o]; wireWidth = (port.size > 1) ? 8 : 2; - this.$('#port-wire-' + port.name).css('stroke-width', wireWidth * state.zoom); + this.$('#port-wire-' + port.id).css('stroke-width', wireWidth * state.zoom); } this.$box.css({ width: bbox.width * state.zoom, @@ -738,8 +705,8 @@ joint.shapes.ice.InfoView = joint.dia.ElementView.extend({ // Prevent paper from handling pointerdown. this.$box.find('#' + editorLabel).on('mousedown click', function(evt) { evt.stopPropagation(); }); - this.$box.find('#' + editorLabel).append(this.model.attributes.data.info); - this.$box.find('#' + contentLabel).append(this.model.attributes.data.info); + this.$box.find('#' + editorLabel).append(this.model.get('data').info); + this.$box.find('#' + contentLabel).append(this.model.get('data').info); }, render: function () { @@ -759,7 +726,7 @@ joint.shapes.ice.InfoView = joint.dia.ElementView.extend({ updateBox: function() { var bbox = this.model.getBBox(); - var state = this.model.attributes.state; + var state = this.model.get('state'); this.$box.css({ width: bbox.width * state.zoom, height: bbox.height * state.zoom, @@ -841,34 +808,22 @@ joint.shapes.ice.WireView = joint.dia.LinkView.extend({ var self = this; setTimeout(function() { - var portName = self.model.attributes.source.port; - var dataSource = self.sourceView.model.attributes.data; - var rightPorts = self.sourceView.model.attributes.rightPorts; + var portName = self.model.get('source').port; + var rightPorts = self.sourceView.model.get('rightPorts'); // Initialize wire properties - var size; - if (dataSource.pins) { - // I/O port block - size = dataSource.pins.length; - } - else { - // Code/Generic block - var port; - for (var o in rightPorts) { - port = rightPorts[o]; - if (portName === port.id) { - size = port.size; - break; - } + var port; + for (var o in rightPorts) { + port = rightPorts[o]; + if (portName === port.id) { + self.model.attributes.size = port.size; // For wire size connection validation + self.$('.connection').css('stroke-width', (port.size > 1) ? 8 : 2); + self.model.label(0, {attrs: { text: { text: (port.size > 1) ? '' + port.size + '' : '' } } }); + self.model.bifurcationMarkup = self.model.bifurcationMarkup.replace(/<%= r %>/g, (port.size > 1) ? 8 : 4); + self.update(); + break; } } - if (size) { - self.model.attributes.size = size; // For wire size connection validation - self.$('.connection').css('stroke-width', (size > 1) ? 8 : 2); - self.model.label(0, {attrs: { text: { text: (size > 1) ? '' + size + '' : '' } } }); - self.model.bifurcationMarkup = self.model.bifurcationMarkup.replace(/<%= r %>/g, (size > 1) ? 8 : 4); - } - self.update(); }, 0); }, @@ -940,15 +895,17 @@ joint.shapes.ice.WireView = joint.dia.LinkView.extend({ // Find all the wires in the same port var portWires = []; _.each(allWires, function(wire) { - if ((wire.attributes.source.id === currentWire.attributes.source.id) && - (wire.attributes.source.port === currentWire.attributes.source.port)) + var wireSource = wire.get('source'); + var cwireSource = currentWire.get('source'); + if ((wireSource.id === cwireSource.id) && + (wireSource.port === cwireSource.port)) { // Wire with the same source of currentWire var wireView = self.paper.findViewByModel(wire); // Clean the wire bifurcations var markerBifurcations = $(wireView._V.markerBifurcations.node).empty(); portWires.push({ - id: wire.attributes.id, + id: wire.get('id'), view: wireView, markers: markerBifurcations }); diff --git a/app/scripts/services/blocks.service.js b/app/scripts/services/blocks.service.js index 3b9a88cf9..5f5a27b3e 100644 --- a/app/scripts/services/blocks.service.js +++ b/app/scripts/services/blocks.service.js @@ -364,36 +364,56 @@ angular.module('icestudio') } function loadBasicInput(instance, disabled) { + var rightPorts = [{ + id: 'out', + label: '', + size: instance.data.pins.length, + gridUnits: 8 + }]; var cell = new joint.shapes.ice.Input({ id: instance.id, blockType: instance.type, data: instance.data, position: instance.position, disabled: disabled, + rightPorts: rightPorts, choices: boards.getPinoutHTML() }); return cell; } function loadBasicOutput(instance, disabled) { + var leftPorts = [{ + id: 'in', + label: '', + size: instance.data.pins.length, + gridUnits: 8 + }]; var cell = new joint.shapes.ice.Output({ id: instance.id, blockType: instance.type, data: instance.data, position: instance.position, disabled: disabled, + leftPorts: leftPorts, choices: boards.getPinoutHTML() }); return cell; } function loadBasicConstant(instance, disabled) { + var bottomPorts = [{ + id: 'constant-out', + label: '', + gridUnits: 8 + }]; var cell = new joint.shapes.ice.Constant({ id: instance.id, blockType: instance.type, data: instance.data, position: instance.position, - disabled: disabled + disabled: disabled, + bottomPorts: bottomPorts }); return cell; } @@ -541,7 +561,6 @@ angular.module('icestudio') var cell = new joint.shapes.ice.Generic({ id: instance.id, blockType: instance.type, - data: {}, image: blockImage, label: blockLabel, position: instance.position, diff --git a/app/scripts/services/graph.service.js b/app/scripts/services/graph.service.js index 5d27acb09..e270d347b 100644 --- a/app/scripts/services/graph.service.js +++ b/app/scripts/services/graph.service.js @@ -153,22 +153,13 @@ angular.module('icestudio') // Prevent different size connections var tsize; var lsize = linkView.model.attributes.size; - var tdata = cellViewT.model.attributes.data; - var tLeftPorts = cellViewT.model.attributes.leftPorts; var portId = magnetT.getAttribute('port'); - if (tdata.pins) { - // I/O port block - tsize = tdata.pins ? tdata.pins.length : 1; - } - else { - // Code/Generic block - var port; - for (i in tLeftPorts) { - port = tLeftPorts[i]; - if (portId === port.id) { - tsize = port.size; - break; - } + var tLeftPorts = cellViewT.model.attributes.leftPorts; + for (i in tLeftPorts) { + var port = tLeftPorts[i]; + if (portId === port.id) { + tsize = port.size; + break; } } tsize = tsize || 1; From c8f663b49f6ed4dd322497b8e4dae6737b4ed89f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jes=C3=BAs=20Arroyo=20Torrens?= Date: Thu, 22 Dec 2016 17:43:06 +0100 Subject: [PATCH 075/169] Optimize project 1.0 format --- app/scripts/controllers/menu.js | 3 + app/scripts/plugins/shapes/joint.shapes.js | 7 +- app/scripts/services/blocks.service.js | 79 +++++++++++----------- app/scripts/services/utils.service.js | 8 +-- 4 files changed, 51 insertions(+), 46 deletions(-) diff --git a/app/scripts/controllers/menu.js b/app/scripts/controllers/menu.js index 23de657d1..5b8e59c6c 100644 --- a/app/scripts/controllers/menu.js +++ b/app/scripts/controllers/menu.js @@ -76,6 +76,9 @@ angular.module('icestudio') if (name) { project.new(name); } + else { + evt.cancel = true; + } }); }; diff --git a/app/scripts/plugins/shapes/joint.shapes.js b/app/scripts/plugins/shapes/joint.shapes.js index 3a0fcf11a..094479257 100644 --- a/app/scripts/plugins/shapes/joint.shapes.js +++ b/app/scripts/plugins/shapes/joint.shapes.js @@ -390,8 +390,9 @@ joint.shapes.ice.IOView = joint.shapes.ice.ModelView.extend({ renderBlock: function() { var virtualPortId = '#virtualPort' + this.id; var fpgaPortId = '#fpgaPort' + this.id; - var name = this.model.get('data').label; - var virtual = this.model.get('data').virtual || this.model.get('disabled'); + var data = this.model.get('data'); + var name = data.name + (data.range ? data.range : ''); + var virtual = data.virtual || this.model.get('disabled'); this.$box.find('label').text(name ? name : ' '); @@ -509,7 +510,7 @@ joint.shapes.ice.ConstantView = joint.shapes.ice.ModelView.extend({ }, renderLabel: function () { - var name = this.model.get('data').label; + var name = this.model.get('data').name; this.$box.find('label').text(name); }, diff --git a/app/scripts/services/blocks.service.js b/app/scripts/services/blocks.service.js index 5f5a27b3e..c18e009c5 100644 --- a/app/scripts/services/blocks.service.js +++ b/app/scripts/services/blocks.service.js @@ -78,15 +78,18 @@ angular.module('icestudio') return; } } + else { + evt.cancel = true; + //return; + } } // Create blocks for (var p in portInfos) { portInfo = portInfos[p]; var pins = getPins(portInfo); blockInstance.data = { - label: portInfo.input, name: portInfo.name, - range: portInfo.rangestr ? portInfo.rangestr : '', + range: portInfo.rangestr, pins: pins, virtual: virtual }; @@ -144,14 +147,18 @@ angular.module('icestudio') return; } } + else { + evt.cancel = true; + //return; + } } // Create blocks for (var p in paramInfos) { paramInfo = paramInfos[p]; blockInstance.data = { - label: paramInfo.input, - local: local, - value: '' + name: paramInfo.name, + value: '', + local: local }; if (addCellCallback) { addCellCallback(loadBasicConstant(blockInstance)); @@ -179,23 +186,25 @@ angular.module('icestudio') ]; if (block) { blockInstance = block; - var index; + var index, port; if (block.data.ports) { var inPorts = []; for (index in block.data.ports.in) { - inPorts.push(block.data.ports.in[index].label); + port = block.data.ports.in[index]; + inPorts.push(port.name + (port.range ? port.range : '')); } defaultValues[0] = inPorts.join(' , '); var outPorts = []; for (index in block.data.ports.out) { - outPorts.push(block.data.ports.out[index].label); + port = block.data.ports.out[index]; + outPorts.push(port.name + (port.range ? port.range : '')); } defaultValues[1] = outPorts.join(' , '); } if (block.data.params) { var params = []; for (index in block.data.params) { - params.push(block.data.params[index].label); + params.push(block.data.params[index].name); } defaultValues[2] = params.join(' , '); } @@ -263,7 +272,6 @@ angular.module('icestudio') if (inPortInfos[i]) { pins = getPins(inPortInfos[i]); blockInstance.data.ports.in.push({ - label: inPortInfos[i].input, name: inPortInfos[i].name, range: inPortInfos[i].rangestr, size: pins.length @@ -276,7 +284,6 @@ angular.module('icestudio') if (outPortInfos[o]) { pins = getPins(outPortInfos[o]); blockInstance.data.ports.out.push({ - label: outPortInfos[o].input, name: outPortInfos[o].name, range: outPortInfos[o].rangestr, size: pins.length @@ -288,7 +295,6 @@ angular.module('icestudio') for (p in paramInfos) { if (paramInfos[p]) { blockInstance.data.params.push({ - label: paramInfos[p].input, name: paramInfos[p].name }); allNames.push(paramInfos[p].name); @@ -419,32 +425,36 @@ angular.module('icestudio') } function loadBasicCode(instance, disabled) { + var port; var leftPorts = []; var rightPorts = []; var topPorts = []; for (var i in instance.data.ports.in) { + port = instance.data.ports.in[i]; leftPorts.push({ - id: instance.data.ports.in[i].name, - label: instance.data.ports.in[i].label, - size: instance.data.ports.in[i].size, + id: port.name, + label: port.name + (port.range ? port.range : ''), + size: port.size, gridUnits: 32 }); } for (var o in instance.data.ports.out) { + port = instance.data.ports.out[o]; rightPorts.push({ - id: instance.data.ports.out[o].name, - label: instance.data.ports.out[o].label, - size: instance.data.ports.out[o].size, + id: port.name, + label: port.name + (port.range ? port.range : ''), + size: port.size, gridUnits: 32 }); } for (var p in instance.data.params) { + port = instance.data.params[p]; topPorts.push({ - id: instance.data.params[p].name, - label: instance.data.params[p].label, + id: port.name, + label: port.name, gridUnits: 48 }); } @@ -486,14 +496,14 @@ angular.module('icestudio') if (item.type === 'basic.input') { leftPorts.push({ id: item.id, - label: item.data.label, + label: item.data.name + (item.data.range ? item.data.range : ''), size: block.design.graph.blocks[i].data.pins.length }); } else if (item.type === 'basic.output') { rightPorts.push({ id: item.id, - label: item.data.label, + label: item.data.name + (item.data.range ? item.data.range : ''), size: block.design.graph.blocks[i].data.pins.length }); } @@ -501,7 +511,7 @@ angular.module('icestudio') if (!item.data.local) { topPorts.push({ id: item.id, - label: item.data.label + label: item.data.name }); } } @@ -634,7 +644,7 @@ angular.module('icestudio') gettextCatalog.getString('Update the port'), gettextCatalog.getString('Virtual port') ], [ - block.data.label, + block.data.name + (block.data.range ? block.data.range : ''), block.data.virtual ], function(evt, values) { @@ -644,20 +654,14 @@ angular.module('icestudio') var portInfo = utils.parsePortLabel(label); if (portInfo) { evt.cancel = false; - if (!block.data.range) { - block.data.range = ''; - } - if (!portInfo.rangestr) { - portInfo.rangestr = ''; - } - if (block.data.range !== portInfo.rangestr) { + if ((block.data.range ? block.data.range : '') !== + (portInfo.rangestr ? portInfo.rangestr : '')) { // Create new block var blockInstance = { id: null, data: { - label: portInfo.input, name: portInfo.name, - range: portInfo.rangestr ? portInfo.rangestr : '', + range: portInfo.rangestr, pins: getPins(portInfo), virtual: virtual }, @@ -673,7 +677,6 @@ angular.module('icestudio') else if (block.data.name !== portInfo.name || block.data.virtual !== virtual) { // Edit block - block.data.label = portInfo.input; block.data.name = portInfo.name; block.data.virtual = virtual; cellView.render(); @@ -693,17 +696,17 @@ angular.module('icestudio') gettextCatalog.getString('Update the block label'), gettextCatalog.getString('Local parameter') ], [ - block.data.label, + block.data.name, block.data.local ], function(evt, values) { - var label = values[0].replace(/ /g, ''); + var name = values[0].replace(/ /g, ''); var local = values[1]; // Edit block - if (block.data.name !== label || + if (block.data.name !== name || block.data.local !== local) { // Edit block - block.data.label = label; + block.data.name = name; block.data.local = local; cellView.renderLabel(); cellView.renderLocal(); diff --git a/app/scripts/services/utils.service.js b/app/scripts/services/utils.service.js index eff998b19..e083c52b3 100644 --- a/app/scripts/services/utils.service.js +++ b/app/scripts/services/utils.service.js @@ -872,8 +872,7 @@ angular.module('icestudio') var pattern = /([A-Za-z_]+[A-Za-z_0-9]*){0,1}(\[([0-9]+):([0-9]+)\]){0,1}/g; match = pattern.exec(data); if (match && (match[0] === match.input)) { - ret.input = match[0]; - ret.name = match[1]; + ret.name = match[1] ? match[1] : ''; ret.rangestr = match[2]; if (match[2]) { if (match[3] > match[4]) { @@ -891,11 +890,10 @@ angular.module('icestudio') this.parseParamLabel = function(data) { // e.g: name var match, ret = {}; - var pattern = /[A-Za-z_]+[A-Za-z_0-9]*/g; + var pattern = /([A-Za-z_]+[A-Za-z_0-9]*){0,1}/g; match = pattern.exec(data); if (match && (match[0] === match.input)) { - ret.input = match[0]; - ret.name = match[0]; + ret.name = match[1] ? match[1] : ''; return ret; } return null; From a043461817ed2a0c5d1b6d93deb793ce639d8eca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jes=C3=BAs=20Arroyo=20Torrens?= Date: Thu, 22 Dec 2016 17:44:14 +0100 Subject: [PATCH 076/169] Add "block" sample --- samples/block.ice | 230 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 230 insertions(+) create mode 100644 samples/block.ice diff --git a/samples/block.ice b/samples/block.ice new file mode 100644 index 000000000..6609d744c --- /dev/null +++ b/samples/block.ice @@ -0,0 +1,230 @@ +{ + "version": "1.0", + "package": { + "name": "", + "version": "", + "description": "", + "author": "", + "image": "" + }, + "design": { + "board": "icezum", + "graph": { + "blocks": [ + { + "id": "deddfc29-7bf1-4ac4-a24e-e91b4cc14335", + "type": "basic.constant", + "data": { + "name": "C", + "value": "4'b1111", + "local": false + }, + "position": { + "x": 296, + "y": 32 + } + }, + { + "id": "a9f85080-6523-428b-966c-359be16be956", + "type": "basic.constant", + "data": { + "name": "D", + "value": "4'b0000", + "local": true + }, + "position": { + "x": 488, + "y": 32 + } + }, + { + "id": "4aa2ce96-a449-42f1-b612-2c852dc50da8", + "type": "basic.input", + "data": { + "name": "p", + "pins": [ + { + "index": "0", + "name": "", + "value": 0 + } + ], + "virtual": true + }, + "position": { + "x": 680, + "y": 64 + } + }, + { + "id": "7f5654cf-4591-4a66-9147-d0cbdcb95f79", + "type": "basic.output", + "data": { + "name": "q", + "pins": [ + { + "index": "0", + "name": "", + "value": 0 + } + ], + "virtual": true + }, + "position": { + "x": 896, + "y": 64 + } + }, + { + "id": "fecaab8e-c7d4-4823-81fb-2b0d42f38026", + "type": "basic.code", + "data": { + "code": "reg [3:0] b_aux;\n\nalways @(a)\nbegin\n if (a == 1)\n b_aux = C;\n else\n b_aux = D;\nend\n\nassign b = b_aux;\n", + "params": [ + { + "name": "C" + }, + { + "name": "D" + } + ], + "ports": { + "in": [ + { + "name": "a", + "size": 1 + } + ], + "out": [ + { + "name": "b", + "range": "[3:0]", + "size": 4 + } + ] + } + }, + "position": { + "x": 248, + "y": 176 + } + }, + { + "id": "cbd336da-6d61-4c71-90e1-e11bbe6817fc", + "type": "basic.input", + "data": { + "name": "in", + "pins": [ + { + "index": "0", + "name": "", + "value": 0 + } + ], + "virtual": true + }, + "position": { + "x": 48, + "y": 272 + } + }, + { + "id": "15e91005-34e6-4ce9-80b4-8c33c6c1e5a0", + "type": "basic.output", + "data": { + "name": "out", + "range": "[3:0]", + "pins": [ + { + "index": "3", + "name": "", + "value": 0 + }, + { + "index": "2", + "name": "", + "value": 0 + }, + { + "index": "1", + "name": "", + "value": 0 + }, + { + "index": "0", + "name": "", + "value": 0 + } + ], + "virtual": true + }, + "position": { + "x": 760, + "y": 272 + } + } + ], + "wires": [ + { + "source": { + "block": "a9f85080-6523-428b-966c-359be16be956", + "port": "constant-out" + }, + "target": { + "block": "fecaab8e-c7d4-4823-81fb-2b0d42f38026", + "port": "D" + } + }, + { + "source": { + "block": "deddfc29-7bf1-4ac4-a24e-e91b4cc14335", + "port": "constant-out" + }, + "target": { + "block": "fecaab8e-c7d4-4823-81fb-2b0d42f38026", + "port": "C" + } + }, + { + "source": { + "block": "cbd336da-6d61-4c71-90e1-e11bbe6817fc", + "port": "out" + }, + "target": { + "block": "fecaab8e-c7d4-4823-81fb-2b0d42f38026", + "port": "a" + } + }, + { + "source": { + "block": "fecaab8e-c7d4-4823-81fb-2b0d42f38026", + "port": "b" + }, + "target": { + "block": "15e91005-34e6-4ce9-80b4-8c33c6c1e5a0", + "port": "in" + }, + "size": 4 + }, + { + "source": { + "block": "4aa2ce96-a449-42f1-b612-2c852dc50da8", + "port": "out" + }, + "target": { + "block": "7f5654cf-4591-4a66-9147-d0cbdcb95f79", + "port": "in" + } + } + ] + }, + "deps": {}, + "state": { + "pan": { + "x": 24.988850906836912, + "y": 53.895818245976436 + }, + "zoom": 0.8154432847623143 + } + } +} \ No newline at end of file From 8e06c8673d012477f03f36c2469584620452e9bb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jes=C3=BAs=20Arroyo=20Torrens?= Date: Thu, 22 Dec 2016 18:11:58 +0100 Subject: [PATCH 077/169] Add more samples --- samples/assign.ice | 148 +++++++++++ samples/complex.ice | 623 ++++++++++++++++++++++++++++++++++++++++++++ samples/in-out.ice | 104 ++++++++ samples/mux.ice | 170 ++++++++++++ samples/not.ice | 111 ++++++++ 5 files changed, 1156 insertions(+) create mode 100644 samples/assign.ice create mode 100644 samples/complex.ice create mode 100644 samples/in-out.ice create mode 100644 samples/mux.ice create mode 100644 samples/not.ice diff --git a/samples/assign.ice b/samples/assign.ice new file mode 100644 index 000000000..8cf289611 --- /dev/null +++ b/samples/assign.ice @@ -0,0 +1,148 @@ +{ + "version": "1.0", + "package": { + "name": "", + "version": "", + "description": "", + "author": "", + "image": "" + }, + "design": { + "board": "icezum", + "graph": { + "blocks": [ + { + "id": "909655b9-5ef0-4c45-9494-c0238d2e4732", + "type": "basic.constant", + "data": { + "name": "Value", + "value": "4'b1110", + "local": false + }, + "position": { + "x": 192, + "y": 56 + } + }, + { + "id": "7e351e09-634d-407c-ab7e-452519468292", + "type": "basic.constant", + "data": { + "name": "offset", + "value": "0", + "local": true + }, + "position": { + "x": 384, + "y": 56 + } + }, + { + "id": "b6bc7556-6362-45ca-80e5-6db7a3100c7d", + "type": "basic.code", + "data": { + "code": "assign out = C + D;", + "params": [ + { + "name": "C" + }, + { + "name": "D" + } + ], + "ports": { + "in": [], + "out": [ + { + "name": "out", + "range": "[3:0]", + "size": 4 + } + ] + } + }, + "position": { + "x": 144, + "y": 200 + } + }, + { + "id": "ef743d41-5941-4831-becd-0d930c4eed54", + "type": "basic.output", + "data": { + "name": "out", + "range": "[3:0]", + "pins": [ + { + "index": "3", + "name": "LED3", + "value": "98" + }, + { + "index": "2", + "name": "LED2", + "value": "97" + }, + { + "index": "1", + "name": "LED1", + "value": "96" + }, + { + "index": "0", + "name": "LED0", + "value": "95" + } + ], + "virtual": false + }, + "position": { + "x": 672, + "y": 248 + } + } + ], + "wires": [ + { + "source": { + "block": "909655b9-5ef0-4c45-9494-c0238d2e4732", + "port": "constant-out" + }, + "target": { + "block": "b6bc7556-6362-45ca-80e5-6db7a3100c7d", + "port": "C" + } + }, + { + "source": { + "block": "7e351e09-634d-407c-ab7e-452519468292", + "port": "constant-out" + }, + "target": { + "block": "b6bc7556-6362-45ca-80e5-6db7a3100c7d", + "port": "D" + } + }, + { + "source": { + "block": "b6bc7556-6362-45ca-80e5-6db7a3100c7d", + "port": "out" + }, + "target": { + "block": "ef743d41-5941-4831-becd-0d930c4eed54", + "port": "in" + }, + "size": 4 + } + ] + }, + "deps": {}, + "state": { + "pan": { + "x": 0, + "y": 0 + }, + "zoom": 1 + } + } +} \ No newline at end of file diff --git a/samples/complex.ice b/samples/complex.ice new file mode 100644 index 000000000..ab8b6a58c --- /dev/null +++ b/samples/complex.ice @@ -0,0 +1,623 @@ +{ + "version": "1.0", + "package": { + "name": "", + "version": "", + "description": "", + "author": "", + "image": "" + }, + "design": { + "board": "icezum", + "graph": { + "blocks": [ + { + "id": "bfebb831-8b03-43e1-9b87-013f1b5a9cdf", + "type": "basic.constant", + "data": { + "name": "C", + "value": "4'b1010", + "local": false + }, + "position": { + "x": 128, + "y": 40 + } + }, + { + "id": "6c168fad-742d-42aa-a286-ec235bf61951", + "type": "assign", + "position": { + "x": 120, + "y": 184 + } + }, + { + "id": "731465bb-f103-4cf5-a273-79b43e628246", + "type": "mux", + "position": { + "x": 352, + "y": 200 + } + }, + { + "id": "fab70b68-1a4e-426c-8a29-fa02328401e7", + "type": "not", + "position": { + "x": 528, + "y": 200 + } + }, + { + "id": "0fbbb687-4a61-4b1d-a022-8884a20bef5c", + "type": "basic.output", + "data": { + "name": "led", + "pins": [ + { + "index": "0", + "name": "LED7", + "value": "104" + } + ], + "virtual": false + }, + "position": { + "x": 712, + "y": 200 + } + }, + { + "id": "21e9e7f9-9b8a-4fca-904d-e266f1496454", + "type": "basic.input", + "data": { + "name": "in", + "range": "[1:0]", + "pins": [ + { + "index": "1", + "name": "SW1", + "value": "10" + }, + { + "index": "0", + "name": "SW2", + "value": "11" + } + ], + "virtual": false + }, + "position": { + "x": 152, + "y": 280 + } + }, + { + "id": "6c809d38-547d-4c70-92eb-2d5c389429e7", + "type": "basic.output", + "data": { + "name": "debug", + "range": "[1:0]", + "pins": [ + { + "index": "1", + "name": "LED1", + "value": "96" + }, + { + "index": "0", + "name": "LED0", + "value": "95" + } + ], + "virtual": false + }, + "position": { + "x": 712, + "y": 280 + } + } + ], + "wires": [ + { + "source": { + "block": "bfebb831-8b03-43e1-9b87-013f1b5a9cdf", + "port": "constant-out" + }, + "target": { + "block": "6c168fad-742d-42aa-a286-ec235bf61951", + "port": "909655b9-5ef0-4c45-9494-c0238d2e4732" + } + }, + { + "source": { + "block": "6c168fad-742d-42aa-a286-ec235bf61951", + "port": "ef743d41-5941-4831-becd-0d930c4eed54" + }, + "target": { + "block": "731465bb-f103-4cf5-a273-79b43e628246", + "port": "95f8c313-6e18-4ee3-b9cf-7266dec53c93" + }, + "size": 4 + }, + { + "source": { + "block": "731465bb-f103-4cf5-a273-79b43e628246", + "port": "60d40fc8-3388-4066-8f0a-af17e179a9bd" + }, + "target": { + "block": "fab70b68-1a4e-426c-8a29-fa02328401e7", + "port": "a4058fa5-b66e-4e5e-b542-28d7c3e9d3cd" + } + }, + { + "source": { + "block": "21e9e7f9-9b8a-4fca-904d-e266f1496454", + "port": "out" + }, + "target": { + "block": "731465bb-f103-4cf5-a273-79b43e628246", + "port": "f6528039-852b-41f9-aa41-268994b3f631" + }, + "size": 2 + }, + { + "source": { + "block": "fab70b68-1a4e-426c-8a29-fa02328401e7", + "port": "07895985-9d14-4a6f-8f2d-b2a6ddf61852" + }, + "target": { + "block": "0fbbb687-4a61-4b1d-a022-8884a20bef5c", + "port": "in" + } + }, + { + "source": { + "block": "21e9e7f9-9b8a-4fca-904d-e266f1496454", + "port": "out" + }, + "target": { + "block": "6c809d38-547d-4c70-92eb-2d5c389429e7", + "port": "in" + }, + "size": 2 + } + ] + }, + "deps": { + "assign": { + "version": "1.0", + "package": { + "name": "", + "version": "", + "description": "", + "author": "", + "image": "" + }, + "design": { + "graph": { + "blocks": [ + { + "id": "909655b9-5ef0-4c45-9494-c0238d2e4732", + "type": "basic.constant", + "data": { + "name": "Value", + "value": "4'b1110", + "local": false + }, + "position": { + "x": 192, + "y": 56 + } + }, + { + "id": "7e351e09-634d-407c-ab7e-452519468292", + "type": "basic.constant", + "data": { + "name": "offset", + "value": "0", + "local": true + }, + "position": { + "x": 384, + "y": 56 + } + }, + { + "id": "b6bc7556-6362-45ca-80e5-6db7a3100c7d", + "type": "basic.code", + "data": { + "code": "assign out = C + D;", + "params": [ + { + "name": "C" + }, + { + "name": "D" + } + ], + "ports": { + "in": [], + "out": [ + { + "name": "out", + "range": "[3:0]", + "size": 4 + } + ] + } + }, + "position": { + "x": 144, + "y": 200 + } + }, + { + "id": "ef743d41-5941-4831-becd-0d930c4eed54", + "type": "basic.output", + "data": { + "name": "out", + "range": "[3:0]", + "pins": [ + { + "index": "3", + "name": "LED3", + "value": "98" + }, + { + "index": "2", + "name": "LED2", + "value": "97" + }, + { + "index": "1", + "name": "LED1", + "value": "96" + }, + { + "index": "0", + "name": "LED0", + "value": "95" + } + ], + "virtual": false + }, + "position": { + "x": 672, + "y": 248 + } + } + ], + "wires": [ + { + "source": { + "block": "909655b9-5ef0-4c45-9494-c0238d2e4732", + "port": "constant-out" + }, + "target": { + "block": "b6bc7556-6362-45ca-80e5-6db7a3100c7d", + "port": "C" + } + }, + { + "source": { + "block": "7e351e09-634d-407c-ab7e-452519468292", + "port": "constant-out" + }, + "target": { + "block": "b6bc7556-6362-45ca-80e5-6db7a3100c7d", + "port": "D" + } + }, + { + "source": { + "block": "b6bc7556-6362-45ca-80e5-6db7a3100c7d", + "port": "out" + }, + "target": { + "block": "ef743d41-5941-4831-becd-0d930c4eed54", + "port": "in" + }, + "size": 4 + } + ] + }, + "deps": {}, + "state": { + "pan": { + "x": 0, + "y": 0 + }, + "zoom": 1 + } + } + }, + "mux": { + "version": "1.0", + "package": { + "name": "", + "version": "", + "description": "", + "author": "", + "image": "" + }, + "design": { + "graph": { + "blocks": [ + { + "id": "5e1563d7-86de-4618-a9b0-2a08075af9ec", + "type": "basic.code", + "data": { + "code": "// Multiplexer 4 to 1 \nassign out = data[sel];", + "params": [], + "ports": { + "in": [ + { + "name": "data", + "range": "[3:0]", + "size": 4 + }, + { + "name": "sel", + "range": "[1:0]", + "size": 2 + } + ], + "out": [ + { + "name": "out", + "size": 1 + } + ] + } + }, + "position": { + "x": 288, + "y": 112 + } + }, + { + "id": "95f8c313-6e18-4ee3-b9cf-7266dec53c93", + "type": "basic.input", + "data": { + "name": "d", + "range": "[3:0]", + "pins": [ + { + "index": "3", + "name": "", + "value": 0 + }, + { + "index": "2", + "name": "", + "value": 0 + }, + { + "index": "1", + "name": "", + "value": 0 + }, + { + "index": "0", + "name": "", + "value": 0 + } + ], + "virtual": true + }, + "position": { + "x": 48, + "y": 144 + } + }, + { + "id": "60d40fc8-3388-4066-8f0a-af17e179a9bd", + "type": "basic.output", + "data": { + "name": "out", + "pins": [ + { + "index": "0", + "name": "", + "value": 0 + } + ], + "virtual": true + }, + "position": { + "x": 760, + "y": 208 + } + }, + { + "id": "f6528039-852b-41f9-aa41-268994b3f631", + "type": "basic.input", + "data": { + "name": "s", + "range": "[1:0]", + "pins": [ + { + "index": "1", + "name": "", + "value": 0 + }, + { + "index": "0", + "name": "", + "value": 0 + } + ], + "virtual": true + }, + "position": { + "x": 48, + "y": 272 + } + } + ], + "wires": [ + { + "source": { + "block": "95f8c313-6e18-4ee3-b9cf-7266dec53c93", + "port": "out" + }, + "target": { + "block": "5e1563d7-86de-4618-a9b0-2a08075af9ec", + "port": "data" + }, + "size": 4 + }, + { + "source": { + "block": "f6528039-852b-41f9-aa41-268994b3f631", + "port": "out" + }, + "target": { + "block": "5e1563d7-86de-4618-a9b0-2a08075af9ec", + "port": "sel" + }, + "size": 2 + }, + { + "source": { + "block": "5e1563d7-86de-4618-a9b0-2a08075af9ec", + "port": "out" + }, + "target": { + "block": "60d40fc8-3388-4066-8f0a-af17e179a9bd", + "port": "in" + } + } + ] + }, + "deps": {}, + "state": { + "pan": { + "x": 0, + "y": 0 + }, + "zoom": 1 + } + } + }, + "not": { + "version": "1.0", + "package": { + "name": "", + "version": "", + "description": "", + "author": "", + "image": "" + }, + "design": { + "graph": { + "blocks": [ + { + "id": "364b95cc-e8ff-4c65-b332-d6125c5968ee", + "type": "basic.code", + "data": { + "code": "// NOT logic gate\nassign b = ~a;", + "params": [], + "ports": { + "in": [ + { + "name": "a", + "size": 1 + } + ], + "out": [ + { + "name": "b", + "size": 1 + } + ] + } + }, + "position": { + "x": 248, + "y": 88 + } + }, + { + "id": "a4058fa5-b66e-4e5e-b542-28d7c3e9d3cd", + "type": "basic.input", + "data": { + "name": "", + "pins": [ + { + "index": "0", + "name": "", + "value": 0 + } + ], + "virtual": true + }, + "position": { + "x": 72, + "y": 184 + } + }, + { + "id": "07895985-9d14-4a6f-8f2d-b2a6ddf61852", + "type": "basic.output", + "data": { + "name": "", + "pins": [ + { + "index": "0", + "name": "", + "value": 0 + } + ], + "virtual": true + }, + "position": { + "x": 728, + "y": 184 + } + } + ], + "wires": [ + { + "source": { + "block": "a4058fa5-b66e-4e5e-b542-28d7c3e9d3cd", + "port": "out" + }, + "target": { + "block": "364b95cc-e8ff-4c65-b332-d6125c5968ee", + "port": "a" + } + }, + { + "source": { + "block": "364b95cc-e8ff-4c65-b332-d6125c5968ee", + "port": "b" + }, + "target": { + "block": "07895985-9d14-4a6f-8f2d-b2a6ddf61852", + "port": "in" + } + } + ] + }, + "deps": {}, + "state": { + "pan": { + "x": 0, + "y": 0 + }, + "zoom": 1 + } + } + } + }, + "state": { + "pan": { + "x": 0, + "y": 0 + }, + "zoom": 1 + } + } +} \ No newline at end of file diff --git a/samples/in-out.ice b/samples/in-out.ice new file mode 100644 index 000000000..6989126d9 --- /dev/null +++ b/samples/in-out.ice @@ -0,0 +1,104 @@ +{ + "version": "1.0", + "package": { + "name": "", + "version": "", + "description": "", + "author": "", + "image": "" + }, + "design": { + "board": "icezum", + "graph": { + "blocks": [ + { + "id": "b25e5929-162c-4631-8d04-156e0b382590", + "type": "basic.input", + "data": { + "name": "in", + "pins": [ + { + "index": "0", + "name": "SW1", + "value": "10" + } + ], + "virtual": false + }, + "position": { + "x": 224, + "y": 112 + } + }, + { + "id": "2a8315b1-437e-40b7-adfb-ff961a0aa8f6", + "type": "basic.output", + "data": { + "name": "out", + "pins": [ + { + "index": "0", + "name": "LED0", + "value": "95" + } + ], + "virtual": false + }, + "position": { + "x": 488, + "y": 112 + } + }, + { + "id": "f8ffb071-9a46-4b46-86d2-cd5b83bae395", + "type": "basic.output", + "data": { + "name": "out", + "pins": [ + { + "index": "0", + "name": "LED1", + "value": "96" + } + ], + "virtual": false + }, + "position": { + "x": 488, + "y": 248 + } + } + ], + "wires": [ + { + "source": { + "block": "b25e5929-162c-4631-8d04-156e0b382590", + "port": "out" + }, + "target": { + "block": "2a8315b1-437e-40b7-adfb-ff961a0aa8f6", + "port": "in" + } + }, + { + "source": { + "block": "b25e5929-162c-4631-8d04-156e0b382590", + "port": "out" + }, + "target": { + "block": "f8ffb071-9a46-4b46-86d2-cd5b83bae395", + "port": "in" + } + } + ] + }, + "deps": {}, + "state": { + "pan": { + "x": 0, + "y": 0 + }, + "zoom": 1 + } + } +} \ No newline at end of file diff --git a/samples/mux.ice b/samples/mux.ice new file mode 100644 index 000000000..f4d921c39 --- /dev/null +++ b/samples/mux.ice @@ -0,0 +1,170 @@ +{ + "version": "1.0", + "package": { + "name": "", + "version": "", + "description": "", + "author": "", + "image": "" + }, + "design": { + "board": "icezum", + "graph": { + "blocks": [ + { + "id": "5e1563d7-86de-4618-a9b0-2a08075af9ec", + "type": "basic.code", + "data": { + "code": "// Multiplexer 4 to 1 \nassign out = data[sel];", + "params": [], + "ports": { + "in": [ + { + "name": "data", + "range": "[3:0]", + "size": 4 + }, + { + "name": "sel", + "range": "[1:0]", + "size": 2 + } + ], + "out": [ + { + "name": "out", + "size": 1 + } + ] + } + }, + "position": { + "x": 288, + "y": 112 + } + }, + { + "id": "95f8c313-6e18-4ee3-b9cf-7266dec53c93", + "type": "basic.input", + "data": { + "name": "d", + "range": "[3:0]", + "pins": [ + { + "index": "3", + "name": "", + "value": 0 + }, + { + "index": "2", + "name": "", + "value": 0 + }, + { + "index": "1", + "name": "", + "value": 0 + }, + { + "index": "0", + "name": "", + "value": 0 + } + ], + "virtual": true + }, + "position": { + "x": 48, + "y": 144 + } + }, + { + "id": "60d40fc8-3388-4066-8f0a-af17e179a9bd", + "type": "basic.output", + "data": { + "name": "out", + "pins": [ + { + "index": "0", + "name": "", + "value": 0 + } + ], + "virtual": true + }, + "position": { + "x": 760, + "y": 208 + } + }, + { + "id": "f6528039-852b-41f9-aa41-268994b3f631", + "type": "basic.input", + "data": { + "name": "s", + "range": "[1:0]", + "pins": [ + { + "index": "1", + "name": "", + "value": 0 + }, + { + "index": "0", + "name": "", + "value": 0 + } + ], + "virtual": true + }, + "position": { + "x": 48, + "y": 272 + } + } + ], + "wires": [ + { + "source": { + "block": "95f8c313-6e18-4ee3-b9cf-7266dec53c93", + "port": "out" + }, + "target": { + "block": "5e1563d7-86de-4618-a9b0-2a08075af9ec", + "port": "data" + }, + "size": 4 + }, + { + "source": { + "block": "f6528039-852b-41f9-aa41-268994b3f631", + "port": "out" + }, + "target": { + "block": "5e1563d7-86de-4618-a9b0-2a08075af9ec", + "port": "sel" + }, + "size": 2 + }, + { + "source": { + "block": "5e1563d7-86de-4618-a9b0-2a08075af9ec", + "port": "out" + }, + "target": { + "block": "60d40fc8-3388-4066-8f0a-af17e179a9bd", + "port": "in" + } + } + ] + }, + "deps": {}, + "state": { + "pan": { + "x": 0, + "y": 0 + }, + "zoom": 1 + } + } +} \ No newline at end of file diff --git a/samples/not.ice b/samples/not.ice new file mode 100644 index 000000000..426794ebe --- /dev/null +++ b/samples/not.ice @@ -0,0 +1,111 @@ +{ + "version": "1.0", + "package": { + "name": "", + "version": "", + "description": "", + "author": "", + "image": "" + }, + "design": { + "board": "icezum", + "graph": { + "blocks": [ + { + "id": "364b95cc-e8ff-4c65-b332-d6125c5968ee", + "type": "basic.code", + "data": { + "code": "// NOT logic gate\nassign b = ~a;", + "params": [], + "ports": { + "in": [ + { + "name": "a", + "size": 1 + } + ], + "out": [ + { + "name": "b", + "size": 1 + } + ] + } + }, + "position": { + "x": 248, + "y": 88 + } + }, + { + "id": "a4058fa5-b66e-4e5e-b542-28d7c3e9d3cd", + "type": "basic.input", + "data": { + "name": "", + "pins": [ + { + "index": "0", + "name": "", + "value": 0 + } + ], + "virtual": true + }, + "position": { + "x": 72, + "y": 184 + } + }, + { + "id": "07895985-9d14-4a6f-8f2d-b2a6ddf61852", + "type": "basic.output", + "data": { + "name": "", + "pins": [ + { + "index": "0", + "name": "", + "value": 0 + } + ], + "virtual": true + }, + "position": { + "x": 728, + "y": 184 + } + } + ], + "wires": [ + { + "source": { + "block": "a4058fa5-b66e-4e5e-b542-28d7c3e9d3cd", + "port": "out" + }, + "target": { + "block": "364b95cc-e8ff-4c65-b332-d6125c5968ee", + "port": "a" + } + }, + { + "source": { + "block": "364b95cc-e8ff-4c65-b332-d6125c5968ee", + "port": "b" + }, + "target": { + "block": "07895985-9d14-4a6f-8f2d-b2a6ddf61852", + "port": "in" + } + } + ] + }, + "deps": {}, + "state": { + "pan": { + "x": 0, + "y": 0 + }, + "zoom": 1 + } + } +} \ No newline at end of file From d99d404163502f86aa6d4dc3cdef86a9fd8918cd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jes=C3=BAs=20Arroyo=20Torrens?= Date: Thu, 22 Dec 2016 18:33:21 +0100 Subject: [PATCH 078/169] Update backward compatibility function --- app/scripts/services/blocks.service.js | 8 ++-- app/scripts/services/project.service.js | 61 +++++++++++++++++++------ app/views/menu.html | 2 +- 3 files changed, 52 insertions(+), 19 deletions(-) diff --git a/app/scripts/services/blocks.service.js b/app/scripts/services/blocks.service.js index c18e009c5..fff0cdcb6 100644 --- a/app/scripts/services/blocks.service.js +++ b/app/scripts/services/blocks.service.js @@ -106,11 +106,11 @@ angular.module('icestudio') var pins = []; if (portInfo.range) { for (var r in portInfo.range) { - pins.push({ index: portInfo.range[r].toString(), name: '', value: 0 }); + pins.push({ index: portInfo.range[r].toString(), name: '', value: '0' }); } } else { - pins.push({ index: '0', name: '', value: 0 }); + pins.push({ index: '0', name: '', value: '0' }); } return pins; } @@ -224,7 +224,7 @@ angular.module('icestudio') for (i in inPorts) { if (inPorts[i]) { inPortInfo = utils.parsePortLabel(inPorts[i]); - if (inPortInfo) { + if (inPortInfo && inPortInfo.name) { evt.cancel = false; inPortInfos.push(inPortInfo); } @@ -239,7 +239,7 @@ angular.module('icestudio') for (o in outPorts) { if (outPorts[o]) { outPortInfo = utils.parsePortLabel(outPorts[o]); - if (outPortInfo) { + if (outPortInfo && outPortInfo.name) { evt.cancel = false; outPortInfos.push(outPortInfo); } diff --git a/app/scripts/services/project.service.js b/app/scripts/services/project.service.js index a487d412c..3f3ac48ef 100644 --- a/app/scripts/services/project.service.js +++ b/app/scripts/services/project.service.js @@ -80,20 +80,53 @@ angular.module('icestudio') project = data; break; default: - var blocks = data.graph.blocks; - for (var b in blocks) { - var block = blocks[b]; - if (block.type === 'basic.input' || - block.type === 'basic.output') { - block.data.name = block.data.label; - block.data.range = ''; - block.data.pins = [{ - index: '0', - name: block.data.pin ? block.data.pin.name : '', - value: block.data.pin ? block.data.pin.value : 0 - }]; - block.data.virtual = false; - delete block.data.pin; + for (var b in data.graph.blocks) { + var block = data.graph.blocks[b]; + switch(block.type) { + case 'basic.input': + case 'basic.output': + block.data = { + name: block.data.label, + pins: [{ + index: '0', + name: '', + value: '0' + }], + virtual: false + }; + break; + case 'basic.constant': + block.data = { + name: block.data.label, + value: block.data.value, + local: false + }; + break; + case 'basic.code': + var params = []; + for (var p in block.data.params) { + params.push({ + name: block.data.params[p] + }); + } + block.data.params = params; + var inPorts = []; + for (var i in block.data.ports.in) { + params.push({ + name: block.data.ports.in[i], + size: 1 + }); + } + block.data.ports.in = inPorts; + var outPorts = []; + for (var o in block.data.ports.out) { + params.push({ + name: block.data.ports.out[o], + size: 1 + }); + } + block.data.ports.out = outPorts; + break; } } project = _default(); diff --git a/app/views/menu.html b/app/views/menu.html index 52777f30c..83dccb4a4 100644 --- a/app/views/menu.html +++ b/app/views/menu.html @@ -7,7 +7,7 @@ - + From ea4057d16ed65708277bd2430569494fe0baf409 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jes=C3=BAs=20Arroyo=20Torrens?= Date: Thu, 22 Dec 2016 18:34:20 +0100 Subject: [PATCH 079/169] Clear demo files --- demo/complex.ice | 411 -------------------------- demo/constant-code-block.ice | 100 ------- demo/constant-code-bus.ice | 125 -------- demo/constant-generic-block.ice | 189 ------------ demo/constant-io-code-block.ice | 154 ---------- demo/div.ice | 133 --------- demo/input-output-bus.ice | 142 --------- demo/input-output.ice | 79 ----- demo/multi-block-block.ice | 276 ----------------- demo/multi-block-output.ice | 238 --------------- demo/multi-constant-generic-block.ice | 245 --------------- demo/multi-input-output.ice | 110 ------- 12 files changed, 2202 deletions(-) delete mode 100644 demo/complex.ice delete mode 100644 demo/constant-code-block.ice delete mode 100644 demo/constant-code-bus.ice delete mode 100644 demo/constant-generic-block.ice delete mode 100644 demo/constant-io-code-block.ice delete mode 100644 demo/div.ice delete mode 100644 demo/input-output-bus.ice delete mode 100644 demo/input-output.ice delete mode 100644 demo/multi-block-block.ice delete mode 100644 demo/multi-block-output.ice delete mode 100644 demo/multi-constant-generic-block.ice delete mode 100644 demo/multi-input-output.ice diff --git a/demo/complex.ice b/demo/complex.ice deleted file mode 100644 index 344dafe77..000000000 --- a/demo/complex.ice +++ /dev/null @@ -1,411 +0,0 @@ -{ - "version": "1.0", - "package": { - "name": "", - "version": "", - "description": "", - "author": "", - "image": "" - }, - "design": { - "board": "icezum", - "graph": { - "blocks": [ - { - "id": "3e7df107-03ee-4c35-9e52-607770f4c832", - "type": "basic.output", - "data": { - "label": "a", - "name": "a", - "range": "", - "pins": [ - { - "index": "0", - "name": "LED0", - "value": "95" - } - ], - "virtual": false - }, - "position": { - "x": 216, - "y": 80 - } - }, - { - "id": "365fa313-f3c1-433d-9d51-97429dfaa3c8", - "type": "basic.constant", - "data": { - "label": "Value", - "value": "1'b1" - }, - "position": { - "x": 344, - "y": 80 - } - }, - { - "id": "083f6679-313b-497a-b2f0-4d972bc3cffa", - "type": "basic.output", - "data": { - "label": "c", - "name": "c", - "range": "", - "pins": [ - { - "index": "0", - "name": "LED2", - "value": "97" - } - ], - "virtual": false - }, - "position": { - "x": 760, - "y": 144 - } - }, - { - "id": "1ffad532-f6da-47b0-8e85-d27fdcc211a8", - "type": "basic.input", - "data": { - "label": "in", - "name": "in", - "range": "", - "pins": [ - { - "index": "0", - "name": "SW1", - "value": "10" - } - ], - "virtual": false - }, - "position": { - "x": 48, - "y": 248 - } - }, - { - "id": "1aa80d81-052d-426d-a073-a6e9678a9959", - "type": "block", - "data": {}, - "position": { - "x": 280, - "y": 264 - } - }, - { - "id": "e55fa1d9-ac88-461c-b5c1-4f4302c547cc", - "type": "block", - "data": {}, - "position": { - "x": 536, - "y": 280 - } - }, - { - "id": "8631a189-f5ed-4be1-88df-30d6acb97f99", - "type": "basic.output", - "data": { - "label": "d", - "name": "d", - "range": "", - "pins": [ - { - "index": "0", - "name": "LED3", - "value": "98" - } - ], - "virtual": false - }, - "position": { - "x": 768, - "y": 280 - } - } - ], - "wires": [ - { - "source": { - "block": "1ffad532-f6da-47b0-8e85-d27fdcc211a8", - "port": "out" - }, - "target": { - "block": "1aa80d81-052d-426d-a073-a6e9678a9959", - "port": "a8faca21-4b86-4bb1-8cd1-8c5252d4038f" - } - }, - { - "source": { - "block": "1aa80d81-052d-426d-a073-a6e9678a9959", - "port": "94e9a915-defe-4437-8abd-d3e57dafbb45" - }, - "target": { - "block": "e55fa1d9-ac88-461c-b5c1-4f4302c547cc", - "port": "a8faca21-4b86-4bb1-8cd1-8c5252d4038f" - } - }, - { - "source": { - "block": "1aa80d81-052d-426d-a073-a6e9678a9959", - "port": "94e9a915-defe-4437-8abd-d3e57dafbb45" - }, - "target": { - "block": "1aa80d81-052d-426d-a073-a6e9678a9959", - "port": "9051bd8c-0c39-4b19-bb08-71ac0ba8e9bf" - }, - "vertices": [ - { - "x": 288, - "y": 352 - } - ] - }, - { - "source": { - "block": "1ffad532-f6da-47b0-8e85-d27fdcc211a8", - "port": "out" - }, - "target": { - "block": "3e7df107-03ee-4c35-9e52-607770f4c832", - "port": "in" - }, - "vertices": [] - }, - { - "source": { - "block": "365fa313-f3c1-433d-9d51-97429dfaa3c8", - "port": "constant-out" - }, - "target": { - "block": "1aa80d81-052d-426d-a073-a6e9678a9959", - "port": "386bc685-d806-4487-bece-b442b8c8689c" - }, - "vertices": [] - }, - { - "source": { - "block": "365fa313-f3c1-433d-9d51-97429dfaa3c8", - "port": "constant-out" - }, - "target": { - "block": "e55fa1d9-ac88-461c-b5c1-4f4302c547cc", - "port": "386bc685-d806-4487-bece-b442b8c8689c" - }, - "vertices": [ - { - "x": 496, - "y": 224 - } - ] - }, - { - "source": { - "block": "e55fa1d9-ac88-461c-b5c1-4f4302c547cc", - "port": "94e9a915-defe-4437-8abd-d3e57dafbb45" - }, - "target": { - "block": "083f6679-313b-497a-b2f0-4d972bc3cffa", - "port": "in" - }, - "vertices": [ - { - "x": 680, - "y": 256 - } - ] - }, - { - "source": { - "block": "e55fa1d9-ac88-461c-b5c1-4f4302c547cc", - "port": "94e9a915-defe-4437-8abd-d3e57dafbb45" - }, - "target": { - "block": "8631a189-f5ed-4be1-88df-30d6acb97f99", - "port": "in" - } - }, - { - "source": { - "block": "1ffad532-f6da-47b0-8e85-d27fdcc211a8", - "port": "out" - }, - "target": { - "block": "e55fa1d9-ac88-461c-b5c1-4f4302c547cc", - "port": "9051bd8c-0c39-4b19-bb08-71ac0ba8e9bf" - }, - "vertices": [ - { - "x": 200, - "y": 400 - } - ] - } - ] - }, - "deps": { - "block": { - "version": "1.0", - "package": { - "name": "", - "version": "", - "description": "", - "author": "", - "image": "" - }, - "design": { - "graph": { - "blocks": [ - { - "id": "386bc685-d806-4487-bece-b442b8c8689c", - "type": "basic.constant", - "data": { - "label": "C", - "value": "1'b0" - }, - "position": { - "x": 360, - "y": 8 - } - }, - { - "id": "94e9a915-defe-4437-8abd-d3e57dafbb45", - "type": "basic.output", - "data": { - "label": "out", - "name": "out", - "range": "", - "pins": [ - { - "index": "0", - "name": "", - "value": 0 - } - ], - "virtual": false - }, - "position": { - "x": 712, - "y": 264 - } - }, - { - "id": "ec9b901f-4cda-4f53-81ae-bfd74a0f0ae6", - "type": "basic.code", - "data": { - "code": "assign o = v;", - "params": [ - "v" - ], - "ports": { - "in": [ - "i" - ], - "out": [ - "o" - ] - } - }, - "position": { - "x": 216, - "y": 168 - } - }, - { - "id": "a8faca21-4b86-4bb1-8cd1-8c5252d4038f", - "type": "basic.input", - "data": { - "label": "in", - "name": "in", - "range": "", - "pins": [ - { - "index": "0", - "name": "", - "value": 0 - } - ], - "virtual": false - }, - "position": { - "x": 24, - "y": 264 - } - }, - { - "id": "9051bd8c-0c39-4b19-bb08-71ac0ba8e9bf", - "type": "basic.input", - "data": { - "label": "", - "name": "", - "range": "", - "pins": [ - { - "index": "0", - "name": "", - "value": 0 - } - ], - "virtual": false - }, - "position": { - "x": 24, - "y": 360 - } - } - ], - "wires": [ - { - "source": { - "block": "386bc685-d806-4487-bece-b442b8c8689c", - "port": "constant-out" - }, - "target": { - "block": "ec9b901f-4cda-4f53-81ae-bfd74a0f0ae6", - "port": "v" - } - }, - { - "source": { - "block": "ec9b901f-4cda-4f53-81ae-bfd74a0f0ae6", - "port": "o" - }, - "target": { - "block": "94e9a915-defe-4437-8abd-d3e57dafbb45", - "port": "in" - } - }, - { - "source": { - "block": "a8faca21-4b86-4bb1-8cd1-8c5252d4038f", - "port": "out" - }, - "target": { - "block": "ec9b901f-4cda-4f53-81ae-bfd74a0f0ae6", - "port": "i" - } - } - ] - }, - "deps": {}, - "state": { - "pan": { - "x": 45.83406713517239, - "y": 43.306661649315814 - }, - "zoom": 0.8527620016280335 - } - } - } - }, - "state": { - "pan": { - "x": 0, - "y": 0 - }, - "zoom": 1 - } - } -} \ No newline at end of file diff --git a/demo/constant-code-block.ice b/demo/constant-code-block.ice deleted file mode 100644 index db4de8682..000000000 --- a/demo/constant-code-block.ice +++ /dev/null @@ -1,100 +0,0 @@ -{ - "version": "1.0", - "package": { - "name": "", - "version": "", - "description": "", - "author": "", - "image": "" - }, - "design": { - "board": "icezum", - "graph": { - "blocks": [ - { - "id": "386bc685-d806-4487-bece-b442b8c8689c", - "type": "basic.constant", - "data": { - "label": "C", - "value": "1'b0" - }, - "position": { - "x": 280, - "y": 48 - } - }, - { - "id": "b38fa7c5-3a2e-403b-b3d3-ac32917b5596", - "type": "basic.code", - "data": { - "code": "assign o = v;", - "params": [ - "v" - ], - "ports": { - "in": [], - "out": [ - "o" - ] - } - }, - "position": { - "x": 136, - "y": 192 - } - }, - { - "id": "94e9a915-defe-4437-8abd-d3e57dafbb45", - "type": "basic.output", - "data": { - "label": "led", - "name": "led", - "range": "", - "pins": [ - { - "index": "0", - "name": "LED0", - "value": "95" - } - ], - "virtual": false - }, - "position": { - "x": 624, - "y": 288 - } - } - ], - "wires": [ - { - "source": { - "block": "386bc685-d806-4487-bece-b442b8c8689c", - "port": "constant-out" - }, - "target": { - "block": "b38fa7c5-3a2e-403b-b3d3-ac32917b5596", - "port": "v" - } - }, - { - "source": { - "block": "b38fa7c5-3a2e-403b-b3d3-ac32917b5596", - "port": "o" - }, - "target": { - "block": "94e9a915-defe-4437-8abd-d3e57dafbb45", - "port": "in" - } - } - ] - }, - "deps": {}, - "state": { - "pan": { - "x": 0, - "y": 0 - }, - "zoom": 1 - } - } -} \ No newline at end of file diff --git a/demo/constant-code-bus.ice b/demo/constant-code-bus.ice deleted file mode 100644 index 2756f76d4..000000000 --- a/demo/constant-code-bus.ice +++ /dev/null @@ -1,125 +0,0 @@ -{ - "version": "1.0", - "package": { - "name": "", - "version": "", - "description": "", - "author": "", - "image": "" - }, - "design": { - "board": "icezum", - "graph": { - "blocks": [ - { - "id": "04b316b2-452b-4e2f-bdc6-26d1a204c675", - "type": "basic.constant", - "data": { - "label": "C", - "local": true, - "value": "5" - }, - "position": { - "x": 232, - "y": 32 - } - }, - { - "id": "3d5412cf-96ac-4429-9a22-01d5095f0981", - "type": "basic.code", - "data": { - "code": "// Assign constant parameter\n\nassign out = value;", - "params": [ - { - "label": "value", - "name": "value" - } - ], - "ports": { - "in": [], - "out": [ - { - "label": "out[3:0]", - "name": "out", - "range": "[3:0]", - "size": 4 - } - ] - } - }, - "position": { - "x": 88, - "y": 176 - } - }, - { - "id": "6d4f9130-37c5-48d2-b481-b803d818c3c7", - "type": "basic.output", - "data": { - "label": "leds[3:0]", - "name": "leds", - "range": "[3:0]", - "pins": [ - { - "index": "3", - "name": "LED3", - "value": "98" - }, - { - "index": "2", - "name": "LED2", - "value": "97" - }, - { - "index": "1", - "name": "LED1", - "value": "96" - }, - { - "index": "0", - "name": "LED0", - "value": "95" - } - ], - "virtual": false - }, - "position": { - "x": 624, - "y": 224 - } - } - ], - "wires": [ - { - "source": { - "block": "04b316b2-452b-4e2f-bdc6-26d1a204c675", - "port": "constant-out" - }, - "target": { - "block": "3d5412cf-96ac-4429-9a22-01d5095f0981", - "port": "value" - } - }, - { - "source": { - "block": "3d5412cf-96ac-4429-9a22-01d5095f0981", - "port": "out" - }, - "target": { - "block": "6d4f9130-37c5-48d2-b481-b803d818c3c7", - "port": "in" - }, - "size": 4 - } - ] - }, - "deps": {}, - "state": { - "pan": { - "x": -7, - "y": 13 - }, - "zoom": 1 - } - } -} \ No newline at end of file diff --git a/demo/constant-generic-block.ice b/demo/constant-generic-block.ice deleted file mode 100644 index dcc1ccca4..000000000 --- a/demo/constant-generic-block.ice +++ /dev/null @@ -1,189 +0,0 @@ -{ - "version": "1.0", - "package": { - "name": "", - "version": "", - "description": "", - "author": "", - "image": "" - }, - "design": { - "board": "icezum", - "graph": { - "blocks": [ - { - "id": "3ea55b72-cda0-4f43-886b-e225b00229a4", - "type": "basic.constant", - "data": { - "label": "Value", - "value": "1'b1" - }, - "position": { - "x": 296, - "y": 32 - } - }, - { - "id": "eb6dddea-3a81-4e26-ab7d-ed107b3676c9", - "type": "constant-code-block", - "data": {}, - "position": { - "x": 248, - "y": 184 - } - }, - { - "id": "06bd1d14-7302-4dd7-9e95-650d1070a203", - "type": "basic.output", - "data": { - "label": "led", - "name": "led", - "range": "", - "pins": [ - { - "index": "0", - "name": "LED0", - "value": "95" - } - ], - "virtual": false - }, - "position": { - "x": 536, - "y": 184 - } - } - ], - "wires": [ - { - "source": { - "block": "3ea55b72-cda0-4f43-886b-e225b00229a4", - "port": "constant-out" - }, - "target": { - "block": "eb6dddea-3a81-4e26-ab7d-ed107b3676c9", - "port": "386bc685-d806-4487-bece-b442b8c8689c" - } - }, - { - "source": { - "block": "eb6dddea-3a81-4e26-ab7d-ed107b3676c9", - "port": "94e9a915-defe-4437-8abd-d3e57dafbb45" - }, - "target": { - "block": "06bd1d14-7302-4dd7-9e95-650d1070a203", - "port": "in" - } - } - ] - }, - "deps": { - "constant-code-block": { - "version": "1.0", - "package": { - "name": "", - "version": "", - "description": "", - "author": "", - "image": "" - }, - "design": { - "graph": { - "blocks": [ - { - "id": "386bc685-d806-4487-bece-b442b8c8689c", - "type": "basic.constant", - "data": { - "label": "C", - "value": "1'b0" - }, - "position": { - "x": 280, - "y": 48 - } - }, - { - "id": "94e9a915-defe-4437-8abd-d3e57dafbb45", - "type": "basic.output", - "data": { - "label": "led", - "name": "led", - "range": "", - "pins": [ - { - "index": "0", - "name": "", - "value": 0 - } - ], - "virtual": false - }, - "position": { - "x": 624, - "y": 288 - } - }, - { - "id": "b38fa7c5-3a2e-403b-b3d3-ac32917b5596", - "type": "basic.code", - "data": { - "code": "assign o = v;", - "params": [ - "v" - ], - "ports": { - "in": [], - "out": [ - "o" - ] - } - }, - "position": { - "x": 136, - "y": 192 - } - } - ], - "wires": [ - { - "source": { - "block": "386bc685-d806-4487-bece-b442b8c8689c", - "port": "constant-out" - }, - "target": { - "block": "b38fa7c5-3a2e-403b-b3d3-ac32917b5596", - "port": "v" - } - }, - { - "source": { - "block": "b38fa7c5-3a2e-403b-b3d3-ac32917b5596", - "port": "o" - }, - "target": { - "block": "94e9a915-defe-4437-8abd-d3e57dafbb45", - "port": "in" - } - } - ] - }, - "deps": {}, - "state": { - "pan": { - "x": 0, - "y": 0 - }, - "zoom": 1 - } - } - } - }, - "state": { - "pan": { - "x": -21, - "y": 66 - }, - "zoom": 0.9999999999999893 - } - } -} \ No newline at end of file diff --git a/demo/constant-io-code-block.ice b/demo/constant-io-code-block.ice deleted file mode 100644 index 941351292..000000000 --- a/demo/constant-io-code-block.ice +++ /dev/null @@ -1,154 +0,0 @@ -{ - "version": "1.0", - "package": { - "name": "", - "version": "", - "description": "", - "author": "", - "image": "" - }, - "design": { - "board": "icezum", - "graph": { - "blocks": [ - { - "id": "386bc685-d806-4487-bece-b442b8c8689c", - "type": "basic.constant", - "data": { - "label": "C", - "value": "1'b0" - }, - "position": { - "x": 360, - "y": 8 - } - }, - { - "id": "ec9b901f-4cda-4f53-81ae-bfd74a0f0ae6", - "type": "basic.code", - "data": { - "code": "assign o = v;", - "params": [ - "v" - ], - "ports": { - "in": [ - "i" - ], - "out": [ - "o" - ] - } - }, - "position": { - "x": 216, - "y": 168 - } - }, - { - "id": "a8faca21-4b86-4bb1-8cd1-8c5252d4038f", - "type": "basic.input", - "data": { - "label": "in", - "name": "in", - "range": "", - "pins": [ - { - "index": "0", - "name": "SW1", - "value": "10" - } - ], - "virtual": false - }, - "position": { - "x": 24, - "y": 264 - } - }, - { - "id": "94e9a915-defe-4437-8abd-d3e57dafbb45", - "type": "basic.output", - "data": { - "label": "out", - "name": "out", - "range": "", - "pins": [ - { - "index": "0", - "name": "LED0", - "value": "95" - } - ], - "virtual": false - }, - "position": { - "x": 712, - "y": 264 - } - }, - { - "id": "9051bd8c-0c39-4b19-bb08-71ac0ba8e9bf", - "type": "basic.input", - "data": { - "label": "", - "name": "", - "range": "", - "pins": [ - { - "index": "0", - "name": "", - "value": 0 - } - ], - "virtual": false - }, - "position": { - "x": 24, - "y": 360 - } - } - ], - "wires": [ - { - "source": { - "block": "386bc685-d806-4487-bece-b442b8c8689c", - "port": "constant-out" - }, - "target": { - "block": "ec9b901f-4cda-4f53-81ae-bfd74a0f0ae6", - "port": "v" - } - }, - { - "source": { - "block": "ec9b901f-4cda-4f53-81ae-bfd74a0f0ae6", - "port": "o" - }, - "target": { - "block": "94e9a915-defe-4437-8abd-d3e57dafbb45", - "port": "in" - } - }, - { - "source": { - "block": "a8faca21-4b86-4bb1-8cd1-8c5252d4038f", - "port": "out" - }, - "target": { - "block": "ec9b901f-4cda-4f53-81ae-bfd74a0f0ae6", - "port": "i" - } - } - ] - }, - "deps": {}, - "state": { - "pan": { - "x": 45.83406713517239, - "y": 43.306661649315814 - }, - "zoom": 0.85276198387146 - } - } -} \ No newline at end of file diff --git a/demo/div.ice b/demo/div.ice deleted file mode 100644 index 0a83e14c5..000000000 --- a/demo/div.ice +++ /dev/null @@ -1,133 +0,0 @@ -{ - "version": "1.0", - "package": { - "name": "", - "version": "", - "description": "", - "author": "", - "image": "" - }, - "design": { - "board": "icezum", - "graph": { - "blocks": [ - { - "id": "4aba74c5-d08d-4d91-9401-099c6aeceb64", - "type": "basic.constant", - "data": { - "label": "M", - "value": "12000000" - }, - "position": { - "x": 392, - "y": -104 - } - }, - { - "id": "a2836617-8c44-4f54-9d1f-f2681c18db26", - "type": "basic.code", - "data": { - "code": "// Div 12MHz / M\n\nlocalparam N = $clog2(M);\n\nreg [N-1:0] c = 0;\n\nalways @(posedge clk_in)\n c <= (c == M - 1) ? 0 : c + 1;\n\nassign clk_out = c[N-1];", - "params": [ - "M" - ], - "ports": { - "in": [ - "clk_in" - ], - "out": [ - "clk_out" - ] - } - }, - "position": { - "x": 248, - "y": 56 - } - }, - { - "id": "5e63bca8-458e-4d7a-ae46-dc2e457fdbf7", - "type": "basic.input", - "data": { - "label": "clk", - "name": "clk", - "range": "", - "pins": [ - { - "index": "0", - "name": "CLK", - "value": "21" - } - ], - "virtual": false - }, - "position": { - "x": 64, - "y": 152 - } - }, - { - "id": "400c2d1d-bce3-4d7a-8ab9-078bd072e1b7", - "type": "basic.output", - "data": { - "label": "", - "name": "", - "range": "", - "pins": [ - { - "index": "0", - "name": "LED0", - "value": "95" - } - ], - "virtual": false - }, - "position": { - "x": 752, - "y": 152 - } - } - ], - "wires": [ - { - "source": { - "block": "5e63bca8-458e-4d7a-ae46-dc2e457fdbf7", - "port": "out" - }, - "target": { - "block": "a2836617-8c44-4f54-9d1f-f2681c18db26", - "port": "clk_in" - } - }, - { - "source": { - "block": "a2836617-8c44-4f54-9d1f-f2681c18db26", - "port": "clk_out" - }, - "target": { - "block": "400c2d1d-bce3-4d7a-8ab9-078bd072e1b7", - "port": "in" - } - }, - { - "source": { - "block": "4aba74c5-d08d-4d91-9401-099c6aeceb64", - "port": "constant-out" - }, - "target": { - "block": "a2836617-8c44-4f54-9d1f-f2681c18db26", - "port": "M" - } - } - ] - }, - "deps": {}, - "state": { - "pan": { - "x": 3, - "y": 145 - }, - "zoom": 0.9999999403953552 - } - } -} \ No newline at end of file diff --git a/demo/input-output-bus.ice b/demo/input-output-bus.ice deleted file mode 100644 index b20c6243f..000000000 --- a/demo/input-output-bus.ice +++ /dev/null @@ -1,142 +0,0 @@ -{ - "version": "1.0", - "package": { - "name": "", - "version": "", - "description": "", - "author": "", - "image": "" - }, - "design": { - "board": "icezum", - "graph": { - "blocks": [ - { - "id": "a63cb442-f0cf-4802-8542-0b50bf859a3c", - "type": "basic.input", - "data": { - "label": "buttons[0:1]", - "name": "buttons", - "range": "[0:1]", - "pins": [ - { - "index": "0", - "name": "SW1", - "value": "10" - }, - { - "index": "1", - "name": "SW2", - "value": "11" - } - ], - "virtual": false - }, - "position": { - "x": 128, - "y": 64 - } - }, - { - "id": "39d544a4-e8fd-4c59-909e-61cddd5e7f98", - "type": "basic.output", - "data": { - "label": "leds[1:0]", - "name": "leds", - "range": "[1:0]", - "pins": [ - { - "index": "1", - "name": "LED0", - "value": "95" - }, - { - "index": "0", - "name": "LED1", - "value": "96" - } - ], - "virtual": false - }, - "position": { - "x": 408, - "y": 64 - } - }, - { - "id": "99ebca85-09ff-456a-8caa-cfa78955e25f", - "type": "basic.input", - "data": { - "label": "in", - "name": "in", - "range": "", - "pins": [ - { - "index": "0", - "name": "D10", - "value": "141" - } - ], - "virtual": false - }, - "position": { - "x": 184, - "y": 248 - } - }, - { - "id": "5b81602a-731c-42bd-9f81-3bec86dbe75c", - "type": "basic.output", - "data": { - "label": "out", - "name": "out", - "range": "", - "pins": [ - { - "index": "0", - "name": "LED2", - "value": "97" - } - ], - "virtual": false - }, - "position": { - "x": 384, - "y": 248 - } - } - ], - "wires": [ - { - "source": { - "block": "a63cb442-f0cf-4802-8542-0b50bf859a3c", - "port": "out" - }, - "target": { - "block": "39d544a4-e8fd-4c59-909e-61cddd5e7f98", - "port": "in" - }, - "size": 2 - }, - { - "source": { - "block": "99ebca85-09ff-456a-8caa-cfa78955e25f", - "port": "out" - }, - "target": { - "block": "5b81602a-731c-42bd-9f81-3bec86dbe75c", - "port": "in" - } - } - ] - }, - "deps": {}, - "state": { - "pan": { - "x": 0, - "y": 0 - }, - "zoom": 1 - } - } -} diff --git a/demo/input-output.ice b/demo/input-output.ice deleted file mode 100644 index 275d36de2..000000000 --- a/demo/input-output.ice +++ /dev/null @@ -1,79 +0,0 @@ -{ - "version": "1.0", - "package": { - "name": "", - "version": "", - "description": "", - "author": "", - "image": "" - }, - "design": { - "board": "icezum", - "graph": { - "blocks": [ - { - "id": "f4405019-32a9-4f31-8e42-441c85f1959c", - "type": "basic.input", - "data": { - "label": "in", - "name": "in", - "range": "", - "pins": [ - { - "index": "0", - "name": "SW1", - "value": "10" - } - ], - "virtual": false - }, - "position": { - "x": 104, - "y": 112 - } - }, - { - "id": "ef08c4f3-94b9-4e85-9fe7-78bc2a376c72", - "type": "basic.output", - "data": { - "label": "out", - "name": "out", - "range": "", - "pins": [ - { - "index": "0", - "name": "LED0", - "value": "95" - } - ], - "virtual": false - }, - "position": { - "x": 344, - "y": 112 - } - } - ], - "wires": [ - { - "source": { - "block": "f4405019-32a9-4f31-8e42-441c85f1959c", - "port": "out" - }, - "target": { - "block": "ef08c4f3-94b9-4e85-9fe7-78bc2a376c72", - "port": "in" - } - } - ] - }, - "deps": {}, - "state": { - "pan": { - "x": 0, - "y": 0 - }, - "zoom": 0.9999999403953552 - } - } -} \ No newline at end of file diff --git a/demo/multi-block-block.ice b/demo/multi-block-block.ice deleted file mode 100644 index 390f96c24..000000000 --- a/demo/multi-block-block.ice +++ /dev/null @@ -1,276 +0,0 @@ -{ - "version": "1.0", - "package": { - "name": "", - "version": "", - "description": "", - "author": "", - "image": "" - }, - "design": { - "board": "icezum", - "graph": { - "blocks": [ - { - "id": "215b7e1b-9d43-410b-ab88-1410f6a39cc1", - "type": "logic.gate.not", - "data": {}, - "position": { - "x": 456, - "y": 64 - } - }, - { - "id": "c39221a3-87dd-4524-9f65-879112b27f51", - "type": "basic.output", - "data": { - "label": "out", - "name": "out", - "range": "", - "pins": [ - { - "index": "0", - "name": "LED0", - "value": "95" - } - ], - "virtual": false - }, - "position": { - "x": 632, - "y": 64 - } - }, - { - "id": "4f302bff-d4d1-4d6f-a7ec-b74698a3cd03", - "type": "basic.input", - "data": { - "label": "in", - "name": "in", - "range": "", - "pins": [ - { - "index": "0", - "name": "SW1", - "value": "10" - } - ], - "virtual": false - }, - "position": { - "x": 96, - "y": 128 - } - }, - { - "id": "c31c5c84-2f92-40f8-abe7-8dc9b214fb39", - "type": "logic.gate.not", - "data": {}, - "position": { - "x": 272, - "y": 128 - } - }, - { - "id": "7be8e651-1218-45ac-ac26-ef34a903e50e", - "type": "logic.gate.not", - "data": {}, - "position": { - "x": 456, - "y": 208 - } - }, - { - "id": "7625149d-3511-4d95-8405-a100409a5d42", - "type": "basic.output", - "data": { - "label": "out", - "name": "out", - "range": "", - "pins": [ - { - "index": "0", - "name": "LED1", - "value": "96" - } - ], - "virtual": false - }, - "position": { - "x": 632, - "y": 208 - } - } - ], - "wires": [ - { - "source": { - "block": "4f302bff-d4d1-4d6f-a7ec-b74698a3cd03", - "port": "out" - }, - "target": { - "block": "c31c5c84-2f92-40f8-abe7-8dc9b214fb39", - "port": "18c2ebc7-5152-439c-9b3f-851c59bac834" - } - }, - { - "source": { - "block": "c31c5c84-2f92-40f8-abe7-8dc9b214fb39", - "port": "664caf9e-5f40-4df4-800a-b626af702e62" - }, - "target": { - "block": "215b7e1b-9d43-410b-ab88-1410f6a39cc1", - "port": "18c2ebc7-5152-439c-9b3f-851c59bac834" - } - }, - { - "source": { - "block": "215b7e1b-9d43-410b-ab88-1410f6a39cc1", - "port": "664caf9e-5f40-4df4-800a-b626af702e62" - }, - "target": { - "block": "c39221a3-87dd-4524-9f65-879112b27f51", - "port": "in" - } - }, - { - "source": { - "block": "c31c5c84-2f92-40f8-abe7-8dc9b214fb39", - "port": "664caf9e-5f40-4df4-800a-b626af702e62" - }, - "target": { - "block": "7be8e651-1218-45ac-ac26-ef34a903e50e", - "port": "18c2ebc7-5152-439c-9b3f-851c59bac834" - } - }, - { - "source": { - "block": "7be8e651-1218-45ac-ac26-ef34a903e50e", - "port": "664caf9e-5f40-4df4-800a-b626af702e62" - }, - "target": { - "block": "7625149d-3511-4d95-8405-a100409a5d42", - "port": "in" - } - } - ] - }, - "deps": { - "logic.gate.not": { - "version": "1.0", - "package": { - "name": "NOT", - "version": "1.0.0", - "description": "NOT logic gate", - "author": "Jesús Arroyo", - "image": "%3Csvg%20xmlns=%22http://www.w3.org/2000/svg%22%20width=%2291.33%22%20height=%2245.752%22%20version=%221%22%3E%3Cpath%20d=%22M0%2020.446h27v2H0zM70.322%2020.447h15.3v2h-15.3z%22/%3E%3Cpath%20d=%22M66.05%2026.746c-2.9%200-5.3-2.4-5.3-5.3s2.4-5.3%205.3-5.3%205.3%202.4%205.3%205.3-2.4%205.3-5.3%205.3zm0-8.6c-1.8%200-3.3%201.5-3.3%203.3%200%201.8%201.5%203.3%203.3%203.3%201.8%200%203.3-1.5%203.3-3.3%200-1.8-1.5-3.3-3.3-3.3z%22/%3E%3Cpath%20d=%22M25.962%202.563l33.624%2018.883L25.962%2040.33V2.563z%22%20fill=%22none%22%20stroke=%22#000%22%20stroke-width=%223%22/%3E%3C/svg%3E" - }, - "design": { - "board": "icezum", - "graph": { - "blocks": [ - { - "id": "5365ed8c-e5db-4445-938f-8d689830ea5c", - "type": "basic.code", - "data": { - "code": "// NOT logic gate\n\nassign c = ~ a;", - "ports": { - "in": [ - "a" - ], - "out": [ - "c" - ] - } - }, - "position": { - "x": 256, - "y": 48 - } - }, - { - "id": "18c2ebc7-5152-439c-9b3f-851c59bac834", - "type": "basic.input", - "data": { - "label": "", - "name": "", - "range": "", - "pins": [ - { - "index": "0", - "name": "", - "value": 0 - } - ], - "virtual": false - }, - "position": { - "x": 64, - "y": 144 - } - }, - { - "id": "664caf9e-5f40-4df4-800a-b626af702e62", - "type": "basic.output", - "data": { - "label": "", - "name": "", - "range": "", - "pins": [ - { - "index": "0", - "name": "", - "value": 0 - } - ], - "virtual": false - }, - "position": { - "x": 752, - "y": 144 - } - } - ], - "wires": [ - { - "source": { - "block": "18c2ebc7-5152-439c-9b3f-851c59bac834", - "port": "out" - }, - "target": { - "block": "5365ed8c-e5db-4445-938f-8d689830ea5c", - "port": "a" - } - }, - { - "source": { - "block": "5365ed8c-e5db-4445-938f-8d689830ea5c", - "port": "c" - }, - "target": { - "block": "664caf9e-5f40-4df4-800a-b626af702e62", - "port": "in" - } - } - ] - }, - "deps": {}, - "state": { - "pan": { - "x": 0, - "y": 0 - }, - "zoom": 1 - } - } - } - }, - "state": { - "pan": { - "x": 0, - "y": 0 - }, - "zoom": 0.9999999403953552 - } - } -} \ No newline at end of file diff --git a/demo/multi-block-output.ice b/demo/multi-block-output.ice deleted file mode 100644 index b50f500c9..000000000 --- a/demo/multi-block-output.ice +++ /dev/null @@ -1,238 +0,0 @@ -{ - "version": "1.0", - "package": { - "name": "", - "version": "", - "description": "", - "author": "", - "image": "" - }, - "design": { - "board": "icezum", - "graph": { - "blocks": [ - { - "id": "c39221a3-87dd-4524-9f65-879112b27f51", - "type": "basic.output", - "data": { - "label": "out", - "name": "out", - "range": "", - "pins": [ - { - "index": "0", - "name": "LED0", - "value": "95" - } - ], - "virtual": false - }, - "position": { - "x": 464, - "y": 40 - } - }, - { - "id": "4f302bff-d4d1-4d6f-a7ec-b74698a3cd03", - "type": "basic.input", - "data": { - "label": "in", - "name": "in", - "range": "", - "pins": [ - { - "index": "0", - "name": "SW1", - "value": "10" - } - ], - "virtual": false - }, - "position": { - "x": 96, - "y": 120 - } - }, - { - "id": "b2763905-e8ff-483f-9d94-96c7ed5715f4", - "type": "logic.gate.not", - "data": {}, - "position": { - "x": 272, - "y": 120 - } - }, - { - "id": "7625149d-3511-4d95-8405-a100409a5d42", - "type": "basic.output", - "data": { - "label": "out", - "name": "out", - "range": "", - "pins": [ - { - "index": "0", - "name": "LED1", - "value": "96" - } - ], - "virtual": false - }, - "position": { - "x": 464, - "y": 208 - } - } - ], - "wires": [ - { - "source": { - "block": "4f302bff-d4d1-4d6f-a7ec-b74698a3cd03", - "port": "out" - }, - "target": { - "block": "b2763905-e8ff-483f-9d94-96c7ed5715f4", - "port": "18c2ebc7-5152-439c-9b3f-851c59bac834" - } - }, - { - "source": { - "block": "b2763905-e8ff-483f-9d94-96c7ed5715f4", - "port": "664caf9e-5f40-4df4-800a-b626af702e62" - }, - "target": { - "block": "c39221a3-87dd-4524-9f65-879112b27f51", - "port": "in" - } - }, - { - "source": { - "block": "b2763905-e8ff-483f-9d94-96c7ed5715f4", - "port": "664caf9e-5f40-4df4-800a-b626af702e62" - }, - "target": { - "block": "7625149d-3511-4d95-8405-a100409a5d42", - "port": "in" - } - } - ] - }, - "deps": { - "logic.gate.not": { - "version": "1.0", - "package": { - "name": "NOT", - "version": "1.0.0", - "description": "NOT logic gate", - "author": "Jesús Arroyo", - "image": "%3Csvg%20xmlns=%22http://www.w3.org/2000/svg%22%20width=%2291.33%22%20height=%2245.752%22%20version=%221%22%3E%3Cpath%20d=%22M0%2020.446h27v2H0zM70.322%2020.447h15.3v2h-15.3z%22/%3E%3Cpath%20d=%22M66.05%2026.746c-2.9%200-5.3-2.4-5.3-5.3s2.4-5.3%205.3-5.3%205.3%202.4%205.3%205.3-2.4%205.3-5.3%205.3zm0-8.6c-1.8%200-3.3%201.5-3.3%203.3%200%201.8%201.5%203.3%203.3%203.3%201.8%200%203.3-1.5%203.3-3.3%200-1.8-1.5-3.3-3.3-3.3z%22/%3E%3Cpath%20d=%22M25.962%202.563l33.624%2018.883L25.962%2040.33V2.563z%22%20fill=%22none%22%20stroke=%22#000%22%20stroke-width=%223%22/%3E%3C/svg%3E" - }, - "design": { - "board": "icezum", - "graph": { - "blocks": [ - { - "id": "5365ed8c-e5db-4445-938f-8d689830ea5c", - "type": "basic.code", - "data": { - "code": "// NOT logic gate\n\nassign c = ~ a;", - "ports": { - "in": [ - "a" - ], - "out": [ - "c" - ] - } - }, - "position": { - "x": 256, - "y": 48 - } - }, - { - "id": "18c2ebc7-5152-439c-9b3f-851c59bac834", - "type": "basic.input", - "data": { - "label": "", - "name": "", - "range": "", - "pins": [ - { - "index": "0", - "name": "", - "value": 0 - } - ], - "virtual": false - }, - "position": { - "x": 64, - "y": 144 - } - }, - { - "id": "664caf9e-5f40-4df4-800a-b626af702e62", - "type": "basic.output", - "data": { - "label": "", - "name": "", - "range": "", - "pins": [ - { - "index": "0", - "name": "", - "value": 0 - } - ], - "virtual": false - }, - "position": { - "x": 752, - "y": 144 - } - } - ], - "wires": [ - { - "source": { - "block": "18c2ebc7-5152-439c-9b3f-851c59bac834", - "port": "out" - }, - "target": { - "block": "5365ed8c-e5db-4445-938f-8d689830ea5c", - "port": "a" - } - }, - { - "source": { - "block": "5365ed8c-e5db-4445-938f-8d689830ea5c", - "port": "c" - }, - "target": { - "block": "664caf9e-5f40-4df4-800a-b626af702e62", - "port": "in" - } - } - ] - }, - "deps": {}, - "state": { - "pan": { - "x": 0, - "y": 0 - }, - "zoom": 1 - } - } - } - }, - "state": { - "pan": { - "x": 0, - "y": 0 - }, - "zoom": 0.9999999403953552 - } - } -} \ No newline at end of file diff --git a/demo/multi-constant-generic-block.ice b/demo/multi-constant-generic-block.ice deleted file mode 100644 index c37737af3..000000000 --- a/demo/multi-constant-generic-block.ice +++ /dev/null @@ -1,245 +0,0 @@ -{ - "version": "1.0", - "package": { - "name": "", - "version": "", - "description": "", - "author": "", - "image": "" - }, - "design": { - "board": "icezum", - "graph": { - "blocks": [ - { - "id": "3ea55b72-cda0-4f43-886b-e225b00229a4", - "type": "basic.constant", - "data": { - "label": "Value", - "value": "1'b1" - }, - "position": { - "x": 296, - "y": 32 - } - }, - { - "id": "eb6dddea-3a81-4e26-ab7d-ed107b3676c9", - "type": "constant-code-block", - "data": {}, - "position": { - "x": 248, - "y": 184 - } - }, - { - "id": "06bd1d14-7302-4dd7-9e95-650d1070a203", - "type": "basic.output", - "data": { - "label": "led", - "name": "led", - "range": "", - "pins": [ - { - "index": "0", - "name": "LED0", - "value": "95" - } - ], - "virtual": false - }, - "position": { - "x": 536, - "y": 184 - } - }, - { - "id": "7217b44b-f3e6-4eb6-862b-1d55c0655ee7", - "type": "constant-code-block", - "data": {}, - "position": { - "x": 392, - "y": 328 - } - }, - { - "id": "019e1dba-a150-483a-9c95-c2970ec781a9", - "type": "basic.output", - "data": { - "label": "led", - "name": "led", - "range": "", - "pins": [ - { - "index": "0", - "name": "LED1", - "value": "96" - } - ], - "virtual": false - }, - "position": { - "x": 680, - "y": 328 - } - } - ], - "wires": [ - { - "source": { - "block": "7217b44b-f3e6-4eb6-862b-1d55c0655ee7", - "port": "94e9a915-defe-4437-8abd-d3e57dafbb45" - }, - "target": { - "block": "019e1dba-a150-483a-9c95-c2970ec781a9", - "port": "in" - } - }, - { - "source": { - "block": "3ea55b72-cda0-4f43-886b-e225b00229a4", - "port": "constant-out" - }, - "target": { - "block": "eb6dddea-3a81-4e26-ab7d-ed107b3676c9", - "port": "386bc685-d806-4487-bece-b442b8c8689c" - } - }, - { - "source": { - "block": "eb6dddea-3a81-4e26-ab7d-ed107b3676c9", - "port": "94e9a915-defe-4437-8abd-d3e57dafbb45" - }, - "target": { - "block": "06bd1d14-7302-4dd7-9e95-650d1070a203", - "port": "in" - } - }, - { - "source": { - "block": "3ea55b72-cda0-4f43-886b-e225b00229a4", - "port": "constant-out" - }, - "target": { - "block": "7217b44b-f3e6-4eb6-862b-1d55c0655ee7", - "port": "386bc685-d806-4487-bece-b442b8c8689c" - }, - "vertices": [ - { - "x": 472, - "y": 152 - } - ] - } - ] - }, - "deps": { - "constant-code-block": { - "version": "1.0", - "package": { - "name": "", - "version": "", - "description": "", - "author": "", - "image": "" - }, - "design": { - "graph": { - "blocks": [ - { - "id": "386bc685-d806-4487-bece-b442b8c8689c", - "type": "basic.constant", - "data": { - "label": "C", - "value": "1'b0" - }, - "position": { - "x": 280, - "y": 48 - } - }, - { - "id": "94e9a915-defe-4437-8abd-d3e57dafbb45", - "type": "basic.output", - "data": { - "label": "led", - "name": "led", - "range": "", - "pins": [ - { - "index": "0", - "name": "", - "value": 0 - } - ], - "virtual": false - }, - "position": { - "x": 624, - "y": 288 - } - }, - { - "id": "b38fa7c5-3a2e-403b-b3d3-ac32917b5596", - "type": "basic.code", - "data": { - "code": "assign o = v;", - "params": [ - "v" - ], - "ports": { - "in": [], - "out": [ - "o" - ] - } - }, - "position": { - "x": 136, - "y": 192 - } - } - ], - "wires": [ - { - "source": { - "block": "386bc685-d806-4487-bece-b442b8c8689c", - "port": "constant-out" - }, - "target": { - "block": "b38fa7c5-3a2e-403b-b3d3-ac32917b5596", - "port": "v" - } - }, - { - "source": { - "block": "b38fa7c5-3a2e-403b-b3d3-ac32917b5596", - "port": "o" - }, - "target": { - "block": "94e9a915-defe-4437-8abd-d3e57dafbb45", - "port": "in" - } - } - ] - }, - "deps": {}, - "state": { - "pan": { - "x": 0, - "y": 0 - }, - "zoom": 1 - } - } - } - }, - "state": { - "pan": { - "x": -139, - "y": 20 - }, - "zoom": 0.9999999403953552 - } - } -} \ No newline at end of file diff --git a/demo/multi-input-output.ice b/demo/multi-input-output.ice deleted file mode 100644 index 9bb7b741e..000000000 --- a/demo/multi-input-output.ice +++ /dev/null @@ -1,110 +0,0 @@ -{ - "version": "1.0", - "package": { - "name": "", - "version": "", - "description": "", - "author": "", - "image": "" - }, - "design": { - "board": "icezum", - "graph": { - "blocks": [ - { - "id": "4f302bff-d4d1-4d6f-a7ec-b74698a3cd03", - "type": "basic.input", - "data": { - "label": "in", - "name": "in", - "range": "", - "pins": [ - { - "index": "0", - "name": "SW1", - "value": "10" - } - ], - "virtual": false - }, - "position": { - "x": 168, - "y": 120 - } - }, - { - "id": "c39221a3-87dd-4524-9f65-879112b27f51", - "type": "basic.output", - "data": { - "label": "out", - "name": "out", - "range": "", - "pins": [ - { - "index": "0", - "name": "LED0", - "value": "95" - } - ], - "virtual": false - }, - "position": { - "x": 480, - "y": 120 - } - }, - { - "id": "7625149d-3511-4d95-8405-a100409a5d42", - "type": "basic.output", - "data": { - "label": "out", - "name": "out", - "range": "", - "pins": [ - { - "index": "0", - "name": "LED1", - "value": "96" - } - ], - "virtual": false - }, - "position": { - "x": 400, - "y": 232 - } - } - ], - "wires": [ - { - "source": { - "block": "4f302bff-d4d1-4d6f-a7ec-b74698a3cd03", - "port": "out" - }, - "target": { - "block": "7625149d-3511-4d95-8405-a100409a5d42", - "port": "in" - } - }, - { - "source": { - "block": "4f302bff-d4d1-4d6f-a7ec-b74698a3cd03", - "port": "out" - }, - "target": { - "block": "c39221a3-87dd-4524-9f65-879112b27f51", - "port": "in" - } - } - ] - }, - "deps": {}, - "state": { - "pan": { - "x": 0, - "y": 0 - }, - "zoom": 0.9999999403953552 - } - } -} \ No newline at end of file From 5b80992d676bfe75062910315b1ea98d12d61db0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jes=C3=BAs=20Arroyo=20Torrens?= Date: Thu, 22 Dec 2016 19:24:27 +0100 Subject: [PATCH 080/169] Update all blocks to final format 1.0 --- app/resources/blocks/bit/0.ice | 22 +- app/resources/blocks/bit/1.ice | 20 +- app/resources/blocks/config/pull_up.ice | 35 ++- app/resources/blocks/config/pull_up_inv.ice | 35 ++- app/resources/blocks/config/tri_state.ice | 63 +++- .../blocks/logic/combinational/demux_1_2.ice | 89 ++++-- .../blocks/logic/combinational/demux_1_4.ice | 144 ++++++--- .../blocks/logic/combinational/demux_1_8.ice | 279 +++++++++++++----- .../logic/combinational/hex_7seg_ca.ice | 212 +++++++++++-- .../logic/combinational/hex_7seg_cc.ice | 202 +++++++++++-- .../blocks/logic/combinational/mux_2_1.ice | 63 +++- .../blocks/logic/combinational/mux_4_1.ice | 110 ++++++- app/resources/blocks/logic/gate/and.ice | 48 ++- app/resources/blocks/logic/gate/nand.ice | 48 ++- app/resources/blocks/logic/gate/nor.ice | 46 ++- app/resources/blocks/logic/gate/not.ice | 33 ++- app/resources/blocks/logic/gate/or.ice | 48 ++- app/resources/blocks/logic/gate/xnor.ice | 46 ++- app/resources/blocks/logic/gate/xor.ice | 48 ++- .../blocks/logic/sequential/debouncer.ice | 66 ++++- .../blocks/logic/sequential/dff_ar.ice | 93 +++++- .../blocks/logic/sequential/dff_sr.ice | 91 +++++- .../blocks/logic/sequential/tff_ar.ice | 93 +++++- .../blocks/logic/sequential/tff_sr.ice | 93 +++++- app/scripts/services/project.service.js | 20 +- 25 files changed, 1673 insertions(+), 374 deletions(-) diff --git a/app/resources/blocks/bit/0.ice b/app/resources/blocks/bit/0.ice index ae9f54780..3c7f9feba 100644 --- a/app/resources/blocks/bit/0.ice +++ b/app/resources/blocks/bit/0.ice @@ -12,21 +12,20 @@ "graph": { "blocks": [ { - "id": "1a748af9-e00b-40ae-a3d9-030da7397247", + "id": "b959fb96-ac67-4aea-90b3-ed35a4c17bf5", "type": "basic.code", "data": { "code": "// Bit 0\n\nassign v = 1'b0;", + "params": [], "ports": { "in": [], "out": [ { - "label": "v", "name": "v", "size": 1 } ] - }, - "params": [] + } }, "position": { "x": 96, @@ -34,16 +33,15 @@ } }, { - "id": "355855e8-69a6-472a-9212-dd5c3bece567", + "id": "19c8f68d-5022-487f-9ab0-f0a3cd58bead", "type": "basic.output", "data": { - "label": "", - "range": "", + "name": "", "pins": [ { "index": "0", "name": "", - "value": 0 + "value": "0" } ], "virtual": true @@ -57,11 +55,11 @@ "wires": [ { "source": { - "block": "1a748af9-e00b-40ae-a3d9-030da7397247", + "block": "b959fb96-ac67-4aea-90b3-ed35a4c17bf5", "port": "v" }, "target": { - "block": "355855e8-69a6-472a-9212-dd5c3bece567", + "block": "19c8f68d-5022-487f-9ab0-f0a3cd58bead", "port": "in" } } @@ -73,7 +71,7 @@ "x": 0, "y": 0 }, - "zoom": 1.0000000353093697 + "zoom": 1 } } -} \ No newline at end of file +} diff --git a/app/resources/blocks/bit/1.ice b/app/resources/blocks/bit/1.ice index 4ae355e75..87964be30 100644 --- a/app/resources/blocks/bit/1.ice +++ b/app/resources/blocks/bit/1.ice @@ -12,21 +12,20 @@ "graph": { "blocks": [ { - "id": "12170bab-1206-41e6-9b74-da1c86af6019", + "id": "b959fb96-ac67-4aea-90b3-ed35a4c17bf5", "type": "basic.code", "data": { "code": "// Bit 1\n\nassign v = 1'b1;", + "params": [], "ports": { "in": [], "out": [ { - "label": "v", "name": "v", "size": 1 } ] - }, - "params": [] + } }, "position": { "x": 96, @@ -34,16 +33,15 @@ } }, { - "id": "34f97cd9-8ec6-4ae3-a19e-606a977e1517", + "id": "19c8f68d-5022-487f-9ab0-f0a3cd58bead", "type": "basic.output", "data": { - "label": "", - "range": "", + "name": "", "pins": [ { "index": "0", "name": "", - "value": 0 + "value": "0" } ], "virtual": true @@ -57,11 +55,11 @@ "wires": [ { "source": { - "block": "12170bab-1206-41e6-9b74-da1c86af6019", + "block": "b959fb96-ac67-4aea-90b3-ed35a4c17bf5", "port": "v" }, "target": { - "block": "34f97cd9-8ec6-4ae3-a19e-606a977e1517", + "block": "19c8f68d-5022-487f-9ab0-f0a3cd58bead", "port": "in" } } @@ -76,4 +74,4 @@ "zoom": 1 } } -} \ No newline at end of file +} diff --git a/app/resources/blocks/config/pull_up.ice b/app/resources/blocks/config/pull_up.ice index d36960ce3..d0a3a3e8c 100644 --- a/app/resources/blocks/config/pull_up.ice +++ b/app/resources/blocks/config/pull_up.ice @@ -16,12 +16,19 @@ "type": "basic.code", "data": { "code": "// Pull up\n\nwire din, dout, outen;\n\nassign o = din;\n\nSB_IO #(\n .PIN_TYPE(6'b 1010_01),\n .PULLUP(1'b 1)\n) io_pin (\n .PACKAGE_PIN(i),\n .OUTPUT_ENABLE(outen),\n .D_OUT_0(dout),\n .D_IN_0(din)\n);", + "params": [], "ports": { "in": [ - "i" + { + "name": "i", + "size": 1 + } ], "out": [ - "o" + { + "name": "o", + "size": 1 + } ] } }, @@ -34,7 +41,15 @@ "id": "bb4a1ca9-1b30-471e-92ca-ca7ff2fc1150", "type": "basic.input", "data": { - "label": "" + "name": "", + "pins": [ + { + "index": "0", + "name": "", + "value": "0" + } + ], + "virtual": true }, "position": { "x": 64, @@ -45,7 +60,15 @@ "id": "a139fa0d-9b45-4480-a251-f4a66b49aa23", "type": "basic.output", "data": { - "label": "" + "name": "", + "pins": [ + { + "index": "0", + "name": "", + "value": "0" + } + ], + "virtual": true }, "position": { "x": 760, @@ -79,8 +102,8 @@ "deps": {}, "state": { "pan": { - "x": -23, - "y": 8 + "x": 0, + "y": 0 }, "zoom": 1 } diff --git a/app/resources/blocks/config/pull_up_inv.ice b/app/resources/blocks/config/pull_up_inv.ice index 6d8b8a698..129e0c67c 100644 --- a/app/resources/blocks/config/pull_up_inv.ice +++ b/app/resources/blocks/config/pull_up_inv.ice @@ -16,12 +16,19 @@ "type": "basic.code", "data": { "code": "// Pull up inv\n\nwire din, dout, outen;\n\nassign o = ~din;\n\nSB_IO #(\n .PIN_TYPE(6'b 1010_01),\n .PULLUP(1'b 1)\n) io_pin (\n .PACKAGE_PIN(i),\n .OUTPUT_ENABLE(outen),\n .D_OUT_0(dout),\n .D_IN_0(din)\n);", + "params": [], "ports": { "in": [ - "i" + { + "name": "i", + "size": 1 + } ], "out": [ - "o" + { + "name": "o", + "size": 1 + } ] } }, @@ -34,7 +41,15 @@ "id": "bb4a1ca9-1b30-471e-92ca-ca7ff2fc1150", "type": "basic.input", "data": { - "label": "" + "name": "", + "pins": [ + { + "index": "0", + "name": "", + "value": "0" + } + ], + "virtual": true }, "position": { "x": 64, @@ -45,7 +60,15 @@ "id": "a139fa0d-9b45-4480-a251-f4a66b49aa23", "type": "basic.output", "data": { - "label": "" + "name": "", + "pins": [ + { + "index": "0", + "name": "", + "value": "0" + } + ], + "virtual": true }, "position": { "x": 760, @@ -79,8 +102,8 @@ "deps": {}, "state": { "pan": { - "x": -23, - "y": 8 + "x": 0, + "y": 0 }, "zoom": 1 } diff --git a/app/resources/blocks/config/tri_state.ice b/app/resources/blocks/config/tri_state.ice index 6a673429d..7168cffa6 100644 --- a/app/resources/blocks/config/tri_state.ice +++ b/app/resources/blocks/config/tri_state.ice @@ -16,14 +16,27 @@ "type": "basic.code", "data": { "code": " SB_IO #(\n .PIN_TYPE(6'b1010_01),\n .PULLUP(1'b0)\n ) triState (\n .PACKAGE_PIN(pin),\n .OUTPUT_ENABLE(oe),\n .D_OUT_0(din),\n .D_IN_0(dout)\n );", + "params": [], "ports": { "in": [ - "pin", - "oe", - "din" + { + "name": "pin", + "size": 1 + }, + { + "name": "oe", + "size": 1 + }, + { + "name": "din", + "size": 1 + } ], "out": [ - "dout" + { + "name": "dout", + "size": 1 + } ] } }, @@ -36,7 +49,15 @@ "id": "076fd025-aa42-4f23-ae97-b65aec2298ce", "type": "basic.input", "data": { - "label": "pin" + "name": "pin", + "pins": [ + { + "index": "0", + "name": "", + "value": "0" + } + ], + "virtual": true }, "position": { "x": 32, @@ -47,7 +68,15 @@ "id": "f96a1baf-fc8b-4c25-b132-12552605743f", "type": "basic.input", "data": { - "label": "oe" + "name": "oe", + "pins": [ + { + "index": "0", + "name": "", + "value": "0" + } + ], + "virtual": true }, "position": { "x": 32, @@ -58,7 +87,15 @@ "id": "0b2a85b3-b6ac-4e8a-8b16-dd5a195fb058", "type": "basic.output", "data": { - "label": "dout" + "name": "dout", + "pins": [ + { + "index": "0", + "name": "", + "value": "0" + } + ], + "virtual": true }, "position": { "x": 760, @@ -69,7 +106,15 @@ "id": "04fdb7a7-2740-4ff1-ad26-56407ef5b958", "type": "basic.input", "data": { - "label": "din" + "name": "din", + "pins": [ + { + "index": "0", + "name": "", + "value": "0" + } + ], + "virtual": true }, "position": { "x": 32, @@ -129,4 +174,4 @@ "zoom": 1 } } -} \ No newline at end of file +} diff --git a/app/resources/blocks/logic/combinational/demux_1_2.ice b/app/resources/blocks/logic/combinational/demux_1_2.ice index 3e844f7e2..6e35eb0a4 100644 --- a/app/resources/blocks/logic/combinational/demux_1_2.ice +++ b/app/resources/blocks/logic/combinational/demux_1_2.ice @@ -16,64 +16,109 @@ "type": "basic.code", "data": { "code": "assign {out1,out0} = in0 << sel0;", + "params": [], "ports": { "in": [ - "in0", - "sel0" + { + "name": "in0", + "size": 1 + }, + { + "name": "sel0", + "size": 1 + } ], "out": [ - "out0", - "out1" + { + "name": "out0", + "size": 1 + }, + { + "name": "out1", + "size": 1 + } ] } }, "position": { - "x": 208, - "y": 64 + "x": 248, + "y": 88 } }, { "id": "5fc9a8e9-d463-4c1f-b6a3-185d5cabb406", "type": "basic.input", "data": { - "label": "i" + "name": "i", + "pins": [ + { + "index": "0", + "name": "", + "value": "0" + } + ], + "virtual": true }, "position": { - "x": 0, - "y": 96 + "x": 40, + "y": 120 } }, { "id": "91e2ff2d-2430-41e5-9d21-bc9ec4082aaa", "type": "basic.output", "data": { - "label": "o0" + "name": "o0", + "pins": [ + { + "index": "0", + "name": "", + "value": "0" + } + ], + "virtual": true }, "position": { - "x": 720, - "y": 96 + "x": 760, + "y": 120 } }, { "id": "75cafe5a-1968-49ed-9e05-70d1bc3fbd0f", "type": "basic.input", "data": { - "label": "sel" + "name": "sel", + "pins": [ + { + "index": "0", + "name": "", + "value": "0" + } + ], + "virtual": true }, "position": { - "x": 0, - "y": 224 + "x": 40, + "y": 248 } }, { "id": "c6dc7002-dfc0-45fd-88e2-b5e5a75231f2", "type": "basic.output", "data": { - "label": "o1" + "name": "o1", + "pins": [ + { + "index": "0", + "name": "", + "value": "0" + } + ], + "virtual": true }, "position": { - "x": 720, - "y": 224 + "x": 760, + "y": 248 } } ], @@ -123,10 +168,10 @@ "deps": {}, "state": { "pan": { - "x": 104.8444188797269, - "y": 152.1580250587398 + "x": 0, + "y": 0 }, - "zoom": 0.8586960682653878 + "zoom": 1 } } -} \ No newline at end of file +} diff --git a/app/resources/blocks/logic/combinational/demux_1_4.ice b/app/resources/blocks/logic/combinational/demux_1_4.ice index 8a4a6fa81..216ad1229 100644 --- a/app/resources/blocks/logic/combinational/demux_1_4.ice +++ b/app/resources/blocks/logic/combinational/demux_1_4.ice @@ -15,11 +15,19 @@ "id": "91e2ff2d-2430-41e5-9d21-bc9ec4082aaa", "type": "basic.output", "data": { - "label": "o0" + "name": "o0", + "pins": [ + { + "index": "0", + "name": "", + "value": "0" + } + ], + "virtual": true }, "position": { - "x": 760, - "y": 40 + "x": 800, + "y": 64 } }, { @@ -27,89 +35,159 @@ "type": "basic.code", "data": { "code": "assign {out3,out2,out1,out0} = in0 << {sel1,sel0};", + "params": [], "ports": { "in": [ - "in0", - "sel0", - "sel1" + { + "name": "in0", + "size": 1 + }, + { + "name": "sel0", + "size": 1 + }, + { + "name": "sel1", + "size": 1 + } ], "out": [ - "out0", - "out1", - "out2", - "out3" + { + "name": "out0", + "size": 1 + }, + { + "name": "out1", + "size": 1 + }, + { + "name": "out2", + "size": 1 + }, + { + "name": "out3", + "size": 1 + } ] } }, "position": { - "x": 208, - "y": 64 + "x": 248, + "y": 88 } }, { "id": "5fc9a8e9-d463-4c1f-b6a3-185d5cabb406", "type": "basic.input", "data": { - "label": "i" + "name": "i", + "pins": [ + { + "index": "0", + "name": "", + "value": "0" + } + ], + "virtual": true }, "position": { - "x": 16, - "y": 72 + "x": 56, + "y": 96 } }, { "id": "c6dc7002-dfc0-45fd-88e2-b5e5a75231f2", "type": "basic.output", "data": { - "label": "o1" + "name": "o1", + "pins": [ + { + "index": "0", + "name": "", + "value": "0" + } + ], + "virtual": true }, "position": { - "x": 760, - "y": 120 + "x": 800, + "y": 144 } }, { "id": "75cafe5a-1968-49ed-9e05-70d1bc3fbd0f", "type": "basic.input", "data": { - "label": "sel0" + "name": "sel0", + "pins": [ + { + "index": "0", + "name": "", + "value": "0" + } + ], + "virtual": true }, "position": { - "x": 16, - "y": 160 + "x": 56, + "y": 184 } }, { "id": "5e246f93-51ad-4d6f-83f1-4fcce69c5ae3", "type": "basic.output", "data": { - "label": "o2" + "name": "o2", + "pins": [ + { + "index": "0", + "name": "", + "value": "0" + } + ], + "virtual": true }, "position": { - "x": 760, - "y": 200 + "x": 800, + "y": 224 } }, { "id": "657dab9e-6580-4f02-b54f-66477863f26a", "type": "basic.input", "data": { - "label": "sel1" + "name": "sel1", + "pins": [ + { + "index": "0", + "name": "", + "value": "0" + } + ], + "virtual": true }, "position": { - "x": 16, - "y": 248 + "x": 56, + "y": 272 } }, { "id": "b9d764ea-538a-420f-a8d3-45af7a8e30a2", "type": "basic.output", "data": { - "label": "o3" + "name": "o3", + "pins": [ + { + "index": "0", + "name": "", + "value": "0" + } + ], + "virtual": true }, "position": { - "x": 760, - "y": 280 + "x": 800, + "y": 304 } } ], @@ -189,10 +267,10 @@ "deps": {}, "state": { "pan": { - "x": 75.84442855228853, - "y": 63.15803102316195 + "x": 11.176135344899718, + "y": 3.2150526334643024 }, - "zoom": 0.8586960434913635 + "zoom": 0.9234510996506167 } } } diff --git a/app/resources/blocks/logic/combinational/demux_1_8.ice b/app/resources/blocks/logic/combinational/demux_1_8.ice index 0784a2757..823421011 100644 --- a/app/resources/blocks/logic/combinational/demux_1_8.ice +++ b/app/resources/blocks/logic/combinational/demux_1_8.ice @@ -15,44 +15,76 @@ "id": "91e2ff2d-2430-41e5-9d21-bc9ec4082aaa", "type": "basic.output", "data": { - "label": "o0" + "name": "o0", + "pins": [ + { + "index": "0", + "name": "", + "value": "0" + } + ], + "virtual": true }, "position": { - "x": 784, - "y": -128 + "x": 760, + "y": -120 } }, { "id": "c6dc7002-dfc0-45fd-88e2-b5e5a75231f2", "type": "basic.output", "data": { - "label": "o1" + "name": "o1", + "pins": [ + { + "index": "0", + "name": "", + "value": "0" + } + ], + "virtual": true }, "position": { - "x": 784, - "y": -48 + "x": 760, + "y": -40 } }, { "id": "5e246f93-51ad-4d6f-83f1-4fcce69c5ae3", "type": "basic.output", "data": { - "label": "o2" + "name": "o2", + "pins": [ + { + "index": "0", + "name": "", + "value": "0" + } + ], + "virtual": true }, "position": { - "x": 784, - "y": 32 + "x": 760, + "y": 40 } }, { "id": "5fc9a8e9-d463-4c1f-b6a3-185d5cabb406", "type": "basic.input", "data": { - "label": "i" + "name": "i", + "pins": [ + { + "index": "0", + "name": "", + "value": "0" + } + ], + "virtual": true }, "position": { - "x": 16, - "y": 40 + "x": -8, + "y": 48 } }, { @@ -60,116 +92,217 @@ "type": "basic.code", "data": { "code": "assign {out7,out6,out5,out4,out3,out2,out1,out0} = in0 << {sel2,sel1,sel0};", + "params": [], "ports": { "in": [ - "in0", - "sel0", - "sel1", - "sel2" + { + "name": "in0", + "size": 1 + }, + { + "name": "sel0", + "size": 1 + }, + { + "name": "sel1", + "size": 1 + }, + { + "name": "sel2", + "size": 1 + } ], "out": [ - "out0", - "out1", - "out2", - "out3", - "out4", - "out5", - "out6", - "out7" + { + "name": "out0", + "size": 1 + }, + { + "name": "out1", + "size": 1 + }, + { + "name": "out2", + "size": 1 + }, + { + "name": "out3", + "size": 1 + }, + { + "name": "out4", + "size": 1 + }, + { + "name": "out5", + "size": 1 + }, + { + "name": "out6", + "size": 1 + }, + { + "name": "out7", + "size": 1 + } ] } }, "position": { - "x": 208, - "y": 64 + "x": 184, + "y": 72 } }, { "id": "b9d764ea-538a-420f-a8d3-45af7a8e30a2", "type": "basic.output", "data": { - "label": "o3" + "name": "o3", + "pins": [ + { + "index": "0", + "name": "", + "value": "0" + } + ], + "virtual": true }, "position": { - "x": 784, - "y": 112 + "x": 760, + "y": 120 } }, { "id": "75cafe5a-1968-49ed-9e05-70d1bc3fbd0f", "type": "basic.input", "data": { - "label": "sel0" + "name": "sel0", + "pins": [ + { + "index": "0", + "name": "", + "value": "0" + } + ], + "virtual": true }, "position": { - "x": 16, - "y": 120 + "x": -8, + "y": 128 } }, { "id": "657dab9e-6580-4f02-b54f-66477863f26a", "type": "basic.input", "data": { - "label": "sel1" + "name": "sel1", + "pins": [ + { + "index": "0", + "name": "", + "value": "0" + } + ], + "virtual": true }, "position": { - "x": 16, - "y": 200 + "x": -8, + "y": 208 } }, { "id": "1b8510ac-d723-4226-bf28-c7329d0f73fb", "type": "basic.output", "data": { - "label": "o4" + "name": "o4", + "pins": [ + { + "index": "0", + "name": "", + "value": "0" + } + ], + "virtual": true }, "position": { - "x": 784, - "y": 208 + "x": 760, + "y": 216 } }, { "id": "e1a156c8-5813-46f6-a4d4-c672857f3396", "type": "basic.input", "data": { - "label": "sel2" + "name": "sel2", + "pins": [ + { + "index": "0", + "name": "", + "value": "0" + } + ], + "virtual": true }, "position": { - "x": 16, - "y": 280 + "x": -8, + "y": 288 } }, { "id": "65f31fca-d607-4d5c-82cc-878a93b8e580", "type": "basic.output", "data": { - "label": "o5" + "name": "o5", + "pins": [ + { + "index": "0", + "name": "", + "value": "0" + } + ], + "virtual": true }, "position": { - "x": 784, - "y": 304 + "x": 760, + "y": 312 } }, { "id": "c8fadd68-77e1-47be-a262-b076e878e6fd", "type": "basic.output", "data": { - "label": "o6" + "name": "o6", + "pins": [ + { + "index": "0", + "name": "", + "value": "0" + } + ], + "virtual": true }, "position": { - "x": 784, - "y": 384 + "x": 760, + "y": 392 } }, { "id": "99ca2a23-7e0d-4c34-9ab1-988c6bf69633", "type": "basic.output", "data": { - "label": "o7" + "name": "o7", + "pins": [ + { + "index": "0", + "name": "", + "value": "0" + } + ], + "virtual": true }, "position": { - "x": 784, - "y": 464 + "x": 760, + "y": 472 } } ], @@ -225,8 +358,8 @@ }, "vertices": [ { - "x": 664, - "y": -24 + "x": 640, + "y": -16 } ] }, @@ -241,8 +374,8 @@ }, "vertices": [ { - "x": 664, - "y": 416 + "x": 640, + "y": 424 } ] }, @@ -257,8 +390,8 @@ }, "vertices": [ { - "x": 680, - "y": 32 + "x": 656, + "y": 40 } ] }, @@ -273,8 +406,8 @@ }, "vertices": [ { - "x": 696, - "y": 112 + "x": 672, + "y": 120 } ] }, @@ -289,8 +422,8 @@ }, "vertices": [ { - "x": 712, - "y": 176 + "x": 688, + "y": 184 } ] }, @@ -315,8 +448,8 @@ }, "vertices": [ { - "x": 696, - "y": 288 + "x": 672, + "y": 296 } ] }, @@ -331,20 +464,20 @@ }, "vertices": [ { - "x": 680, - "y": 320 + "x": 656, + "y": 328 }, { - "x": 680, - "y": 360 + "x": 656, + "y": 368 }, { - "x": 680, - "y": 376 + "x": 656, + "y": 384 }, { - "x": 688, - "y": 416 + "x": 664, + "y": 424 } ] } @@ -353,10 +486,10 @@ "deps": {}, "state": { "pan": { - "x": 75.69774669071234, - "y": 148.91048230054443 + "x": 143.76402059142058, + "y": 110.755583226028 }, - "zoom": 0.6331667332315369 + "zoom": 0.7272029968400818 } } } diff --git a/app/resources/blocks/logic/combinational/hex_7seg_ca.ice b/app/resources/blocks/logic/combinational/hex_7seg_ca.ice index 6dc70db99..4435b169b 100644 --- a/app/resources/blocks/logic/combinational/hex_7seg_ca.ice +++ b/app/resources/blocks/logic/combinational/hex_7seg_ca.ice @@ -15,7 +15,15 @@ "id": "8b73e273-3603-443a-b952-0ab9ad826a96", "type": "basic.output", "data": { - "label": "a" + "name": "a", + "pins": [ + { + "index": "0", + "name": "", + "value": "0" + } + ], + "virtual": true }, "position": { "x": 1016, @@ -26,7 +34,15 @@ "id": "f2fce5fa-be07-46fe-bee1-bb2a497fe747", "type": "basic.output", "data": { - "label": "b" + "name": "b", + "pins": [ + { + "index": "0", + "name": "", + "value": "0" + } + ], + "virtual": true }, "position": { "x": 1016, @@ -37,7 +53,15 @@ "id": "16e44a6a-853a-4264-9e9d-2269827ed136", "type": "basic.input", "data": { - "label": "h0" + "name": "h0", + "pins": [ + { + "index": "0", + "name": "", + "value": "0" + } + ], + "virtual": true }, "position": { "x": 312, @@ -49,21 +73,55 @@ "type": "basic.code", "data": { "code": "// Ánodo común\n// gfe_dcba\nlocalparam BCD_0 = 7'b011_1111,\n BCD_1 = 7'b000_0110,\n BCD_2 = 7'b101_1011,\n BCD_3 = 7'b100_1111,\n BCD_4 = 7'b110_0110,\n BCD_5 = 7'b110_1101,\n BCD_6 = 7'b111_1101,\n BCD_7 = 7'b000_0111,\n BCD_8 = 7'b111_1111,\n BCD_9 = 7'b110_1111,\n BCD_A = 7'b111_0111,\n BCD_B = 7'b111_1100,\n BCD_C = 7'b011_1001,\n BCD_D = 7'b101_1110,\n BCD_E = 7'b111_1001,\n BCD_F = 7'b111_0001;\n\nreg [6:0] _o;\n\nalways @(*)\nbegin\n\n case({h3, h2, h1, h0})\n 4'h0: _o <= BCD_0;\n 4'h1: _o <= BCD_1;\n 4'h2: _o <= BCD_2;\n 4'h3: _o <= BCD_3;\n 4'h4: _o <= BCD_4;\n 4'h5: _o <= BCD_5;\n 4'h6: _o <= BCD_6;\n 4'h7: _o <= BCD_7;\n 4'h8: _o <= BCD_8;\n 4'h9: _o <= BCD_9;\n 4'hA: _o <= BCD_A;\n 4'hB: _o <= BCD_B;\n 4'hC: _o <= BCD_C;\n 4'hD: _o <= BCD_D;\n 4'hE: _o <= BCD_E;\n 4'hF: _o <= BCD_F;\n default: _o <= 0;\n endcase\nend\n\nassign {g, f, e, d, c, b, a} = ~_o;", + "params": [], "ports": { "in": [ - "h0", - "h1", - "h2", - "h3" + { + "name": "h0", + "size": 1 + }, + { + "name": "h1", + "size": 1 + }, + { + "name": "h2", + "size": 1 + }, + { + "name": "h3", + "size": 1 + } ], "out": [ - "a", - "b", - "c", - "d", - "e", - "f", - "g" + { + "name": "a", + "size": 1 + }, + { + "name": "b", + "size": 1 + }, + { + "name": "c", + "size": 1 + }, + { + "name": "d", + "size": 1 + }, + { + "name": "e", + "size": 1 + }, + { + "name": "f", + "size": 1 + }, + { + "name": "g", + "size": 1 + } ] } }, @@ -76,7 +134,15 @@ "id": "bf0ea22e-3ac2-4756-87d5-020a6ea6a1a8", "type": "basic.output", "data": { - "label": "c" + "name": "c", + "pins": [ + { + "index": "0", + "name": "", + "value": "0" + } + ], + "virtual": true }, "position": { "x": 1016, @@ -87,7 +153,15 @@ "id": "9cdbdf9f-f086-4427-9719-e13470658d97", "type": "basic.input", "data": { - "label": "h1" + "name": "h1", + "pins": [ + { + "index": "0", + "name": "", + "value": "0" + } + ], + "virtual": true }, "position": { "x": 312, @@ -98,7 +172,15 @@ "id": "4687e984-3f19-44d7-baee-ca89513f8f1a", "type": "basic.output", "data": { - "label": "d" + "name": "d", + "pins": [ + { + "index": "0", + "name": "", + "value": "0" + } + ], + "virtual": true }, "position": { "x": 1016, @@ -109,7 +191,15 @@ "id": "f40ab7a8-10e5-4e7f-94f9-cefd697d5d40", "type": "basic.input", "data": { - "label": "h2" + "name": "h2", + "pins": [ + { + "index": "0", + "name": "", + "value": "0" + } + ], + "virtual": true }, "position": { "x": 312, @@ -120,7 +210,15 @@ "id": "1691b072-9102-4986-a900-fefd1a5a7b9e", "type": "basic.output", "data": { - "label": "e" + "name": "e", + "pins": [ + { + "index": "0", + "name": "", + "value": "0" + } + ], + "virtual": true }, "position": { "x": 1016, @@ -131,7 +229,15 @@ "id": "2d774807-3ec8-492c-98e2-f1c9da8d68ff", "type": "basic.input", "data": { - "label": "h3" + "name": "h3", + "pins": [ + { + "index": "0", + "name": "", + "value": "0" + } + ], + "virtual": true }, "position": { "x": 312, @@ -142,7 +248,15 @@ "id": "7c14afe7-1ac0-4394-b38e-fa8a00ffa21c", "type": "basic.output", "data": { - "label": "f" + "name": "f", + "pins": [ + { + "index": "0", + "name": "", + "value": "0" + } + ], + "virtual": true }, "position": { "x": 1016, @@ -153,7 +267,15 @@ "id": "2565c42b-00b0-4b1d-92a4-66c715834b33", "type": "basic.output", "data": { - "label": "g" + "name": "g", + "pins": [ + { + "index": "0", + "name": "", + "value": "0" + } + ], + "virtual": true }, "position": { "x": 1016, @@ -230,7 +352,13 @@ "target": { "block": "f2fce5fa-be07-46fe-bee1-bb2a497fe747", "port": "in" - } + }, + "vertices": [ + { + "x": 952, + "y": 504 + } + ] }, { "source": { @@ -240,7 +368,13 @@ "target": { "block": "8b73e273-3603-443a-b952-0ab9ad826a96", "port": "in" - } + }, + "vertices": [ + { + "x": 928, + "y": 440 + } + ] }, { "source": { @@ -250,7 +384,13 @@ "target": { "block": "1691b072-9102-4986-a900-fefd1a5a7b9e", "port": "in" - } + }, + "vertices": [ + { + "x": 976, + "y": 704 + } + ] }, { "source": { @@ -260,7 +400,13 @@ "target": { "block": "7c14afe7-1ac0-4394-b38e-fa8a00ffa21c", "port": "in" - } + }, + "vertices": [ + { + "x": 952, + "y": 752 + } + ] }, { "source": { @@ -270,17 +416,23 @@ "target": { "block": "2565c42b-00b0-4b1d-92a4-66c715834b33", "port": "in" - } + }, + "vertices": [ + { + "x": 928, + "y": 824 + } + ] } ] }, "deps": {}, "state": { "pan": { - "x": -155.98941303266986, - "y": -230.62665026580393 + "x": -152.07320110504, + "y": -209.21075900090992 }, - "zoom": 0.7823535799980164 + "zoom": 0.7373584811199316 } } } diff --git a/app/resources/blocks/logic/combinational/hex_7seg_cc.ice b/app/resources/blocks/logic/combinational/hex_7seg_cc.ice index 2aa29a892..9d64d44c5 100644 --- a/app/resources/blocks/logic/combinational/hex_7seg_cc.ice +++ b/app/resources/blocks/logic/combinational/hex_7seg_cc.ice @@ -15,7 +15,15 @@ "id": "8b73e273-3603-443a-b952-0ab9ad826a96", "type": "basic.output", "data": { - "label": "a" + "name": "a", + "pins": [ + { + "index": "0", + "name": "", + "value": "0" + } + ], + "virtual": true }, "position": { "x": 1016, @@ -26,7 +34,15 @@ "id": "f2fce5fa-be07-46fe-bee1-bb2a497fe747", "type": "basic.output", "data": { - "label": "b" + "name": "b", + "pins": [ + { + "index": "0", + "name": "", + "value": "0" + } + ], + "virtual": true }, "position": { "x": 1016, @@ -37,7 +53,15 @@ "id": "16e44a6a-853a-4264-9e9d-2269827ed136", "type": "basic.input", "data": { - "label": "h0" + "name": "h0", + "pins": [ + { + "index": "0", + "name": "", + "value": "0" + } + ], + "virtual": true }, "position": { "x": 312, @@ -49,21 +73,55 @@ "type": "basic.code", "data": { "code": "// Catodo común\n// gfe_dcba\nlocalparam BCD_0 = 7'b011_1111,\n BCD_1 = 7'b000_0110,\n BCD_2 = 7'b101_1011,\n BCD_3 = 7'b100_1111,\n BCD_4 = 7'b110_0110,\n BCD_5 = 7'b110_1101,\n BCD_6 = 7'b111_1101,\n BCD_7 = 7'b000_0111,\n BCD_8 = 7'b111_1111,\n BCD_9 = 7'b110_1111,\n BCD_A = 7'b111_0111,\n BCD_B = 7'b111_1100,\n BCD_C = 7'b011_1001,\n BCD_D = 7'b101_1110,\n BCD_E = 7'b111_1001,\n BCD_F = 7'b111_0001;\n\nreg [6:0] _o;\n\nalways @(*)\nbegin\n\n case({h3, h2, h1, h0})\n 4'h0: _o <= BCD_0;\n 4'h1: _o <= BCD_1;\n 4'h2: _o <= BCD_2;\n 4'h3: _o <= BCD_3;\n 4'h4: _o <= BCD_4;\n 4'h5: _o <= BCD_5;\n 4'h6: _o <= BCD_6;\n 4'h7: _o <= BCD_7;\n 4'h8: _o <= BCD_8;\n 4'h9: _o <= BCD_9;\n 4'hA: _o <= BCD_A;\n 4'hB: _o <= BCD_B;\n 4'hC: _o <= BCD_C;\n 4'hD: _o <= BCD_D;\n 4'hE: _o <= BCD_E;\n 4'hF: _o <= BCD_F;\n default: _o <= 0;\n endcase\nend\n\nassign {g, f, e, d, c, b, a} = _o;", + "params": [], "ports": { "in": [ - "h0", - "h1", - "h2", - "h3" + { + "name": "h0", + "size": 1 + }, + { + "name": "h1", + "size": 1 + }, + { + "name": "h2", + "size": 1 + }, + { + "name": "h3", + "size": 1 + } ], "out": [ - "a", - "b", - "c", - "d", - "e", - "f", - "g" + { + "name": "a", + "size": 1 + }, + { + "name": "b", + "size": 1 + }, + { + "name": "c", + "size": 1 + }, + { + "name": "d", + "size": 1 + }, + { + "name": "e", + "size": 1 + }, + { + "name": "f", + "size": 1 + }, + { + "name": "g", + "size": 1 + } ] } }, @@ -76,7 +134,15 @@ "id": "bf0ea22e-3ac2-4756-87d5-020a6ea6a1a8", "type": "basic.output", "data": { - "label": "c" + "name": "c", + "pins": [ + { + "index": "0", + "name": "", + "value": "0" + } + ], + "virtual": true }, "position": { "x": 1016, @@ -87,7 +153,15 @@ "id": "9cdbdf9f-f086-4427-9719-e13470658d97", "type": "basic.input", "data": { - "label": "h1" + "name": "h1", + "pins": [ + { + "index": "0", + "name": "", + "value": "0" + } + ], + "virtual": true }, "position": { "x": 312, @@ -98,7 +172,15 @@ "id": "4687e984-3f19-44d7-baee-ca89513f8f1a", "type": "basic.output", "data": { - "label": "d" + "name": "d", + "pins": [ + { + "index": "0", + "name": "", + "value": "0" + } + ], + "virtual": true }, "position": { "x": 1016, @@ -109,7 +191,15 @@ "id": "f40ab7a8-10e5-4e7f-94f9-cefd697d5d40", "type": "basic.input", "data": { - "label": "h2" + "name": "h2", + "pins": [ + { + "index": "0", + "name": "", + "value": "0" + } + ], + "virtual": true }, "position": { "x": 312, @@ -120,7 +210,15 @@ "id": "1691b072-9102-4986-a900-fefd1a5a7b9e", "type": "basic.output", "data": { - "label": "e" + "name": "e", + "pins": [ + { + "index": "0", + "name": "", + "value": "0" + } + ], + "virtual": true }, "position": { "x": 1016, @@ -131,7 +229,15 @@ "id": "2d774807-3ec8-492c-98e2-f1c9da8d68ff", "type": "basic.input", "data": { - "label": "h3" + "name": "h3", + "pins": [ + { + "index": "0", + "name": "", + "value": "0" + } + ], + "virtual": true }, "position": { "x": 312, @@ -142,7 +248,15 @@ "id": "7c14afe7-1ac0-4394-b38e-fa8a00ffa21c", "type": "basic.output", "data": { - "label": "f" + "name": "f", + "pins": [ + { + "index": "0", + "name": "", + "value": "0" + } + ], + "virtual": true }, "position": { "x": 1016, @@ -153,7 +267,15 @@ "id": "2565c42b-00b0-4b1d-92a4-66c715834b33", "type": "basic.output", "data": { - "label": "g" + "name": "g", + "pins": [ + { + "index": "0", + "name": "", + "value": "0" + } + ], + "virtual": true }, "position": { "x": 1016, @@ -230,7 +352,13 @@ "target": { "block": "f2fce5fa-be07-46fe-bee1-bb2a497fe747", "port": "in" - } + }, + "vertices": [ + { + "x": 952, + "y": 528 + } + ] }, { "source": { @@ -240,7 +368,13 @@ "target": { "block": "8b73e273-3603-443a-b952-0ab9ad826a96", "port": "in" - } + }, + "vertices": [ + { + "x": 928, + "y": 448 + } + ] }, { "source": { @@ -260,7 +394,13 @@ "target": { "block": "7c14afe7-1ac0-4394-b38e-fa8a00ffa21c", "port": "in" - } + }, + "vertices": [ + { + "x": 952, + "y": 776 + } + ] }, { "source": { @@ -270,7 +410,13 @@ "target": { "block": "2565c42b-00b0-4b1d-92a4-66c715834b33", "port": "in" - } + }, + "vertices": [ + { + "x": 928, + "y": 824 + } + ] } ] }, @@ -280,7 +426,7 @@ "x": -152.07320110504, "y": -209.21075900090992 }, - "zoom": 0.7373584508895874 + "zoom": 0.7373584371699413 } } -} \ No newline at end of file +} diff --git a/app/resources/blocks/logic/combinational/mux_2_1.ice b/app/resources/blocks/logic/combinational/mux_2_1.ice index f10bd5288..1e939fdf3 100644 --- a/app/resources/blocks/logic/combinational/mux_2_1.ice +++ b/app/resources/blocks/logic/combinational/mux_2_1.ice @@ -16,14 +16,27 @@ "type": "basic.code", "data": { "code": "reg _o;\n\nalways @(*) begin\n case(sel0)\n 0: _o = in0;\n 1: _o = in1;\n default: _o = in0;\n endcase\nend\n\nassign o = _o;", + "params": [], "ports": { "in": [ - "in0", - "in1", - "sel0" + { + "name": "in0", + "size": 1 + }, + { + "name": "in1", + "size": 1 + }, + { + "name": "sel0", + "size": 1 + } ], "out": [ - "o" + { + "name": "o", + "size": 1 + } ] } }, @@ -36,7 +49,15 @@ "id": "c3f73f68-1074-4355-b69f-6a20f7bea3e7", "type": "basic.input", "data": { - "label": "i0" + "name": "i0", + "pins": [ + { + "index": "0", + "name": "", + "value": "0" + } + ], + "virtual": true }, "position": { "x": 80, @@ -47,7 +68,15 @@ "id": "5fb29465-2ee7-45bb-afa4-9a3de895c774", "type": "basic.input", "data": { - "label": "i1" + "name": "i1", + "pins": [ + { + "index": "0", + "name": "", + "value": "0" + } + ], + "virtual": true }, "position": { "x": 80, @@ -58,7 +87,15 @@ "id": "061aa997-2f30-4591-8841-fb6abf5c3b2e", "type": "basic.output", "data": { - "label": "o" + "name": "o", + "pins": [ + { + "index": "0", + "name": "", + "value": "0" + } + ], + "virtual": true }, "position": { "x": 792, @@ -69,7 +106,15 @@ "id": "67ed5e09-486d-4f97-929f-aefea9c43951", "type": "basic.input", "data": { - "label": "sel" + "name": "sel", + "pins": [ + { + "index": "0", + "name": "", + "value": "0" + } + ], + "virtual": true }, "position": { "x": 80, @@ -126,7 +171,7 @@ "x": -21.03752160981206, "y": 29.479234822175684 }, - "zoom": 1.000000703366588 + "zoom": 1 } } } diff --git a/app/resources/blocks/logic/combinational/mux_4_1.ice b/app/resources/blocks/logic/combinational/mux_4_1.ice index 7480c7521..66b25ea73 100644 --- a/app/resources/blocks/logic/combinational/mux_4_1.ice +++ b/app/resources/blocks/logic/combinational/mux_4_1.ice @@ -15,7 +15,15 @@ "id": "c3f73f68-1074-4355-b69f-6a20f7bea3e7", "type": "basic.input", "data": { - "label": "i0" + "name": "i0", + "pins": [ + { + "index": "0", + "name": "", + "value": "0" + } + ], + "virtual": true }, "position": { "x": 40, @@ -26,7 +34,15 @@ "id": "5fb29465-2ee7-45bb-afa4-9a3de895c774", "type": "basic.input", "data": { - "label": "i1" + "name": "i1", + "pins": [ + { + "index": "0", + "name": "", + "value": "0" + } + ], + "virtual": true }, "position": { "x": 40, @@ -38,17 +54,39 @@ "type": "basic.code", "data": { "code": "reg _o;\nwire [1:0] _sel;\n\nassign _sel = {sel1, sel0};\n\nalways @(*) begin\n case(_sel)\n 0: _o = in0;\n 1: _o = in1;\n 2: _o = in2;\n 3: _o = in3;\n default: _o = in0;\n endcase\nend\n\nassign o = _o;", + "params": [], "ports": { "in": [ - "in0", - "in1", - "in2", - "in3", - "sel0", - "sel1" + { + "name": "in0", + "size": 1 + }, + { + "name": "in1", + "size": 1 + }, + { + "name": "in2", + "size": 1 + }, + { + "name": "in3", + "size": 1 + }, + { + "name": "sel0", + "size": 1 + }, + { + "name": "sel1", + "size": 1 + } ], "out": [ - "o" + { + "name": "o", + "size": 1 + } ] } }, @@ -61,7 +99,15 @@ "id": "67ed5e09-486d-4f97-929f-aefea9c43951", "type": "basic.input", "data": { - "label": "i2" + "name": "i2", + "pins": [ + { + "index": "0", + "name": "", + "value": "0" + } + ], + "virtual": true }, "position": { "x": 40, @@ -72,7 +118,15 @@ "id": "061aa997-2f30-4591-8841-fb6abf5c3b2e", "type": "basic.output", "data": { - "label": "o" + "name": "o", + "pins": [ + { + "index": "0", + "name": "", + "value": "0" + } + ], + "virtual": true }, "position": { "x": 776, @@ -83,7 +137,15 @@ "id": "8be9cded-6d06-4b23-b73c-94c7ff311dbc", "type": "basic.input", "data": { - "label": "i3" + "name": "i3", + "pins": [ + { + "index": "0", + "name": "", + "value": "0" + } + ], + "virtual": true }, "position": { "x": 40, @@ -94,7 +156,15 @@ "id": "1b7db016-c89a-4f65-b6f0-0f87c851c077", "type": "basic.input", "data": { - "label": "sel0" + "name": "sel0", + "pins": [ + { + "index": "0", + "name": "", + "value": "0" + } + ], + "virtual": true }, "position": { "x": 40, @@ -105,7 +175,15 @@ "id": "a014971e-5470-490b-9058-b4b00f2dd125", "type": "basic.input", "data": { - "label": "sel1" + "name": "sel1", + "pins": [ + { + "index": "0", + "name": "", + "value": "0" + } + ], + "virtual": true }, "position": { "x": 40, @@ -204,7 +282,7 @@ "x": 0, "y": 0 }, - "zoom": 0.9999999999994884 + "zoom": 1 } } -} \ No newline at end of file +} diff --git a/app/resources/blocks/logic/gate/and.ice b/app/resources/blocks/logic/gate/and.ice index 64b081da8..41d70ac1c 100644 --- a/app/resources/blocks/logic/gate/and.ice +++ b/app/resources/blocks/logic/gate/and.ice @@ -16,13 +16,23 @@ "type": "basic.code", "data": { "code": "// AND logic gate\n\nassign c = a & b;", + "params": [], "ports": { "in": [ - "a", - "b" + { + "name": "a", + "size": 1 + }, + { + "name": "b", + "size": 1 + } ], "out": [ - "c" + { + "name": "c", + "size": 1 + } ] } }, @@ -35,7 +45,15 @@ "id": "18c2ebc7-5152-439c-9b3f-851c59bac834", "type": "basic.input", "data": { - "label": "" + "name": "", + "pins": [ + { + "index": "0", + "name": "", + "value": "0" + } + ], + "virtual": true }, "position": { "x": 64, @@ -46,7 +64,15 @@ "id": "664caf9e-5f40-4df4-800a-b626af702e62", "type": "basic.output", "data": { - "label": "" + "name": "", + "pins": [ + { + "index": "0", + "name": "", + "value": "0" + } + ], + "virtual": true }, "position": { "x": 752, @@ -57,7 +83,15 @@ "id": "97b51945-d716-4b6c-9db9-970d08541249", "type": "basic.input", "data": { - "label": "" + "name": "", + "pins": [ + { + "index": "0", + "name": "", + "value": "0" + } + ], + "virtual": true }, "position": { "x": 64, @@ -104,7 +138,7 @@ "x": 0, "y": 0 }, - "zoom": 0.9999999784900666 + "zoom": 1 } } } diff --git a/app/resources/blocks/logic/gate/nand.ice b/app/resources/blocks/logic/gate/nand.ice index 0d5fe5a31..cb8a28934 100644 --- a/app/resources/blocks/logic/gate/nand.ice +++ b/app/resources/blocks/logic/gate/nand.ice @@ -16,13 +16,23 @@ "type": "basic.code", "data": { "code": "// NAND logic gate\n\nassign c = ~(a & b);", + "params": [], "ports": { "in": [ - "a", - "b" + { + "name": "a", + "size": 1 + }, + { + "name": "b", + "size": 1 + } ], "out": [ - "c" + { + "name": "c", + "size": 1 + } ] } }, @@ -35,7 +45,15 @@ "id": "18c2ebc7-5152-439c-9b3f-851c59bac834", "type": "basic.input", "data": { - "label": "" + "name": "", + "pins": [ + { + "index": "0", + "name": "", + "value": "0" + } + ], + "virtual": true }, "position": { "x": 64, @@ -46,7 +64,15 @@ "id": "664caf9e-5f40-4df4-800a-b626af702e62", "type": "basic.output", "data": { - "label": "" + "name": "", + "pins": [ + { + "index": "0", + "name": "", + "value": "0" + } + ], + "virtual": true }, "position": { "x": 752, @@ -57,7 +83,15 @@ "id": "97b51945-d716-4b6c-9db9-970d08541249", "type": "basic.input", "data": { - "label": "" + "name": "", + "pins": [ + { + "index": "0", + "name": "", + "value": "0" + } + ], + "virtual": true }, "position": { "x": 64, @@ -107,4 +141,4 @@ "zoom": 1 } } -} \ No newline at end of file +} diff --git a/app/resources/blocks/logic/gate/nor.ice b/app/resources/blocks/logic/gate/nor.ice index 1d9f38242..b1157273c 100644 --- a/app/resources/blocks/logic/gate/nor.ice +++ b/app/resources/blocks/logic/gate/nor.ice @@ -16,13 +16,23 @@ "type": "basic.code", "data": { "code": "// NOR logic gate\n\nassign c = ~(a | b);", + "params": [], "ports": { "in": [ - "a", - "b" + { + "name": "a", + "size": 1 + }, + { + "name": "b", + "size": 1 + } ], "out": [ - "c" + { + "name": "c", + "size": 1 + } ] } }, @@ -35,7 +45,15 @@ "id": "18c2ebc7-5152-439c-9b3f-851c59bac834", "type": "basic.input", "data": { - "label": "" + "name": "", + "pins": [ + { + "index": "0", + "name": "", + "value": "0" + } + ], + "virtual": true }, "position": { "x": 64, @@ -46,7 +64,15 @@ "id": "664caf9e-5f40-4df4-800a-b626af702e62", "type": "basic.output", "data": { - "label": "" + "name": "", + "pins": [ + { + "index": "0", + "name": "", + "value": "0" + } + ], + "virtual": true }, "position": { "x": 752, @@ -57,7 +83,15 @@ "id": "97b51945-d716-4b6c-9db9-970d08541249", "type": "basic.input", "data": { - "label": "" + "name": "", + "pins": [ + { + "index": "0", + "name": "", + "value": "0" + } + ], + "virtual": true }, "position": { "x": 64, diff --git a/app/resources/blocks/logic/gate/not.ice b/app/resources/blocks/logic/gate/not.ice index 0586db3bc..12ff9752b 100644 --- a/app/resources/blocks/logic/gate/not.ice +++ b/app/resources/blocks/logic/gate/not.ice @@ -16,12 +16,19 @@ "type": "basic.code", "data": { "code": "// NOT logic gate\n\nassign c = ~ a;", + "params": [], "ports": { "in": [ - "a" + { + "name": "a", + "size": 1 + } ], "out": [ - "c" + { + "name": "c", + "size": 1 + } ] } }, @@ -34,7 +41,15 @@ "id": "18c2ebc7-5152-439c-9b3f-851c59bac834", "type": "basic.input", "data": { - "label": "" + "name": "", + "pins": [ + { + "index": "0", + "name": "", + "value": "0" + } + ], + "virtual": true }, "position": { "x": 64, @@ -45,7 +60,15 @@ "id": "664caf9e-5f40-4df4-800a-b626af702e62", "type": "basic.output", "data": { - "label": "" + "name": "", + "pins": [ + { + "index": "0", + "name": "", + "value": "0" + } + ], + "virtual": true }, "position": { "x": 752, @@ -85,4 +108,4 @@ "zoom": 1 } } -} \ No newline at end of file +} diff --git a/app/resources/blocks/logic/gate/or.ice b/app/resources/blocks/logic/gate/or.ice index 35c0f1515..440294bb7 100644 --- a/app/resources/blocks/logic/gate/or.ice +++ b/app/resources/blocks/logic/gate/or.ice @@ -16,13 +16,23 @@ "type": "basic.code", "data": { "code": "// OR logic gate\n\nassign c = a | b;", + "params": [], "ports": { "in": [ - "a", - "b" + { + "name": "a", + "size": 1 + }, + { + "name": "b", + "size": 1 + } ], "out": [ - "c" + { + "name": "c", + "size": 1 + } ] } }, @@ -35,7 +45,15 @@ "id": "18c2ebc7-5152-439c-9b3f-851c59bac834", "type": "basic.input", "data": { - "label": "" + "name": "", + "pins": [ + { + "index": "0", + "name": "", + "value": "0" + } + ], + "virtual": true }, "position": { "x": 64, @@ -46,7 +64,15 @@ "id": "664caf9e-5f40-4df4-800a-b626af702e62", "type": "basic.output", "data": { - "label": "" + "name": "", + "pins": [ + { + "index": "0", + "name": "", + "value": "0" + } + ], + "virtual": true }, "position": { "x": 752, @@ -57,7 +83,15 @@ "id": "97b51945-d716-4b6c-9db9-970d08541249", "type": "basic.input", "data": { - "label": "" + "name": "", + "pins": [ + { + "index": "0", + "name": "", + "value": "0" + } + ], + "virtual": true }, "position": { "x": 64, @@ -107,4 +141,4 @@ "zoom": 1 } } -} \ No newline at end of file +} diff --git a/app/resources/blocks/logic/gate/xnor.ice b/app/resources/blocks/logic/gate/xnor.ice index f55df49ff..b90ac28a1 100644 --- a/app/resources/blocks/logic/gate/xnor.ice +++ b/app/resources/blocks/logic/gate/xnor.ice @@ -16,13 +16,23 @@ "type": "basic.code", "data": { "code": "// XNOR logic gate\n\nassign c = ~(a ^ b);", + "params": [], "ports": { "in": [ - "a", - "b" + { + "name": "a", + "size": 1 + }, + { + "name": "b", + "size": 1 + } ], "out": [ - "c" + { + "name": "c", + "size": 1 + } ] } }, @@ -35,7 +45,15 @@ "id": "18c2ebc7-5152-439c-9b3f-851c59bac834", "type": "basic.input", "data": { - "label": "" + "name": "", + "pins": [ + { + "index": "0", + "name": "", + "value": "0" + } + ], + "virtual": true }, "position": { "x": 64, @@ -46,7 +64,15 @@ "id": "664caf9e-5f40-4df4-800a-b626af702e62", "type": "basic.output", "data": { - "label": "" + "name": "", + "pins": [ + { + "index": "0", + "name": "", + "value": "0" + } + ], + "virtual": true }, "position": { "x": 752, @@ -57,7 +83,15 @@ "id": "97b51945-d716-4b6c-9db9-970d08541249", "type": "basic.input", "data": { - "label": "" + "name": "", + "pins": [ + { + "index": "0", + "name": "", + "value": "0" + } + ], + "virtual": true }, "position": { "x": 64, diff --git a/app/resources/blocks/logic/gate/xor.ice b/app/resources/blocks/logic/gate/xor.ice index 37e840d56..b0a081f16 100644 --- a/app/resources/blocks/logic/gate/xor.ice +++ b/app/resources/blocks/logic/gate/xor.ice @@ -16,13 +16,23 @@ "type": "basic.code", "data": { "code": "// XOR logic gate\n\nassign c = a ^ b;", + "params": [], "ports": { "in": [ - "a", - "b" + { + "name": "a", + "size": 1 + }, + { + "name": "b", + "size": 1 + } ], "out": [ - "c" + { + "name": "c", + "size": 1 + } ] } }, @@ -35,7 +45,15 @@ "id": "18c2ebc7-5152-439c-9b3f-851c59bac834", "type": "basic.input", "data": { - "label": "" + "name": "", + "pins": [ + { + "index": "0", + "name": "", + "value": "0" + } + ], + "virtual": true }, "position": { "x": 64, @@ -46,7 +64,15 @@ "id": "664caf9e-5f40-4df4-800a-b626af702e62", "type": "basic.output", "data": { - "label": "" + "name": "", + "pins": [ + { + "index": "0", + "name": "", + "value": "0" + } + ], + "virtual": true }, "position": { "x": 752, @@ -57,7 +83,15 @@ "id": "97b51945-d716-4b6c-9db9-970d08541249", "type": "basic.input", "data": { - "label": "" + "name": "", + "pins": [ + { + "index": "0", + "name": "", + "value": "0" + } + ], + "virtual": true }, "position": { "x": 64, @@ -107,4 +141,4 @@ "zoom": 1 } } -} \ No newline at end of file +} diff --git a/app/resources/blocks/logic/sequential/debouncer.ice b/app/resources/blocks/logic/sequential/debouncer.ice index d28c6ea5c..3b6019dd2 100644 --- a/app/resources/blocks/logic/sequential/debouncer.ice +++ b/app/resources/blocks/logic/sequential/debouncer.ice @@ -16,52 +16,86 @@ "type": "basic.code", "data": { "code": "//-- Debouncer Circuit\n//-- It produces a stable output when the\n//-- input signal is bouncing\n\nreg btn_prev = 0;\nreg btn_out_r = 0;\n\nreg [16:0] counter = 0;\n\n\nalways @(posedge clk) begin\n\n //-- If btn_prev and btn_in are differents\n if (btn_prev ^ in == 1'b1) begin\n \n //-- Reset the counter\n counter <= 0;\n \n //-- Capture the button status\n btn_prev <= in;\n end\n \n //-- If no timeout, increase the counter\n else if (counter[16] == 1'b0)\n counter <= counter + 1;\n \n else\n //-- Set the output to the stable value\n btn_out_r <= btn_prev;\n\nend\n\nassign out = btn_out_r;\n", + "params": [], "ports": { "in": [ - "clk", - "in" + { + "name": "clk", + "size": 1 + }, + { + "name": "in", + "size": 1 + } ], "out": [ - "out" + { + "name": "out", + "size": 1 + } ] } }, "position": { - "x": 368, - "y": 120 + "x": 264, + "y": 112 } }, { "id": "4bf41c17-a2da-4140-95f7-2a80d51b1e1a", "type": "basic.input", "data": { - "label": "clk" + "name": "clk", + "pins": [ + { + "index": "0", + "name": "", + "value": "0" + } + ], + "virtual": true }, "position": { - "x": 152, - "y": 152 + "x": 48, + "y": 144 } }, { "id": "22ff3fa1-943b-4d1a-bd89-36e1c054d077", "type": "basic.output", "data": { - "label": "out" + "name": "out", + "pins": [ + { + "index": "0", + "name": "", + "value": "0" + } + ], + "virtual": true }, "position": { - "x": 872, - "y": 216 + "x": 768, + "y": 208 } }, { "id": "c9e1af2a-6f09-4cf6-a5b3-fdf7ec2c6530", "type": "basic.input", "data": { - "label": "in" + "name": "in", + "pins": [ + { + "index": "0", + "name": "", + "value": "0" + } + ], + "virtual": true }, "position": { - "x": 152, - "y": 280 + "x": 48, + "y": 272 } } ], @@ -104,7 +138,7 @@ "x": 0, "y": 0 }, - "zoom": 0.9999999623653131 + "zoom": 1 } } -} \ No newline at end of file +} diff --git a/app/resources/blocks/logic/sequential/dff_ar.ice b/app/resources/blocks/logic/sequential/dff_ar.ice index fae0d636e..7f04bfbc3 100644 --- a/app/resources/blocks/logic/sequential/dff_ar.ice +++ b/app/resources/blocks/logic/sequential/dff_ar.ice @@ -15,7 +15,15 @@ "id": "b32a6101-5bd1-4bcf-ae5f-e569b958a6a2", "type": "basic.input", "data": { - "label": "D" + "name": "D", + "pins": [ + { + "index": "0", + "name": "", + "value": "0" + } + ], + "virtual": true }, "position": { "x": 168, @@ -27,16 +35,35 @@ "type": "basic.code", "data": { "code": "// D flip-flop with asynchronous reset\n\nreg _q = 1'b0;\n\nalways @(posedge clk or negedge rst_n)\nbegin\n if(rst_n == 0)\n _q = 1'b0;\n else if(en)\n _q <= d;\nend\n\nassign {q, q_n} = {_q, ~_q};\n", + "params": [], "ports": { "in": [ - "d", - "en", - "rst_n", - "clk" + { + "name": "d", + "size": 1 + }, + { + "name": "en", + "size": 1 + }, + { + "name": "rst_n", + "size": 1 + }, + { + "name": "clk", + "size": 1 + } ], "out": [ - "q", - "q_n" + { + "name": "q", + "size": 1 + }, + { + "name": "q_n", + "size": 1 + } ] } }, @@ -49,7 +76,15 @@ "id": "ffdd9aa2-aea3-4aa9-8431-80e799226774", "type": "basic.output", "data": { - "label": "Q" + "name": "Q", + "pins": [ + { + "index": "0", + "name": "", + "value": "0" + } + ], + "virtual": true }, "position": { "x": 824, @@ -60,7 +95,15 @@ "id": "50d69ac2-949d-476e-a711-420ba9f510cd", "type": "basic.input", "data": { - "label": "en" + "name": "en", + "pins": [ + { + "index": "0", + "name": "", + "value": "0" + } + ], + "virtual": true }, "position": { "x": 168, @@ -71,7 +114,15 @@ "id": "07105e68-401b-49e9-b85f-2cddbfee9fbe", "type": "basic.input", "data": { - "label": "rst*" + "name": "rst*", + "pins": [ + { + "index": "0", + "name": "", + "value": "0" + } + ], + "virtual": true }, "position": { "x": 168, @@ -82,7 +133,15 @@ "id": "4a261f0b-523c-4fe0-ae1c-de05b8eb7e8a", "type": "basic.output", "data": { - "label": "Q*" + "name": "Q*", + "pins": [ + { + "index": "0", + "name": "", + "value": "0" + } + ], + "virtual": true }, "position": { "x": 824, @@ -93,7 +152,15 @@ "id": "6855f64f-fa1c-4371-b2e1-a98970674a96", "type": "basic.input", "data": { - "label": "clk" + "name": "clk", + "pins": [ + { + "index": "0", + "name": "", + "value": "0" + } + ], + "virtual": true }, "position": { "x": 168, @@ -170,7 +237,7 @@ "x": -100, "y": 0 }, - "zoom": 1.0000000596046377 + "zoom": 1 } } } diff --git a/app/resources/blocks/logic/sequential/dff_sr.ice b/app/resources/blocks/logic/sequential/dff_sr.ice index 2dfabb8d0..f57c59a0d 100644 --- a/app/resources/blocks/logic/sequential/dff_sr.ice +++ b/app/resources/blocks/logic/sequential/dff_sr.ice @@ -15,7 +15,15 @@ "id": "b32a6101-5bd1-4bcf-ae5f-e569b958a6a2", "type": "basic.input", "data": { - "label": "D" + "name": "D", + "pins": [ + { + "index": "0", + "name": "", + "value": "0" + } + ], + "virtual": true }, "position": { "x": 168, @@ -27,16 +35,35 @@ "type": "basic.code", "data": { "code": "// D flip-flop with synchronous reset\n\nreg _q = 1'b0;\n\nalways @(posedge clk)\nbegin\n if(rst_n == 0)\n _q = 1'b0;\n else if(en)\n _q <= d;\nend\n\nassign {q, q_n} = {_q, ~_q};\n", + "params": [], "ports": { "in": [ - "d", - "en", - "rst_n", - "clk" + { + "name": "d", + "size": 1 + }, + { + "name": "en", + "size": 1 + }, + { + "name": "rst_n", + "size": 1 + }, + { + "name": "clk", + "size": 1 + } ], "out": [ - "q", - "q_n" + { + "name": "q", + "size": 1 + }, + { + "name": "q_n", + "size": 1 + } ] } }, @@ -49,7 +76,15 @@ "id": "ffdd9aa2-aea3-4aa9-8431-80e799226774", "type": "basic.output", "data": { - "label": "Q" + "name": "Q", + "pins": [ + { + "index": "0", + "name": "", + "value": "0" + } + ], + "virtual": true }, "position": { "x": 824, @@ -60,7 +95,15 @@ "id": "50d69ac2-949d-476e-a711-420ba9f510cd", "type": "basic.input", "data": { - "label": "en" + "name": "en", + "pins": [ + { + "index": "0", + "name": "", + "value": "0" + } + ], + "virtual": true }, "position": { "x": 168, @@ -71,7 +114,15 @@ "id": "07105e68-401b-49e9-b85f-2cddbfee9fbe", "type": "basic.input", "data": { - "label": "rst*" + "name": "rst*", + "pins": [ + { + "index": "0", + "name": "", + "value": "0" + } + ], + "virtual": true }, "position": { "x": 168, @@ -82,7 +133,15 @@ "id": "4a261f0b-523c-4fe0-ae1c-de05b8eb7e8a", "type": "basic.output", "data": { - "label": "Q*" + "name": "Q*", + "pins": [ + { + "index": "0", + "name": "", + "value": "0" + } + ], + "virtual": true }, "position": { "x": 824, @@ -93,7 +152,15 @@ "id": "6855f64f-fa1c-4371-b2e1-a98970674a96", "type": "basic.input", "data": { - "label": "clk" + "name": "clk", + "pins": [ + { + "index": "0", + "name": "", + "value": "0" + } + ], + "virtual": true }, "position": { "x": 168, diff --git a/app/resources/blocks/logic/sequential/tff_ar.ice b/app/resources/blocks/logic/sequential/tff_ar.ice index 33e16dfc7..0c1d6ba47 100644 --- a/app/resources/blocks/logic/sequential/tff_ar.ice +++ b/app/resources/blocks/logic/sequential/tff_ar.ice @@ -15,7 +15,15 @@ "id": "b32a6101-5bd1-4bcf-ae5f-e569b958a6a2", "type": "basic.input", "data": { - "label": "T" + "name": "T", + "pins": [ + { + "index": "0", + "name": "", + "value": "0" + } + ], + "virtual": true }, "position": { "x": 168, @@ -27,16 +35,35 @@ "type": "basic.code", "data": { "code": "// T flip-flop with asynchronous reset\n\nreg _q = 1'b0;\n\nalways @(posedge clk or negedge rst_n)\nbegin\n if(rst_n == 0)\n _q <= 1'b0;\n else\n if(en & t)\n _q = ~_q;\nend\n\nassign {q, q_n} = {_q, ~_q};", + "params": [], "ports": { "in": [ - "t", - "en", - "rst_n", - "clk" + { + "name": "t", + "size": 1 + }, + { + "name": "en", + "size": 1 + }, + { + "name": "rst_n", + "size": 1 + }, + { + "name": "clk", + "size": 1 + } ], "out": [ - "q", - "q_n" + { + "name": "q", + "size": 1 + }, + { + "name": "q_n", + "size": 1 + } ] } }, @@ -49,7 +76,15 @@ "id": "ffdd9aa2-aea3-4aa9-8431-80e799226774", "type": "basic.output", "data": { - "label": "Q" + "name": "Q", + "pins": [ + { + "index": "0", + "name": "", + "value": "0" + } + ], + "virtual": true }, "position": { "x": 824, @@ -60,7 +95,15 @@ "id": "50d69ac2-949d-476e-a711-420ba9f510cd", "type": "basic.input", "data": { - "label": "en" + "name": "en", + "pins": [ + { + "index": "0", + "name": "", + "value": "0" + } + ], + "virtual": true }, "position": { "x": 168, @@ -71,7 +114,15 @@ "id": "8fa94192-fba9-4c2a-be61-b8ca88389423", "type": "basic.input", "data": { - "label": "rst*" + "name": "rst*", + "pins": [ + { + "index": "0", + "name": "", + "value": "0" + } + ], + "virtual": true }, "position": { "x": 168, @@ -82,7 +133,15 @@ "id": "4a261f0b-523c-4fe0-ae1c-de05b8eb7e8a", "type": "basic.output", "data": { - "label": "Q*" + "name": "Q*", + "pins": [ + { + "index": "0", + "name": "", + "value": "0" + } + ], + "virtual": true }, "position": { "x": 824, @@ -93,7 +152,15 @@ "id": "6855f64f-fa1c-4371-b2e1-a98970674a96", "type": "basic.input", "data": { - "label": "clk" + "name": "clk", + "pins": [ + { + "index": "0", + "name": "", + "value": "0" + } + ], + "virtual": true }, "position": { "x": 168, @@ -173,4 +240,4 @@ "zoom": 1 } } -} \ No newline at end of file +} diff --git a/app/resources/blocks/logic/sequential/tff_sr.ice b/app/resources/blocks/logic/sequential/tff_sr.ice index 95267f2e8..825b32d4f 100644 --- a/app/resources/blocks/logic/sequential/tff_sr.ice +++ b/app/resources/blocks/logic/sequential/tff_sr.ice @@ -15,7 +15,15 @@ "id": "b32a6101-5bd1-4bcf-ae5f-e569b958a6a2", "type": "basic.input", "data": { - "label": "T" + "name": "T", + "pins": [ + { + "index": "0", + "name": "", + "value": "0" + } + ], + "virtual": true }, "position": { "x": 168, @@ -27,16 +35,35 @@ "type": "basic.code", "data": { "code": "// T flip-flop with synchronous reset\n\nreg _q = 1'b0;\n\nalways @(posedge clk)\nbegin\n if(rst_n == 0)\n _q <= 1'b0;\n else\n if(en & t)\n _q = ~_q;\nend\n\nassign {q, q_n} = {_q, ~_q};", + "params": [], "ports": { "in": [ - "t", - "en", - "rst_n", - "clk" + { + "name": "t", + "size": 1 + }, + { + "name": "en", + "size": 1 + }, + { + "name": "rst_n", + "size": 1 + }, + { + "name": "clk", + "size": 1 + } ], "out": [ - "q", - "q_n" + { + "name": "q", + "size": 1 + }, + { + "name": "q_n", + "size": 1 + } ] } }, @@ -49,7 +76,15 @@ "id": "ffdd9aa2-aea3-4aa9-8431-80e799226774", "type": "basic.output", "data": { - "label": "Q" + "name": "Q", + "pins": [ + { + "index": "0", + "name": "", + "value": "0" + } + ], + "virtual": true }, "position": { "x": 824, @@ -60,7 +95,15 @@ "id": "50d69ac2-949d-476e-a711-420ba9f510cd", "type": "basic.input", "data": { - "label": "en" + "name": "en", + "pins": [ + { + "index": "0", + "name": "", + "value": "0" + } + ], + "virtual": true }, "position": { "x": 168, @@ -71,7 +114,15 @@ "id": "8fa94192-fba9-4c2a-be61-b8ca88389423", "type": "basic.input", "data": { - "label": "rst*" + "name": "rst*", + "pins": [ + { + "index": "0", + "name": "", + "value": "0" + } + ], + "virtual": true }, "position": { "x": 168, @@ -82,7 +133,15 @@ "id": "4a261f0b-523c-4fe0-ae1c-de05b8eb7e8a", "type": "basic.output", "data": { - "label": "Q*" + "name": "Q*", + "pins": [ + { + "index": "0", + "name": "", + "value": "0" + } + ], + "virtual": true }, "position": { "x": 824, @@ -93,7 +152,15 @@ "id": "6855f64f-fa1c-4371-b2e1-a98970674a96", "type": "basic.input", "data": { - "label": "clk" + "name": "clk", + "pins": [ + { + "index": "0", + "name": "", + "value": "0" + } + ], + "virtual": true }, "position": { "x": 168, @@ -173,4 +240,4 @@ "zoom": 1 } } -} \ No newline at end of file +} diff --git a/app/scripts/services/project.service.js b/app/scripts/services/project.service.js index 3f3ac48ef..b7236b61c 100644 --- a/app/scripts/services/project.service.js +++ b/app/scripts/services/project.service.js @@ -89,8 +89,8 @@ angular.module('icestudio') name: block.data.label, pins: [{ index: '0', - name: '', - value: '0' + name: block.data.pin ? block.data.pin.name : '', + value: block.data.pin? block.data.pin.value : '0' }], virtual: false }; @@ -109,23 +109,29 @@ angular.module('icestudio') name: block.data.params[p] }); } - block.data.params = params; var inPorts = []; for (var i in block.data.ports.in) { - params.push({ + inPorts.push({ name: block.data.ports.in[i], size: 1 }); } - block.data.ports.in = inPorts; + var outPorts = []; for (var o in block.data.ports.out) { - params.push({ + outPorts.push({ name: block.data.ports.out[o], size: 1 }); } - block.data.ports.out = outPorts; + block.data = { + code: block.data.code, + params: params, + ports: { + in: inPorts, + out: outPorts + } + }; break; } } From b82c1ec84c47c2c9a6b64527653d8e3896f0fa15 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jes=C3=BAs=20Arroyo=20Torrens?= Date: Thu, 22 Dec 2016 19:51:03 +0100 Subject: [PATCH 081/169] Update all examples to final format 1.0 --- .../examples/icestick/1_basic/1_led_on.ice | 27 ++++--- .../examples/icezum/1_basic/1_led_on.ice | 27 ++++--- .../examples/icezum/1_basic/2_switch_led.ice | 8 +- .../icezum/1_basic/3_switch_and_gate.ice | 81 ++++++++++++------- app/scripts/services/compiler.service.js | 3 +- 5 files changed, 93 insertions(+), 53 deletions(-) diff --git a/app/resources/examples/icestick/1_basic/1_led_on.ice b/app/resources/examples/icestick/1_basic/1_led_on.ice index d6022735f..c34f87a6a 100644 --- a/app/resources/examples/icestick/1_basic/1_led_on.ice +++ b/app/resources/examples/icestick/1_basic/1_led_on.ice @@ -1,8 +1,8 @@ { "version": "1.0", "package": { - "name": "", - "version": "", + "name": "Led on", + "version": "1.0.0", "description": "", "author": "", "image": "" @@ -12,9 +12,8 @@ "graph": { "blocks": [ { - "id": "f9239f87-12a4-4141-85f7-c3862615af3a", + "id": "eaf792b5-de98-4e2f-b78a-4023eb9a7f2b", "type": "bit.1", - "data": {}, "position": { "x": 80, "y": 64 @@ -24,9 +23,7 @@ "id": "949075cb-26c0-49da-ba76-2496ea9aa7cc", "type": "basic.output", "data": { - "label": "led", "name": "led", - "range": "", "pins": [ { "index": "0", @@ -67,7 +64,7 @@ "wires": [ { "source": { - "block": "f9239f87-12a4-4141-85f7-c3862615af3a", + "block": "eaf792b5-de98-4e2f-b78a-4023eb9a7f2b", "port": "19c8f68d-5022-487f-9ab0-f0a3cd58bead" }, "target": { @@ -96,10 +93,14 @@ "type": "basic.code", "data": { "code": "// Bit 1\n\nassign v = 1'b1;", + "params": [], "ports": { "in": [], "out": [ - "v" + { + "name": "v", + "size": 1 + } ] } }, @@ -112,7 +113,15 @@ "id": "19c8f68d-5022-487f-9ab0-f0a3cd58bead", "type": "basic.output", "data": { - "label": "" + "name": "", + "pins": [ + { + "index": "0", + "name": "", + "value": "0" + } + ], + "virtual": true }, "position": { "x": 608, diff --git a/app/resources/examples/icezum/1_basic/1_led_on.ice b/app/resources/examples/icezum/1_basic/1_led_on.ice index 185c1ade2..c66fb5642 100644 --- a/app/resources/examples/icezum/1_basic/1_led_on.ice +++ b/app/resources/examples/icezum/1_basic/1_led_on.ice @@ -1,8 +1,8 @@ { "version": "1.0", "package": { - "name": "", - "version": "", + "name": "Led on", + "version": "1.0.0", "description": "", "author": "", "image": "" @@ -12,9 +12,8 @@ "graph": { "blocks": [ { - "id": "8c3d15a4-2311-4a24-8321-6036eb0eb92b", + "id": "eaf792b5-de98-4e2f-b78a-4023eb9a7f2b", "type": "bit.1", - "data": {}, "position": { "x": 80, "y": 64 @@ -24,9 +23,7 @@ "id": "949075cb-26c0-49da-ba76-2496ea9aa7cc", "type": "basic.output", "data": { - "label": "led", "name": "led", - "range": "", "pins": [ { "index": "0", @@ -67,7 +64,7 @@ "wires": [ { "source": { - "block": "8c3d15a4-2311-4a24-8321-6036eb0eb92b", + "block": "eaf792b5-de98-4e2f-b78a-4023eb9a7f2b", "port": "19c8f68d-5022-487f-9ab0-f0a3cd58bead" }, "target": { @@ -96,10 +93,14 @@ "type": "basic.code", "data": { "code": "// Bit 1\n\nassign v = 1'b1;", + "params": [], "ports": { "in": [], "out": [ - "v" + { + "name": "v", + "size": 1 + } ] } }, @@ -112,7 +113,15 @@ "id": "19c8f68d-5022-487f-9ab0-f0a3cd58bead", "type": "basic.output", "data": { - "label": "" + "name": "", + "pins": [ + { + "index": "0", + "name": "", + "value": "0" + } + ], + "virtual": true }, "position": { "x": 608, diff --git a/app/resources/examples/icezum/1_basic/2_switch_led.ice b/app/resources/examples/icezum/1_basic/2_switch_led.ice index 7b42bc6ae..d428f6e3e 100644 --- a/app/resources/examples/icezum/1_basic/2_switch_led.ice +++ b/app/resources/examples/icezum/1_basic/2_switch_led.ice @@ -1,8 +1,8 @@ { "version": "1.0", "package": { - "name": "", - "version": "", + "name": "Switch led", + "version": "1.0.0", "description": "", "author": "", "image": "" @@ -15,9 +15,7 @@ "id": "aac1b394-533e-4410-9f35-ba80af8abd63", "type": "basic.input", "data": { - "label": "button", "name": "button", - "range": "", "pins": [ { "index": "0", @@ -36,9 +34,7 @@ "id": "30a83e46-176d-40a8-ac0e-f19a131ea9d9", "type": "basic.output", "data": { - "label": "led", "name": "led", - "range": "", "pins": [ { "index": "0", diff --git a/app/resources/examples/icezum/1_basic/3_switch_and_gate.ice b/app/resources/examples/icezum/1_basic/3_switch_and_gate.ice index 6edbb2630..3a7a02bf6 100644 --- a/app/resources/examples/icezum/1_basic/3_switch_and_gate.ice +++ b/app/resources/examples/icezum/1_basic/3_switch_and_gate.ice @@ -15,9 +15,7 @@ "id": "aa8bab8b-61e4-4e28-b444-0e68d9484ea1", "type": "basic.input", "data": { - "label": "button1", "name": "button1", - "range": "", "pins": [ { "index": "0", @@ -33,11 +31,10 @@ } }, { - "id": "81f8eceb-3742-4350-8833-78fef262c542", + "id": "840e71b2-bf5a-4e20-8413-d386500c87fa", "type": "logic.gate.and", - "data": {}, "position": { - "x": 248, + "x": 256, "y": 80 } }, @@ -45,9 +42,7 @@ "id": "3cad6e72-e7d3-4273-be1c-ce5f9b4c020a", "type": "basic.output", "data": { - "label": "led", "name": "led", - "range": "", "pins": [ { "index": "0", @@ -66,9 +61,7 @@ "id": "5d1b4f33-ae65-4154-b4f4-ff1403437600", "type": "basic.input", "data": { - "label": "button2", "name": "button2", - "range": "", "pins": [ { "index": "0", @@ -109,32 +102,32 @@ "wires": [ { "source": { - "block": "aa8bab8b-61e4-4e28-b444-0e68d9484ea1", - "port": "out" + "block": "840e71b2-bf5a-4e20-8413-d386500c87fa", + "port": "664caf9e-5f40-4df4-800a-b626af702e62" }, "target": { - "block": "81f8eceb-3742-4350-8833-78fef262c542", - "port": "18c2ebc7-5152-439c-9b3f-851c59bac834" + "block": "3cad6e72-e7d3-4273-be1c-ce5f9b4c020a", + "port": "in" } }, { "source": { - "block": "5d1b4f33-ae65-4154-b4f4-ff1403437600", + "block": "aa8bab8b-61e4-4e28-b444-0e68d9484ea1", "port": "out" }, "target": { - "block": "81f8eceb-3742-4350-8833-78fef262c542", - "port": "97b51945-d716-4b6c-9db9-970d08541249" + "block": "840e71b2-bf5a-4e20-8413-d386500c87fa", + "port": "18c2ebc7-5152-439c-9b3f-851c59bac834" } }, { "source": { - "block": "81f8eceb-3742-4350-8833-78fef262c542", - "port": "664caf9e-5f40-4df4-800a-b626af702e62" + "block": "5d1b4f33-ae65-4154-b4f4-ff1403437600", + "port": "out" }, "target": { - "block": "3cad6e72-e7d3-4273-be1c-ce5f9b4c020a", - "port": "in" + "block": "840e71b2-bf5a-4e20-8413-d386500c87fa", + "port": "97b51945-d716-4b6c-9db9-970d08541249" } } ] @@ -158,13 +151,23 @@ "type": "basic.code", "data": { "code": "// AND logic gate\n\nassign c = a & b;", + "params": [], "ports": { "in": [ - "a", - "b" + { + "name": "a", + "size": 1 + }, + { + "name": "b", + "size": 1 + } ], "out": [ - "c" + { + "name": "c", + "size": 1 + } ] } }, @@ -177,7 +180,15 @@ "id": "18c2ebc7-5152-439c-9b3f-851c59bac834", "type": "basic.input", "data": { - "label": "" + "name": "", + "pins": [ + { + "index": "0", + "name": "", + "value": "0" + } + ], + "virtual": true }, "position": { "x": 64, @@ -188,7 +199,15 @@ "id": "664caf9e-5f40-4df4-800a-b626af702e62", "type": "basic.output", "data": { - "label": "" + "name": "", + "pins": [ + { + "index": "0", + "name": "", + "value": "0" + } + ], + "virtual": true }, "position": { "x": 752, @@ -199,7 +218,15 @@ "id": "97b51945-d716-4b6c-9db9-970d08541249", "type": "basic.input", "data": { - "label": "" + "name": "", + "pins": [ + { + "index": "0", + "name": "", + "value": "0" + } + ], + "virtual": true }, "position": { "x": 64, @@ -246,7 +273,7 @@ "x": 0, "y": 0 }, - "zoom": 0.9999999784900666 + "zoom": 1 } } } diff --git a/app/scripts/services/compiler.service.js b/app/scripts/services/compiler.service.js index 828ef6f88..c01e911b0 100644 --- a/app/scripts/services/compiler.service.js +++ b/app/scripts/services/compiler.service.js @@ -44,7 +44,7 @@ angular.module('icestudio') return 'v' + nodeSha1(id).toString().substring(0, 6); } else { - return id.replace('.', '_'); + return id.replace(/\./g, '_'); } } @@ -242,7 +242,6 @@ angular.module('icestudio') block.type !== 'basic.info') { // Header - instance += name; if (block.type === 'basic.code') { instance += '_' + digestId(block.id); From f4d3fe041ffb31d93ddc6cf97ae6b7ceb71dbb72 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jes=C3=BAs=20Arroyo=20Torrens?= Date: Thu, 22 Dec 2016 20:06:54 +0100 Subject: [PATCH 082/169] Update contador* blocks format --- .../logic/combinational/contadorAsc.ice | 237 +++++++++++------- .../logic/combinational/contadorDes.ice | 235 ++++++++++------- 2 files changed, 297 insertions(+), 175 deletions(-) diff --git a/app/resources/blocks/logic/combinational/contadorAsc.ice b/app/resources/blocks/logic/combinational/contadorAsc.ice index e8f31b70b..800d368d8 100644 --- a/app/resources/blocks/logic/combinational/contadorAsc.ice +++ b/app/resources/blocks/logic/combinational/contadorAsc.ice @@ -15,41 +15,45 @@ "id": "579cff99-2d27-41d4-a20b-262ca8a93ca9", "type": "basic.constant", "data": { - "label": "INIT_CNT", - "local": false, - "value": "4'h2" + "name": "INIT_CNT", + "value": "4'h2", + "local": false }, "position": { - "x": 160, - "y": 32 + "x": 312, + "y": 48 } }, { "id": "c299b4e2-ec25-4472-a58c-5dc46056c414", "type": "basic.constant", "data": { - "label": "FIN_CNT", - "local": false, - "value": "4'h5" + "name": "FIN_CNT", + "value": "4'h5", + "local": false }, "position": { - "x": 352, - "y": 32 + "x": 504, + "y": 48 } }, { "id": "c1e3529f-d1eb-4ae5-8345-a43512f21577", "type": "basic.output", "data": { - "label": "out0", - "pin": { - "name": "D1", - "value": "99" - } + "name": "out0", + "pins": [ + { + "index": "0", + "name": "D1", + "value": "99" + } + ], + "virtual": false }, "position": { - "x": 592, - "y": 128 + "x": 744, + "y": 144 } }, { @@ -58,124 +62,158 @@ "data": { "code": "// INIT_CNT: Valor inicial de la cuenta\n// FIN_CNT: Valor final de la cuenta\n\n// El registro interno inicia su\n// cuenta a partir del valor del\n// parametro INIT_CNT\nreg [3:0] _o = INIT_CNT;\n\nalways @(posedge clk) begin\n if (en) begin\n _o <= _o + 1;\n // cuando _o vale igual que\n // el parametro FIN_CNT\n // se \"reinicia\" la cuenta\n // a partir de INIT_CNT\n if (_o == FIN_CNT || _o == 4'hFF) begin\n _o <= INIT_CNT;\n end\n end\nend\n\nassign {o3, o2, o1, o0} = _o;\n\n// (tc) terminal count, un clk de ancho a\n// la salida cuando termina _o vale FIN_CNT o 0\nwire tc = ((_o == FIN_CNT || _o == 4'hFF) ? 1 : 0);", "params": [ - "INIT_CNT", - "FIN_CNT" + { + "name": "INIT_CNT" + }, + { + "name": "FIN_CNT" + } ], "ports": { "in": [ - "en", - "clk" + { + "name": "en", + "size": 1 + }, + { + "name": "clk", + "size": 1 + } ], "out": [ - "o0", - "o1", - "o2", - "o3", - "tc" + { + "name": "o0", + "size": 1 + }, + { + "name": "o1", + "size": 1 + }, + { + "name": "o2", + "size": 1 + }, + { + "name": "o3", + "size": 1 + }, + { + "name": "tc", + "size": 1 + } ] } }, "position": { - "x": 112, - "y": 176 + "x": 264, + "y": 192 } }, { "id": "1e21f6ca-9956-475d-a933-5bb01829f464", "type": "basic.output", "data": { - "label": "out1", - "pin": { - "name": "D2", - "value": "98" - } + "name": "out1", + "pins": [ + { + "index": "0", + "name": "D2", + "value": "98" + } + ], + "virtual": false }, "position": { - "x": 592, - "y": 200 + "x": 744, + "y": 216 } }, { - "id": "13b692a2-7ad9-44f7-afb9-83210bd94f28", + "id": "aa65e0fd-fea6-4cde-bcea-5b09f97848ff", "type": "bit.1", - "data": {}, "position": { - "x": -72, - "y": 208 + "x": 72, + "y": 224 } }, { "id": "e83e3ae9-0616-4a17-a145-f14954f3f6e0", "type": "basic.output", "data": { - "label": "out2", - "pin": { - "name": "D3", - "value": "97" - } + "name": "out2", + "pins": [ + { + "index": "0", + "name": "D3", + "value": "97" + } + ], + "virtual": false }, "position": { - "x": 592, - "y": 272 + "x": 744, + "y": 288 } }, { "id": "8d6dece9-e3b8-42d4-b8eb-386c90440923", "type": "basic.input", "data": { - "label": "clk", - "pin": { - "name": "CLK", - "value": "21" - } + "name": "clk", + "pins": [ + { + "index": "0", + "name": "CLK", + "value": "21" + } + ], + "virtual": false }, "position": { - "x": -80, - "y": 336 + "x": 72, + "y": 352 } }, { "id": "1f036705-53b5-4833-83ed-adf0a7bf3b98", "type": "basic.output", "data": { - "label": "out3", - "pin": { - "name": "TR8", - "value": "117" - } + "name": "out3", + "pins": [ + { + "index": "0", + "name": "TR8", + "value": "117" + } + ], + "virtual": false }, "position": { - "x": 592, - "y": 344 + "x": 744, + "y": 360 } }, { "id": "a9409df4-b096-4ad0-a1c6-c6eb9bfa1d89", "type": "basic.output", "data": { - "label": "tc", - "pin": { - "name": "D4", - "value": "96" - } + "name": "tc", + "pins": [ + { + "index": "0", + "name": "D4", + "value": "96" + } + ], + "virtual": false }, "position": { - "x": 592, - "y": 416 + "x": 744, + "y": 432 } } ], "wires": [ - { - "source": { - "block": "13b692a2-7ad9-44f7-afb9-83210bd94f28", - "port": "19c8f68d-5022-487f-9ab0-f0a3cd58bead" - }, - "target": { - "block": "86492073-e297-4c25-9678-30ab6dd1fa10", - "port": "en" - } - }, { "source": { "block": "86492073-e297-4c25-9678-30ab6dd1fa10", @@ -255,6 +293,16 @@ "block": "86492073-e297-4c25-9678-30ab6dd1fa10", "port": "clk" } + }, + { + "source": { + "block": "aa65e0fd-fea6-4cde-bcea-5b09f97848ff", + "port": "19c8f68d-5022-487f-9ab0-f0a3cd58bead" + }, + "target": { + "block": "86492073-e297-4c25-9678-30ab6dd1fa10", + "port": "en" + } } ] }, @@ -262,13 +310,14 @@ "bit.1": { "version": "1.0", "package": { - "name": "", - "version": "", - "description": "", - "author": "", - "image": "" + "name": "Bit 1", + "version": "1.0.0", + "description": "Assign 1 to the output wire", + "author": "Jesús Arroyo", + "image": "%3Csvg%20xmlns=%22http://www.w3.org/2000/svg%22%20width=%2247.303%22%20height=%2227.648%22%20viewBox=%220%200%2044.346456%2025.919999%22%3E%3Ctext%20style=%22line-height:125%25%22%20x=%22325.218%22%20y=%22315.455%22%20font-weight=%22400%22%20font-size=%2212.669%22%20font-family=%22sans-serif%22%20letter-spacing=%220%22%20word-spacing=%220%22%20transform=%22translate(-307.01%20-298.51)%22%3E%3Ctspan%20x=%22325.218%22%20y=%22315.455%22%20style=%22-inkscape-font-specification:'Courier%2010%20Pitch'%22%20font-family=%22Courier%2010%20Pitch%22%3E1%3C/tspan%3E%3C/text%3E%3C/svg%3E" }, "design": { + "board": "icezum", "graph": { "blocks": [ { @@ -276,10 +325,14 @@ "type": "basic.code", "data": { "code": "// Bit 1\n\nassign v = 1'b1;", + "params": [], "ports": { "in": [], "out": [ - "v" + { + "name": "v", + "size": 1 + } ] } }, @@ -292,7 +345,15 @@ "id": "19c8f68d-5022-487f-9ab0-f0a3cd58bead", "type": "basic.output", "data": { - "label": "" + "name": "", + "pins": [ + { + "index": "0", + "name": "", + "value": "0" + } + ], + "virtual": true }, "position": { "x": 608, @@ -326,10 +387,10 @@ }, "state": { "pan": { - "x": 194.09767648117244, - "y": 17.47600388566561 + "x": 0, + "y": 0 }, - "zoom": 0.9124844670295715 + "zoom": 1.000000029620754 } } -} \ No newline at end of file +} diff --git a/app/resources/blocks/logic/combinational/contadorDes.ice b/app/resources/blocks/logic/combinational/contadorDes.ice index a95ded233..03efd2c52 100644 --- a/app/resources/blocks/logic/combinational/contadorDes.ice +++ b/app/resources/blocks/logic/combinational/contadorDes.ice @@ -15,41 +15,45 @@ "id": "579cff99-2d27-41d4-a20b-262ca8a93ca9", "type": "basic.constant", "data": { - "label": "INIT_CNT", - "local": false, - "value": "4'h6" + "name": "INIT_CNT", + "value": "4'h6", + "local": false }, "position": { - "x": 160, - "y": 32 + "x": 296, + "y": 48 } }, { "id": "587cbcbb-9779-4bd4-a6da-501087ccf9d5", "type": "basic.constant", "data": { - "label": "FIN_CNT", - "value": "", + "name": "FIN_CNT", + "value": "4'h0", "local": false }, "position": { - "x": 352, - "y": 32 + "x": 488, + "y": 48 } }, { "id": "c1e3529f-d1eb-4ae5-8345-a43512f21577", "type": "basic.output", "data": { - "label": "out0", - "pin": { - "name": "D1", - "value": "99" - } + "name": "out0", + "pins": [ + { + "index": "0", + "name": "D1", + "value": "99" + } + ], + "virtual": false }, "position": { - "x": 592, - "y": 128 + "x": 728, + "y": 144 } }, { @@ -58,110 +62,154 @@ "data": { "code": "// INIT_CNT: Valor inicial de la cuenta\n// FIN_CNT: Valor final de la cuenta\n\n// El registro interno inicia su\n// cuenta a partir del valor del\n// parametro INIT_CNT\nreg [3:0] _o = INIT_CNT;\n\nalways @(posedge clk) begin\n if (en) begin\n _o <= _o - 1;\n // si _o es igual a 0 o al valor\n // de FIN_CNT se reinicia\n // la cuenta\n if (_o == FIN_CNT || _o == 0) begin\n _o <= INIT_CNT;\n end\n end\nend\n\nassign {o3, o2, o1, o0} = _o;\n\n// (tc) terminal count, un clk de ancho a\n// la salida cuando termina _o vale FIN_CNT o 0\nwire tc = ((_o == FIN_CNT || _o == 0) ? 1 : 0);", "params": [ - "INIT_CNT", - "FIN_CNT" + { + "name": "INIT_CNT" + }, + { + "name": "FIN_CNT" + } ], "ports": { "in": [ - "en", - "clk" + { + "name": "en", + "size": 1 + }, + { + "name": "clk", + "size": 1 + } ], "out": [ - "o0", - "o1", - "o2", - "o3", - "tc" + { + "name": "o0", + "size": 1 + }, + { + "name": "o1", + "size": 1 + }, + { + "name": "o2", + "size": 1 + }, + { + "name": "o3", + "size": 1 + }, + { + "name": "tc", + "size": 1 + } ] } }, "position": { - "x": 112, - "y": 176 + "x": 248, + "y": 192 } }, { "id": "1e21f6ca-9956-475d-a933-5bb01829f464", "type": "basic.output", "data": { - "label": "out1", - "pin": { - "name": "D2", - "value": "98" - } + "name": "out1", + "pins": [ + { + "index": "0", + "name": "D2", + "value": "98" + } + ], + "virtual": false }, "position": { - "x": 592, - "y": 200 + "x": 728, + "y": 216 } }, { - "id": "13b692a2-7ad9-44f7-afb9-83210bd94f28", + "id": "dc5dc1c3-0471-4669-9760-2b2ee9d7d467", "type": "bit.1", - "data": {}, "position": { - "x": -88, - "y": 208 + "x": 56, + "y": 224 } }, { "id": "e83e3ae9-0616-4a17-a145-f14954f3f6e0", "type": "basic.output", "data": { - "label": "out2", - "pin": { - "name": "D3", - "value": "97" - } + "name": "out2", + "pins": [ + { + "index": "0", + "name": "D3", + "value": "97" + } + ], + "virtual": false }, "position": { - "x": 592, - "y": 272 + "x": 728, + "y": 288 } }, { "id": "8d6dece9-e3b8-42d4-b8eb-386c90440923", "type": "basic.input", "data": { - "label": "clk", - "pin": { - "name": "CLK", - "value": "21" - } + "name": "clk", + "pins": [ + { + "index": "0", + "name": "CLK", + "value": "21" + } + ], + "virtual": false }, "position": { - "x": -80, - "y": 336 + "x": 56, + "y": 352 } }, { "id": "1f036705-53b5-4833-83ed-adf0a7bf3b98", "type": "basic.output", "data": { - "label": "out3", - "pin": { - "name": "TR8", - "value": "117" - } + "name": "out3", + "pins": [ + { + "index": "0", + "name": "TR8", + "value": "117" + } + ], + "virtual": false }, "position": { - "x": 592, - "y": 344 + "x": 728, + "y": 360 } }, { "id": "a9409df4-b096-4ad0-a1c6-c6eb9bfa1d89", "type": "basic.output", "data": { - "label": "tc", - "pin": { - "name": "D4", - "value": "96" - } + "name": "tc", + "pins": [ + { + "index": "0", + "name": "D4", + "value": "96" + } + ], + "virtual": false }, "position": { - "x": 592, - "y": 416 + "x": 728, + "y": 432 } } ], @@ -186,16 +234,6 @@ "port": "INIT_CNT" } }, - { - "source": { - "block": "13b692a2-7ad9-44f7-afb9-83210bd94f28", - "port": "19c8f68d-5022-487f-9ab0-f0a3cd58bead" - }, - "target": { - "block": "75566233-6418-463a-a42b-1e975f6caf7c", - "port": "en" - } - }, { "source": { "block": "75566233-6418-463a-a42b-1e975f6caf7c", @@ -255,6 +293,16 @@ "block": "75566233-6418-463a-a42b-1e975f6caf7c", "port": "clk" } + }, + { + "source": { + "block": "dc5dc1c3-0471-4669-9760-2b2ee9d7d467", + "port": "19c8f68d-5022-487f-9ab0-f0a3cd58bead" + }, + "target": { + "block": "75566233-6418-463a-a42b-1e975f6caf7c", + "port": "en" + } } ] }, @@ -262,13 +310,14 @@ "bit.1": { "version": "1.0", "package": { - "name": "", - "version": "", - "description": "", - "author": "", - "image": "" + "name": "Bit 1", + "version": "1.0.0", + "description": "Assign 1 to the output wire", + "author": "Jesús Arroyo", + "image": "%3Csvg%20xmlns=%22http://www.w3.org/2000/svg%22%20width=%2247.303%22%20height=%2227.648%22%20viewBox=%220%200%2044.346456%2025.919999%22%3E%3Ctext%20style=%22line-height:125%25%22%20x=%22325.218%22%20y=%22315.455%22%20font-weight=%22400%22%20font-size=%2212.669%22%20font-family=%22sans-serif%22%20letter-spacing=%220%22%20word-spacing=%220%22%20transform=%22translate(-307.01%20-298.51)%22%3E%3Ctspan%20x=%22325.218%22%20y=%22315.455%22%20style=%22-inkscape-font-specification:'Courier%2010%20Pitch'%22%20font-family=%22Courier%2010%20Pitch%22%3E1%3C/tspan%3E%3C/text%3E%3C/svg%3E" }, "design": { + "board": "icezum", "graph": { "blocks": [ { @@ -276,10 +325,14 @@ "type": "basic.code", "data": { "code": "// Bit 1\n\nassign v = 1'b1;", + "params": [], "ports": { "in": [], "out": [ - "v" + { + "name": "v", + "size": 1 + } ] } }, @@ -292,7 +345,15 @@ "id": "19c8f68d-5022-487f-9ab0-f0a3cd58bead", "type": "basic.output", "data": { - "label": "" + "name": "", + "pins": [ + { + "index": "0", + "name": "", + "value": "0" + } + ], + "virtual": true }, "position": { "x": 608, @@ -326,10 +387,10 @@ }, "state": { "pan": { - "x": 299.1610720840899, - "y": 65.30744435772274 + "x": 0, + "y": 0 }, - "zoom": 0.7185669634733571 + "zoom": 1 } } -} \ No newline at end of file +} From 773e8a01f5d8514485edf50594d49536e9d1295c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jes=C3=BAs=20Arroyo=20Torrens?= Date: Thu, 22 Dec 2016 20:13:35 +0100 Subject: [PATCH 083/169] Update POT file --- README.md | 8 +- app/resources/locale/en/en.po | 449 ++++++++++++++++---------- app/resources/locale/es_ES/es_ES.po | 457 ++++++++++++++++---------- app/resources/locale/eu_ES/eu_ES.po | 461 ++++++++++++++++---------- app/resources/locale/fr_FR/fr_FR.po | 480 ++++++++++++++++++---------- app/resources/locale/gl_ES/gl_ES.po | 461 ++++++++++++++++---------- app/resources/locale/template.pot | 415 ++++++++++++++---------- 7 files changed, 1710 insertions(+), 1021 deletions(-) diff --git a/README.md b/README.md index 9d503171f..9fd328e31 100644 --- a/README.md +++ b/README.md @@ -78,10 +78,10 @@ NOTE: in Mac OS X this command also generates a **dmg** package. | Language | Translated strings | |:----------:|:------------------------------------------:| | English | ![Progress](http://progressed.io/bar/100) | -| Spanish | ![Progress](http://progressed.io/bar/100) | -| French | ![Progress](http://progressed.io/bar/96) | -| Basque | ![Progress](http://progressed.io/bar/69) | -| Galician | ![Progress](http://progressed.io/bar/67) | +| Spanish | ![Progress](http://progressed.io/bar/83) | +| French | ![Progress](http://progressed.io/bar/81) | +| Basque | ![Progress](http://progressed.io/bar/56) | +| Galician | ![Progress](http://progressed.io/bar/54) | **Contribute**: add or update the [translations](https://github.com/FPGAwars/icestudio/tree/develop/app/resources/locale) by following the [next instructions](https://angular-gettext.rocketeer.be/dev-guide/translate/#poedit). diff --git a/app/resources/locale/en/en.po b/app/resources/locale/en/en.po index d05c5ec61..1fd2672cc 100644 --- a/app/resources/locale/en/en.po +++ b/app/resources/locale/en/en.po @@ -9,13 +9,13 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: Poedit 1.8.7.1\n" +"X-Generator: Poedit 1.5.4\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" #. 1. Basic #: app/resources/examples/labels.js:4 msgid "1_basic" -msgstr "1. Basic" +msgstr "1_basic" #. 1. Led on #: app/resources/examples/labels.js:6 @@ -32,12 +32,12 @@ msgstr "2. Switch led" msgid "3_switch_and_gate" msgstr "3. Switch and gate" -#: app/scripts/services/utils.service.js:421 -#: app/scripts/services/utils.service.js:496 +#: app/scripts/services/utils.service.js:439 +#: app/scripts/services/utils.service.js:519 msgid "Unplug and reconnect the board" msgstr "Unplug and reconnect the board" -#: app/scripts/services/utils.service.js:487 +#: app/scripts/services/utils.service.js:510 msgid "" "

                FTDI driver installation instructions

                1. Connect the FPGA " "board
                2. Replace the (Interface 0) driver of the board by " @@ -47,7 +47,7 @@ msgstr "" "board
                3. Replace the (Interface 0) driver of the board by " "libusbK
                4. Unplug and reconnect the board
                " -#: app/scripts/services/utils.service.js:503 +#: app/scripts/services/utils.service.js:526 msgid "" "

                FTDI driver uninstallation instructions

                1. Find the FPGA USB " "Device
                2. Select the board interface and uninstall the driver
                " @@ -55,79 +55,94 @@ msgstr "" "

                FTDI driver uninstallation instructions

                1. Find the FPGA USB " "Device
                2. Select the board interface and uninstall the driver
                " -#: app/views/menu.html:275 +#: app/views/menu.html:260 msgid "About Icestudio" msgstr "About Icestudio" -#: app/scripts/controllers/menu.js:421 +#: app/scripts/controllers/menu.js:415 msgid "Add a block to start" msgstr "Add a block to start" -#: app/views/menu.html:285 +#: app/views/menu.html:50 +msgid "Add as block" +msgstr "Add as block" + +#: app/scripts/services/utils.service.js:668 +msgid "Author" +msgstr "Author" + +#: app/views/menu.html:270 msgid "Basic" msgstr "Basic" -#: app/views/menu.html:153 +#: app/views/menu.html:138 msgid "Basque" msgstr "Basque" -#: app/scripts/services/common.service.js:183 -msgid "Block exported as {{name}}" -msgstr "Block exported as {{name}}" +#: app/scripts/services/blocks.service.js:674 +#: app/scripts/services/blocks.service.js:683 +#: app/scripts/services/blocks.service.js:713 +#: app/scripts/services/blocks.service.js:730 +msgid "Block updated" +msgstr "Block updated" -#: app/scripts/services/common.service.js:164 +#: app/scripts/services/project.service.js:293 msgid "Block {{name}} imported" msgstr "Block {{name}} imported" -#: app/scripts/services/tools.service.js:205 +#: app/scripts/services/tools.service.js:218 msgid "Board {{name}} not detected" msgstr "Board {{name}} not detected" -#: app/scripts/controllers/menu.js:383 app/scripts/controllers/menu.js:390 +#: app/scripts/controllers/menu.js:371 app/scripts/controllers/menu.js:378 msgid "Board {{name}} selected" msgstr "Board {{name}} selected" -#: app/views/menu.html:186 +#: app/views/menu.html:171 msgid "Boards" msgstr "Boards" -#: app/views/menu.html:204 +#: app/views/menu.html:189 msgid "Build" msgstr "Build" -#: app/scripts/controllers/main.js:15 +#: app/scripts/controllers/main.js:16 msgid "Cancel" msgstr "Cancel" -#: app/scripts/services/tools.service.js:417 +#: app/scripts/services/tools.service.js:429 msgid "Check Internet connection..." msgstr "Check Internet connection..." -#: app/scripts/services/tools.service.js:425 +#: app/scripts/services/tools.service.js:437 msgid "Check Python..." msgstr "Check Python..." -#: app/views/menu.html:113 +#: app/views/menu.html:98 msgid "Clear all" msgstr "Clear all" -#: app/views/menu.html:107 +#: app/views/menu.html:92 msgid "Clone selected" msgstr "Clone selected" -#: app/views/menu.html:288 +#: app/views/menu.html:276 msgid "Code" msgstr "Code" -#: app/views/menu.html:271 +#: app/views/menu.html:256 msgid "Community forum" msgstr "Community forum" -#: app/views/menu.html:180 +#: app/views/menu.html:275 +msgid "Constant" +msgstr "Constant" + +#: app/views/menu.html:165 msgid "Datasheet" msgstr "Datasheet" -#: app/scripts/services/tools.service.js:294 +#: app/scripts/services/tools.service.js:306 msgid "" "Default toolchain not found. Toolchain will be downloaded. This operation " "requires Internet connection. Do you want to continue?" @@ -135,79 +150,97 @@ msgstr "" "Default toolchain not found. Toolchain will be downloaded. This operation " "requires Internet connection. Do you want to continue?" -#: app/views/menu.html:245 +#: app/scripts/services/utils.service.js:667 +msgid "Description" +msgstr "Description" + +#: app/views/menu.html:230 msgid "Disable" msgstr "Disable" -#: app/scripts/controllers/menu.js:256 +#: app/scripts/controllers/menu.js:222 msgid "Do you want to clear all?" msgstr "Do you want to clear all?" -#: app/scripts/controllers/menu.js:269 +#: app/scripts/controllers/menu.js:192 +msgid "Do you want to exit the application?" +msgstr "Do you want to exit the application?" + +#: app/scripts/controllers/menu.js:213 msgid "Do you want to remove the selected block?" msgstr "Do you want to remove the selected block?" -#: app/views/menu.html:264 +#: app/views/menu.html:249 msgid "Documentation" msgstr "Documentation" -#: app/views/menu.html:238 +#: app/views/menu.html:223 msgid "Drivers" msgstr "Drivers" -#: app/scripts/services/utils.service.js:418 -#: app/scripts/services/utils.service.js:481 +#: app/scripts/services/utils.service.js:436 +#: app/scripts/services/utils.service.js:504 msgid "Drivers disabled" msgstr "Drivers disabled" -#: app/scripts/services/utils.service.js:415 -#: app/scripts/services/utils.service.js:462 +#: app/scripts/services/utils.service.js:433 +#: app/scripts/services/utils.service.js:485 msgid "Drivers enabled" msgstr "Drivers enabled" -#: app/scripts/services/tools.service.js:217 +#: app/scripts/services/tools.service.js:230 msgid "Duplicated FPGA I/O ports" msgstr "Duplicated FPGA I/O ports" -#: app/views/menu.html:100 +#: app/scripts/services/blocks.service.js:314 +msgid "Duplicated block attributes" +msgstr "Duplicated block attributes" + +#: app/views/menu.html:85 msgid "Edit" msgstr "Edit" -#: app/views/menu.html:241 +#: app/views/menu.html:226 msgid "Enable" msgstr "Enable" -#: app/views/menu.html:135 +#: app/views/menu.html:120 msgid "English" msgstr "English" -#: app/scripts/services/graph.service.js:438 -#: app/scripts/services/graph.service.js:496 +#: app/scripts/services/blocks.service.js:126 +msgid "Enter the constant blocks" +msgstr "Enter the constant blocks" + +#: app/scripts/services/blocks.service.js:213 msgid "Enter the input ports" msgstr "Enter the input ports" -#: app/scripts/services/graph.service.js:439 -#: app/scripts/services/graph.service.js:536 +#: app/scripts/services/blocks.service.js:214 msgid "Enter the output ports" msgstr "Enter the output ports" -#: app/scripts/controllers/menu.js:233 -msgid "Enter the project's image path" -msgstr "Enter the project's image path" +#: app/scripts/services/blocks.service.js:215 +msgid "Enter the parameters" +msgstr "Enter the parameters" + +#: app/scripts/services/blocks.service.js:57 +msgid "Enter the ports" +msgstr "Enter the ports" -#: app/scripts/controllers/menu.js:82 -msgid "Enter the project's title" -msgstr "Enter the project's title" +#: app/scripts/controllers/menu.js:73 +msgid "Enter the project name" +msgstr "Enter the project name" -#: app/scripts/controllers/menu.js:241 +#: app/scripts/controllers/menu.js:249 msgid "Enter the remote hostname user@host (experimental)" msgstr "Enter the remote hostname user@host (experimental)" -#: app/scripts/services/tools.service.js:317 +#: app/scripts/services/tools.service.js:329 msgid "Error: default toolchain not found in '{{dir}}'" msgstr "Error: default toolchain not found in '{{dir}}'" -#: app/scripts/services/utils.service.js:610 +#: app/scripts/services/utils.service.js:800 msgid "Error: {{error}}" msgstr "Error: {{error}}" @@ -215,32 +248,28 @@ msgstr "Error: {{error}}" msgid "Examples" msgstr "Examples" -#: app/scripts/services/tools.service.js:175 +#: app/scripts/services/tools.service.js:187 msgid "Execute remote {{label}} ..." msgstr "Execute remote {{label}} ..." -#: app/views/menu.html:80 +#: app/views/menu.html:61 msgid "Export" msgstr "Export" -#: app/views/menu.html:76 -msgid "Export as block" -msgstr "Export as block" - -#: app/scripts/services/tools.service.js:449 +#: app/scripts/services/tools.service.js:461 msgid "Extract default apio files..." msgstr "Extract default apio files..." -#: app/scripts/services/tools.service.js:459 +#: app/scripts/services/tools.service.js:471 msgid "Extract default apio packages..." msgstr "Extract default apio packages..." -#: app/scripts/services/tools.service.js:437 +#: app/scripts/services/tools.service.js:449 msgid "Extract virtual env files..." msgstr "Extract virtual env files..." -#: app/scripts/services/tools.service.js:211 -#: app/scripts/services/tools.service.js:214 +#: app/scripts/services/tools.service.js:224 +#: app/scripts/services/tools.service.js:227 msgid "FPGA I/O ports not defined" msgstr "FPGA I/O ports not defined" @@ -248,219 +277,247 @@ msgstr "FPGA I/O ports not defined" msgid "File" msgstr "File" -#: app/scripts/services/common.service.js:125 +#: app/scripts/services/project.service.js:241 msgid "" "File {{file}} already exists in the project path. Do you want to replace it?" msgstr "" "File {{file}} already exists in the project path. Do you want to replace it?" -#: app/scripts/services/tools.service.js:148 +#: app/scripts/services/tools.service.js:163 msgid "File {{file}} does not exist" msgstr "File {{file}} does not exist" -#: app/scripts/services/common.service.js:153 +#: app/scripts/services/project.service.js:273 msgid "File {{file}} imported" msgstr "File {{file}} imported" -#: app/views/menu.html:159 +#: app/views/menu.html:144 msgid "French" msgstr "French" -#: app/scripts/services/common.service.js:223 +#: app/scripts/controllers/menu.js:176 msgid "GTKWave exported" msgstr "GTKWave exported" -#: app/views/menu.html:147 +#: app/views/menu.html:132 msgid "Galician" msgstr "Galician" -#: app/views/menu.html:254 +#: app/views/menu.html:239 msgid "Help" msgstr "Help" -#: app/scripts/services/utils.service.js:452 +#: app/scripts/services/utils.service.js:474 msgid "Homebrew is required" msgstr "Homebrew is required" -#: app/views/menu.html:120 -msgid "Image path" -msgstr "Image path" +#: app/scripts/services/utils.service.js:681 +msgid "Image" +msgstr "Image" -#: app/scripts/controllers/menu.js:322 +#: app/scripts/controllers/menu.js:309 msgid "Image {{name}} saved" msgstr "Image {{name}} saved" -#: app/views/menu.html:73 -msgid "Import block" -msgstr "Import block" - -#: app/views/menu.html:289 +#: app/views/menu.html:277 msgid "Info" msgstr "Info" -#: app/views/menu.html:290 +#: app/views/menu.html:273 msgid "Input" msgstr "Input" -#: app/views/menu.html:215 +#: app/views/menu.html:200 msgid "Install" msgstr "Install" -#: app/scripts/services/tools.service.js:454 +#: app/scripts/services/tools.service.js:466 msgid "Install default apio..." msgstr "Install default apio..." -#: app/scripts/services/tools.service.js:503 +#: app/scripts/services/tools.service.js:515 msgid "Installation completed" msgstr "Installation completed" -#: app/scripts/services/tools.service.js:346 -#: app/scripts/services/tools.service.js:383 +#: app/scripts/services/tools.service.js:358 +#: app/scripts/services/tools.service.js:395 msgid "Installing toolchain" msgstr "Installing toolchain" -#: app/scripts/services/tools.service.js:419 -#: app/scripts/services/utils.service.js:455 +#: app/scripts/services/tools.service.js:431 +#: app/scripts/services/utils.service.js:478 msgid "Internet connection required" msgstr "Internet connection required" -#: app/scripts/services/graph.service.js:134 +#: app/scripts/services/graph.service.js:133 msgid "Invalid Pull up connection:
                block already connected" msgstr "Invalid Pull up connection:
                block already connected" -#: app/scripts/services/graph.service.js:150 +#: app/scripts/services/graph.service.js:149 msgid "Invalid Pull up connection:
                only Input blocks allowed" msgstr "Invalid Pull up connection:
                only Input blocks allowed" -#: app/scripts/services/graph.service.js:141 +#: app/scripts/services/graph.service.js:140 msgid "Invalid block connection:
                Pull up already connected" msgstr "Invalid block connection:
                Pull up already connected" -#: app/scripts/services/graph.service.js:113 +#: app/scripts/services/graph.service.js:104 +#: app/scripts/services/graph.service.js:111 +#: app/scripts/services/graph.service.js:97 msgid "Invalid connection" msgstr "Invalid connection" -#: app/scripts/services/graph.service.js:127 +#: app/scripts/services/graph.service.js:168 +msgid "Invalid connection: →" +msgstr "Invalid connection: →" + +#: app/scripts/services/graph.service.js:126 msgid "Invalid multiple input connections" msgstr "Invalid multiple input connections" -#: app/scripts/services/graph.service.js:298 -msgid "Label updated" -msgstr "Label updated" - -#: app/views/menu.html:131 +#: app/views/menu.html:116 msgid "Language" msgstr "Language" -#: app/scripts/services/tools.service.js:442 +#: app/scripts/services/blocks.service.js:127 +#: app/scripts/services/blocks.service.js:697 +msgid "Local parameter" +msgstr "Local parameter" + +#: app/scripts/services/tools.service.js:454 msgid "Make virtual env..." msgstr "Make virtual env..." +#: app/scripts/services/utils.service.js:665 +msgid "Name" +msgstr "Name" + #: app/views/menu.html:27 -msgid "New project" -msgstr "New project" +msgid "New" +msgstr "New" -#: app/scripts/services/common.service.js:36 +#: app/scripts/services/project.service.js:44 msgid "New project {{name}} created" msgstr "New project {{name}} created" -#: app/scripts/controllers/main.js:14 +#: app/scripts/controllers/main.js:15 msgid "OK" msgstr "OK" +#: app/scripts/services/project.service.js:188 +#: app/scripts/services/project.service.js:60 +msgid "Old project format" +msgstr "Old project format" + #: app/views/menu.html:30 -msgid "Open project" -msgstr "Open project" +msgid "Open" +msgstr "Open" + +#: app/scripts/services/utils.service.js:688 +msgid "Open SVG" +msgstr "Open SVG" -#: app/scripts/services/common.service.js:156 +#: app/scripts/services/project.service.js:276 msgid "Original file {{file}} does not exist" msgstr "Original file {{file}} does not exist" -#: app/views/menu.html:291 +#: app/views/menu.html:274 msgid "Output" msgstr "Output" -#: app/scripts/services/common.service.js:203 +#: app/scripts/controllers/menu.js:158 msgid "PCF file exported" msgstr "PCF file exported" -#: app/views/menu.html:117 +#: app/views/menu.html:102 msgid "Preferences" msgstr "Preferences" -#: app/scripts/services/common.service.js:55 +#: app/views/menu.html:105 +msgid "Project information" +msgstr "Project information" + +#: app/scripts/services/project.service.js:64 msgid "Project {{name}} loaded" msgstr "Project {{name}} loaded" -#: app/scripts/services/common.service.js:68 +#: app/scripts/services/project.service.js:160 msgid "Project {{name}} saved" msgstr "Project {{name}} saved" -#: app/scripts/services/tools.service.js:430 +#: app/scripts/services/tools.service.js:442 msgid "Python 2.7 is required" msgstr "Python 2.7 is required" -#: app/views/project.html:3 +#: app/views/menu.html:79 +msgid "Quit" +msgstr "Quit" + +#: app/views/design.html:4 msgid "Read only" msgstr "Read only" -#: app/scripts/services/tools.service.js:243 +#: app/scripts/services/tools.service.js:255 msgid "Remote host {{name}} not connected" msgstr "Remote host {{name}} not connected" -#: app/views/menu.html:125 +#: app/views/menu.html:110 msgid "Remote hostname" msgstr "Remote hostname" -#: app/views/menu.html:223 +#: app/views/menu.html:208 msgid "Remove" msgstr "Remove" -#: app/views/menu.html:110 +#: app/views/menu.html:95 msgid "Remove selected" msgstr "Remove selected" -#: app/views/menu.html:228 +#: app/scripts/services/utils.service.js:690 +msgid "Reset SVG" +msgstr "Reset SVG" + +#: app/views/menu.html:213 msgid "Reset default" msgstr "Reset default" -#: app/views/menu.html:103 +#: app/views/menu.html:88 msgid "Reset view" msgstr "Reset view" -#: app/views/menu.html:66 +#: app/views/menu.html:54 msgid "Save" msgstr "Save" -#: app/views/menu.html:69 +#: app/scripts/services/utils.service.js:689 +msgid "Save SVG" +msgstr "Save SVG" + +#: app/views/menu.html:57 msgid "Save as" msgstr "Save as" -#: app/views/menu.html:267 +#: app/views/menu.html:252 msgid "Source code" msgstr "Source code" -#: app/views/menu.html:141 +#: app/views/menu.html:126 msgid "Spanish" msgstr "Spanish" -#: app/scripts/services/tools.service.js:164 +#: app/scripts/services/tools.service.js:176 msgid "Synchronize remote files ..." msgstr "Synchronize remote files ..." -#: app/views/menu.html:50 -msgid "Templates" -msgstr "Templates" - -#: app/views/menu.html:89 +#: app/views/menu.html:70 msgid "Testbench" msgstr "Testbench" -#: app/scripts/services/common.service.js:213 +#: app/scripts/controllers/menu.js:167 msgid "Testbench exported" msgstr "Testbench exported" -#: app/scripts/controllers/menu.js:379 +#: app/scripts/controllers/menu.js:367 msgid "" "The current FPGA I/O configuration will be lost. Do you want to change to " "{{name}} board?" @@ -468,7 +525,7 @@ msgstr "" "The current FPGA I/O configuration will be lost. Do you want to change to " "{{name}} board?" -#: app/scripts/controllers/menu.js:103 app/scripts/controllers/menu.js:126 +#: app/scripts/controllers/menu.js:105 app/scripts/controllers/menu.js:90 msgid "" "The current project will be removed. Do you want to continue loading the " "project?" @@ -476,15 +533,15 @@ msgstr "" "The current project will be removed. Do you want to continue loading the " "project?" -#: app/scripts/services/tools.service.js:322 +#: app/scripts/services/tools.service.js:334 msgid "The toolchain will be removed. Do you want to continue?" msgstr "The toolchain will be removed. Do you want to continue?" -#: app/scripts/services/tools.service.js:310 +#: app/scripts/services/tools.service.js:322 msgid "The toolchain will be restored to default. Do you want to continue?" msgstr "The toolchain will be restored to default. Do you want to continue?" -#: app/scripts/services/tools.service.js:302 +#: app/scripts/services/tools.service.js:314 msgid "" "The toolchain will be updated. This operation requires Internet connection. " "Do you want to continue?" @@ -492,7 +549,7 @@ msgstr "" "The toolchain will be updated. This operation requires Internet connection. " "Do you want to continue?" -#: app/scripts/services/common.service.js:95 +#: app/scripts/services/project.service.js:210 msgid "" "This import operation requires a project path. You need to save the current " "project. Do you want to continue?" @@ -500,77 +557,98 @@ msgstr "" "This import operation requires a project path. You need to save the current " "project. Do you want to continue?" -#: app/views/menu.html:211 +#: app/views/menu.html:196 msgid "Toolchain" msgstr "Toolchain" -#: app/scripts/services/tools.service.js:504 +#: app/scripts/services/tools.service.js:516 msgid "Toolchain installed" msgstr "Toolchain installed" -#: app/scripts/services/tools.service.js:508 +#: app/scripts/services/tools.service.js:520 msgid "Toolchain not installed" msgstr "Toolchain not installed" -#: app/scripts/services/tools.service.js:79 -#: app/scripts/services/utils.service.js:493 -#: app/scripts/services/utils.service.js:509 +#: app/scripts/services/tools.service.js:91 +#: app/scripts/services/utils.service.js:516 +#: app/scripts/services/utils.service.js:532 msgid "Toolchain not installed. Please, install the toolchain" msgstr "Toolchain not installed. Please, install the toolchain" -#: app/scripts/services/tools.service.js:326 +#: app/scripts/services/tools.service.js:338 msgid "Toolchain removed" msgstr "Toolchain removed" -#: app/views/menu.html:198 +#: app/views/menu.html:183 msgid "Tools" msgstr "Tools" -#: app/scripts/services/tools.service.js:208 +#: app/scripts/services/tools.service.js:221 msgid "Unknown board" msgstr "Unknown board" -#: app/views/menu.html:218 +#: app/views/menu.html:203 msgid "Update" msgstr "Update" -#: app/scripts/services/graph.service.js:292 -msgid "Update the port label" -msgstr "Update the port label" +#: app/scripts/services/blocks.service.js:696 +msgid "Update the block label" +msgstr "Update the block label" + +#: app/scripts/services/blocks.service.js:644 +msgid "Update the port" +msgstr "Update the port" -#: app/views/menu.html:207 +#: app/views/menu.html:192 msgid "Upload" msgstr "Upload" -#: app/views/menu.html:201 +#: app/views/menu.html:186 msgid "Verify" msgstr "Verify" -#: app/scripts/services/common.service.js:193 +#: app/scripts/controllers/menu.js:149 msgid "Verilog code exported" msgstr "Verilog code exported" -#: app/views/menu.html:260 +#: app/scripts/services/utils.service.js:666 app/views/menu.html:245 msgid "Version" msgstr "Version" -#: app/views/menu.html:171 +#: app/views/menu.html:156 msgid "View" msgstr "View" -#: app/views/menu.html:257 +#: app/views/menu.html:242 msgid "View license" msgstr "View license" -#: app/scripts/services/graph.service.js:593 +#: app/scripts/services/blocks.service.js:58 +#: app/scripts/services/blocks.service.js:645 +msgid "Virtual port" +msgstr "Virtual port" + +#: app/scripts/services/blocks.service.js:348 msgid "Wrong block format: {{type}}" msgstr "Wrong block format: {{type}}" -#: app/scripts/services/common.service.js:58 +#: app/scripts/services/blocks.service.js:146 +#: app/scripts/services/blocks.service.js:263 +msgid "Wrong parameter name {{name}}" +msgstr "Wrong parameter name {{name}}" + +#: app/scripts/services/blocks.service.js:233 +#: app/scripts/services/blocks.service.js:248 +#: app/scripts/services/blocks.service.js:688 +#: app/scripts/services/blocks.service.js:77 +msgid "Wrong port name {{name}}" +msgstr "Wrong port name {{name}}" + +#: app/scripts/services/project.service.js:72 msgid "Wrong project format: {{name}}" msgstr "Wrong project format: {{name}}" -#: app/scripts/services/tools.service.js:240 +#: app/scripts/services/tools.service.js:252 msgid "Wrong remote hostname {{name}}" msgstr "Wrong remote hostname {{name}}" @@ -579,7 +657,7 @@ msgstr "Wrong remote hostname {{name}}" msgid "and" msgstr "And" -#: app/views/project.html:4 +#: app/views/design.html:5 msgid "back" msgstr "back" @@ -598,8 +676,18 @@ msgstr "Combinational" msgid "config" msgstr "Config" +#. contadorAsc +#: app/resources/blocks/labels.js:60 +msgid "contadorAsc" +msgstr "contadorAsc" + +#. contadorDes +#: app/resources/blocks/labels.js:62 +msgid "contadorDes" +msgstr "contadorDes" + #. Debouncer -#: app/resources/blocks/labels.js:57 +#: app/resources/blocks/labels.js:58 msgid "debouncer" msgstr "Debouncer" @@ -629,17 +717,17 @@ msgid "dff_sr" msgstr "D flip-flop" #. Build done -#: app/scripts/services/tools.service.js:255 +#: app/scripts/services/tools.service.js:267 msgid "done_build" msgstr "Build done" #. Upload done -#: app/scripts/services/tools.service.js:257 +#: app/scripts/services/tools.service.js:269 msgid "done_upload" msgstr "Upload done" #. Verification done -#: app/scripts/services/tools.service.js:253 +#: app/scripts/services/tools.service.js:265 msgid "done_verify" msgstr "Verification done" @@ -709,17 +797,17 @@ msgid "sequential" msgstr "Sequential" #. Start building ... -#: app/scripts/services/tools.service.js:45 +#: app/scripts/services/tools.service.js:57 msgid "start_build" msgstr "Start building ..." #. Start uploading ... -#: app/scripts/services/tools.service.js:47 +#: app/scripts/services/tools.service.js:59 msgid "start_upload" msgstr "Start uploading ..." #. Start verification ... -#: app/scripts/services/tools.service.js:43 +#: app/scripts/services/tools.service.js:55 msgid "start_verify" msgstr "Start verification ..." @@ -738,7 +826,7 @@ msgstr "T flip-flop" msgid "tri_state" msgstr "Tri-state" -#: app/scripts/app.js:38 app/scripts/controllers/menu.js:83 +#: app/scripts/app.js:42 app/scripts/controllers/menu.js:74 msgid "untitled" msgstr "untitled" @@ -752,14 +840,35 @@ msgstr "Xnor" msgid "xor" msgstr "Xor" -#: app/scripts/controllers/menu.js:370 +#: app/scripts/controllers/menu.js:357 msgid "{{board}} datasheet not defined" msgstr "{{board}} datasheet not defined" -#: app/scripts/controllers/menu.js:360 +#: app/scripts/controllers/menu.js:347 msgid "{{board}} pinout not defined" msgstr "{{board}} pinout not defined" +#~ msgid "Block exported as {{name}}" +#~ msgstr "Block exported as {{name}}" + +#~ msgid "Enter the project's image path" +#~ msgstr "Enter the project's image path" + +#~ msgid "Export as block" +#~ msgstr "Export as block" + +#~ msgid "Import block" +#~ msgstr "Import block" + +#~ msgid "New project" +#~ msgstr "New project" + +#~ msgid "Open project" +#~ msgstr "Open project" + +#~ msgid "Templates" +#~ msgstr "Templates" + #~ msgid "Datasheet not defined" #~ msgstr "Datasheet not defined" diff --git a/app/resources/locale/es_ES/es_ES.po b/app/resources/locale/es_ES/es_ES.po index e325c9edc..8c44a0fbd 100644 --- a/app/resources/locale/es_ES/es_ES.po +++ b/app/resources/locale/es_ES/es_ES.po @@ -9,7 +9,7 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: Poedit 1.8.7.1\n" +"X-Generator: Poedit 1.5.4\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" #. 1. Basic @@ -32,12 +32,12 @@ msgstr "2. Interruptor con led" msgid "3_switch_and_gate" msgstr "3. Interruptor con puerta and" -#: app/scripts/services/utils.service.js:421 -#: app/scripts/services/utils.service.js:496 +#: app/scripts/services/utils.service.js:439 +#: app/scripts/services/utils.service.js:519 msgid "Unplug and reconnect the board" msgstr "Desconecta y conecta la placa" -#: app/scripts/services/utils.service.js:487 +#: app/scripts/services/utils.service.js:510 msgid "" "

                FTDI driver installation instructions

                1. Connect the FPGA " "board
                2. Replace the (Interface 0) driver of the board by " @@ -47,7 +47,7 @@ msgstr "" "placa FPGA
                3. Reemplaza el driver de la (Interface 0) de la " "placa por libusbK
                4. Desconecta y conecta la placa
                " -#: app/scripts/services/utils.service.js:503 +#: app/scripts/services/utils.service.js:526 msgid "" "

                FTDI driver uninstallation instructions

                1. Find the FPGA USB " "Device
                2. Select the board interface and uninstall the driver
                " @@ -56,79 +56,96 @@ msgstr "" "dispositivo USB FPGA
              • Selecciona la interfaz de la placa y desinstala " "el driver
                • " -#: app/views/menu.html:275 +#: app/views/menu.html:260 msgid "About Icestudio" msgstr "Sobre Icestudio" -#: app/scripts/controllers/menu.js:421 +#: app/scripts/controllers/menu.js:415 msgid "Add a block to start" msgstr "Añade un bloque para comenzar" -#: app/views/menu.html:285 +#: app/views/menu.html:50 +#, fuzzy +msgid "Add as block" +msgstr "Añade un bloque para comenzar" + +#: app/scripts/services/utils.service.js:668 +msgid "Author" +msgstr "" + +#: app/views/menu.html:270 msgid "Basic" msgstr "Básico" -#: app/views/menu.html:153 +#: app/views/menu.html:138 msgid "Basque" msgstr "Euskera" -#: app/scripts/services/common.service.js:183 -msgid "Block exported as {{name}}" -msgstr "Bloque exportado como {{name}}" +#: app/scripts/services/blocks.service.js:674 +#: app/scripts/services/blocks.service.js:683 +#: app/scripts/services/blocks.service.js:713 +#: app/scripts/services/blocks.service.js:730 +#, fuzzy +msgid "Block updated" +msgstr "Etiqueta actualizada" -#: app/scripts/services/common.service.js:164 +#: app/scripts/services/project.service.js:293 msgid "Block {{name}} imported" msgstr "Bloque {{name}} importado" -#: app/scripts/services/tools.service.js:205 +#: app/scripts/services/tools.service.js:218 msgid "Board {{name}} not detected" msgstr "Placa {{name}} no detectada" -#: app/scripts/controllers/menu.js:383 app/scripts/controllers/menu.js:390 +#: app/scripts/controllers/menu.js:371 app/scripts/controllers/menu.js:378 msgid "Board {{name}} selected" msgstr "Placa {{name}} seleccionada" -#: app/views/menu.html:186 +#: app/views/menu.html:171 msgid "Boards" msgstr "Placas" -#: app/views/menu.html:204 +#: app/views/menu.html:189 msgid "Build" msgstr "Sintetizar" -#: app/scripts/controllers/main.js:15 +#: app/scripts/controllers/main.js:16 msgid "Cancel" msgstr "Cancelar" -#: app/scripts/services/tools.service.js:417 +#: app/scripts/services/tools.service.js:429 msgid "Check Internet connection..." msgstr "Comprobando conexión a Internet..." -#: app/scripts/services/tools.service.js:425 +#: app/scripts/services/tools.service.js:437 msgid "Check Python..." msgstr "Comprobando Python..." -#: app/views/menu.html:113 +#: app/views/menu.html:98 msgid "Clear all" msgstr "Borrar todo" -#: app/views/menu.html:107 +#: app/views/menu.html:92 msgid "Clone selected" msgstr "Clonar seleccionado" -#: app/views/menu.html:288 +#: app/views/menu.html:276 msgid "Code" msgstr "Código" -#: app/views/menu.html:271 +#: app/views/menu.html:256 msgid "Community forum" msgstr "Foro de la comunidad" -#: app/views/menu.html:180 +#: app/views/menu.html:275 +msgid "Constant" +msgstr "" + +#: app/views/menu.html:165 msgid "Datasheet" msgstr "Datasheet" -#: app/scripts/services/tools.service.js:294 +#: app/scripts/services/tools.service.js:306 msgid "" "Default toolchain not found. Toolchain will be downloaded. This operation " "requires Internet connection. Do you want to continue?" @@ -136,79 +153,102 @@ msgstr "" "No se encuentra la toolchain por defecto, por lo que será descargada. Esta " "operación requiere conexión a Internet. ¿Deseas continuar?" -#: app/views/menu.html:245 +#: app/scripts/services/utils.service.js:667 +msgid "Description" +msgstr "" + +#: app/views/menu.html:230 msgid "Disable" msgstr "Deshabilitar" -#: app/scripts/controllers/menu.js:256 +#: app/scripts/controllers/menu.js:222 msgid "Do you want to clear all?" msgstr "¿Deseas borrar todo?" -#: app/scripts/controllers/menu.js:269 +#: app/scripts/controllers/menu.js:192 +#, fuzzy +msgid "Do you want to exit the application?" +msgstr "¿Deseas eliminar el bloque seleccionado?" + +#: app/scripts/controllers/menu.js:213 msgid "Do you want to remove the selected block?" msgstr "¿Deseas eliminar el bloque seleccionado?" -#: app/views/menu.html:264 +#: app/views/menu.html:249 msgid "Documentation" msgstr "Documentación" -#: app/views/menu.html:238 +#: app/views/menu.html:223 msgid "Drivers" msgstr "Drivers" -#: app/scripts/services/utils.service.js:418 -#: app/scripts/services/utils.service.js:481 +#: app/scripts/services/utils.service.js:436 +#: app/scripts/services/utils.service.js:504 msgid "Drivers disabled" msgstr "Drivers deshabilitados" -#: app/scripts/services/utils.service.js:415 -#: app/scripts/services/utils.service.js:462 +#: app/scripts/services/utils.service.js:433 +#: app/scripts/services/utils.service.js:485 msgid "Drivers enabled" msgstr "Drivers habilitados" -#: app/scripts/services/tools.service.js:217 +#: app/scripts/services/tools.service.js:230 msgid "Duplicated FPGA I/O ports" msgstr "Puertos E/S de la FPGA duplicados" -#: app/views/menu.html:100 +#: app/scripts/services/blocks.service.js:314 +msgid "Duplicated block attributes" +msgstr "" + +#: app/views/menu.html:85 msgid "Edit" msgstr "Editar" -#: app/views/menu.html:241 +#: app/views/menu.html:226 msgid "Enable" msgstr "Habilitar" -#: app/views/menu.html:135 +#: app/views/menu.html:120 msgid "English" msgstr "Inglés" -#: app/scripts/services/graph.service.js:438 -#: app/scripts/services/graph.service.js:496 +#: app/scripts/services/blocks.service.js:126 +#, fuzzy +msgid "Enter the constant blocks" +msgstr "Introduce los puertos de salida" + +#: app/scripts/services/blocks.service.js:213 msgid "Enter the input ports" msgstr "Introduce los puertos de entrada" -#: app/scripts/services/graph.service.js:439 -#: app/scripts/services/graph.service.js:536 +#: app/scripts/services/blocks.service.js:214 msgid "Enter the output ports" msgstr "Introduce los puertos de salida" -#: app/scripts/controllers/menu.js:233 -msgid "Enter the project's image path" -msgstr "Introduce la ruta de la imagen del proyecto" +#: app/scripts/services/blocks.service.js:215 +#, fuzzy +msgid "Enter the parameters" +msgstr "Introduce los puertos de entrada" + +#: app/scripts/services/blocks.service.js:57 +#, fuzzy +msgid "Enter the ports" +msgstr "Introduce los puertos de entrada" -#: app/scripts/controllers/menu.js:82 -msgid "Enter the project's title" +#: app/scripts/controllers/menu.js:73 +#, fuzzy +msgid "Enter the project name" msgstr "Introduce el título del proyecto" -#: app/scripts/controllers/menu.js:241 +#: app/scripts/controllers/menu.js:249 msgid "Enter the remote hostname user@host (experimental)" msgstr "Introduce el nombre del host remoto usuario@host (experimental)" -#: app/scripts/services/tools.service.js:317 +#: app/scripts/services/tools.service.js:329 msgid "Error: default toolchain not found in '{{dir}}'" msgstr "Error: toolchain por defecto no encontrada en '{{dir}}'" -#: app/scripts/services/utils.service.js:610 +#: app/scripts/services/utils.service.js:800 msgid "Error: {{error}}" msgstr "Error: {{error}}" @@ -216,32 +256,28 @@ msgstr "Error: {{error}}" msgid "Examples" msgstr "Ejemplos" -#: app/scripts/services/tools.service.js:175 +#: app/scripts/services/tools.service.js:187 msgid "Execute remote {{label}} ..." msgstr "Ejecutar {{label}} remoto ..." -#: app/views/menu.html:80 +#: app/views/menu.html:61 msgid "Export" msgstr "Exportar" -#: app/views/menu.html:76 -msgid "Export as block" -msgstr "Exportar como bloque" - -#: app/scripts/services/tools.service.js:449 +#: app/scripts/services/tools.service.js:461 msgid "Extract default apio files..." msgstr "Extraer ficheros de apio..." -#: app/scripts/services/tools.service.js:459 +#: app/scripts/services/tools.service.js:471 msgid "Extract default apio packages..." msgstr "Extraer paquetes de apio..." -#: app/scripts/services/tools.service.js:437 +#: app/scripts/services/tools.service.js:449 msgid "Extract virtual env files..." msgstr "Extraer ficheros del virtual env" -#: app/scripts/services/tools.service.js:211 -#: app/scripts/services/tools.service.js:214 +#: app/scripts/services/tools.service.js:224 +#: app/scripts/services/tools.service.js:227 msgid "FPGA I/O ports not defined" msgstr "Puertos E/S de la FPGA no definidos" @@ -249,222 +285,255 @@ msgstr "Puertos E/S de la FPGA no definidos" msgid "File" msgstr "Archivo" -#: app/scripts/services/common.service.js:125 +#: app/scripts/services/project.service.js:241 msgid "" "File {{file}} already exists in the project path. Do you want to replace it?" msgstr "" "El archivo {{file}} ya existe en el directorio del proyecto. ¿Deseas " "reemplazarlo?" -#: app/scripts/services/tools.service.js:148 +#: app/scripts/services/tools.service.js:163 msgid "File {{file}} does not exist" msgstr "El archivo {{file}} no existe" -#: app/scripts/services/common.service.js:153 +#: app/scripts/services/project.service.js:273 msgid "File {{file}} imported" msgstr "Archivo {{file}} importado" -#: app/views/menu.html:159 +#: app/views/menu.html:144 msgid "French" msgstr "Francés" -#: app/scripts/services/common.service.js:223 +#: app/scripts/controllers/menu.js:176 msgid "GTKWave exported" msgstr "GTKWave exportado" -#: app/views/menu.html:147 +#: app/views/menu.html:132 msgid "Galician" msgstr "Gallego" -#: app/views/menu.html:254 +#: app/views/menu.html:239 msgid "Help" msgstr "Ayuda" -#: app/scripts/services/utils.service.js:452 +#: app/scripts/services/utils.service.js:474 msgid "Homebrew is required" msgstr "Es necesario Homebrew" -#: app/views/menu.html:120 -msgid "Image path" +#: app/scripts/services/utils.service.js:681 +#, fuzzy +msgid "Image" msgstr "Ruta de la imagen" -#: app/scripts/controllers/menu.js:322 +#: app/scripts/controllers/menu.js:309 msgid "Image {{name}} saved" msgstr "Imagen {{name}} guardada" -#: app/views/menu.html:73 -msgid "Import block" -msgstr "Importar bloque" - -#: app/views/menu.html:289 +#: app/views/menu.html:277 msgid "Info" msgstr "Info" -#: app/views/menu.html:290 +#: app/views/menu.html:273 msgid "Input" msgstr "Entrada" -#: app/views/menu.html:215 +#: app/views/menu.html:200 msgid "Install" msgstr "Instalar" -#: app/scripts/services/tools.service.js:454 +#: app/scripts/services/tools.service.js:466 msgid "Install default apio..." msgstr "Instalar apio..." -#: app/scripts/services/tools.service.js:503 +#: app/scripts/services/tools.service.js:515 msgid "Installation completed" msgstr "Instalación completada" -#: app/scripts/services/tools.service.js:346 -#: app/scripts/services/tools.service.js:383 +#: app/scripts/services/tools.service.js:358 +#: app/scripts/services/tools.service.js:395 msgid "Installing toolchain" msgstr "Instalando la toolchain" -#: app/scripts/services/tools.service.js:419 -#: app/scripts/services/utils.service.js:455 +#: app/scripts/services/tools.service.js:431 +#: app/scripts/services/utils.service.js:478 msgid "Internet connection required" msgstr "Es necesario conexión a Internet" -#: app/scripts/services/graph.service.js:134 +#: app/scripts/services/graph.service.js:133 msgid "Invalid Pull up connection:
                block already connected" msgstr "Conexión de Pull up no válida:
                hay un bloque conectado" -#: app/scripts/services/graph.service.js:150 +#: app/scripts/services/graph.service.js:149 msgid "Invalid Pull up connection:
                only Input blocks allowed" msgstr "" "Conexión de Pull up no válida:
                sólo se permiten bloques " "Entrada" -#: app/scripts/services/graph.service.js:141 +#: app/scripts/services/graph.service.js:140 msgid "Invalid block connection:
                Pull up already connected" msgstr "Conexión de bloque no válida:
                hay un Pull up conectado" -#: app/scripts/services/graph.service.js:113 +#: app/scripts/services/graph.service.js:104 +#: app/scripts/services/graph.service.js:111 +#: app/scripts/services/graph.service.js:97 msgid "Invalid connection" msgstr "Conexión no válida" -#: app/scripts/services/graph.service.js:127 +#: app/scripts/services/graph.service.js:168 +#, fuzzy +msgid "Invalid connection: →" +msgstr "Conexión no válida" + +#: app/scripts/services/graph.service.js:126 msgid "Invalid multiple input connections" msgstr "Conexiones de entrada múltiple no válidas" -#: app/scripts/services/graph.service.js:298 -msgid "Label updated" -msgstr "Etiqueta actualizada" - -#: app/views/menu.html:131 +#: app/views/menu.html:116 msgid "Language" msgstr "Idioma" -#: app/scripts/services/tools.service.js:442 +#: app/scripts/services/blocks.service.js:127 +#: app/scripts/services/blocks.service.js:697 +msgid "Local parameter" +msgstr "" + +#: app/scripts/services/tools.service.js:454 msgid "Make virtual env..." msgstr "Crear virtual env..." +#: app/scripts/services/utils.service.js:665 +msgid "Name" +msgstr "" + #: app/views/menu.html:27 -msgid "New project" -msgstr "Nuevo proyecto" +msgid "New" +msgstr "" -#: app/scripts/services/common.service.js:36 +#: app/scripts/services/project.service.js:44 msgid "New project {{name}} created" msgstr "Nuevo proyecto {{name}} creado" -#: app/scripts/controllers/main.js:14 +#: app/scripts/controllers/main.js:15 msgid "OK" msgstr "OK" +#: app/scripts/services/project.service.js:188 +#: app/scripts/services/project.service.js:60 +#, fuzzy +msgid "Old project format" +msgstr "Formato de proyecto incorrecto: {{name}}" + #: app/views/menu.html:30 -msgid "Open project" -msgstr "Abrir proyecto" +msgid "Open" +msgstr "" + +#: app/scripts/services/utils.service.js:688 +msgid "Open SVG" +msgstr "" -#: app/scripts/services/common.service.js:156 +#: app/scripts/services/project.service.js:276 msgid "Original file {{file}} does not exist" msgstr "El archivo original {{file}} no existe" -#: app/views/menu.html:291 +#: app/views/menu.html:274 msgid "Output" msgstr "Salida" -#: app/scripts/services/common.service.js:203 +#: app/scripts/controllers/menu.js:158 msgid "PCF file exported" msgstr "Fichero PCF exportado" -#: app/views/menu.html:117 +#: app/views/menu.html:102 msgid "Preferences" msgstr "Preferencias" -#: app/scripts/services/common.service.js:55 +#: app/views/menu.html:105 +msgid "Project information" +msgstr "" + +#: app/scripts/services/project.service.js:64 msgid "Project {{name}} loaded" msgstr "Proyecto {{name}} cargado" -#: app/scripts/services/common.service.js:68 +#: app/scripts/services/project.service.js:160 msgid "Project {{name}} saved" msgstr "Proyecto {{name}} guardado" -#: app/scripts/services/tools.service.js:430 +#: app/scripts/services/tools.service.js:442 msgid "Python 2.7 is required" msgstr "Es necesario Python 2.7" -#: app/views/project.html:3 +#: app/views/menu.html:79 +msgid "Quit" +msgstr "" + +#: app/views/design.html:4 msgid "Read only" msgstr "Solo lectura" -#: app/scripts/services/tools.service.js:243 +#: app/scripts/services/tools.service.js:255 msgid "Remote host {{name}} not connected" msgstr "Host remoto {{name}} no conectado" -#: app/views/menu.html:125 +#: app/views/menu.html:110 msgid "Remote hostname" msgstr "Nombre del host remoto" -#: app/views/menu.html:223 +#: app/views/menu.html:208 msgid "Remove" msgstr "Eliminar" -#: app/views/menu.html:110 +#: app/views/menu.html:95 msgid "Remove selected" msgstr "Eliminar seleccionado" -#: app/views/menu.html:228 +#: app/scripts/services/utils.service.js:690 +#, fuzzy +msgid "Reset SVG" +msgstr "Resetear vista" + +#: app/views/menu.html:213 msgid "Reset default" msgstr "Reset default" -#: app/views/menu.html:103 +#: app/views/menu.html:88 msgid "Reset view" msgstr "Resetear vista" -#: app/views/menu.html:66 +#: app/views/menu.html:54 msgid "Save" msgstr "Guardar" -#: app/views/menu.html:69 +#: app/scripts/services/utils.service.js:689 +#, fuzzy +msgid "Save SVG" +msgstr "Guardar como" + +#: app/views/menu.html:57 msgid "Save as" msgstr "Guardar como" -#: app/views/menu.html:267 +#: app/views/menu.html:252 msgid "Source code" msgstr "Código fuente" -#: app/views/menu.html:141 +#: app/views/menu.html:126 msgid "Spanish" msgstr "Español" -#: app/scripts/services/tools.service.js:164 +#: app/scripts/services/tools.service.js:176 msgid "Synchronize remote files ..." msgstr "Sincronizando ficheros remotos ..." -#: app/views/menu.html:50 -msgid "Templates" -msgstr "Plantillas" - -#: app/views/menu.html:89 +#: app/views/menu.html:70 msgid "Testbench" msgstr "Testbench" -#: app/scripts/services/common.service.js:213 +#: app/scripts/controllers/menu.js:167 msgid "Testbench exported" msgstr "Testbench exportado" -#: app/scripts/controllers/menu.js:379 +#: app/scripts/controllers/menu.js:367 msgid "" "The current FPGA I/O configuration will be lost. Do you want to change to " "{{name}} board?" @@ -472,22 +541,22 @@ msgstr "" "La configuración actual de E/S de la FPGA se perderá. ¿Deseas cambiar a la " "placa {{name}}?" -#: app/scripts/controllers/menu.js:103 app/scripts/controllers/menu.js:126 +#: app/scripts/controllers/menu.js:105 app/scripts/controllers/menu.js:90 msgid "" "The current project will be removed. Do you want to continue loading the " "project?" msgstr "El actual proyecto se borrará. ¿Deseas continuar abriendo el proyecto?" -#: app/scripts/services/tools.service.js:322 +#: app/scripts/services/tools.service.js:334 msgid "The toolchain will be removed. Do you want to continue?" msgstr "La toolchain será eliminada. ¿Deseas continuar?" -#: app/scripts/services/tools.service.js:310 +#: app/scripts/services/tools.service.js:322 msgid "The toolchain will be restored to default. Do you want to continue?" msgstr "" "La toolchain será restaurada a los valores por defecto: ¿Deseas continuar?" -#: app/scripts/services/tools.service.js:302 +#: app/scripts/services/tools.service.js:314 msgid "" "The toolchain will be updated. This operation requires Internet connection. " "Do you want to continue?" @@ -495,7 +564,7 @@ msgstr "" "La toolchain será actualizada. Esta operación requiere conexión a Internet. " "¿Deseas continuar?" -#: app/scripts/services/common.service.js:95 +#: app/scripts/services/project.service.js:210 msgid "" "This import operation requires a project path. You need to save the current " "project. Do you want to continue?" @@ -503,77 +572,102 @@ msgstr "" "Esta operación de importación requiere una ruta del proyecto. Debes guardar " "el proyecto actual. ¿Deseas continuar?" -#: app/views/menu.html:211 +#: app/views/menu.html:196 msgid "Toolchain" msgstr "Toolchain" -#: app/scripts/services/tools.service.js:504 +#: app/scripts/services/tools.service.js:516 msgid "Toolchain installed" msgstr "Toolchain instalada" -#: app/scripts/services/tools.service.js:508 +#: app/scripts/services/tools.service.js:520 msgid "Toolchain not installed" msgstr "La toolchain no está instalada" -#: app/scripts/services/tools.service.js:79 -#: app/scripts/services/utils.service.js:493 -#: app/scripts/services/utils.service.js:509 +#: app/scripts/services/tools.service.js:91 +#: app/scripts/services/utils.service.js:516 +#: app/scripts/services/utils.service.js:532 msgid "Toolchain not installed. Please, install the toolchain" msgstr "La toolchain no está instalada. Por favor, instala la toolchain" -#: app/scripts/services/tools.service.js:326 +#: app/scripts/services/tools.service.js:338 msgid "Toolchain removed" msgstr "Toolchain eliminada" -#: app/views/menu.html:198 +#: app/views/menu.html:183 msgid "Tools" msgstr "Herramientas" -#: app/scripts/services/tools.service.js:208 +#: app/scripts/services/tools.service.js:221 msgid "Unknown board" msgstr "Placa desconocida" -#: app/views/menu.html:218 +#: app/views/menu.html:203 msgid "Update" msgstr "Actualizar" -#: app/scripts/services/graph.service.js:292 -msgid "Update the port label" +#: app/scripts/services/blocks.service.js:696 +#, fuzzy +msgid "Update the block label" msgstr "Actualizar la etiqueta del puerto" -#: app/views/menu.html:207 +#: app/scripts/services/blocks.service.js:644 +#, fuzzy +msgid "Update the port" +msgstr "Actualizar la etiqueta del puerto" + +#: app/views/menu.html:192 msgid "Upload" msgstr "Cargar" -#: app/views/menu.html:201 +#: app/views/menu.html:186 msgid "Verify" msgstr "Verificar" -#: app/scripts/services/common.service.js:193 +#: app/scripts/controllers/menu.js:149 msgid "Verilog code exported" msgstr "Código Verilog exportado" -#: app/views/menu.html:260 +#: app/scripts/services/utils.service.js:666 app/views/menu.html:245 msgid "Version" msgstr "Versión" -#: app/views/menu.html:171 +#: app/views/menu.html:156 msgid "View" msgstr "Ver" -#: app/views/menu.html:257 +#: app/views/menu.html:242 msgid "View license" msgstr "Ver licencia" -#: app/scripts/services/graph.service.js:593 +#: app/scripts/services/blocks.service.js:58 +#: app/scripts/services/blocks.service.js:645 +msgid "Virtual port" +msgstr "" + +#: app/scripts/services/blocks.service.js:348 msgid "Wrong block format: {{type}}" msgstr "Formato de bloque incorrecto: {{type}}" -#: app/scripts/services/common.service.js:58 +#: app/scripts/services/blocks.service.js:146 +#: app/scripts/services/blocks.service.js:263 +#, fuzzy +msgid "Wrong parameter name {{name}}" +msgstr "Nombre del host remoto incorrecto {{name}}" + +#: app/scripts/services/blocks.service.js:233 +#: app/scripts/services/blocks.service.js:248 +#: app/scripts/services/blocks.service.js:688 +#: app/scripts/services/blocks.service.js:77 +#, fuzzy +msgid "Wrong port name {{name}}" +msgstr "Nombre del host remoto incorrecto {{name}}" + +#: app/scripts/services/project.service.js:72 msgid "Wrong project format: {{name}}" msgstr "Formato de proyecto incorrecto: {{name}}" -#: app/scripts/services/tools.service.js:240 +#: app/scripts/services/tools.service.js:252 msgid "Wrong remote hostname {{name}}" msgstr "Nombre del host remoto incorrecto {{name}}" @@ -582,7 +676,7 @@ msgstr "Nombre del host remoto incorrecto {{name}}" msgid "and" msgstr "And" -#: app/views/project.html:4 +#: app/views/design.html:5 msgid "back" msgstr "volver" @@ -601,8 +695,18 @@ msgstr "Combinacional" msgid "config" msgstr "Config" +#. contadorAsc +#: app/resources/blocks/labels.js:60 +msgid "contadorAsc" +msgstr "" + +#. contadorDes +#: app/resources/blocks/labels.js:62 +msgid "contadorDes" +msgstr "" + #. Debouncer -#: app/resources/blocks/labels.js:57 +#: app/resources/blocks/labels.js:58 msgid "debouncer" msgstr "Antirrebotes" @@ -632,17 +736,17 @@ msgid "dff_sr" msgstr "Biestable D" #. Build done -#: app/scripts/services/tools.service.js:255 +#: app/scripts/services/tools.service.js:267 msgid "done_build" msgstr "Sintetizado realizado" #. Upload done -#: app/scripts/services/tools.service.js:257 +#: app/scripts/services/tools.service.js:269 msgid "done_upload" msgstr "Carga realizada" #. Verification done -#: app/scripts/services/tools.service.js:253 +#: app/scripts/services/tools.service.js:265 msgid "done_verify" msgstr "Verificación realizada" @@ -712,17 +816,17 @@ msgid "sequential" msgstr "Secuencial" #. Start building ... -#: app/scripts/services/tools.service.js:45 +#: app/scripts/services/tools.service.js:57 msgid "start_build" msgstr "Comenzar sintetizado ..." #. Start uploading ... -#: app/scripts/services/tools.service.js:47 +#: app/scripts/services/tools.service.js:59 msgid "start_upload" msgstr "Comenzar carga ..." #. Start verification ... -#: app/scripts/services/tools.service.js:43 +#: app/scripts/services/tools.service.js:55 msgid "start_verify" msgstr "Comenzar verificación ..." @@ -741,7 +845,7 @@ msgstr "Biestable T" msgid "tri_state" msgstr "Tri-estado" -#: app/scripts/app.js:38 app/scripts/controllers/menu.js:83 +#: app/scripts/app.js:42 app/scripts/controllers/menu.js:74 msgid "untitled" msgstr "Sin título" @@ -755,14 +859,35 @@ msgstr "Xnor" msgid "xor" msgstr "Xor" -#: app/scripts/controllers/menu.js:370 +#: app/scripts/controllers/menu.js:357 msgid "{{board}} datasheet not defined" msgstr "{{board}} datasheet no definido" -#: app/scripts/controllers/menu.js:360 +#: app/scripts/controllers/menu.js:347 msgid "{{board}} pinout not defined" msgstr "{{board}} pinout no definido" +#~ msgid "Block exported as {{name}}" +#~ msgstr "Bloque exportado como {{name}}" + +#~ msgid "Enter the project's image path" +#~ msgstr "Introduce la ruta de la imagen del proyecto" + +#~ msgid "Export as block" +#~ msgstr "Exportar como bloque" + +#~ msgid "Import block" +#~ msgstr "Importar bloque" + +#~ msgid "New project" +#~ msgstr "Nuevo proyecto" + +#~ msgid "Open project" +#~ msgstr "Abrir proyecto" + +#~ msgid "Templates" +#~ msgstr "Plantillas" + #~ msgid "Datasheet not defined" #~ msgstr "Datasheet no definido" diff --git a/app/resources/locale/eu_ES/eu_ES.po b/app/resources/locale/eu_ES/eu_ES.po index b810708b6..ee1849bba 100644 --- a/app/resources/locale/eu_ES/eu_ES.po +++ b/app/resources/locale/eu_ES/eu_ES.po @@ -9,7 +9,7 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: Poedit 1.8.7.1\n" +"X-Generator: Poedit 1.5.4\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" #. 1. Basic @@ -32,175 +32,215 @@ msgstr "2. Etengailua led batekin" msgid "3_switch_and_gate" msgstr "3. Etengailua and atearekin" -#: app/scripts/services/utils.service.js:421 -#: app/scripts/services/utils.service.js:496 +#: app/scripts/services/utils.service.js:439 +#: app/scripts/services/utils.service.js:519 msgid "Unplug and reconnect the board" msgstr "" -#: app/scripts/services/utils.service.js:487 +#: app/scripts/services/utils.service.js:510 msgid "" "

                FTDI driver installation instructions

                1. Connect the FPGA " "board
                2. Replace the (Interface 0) driver of the board by " "libusbK
                3. Unplug and reconnect the board
                " msgstr "" -#: app/scripts/services/utils.service.js:503 +#: app/scripts/services/utils.service.js:526 msgid "" "

                FTDI driver uninstallation instructions

                1. Find the FPGA USB " "Device
                2. Select the board interface and uninstall the driver
                " msgstr "" -#: app/views/menu.html:275 +#: app/views/menu.html:260 msgid "About Icestudio" msgstr "Icestudio informazioa" -#: app/scripts/controllers/menu.js:421 +#: app/scripts/controllers/menu.js:415 msgid "Add a block to start" msgstr "" -#: app/views/menu.html:285 +#: app/views/menu.html:50 +#, fuzzy +msgid "Add as block" +msgstr "Blokea bezala esportatu" + +#: app/scripts/services/utils.service.js:668 +msgid "Author" +msgstr "" + +#: app/views/menu.html:270 msgid "Basic" msgstr "Basikoa" -#: app/views/menu.html:153 +#: app/views/menu.html:138 msgid "Basque" msgstr "Euskera" -#: app/scripts/services/common.service.js:183 -msgid "Block exported as {{name}}" -msgstr "Blokea {{name}} bezala esportatua" +#: app/scripts/services/blocks.service.js:674 +#: app/scripts/services/blocks.service.js:683 +#: app/scripts/services/blocks.service.js:713 +#: app/scripts/services/blocks.service.js:730 +#, fuzzy +msgid "Block updated" +msgstr "Etiketa freskatua" -#: app/scripts/services/common.service.js:164 +#: app/scripts/services/project.service.js:293 msgid "Block {{name}} imported" msgstr "{{name}} blokea importatua" -#: app/scripts/services/tools.service.js:205 +#: app/scripts/services/tools.service.js:218 msgid "Board {{name}} not detected" msgstr "{{name}} plaka ez da aurkitzen" -#: app/scripts/controllers/menu.js:383 app/scripts/controllers/menu.js:390 +#: app/scripts/controllers/menu.js:371 app/scripts/controllers/menu.js:378 msgid "Board {{name}} selected" msgstr "{{name}} paka aukeratul" -#: app/views/menu.html:186 +#: app/views/menu.html:171 msgid "Boards" msgstr "Plakak" -#: app/views/menu.html:204 +#: app/views/menu.html:189 msgid "Build" msgstr "Sintetizatu" -#: app/scripts/controllers/main.js:15 +#: app/scripts/controllers/main.js:16 msgid "Cancel" msgstr "" -#: app/scripts/services/tools.service.js:417 +#: app/scripts/services/tools.service.js:429 msgid "Check Internet connection..." msgstr "" -#: app/scripts/services/tools.service.js:425 +#: app/scripts/services/tools.service.js:437 msgid "Check Python..." msgstr "" -#: app/views/menu.html:113 +#: app/views/menu.html:98 msgid "Clear all" msgstr "Dena ezabatu" -#: app/views/menu.html:107 +#: app/views/menu.html:92 msgid "Clone selected" msgstr "Aukeratua klonatu" -#: app/views/menu.html:288 +#: app/views/menu.html:276 msgid "Code" msgstr "Kodea" -#: app/views/menu.html:271 +#: app/views/menu.html:256 msgid "Community forum" msgstr "Komunitatearen foroa" -#: app/views/menu.html:180 +#: app/views/menu.html:275 +msgid "Constant" +msgstr "" + +#: app/views/menu.html:165 msgid "Datasheet" msgstr "" -#: app/scripts/services/tools.service.js:294 +#: app/scripts/services/tools.service.js:306 msgid "" "Default toolchain not found. Toolchain will be downloaded. This operation " "requires Internet connection. Do you want to continue?" msgstr "" -#: app/views/menu.html:245 +#: app/scripts/services/utils.service.js:667 +msgid "Description" +msgstr "" + +#: app/views/menu.html:230 msgid "Disable" msgstr "" -#: app/scripts/controllers/menu.js:256 +#: app/scripts/controllers/menu.js:222 msgid "Do you want to clear all?" msgstr "¿Dena ezabatu nahi duzu?" -#: app/scripts/controllers/menu.js:269 +#: app/scripts/controllers/menu.js:192 +#, fuzzy +msgid "Do you want to exit the application?" +msgstr "¿Aukeratutako blokea ezabatu nahi duzu?" + +#: app/scripts/controllers/menu.js:213 msgid "Do you want to remove the selected block?" msgstr "¿Aukeratutako blokea ezabatu nahi duzu?" -#: app/views/menu.html:264 +#: app/views/menu.html:249 msgid "Documentation" msgstr "Documentazioa" -#: app/views/menu.html:238 +#: app/views/menu.html:223 msgid "Drivers" msgstr "" -#: app/scripts/services/utils.service.js:418 -#: app/scripts/services/utils.service.js:481 +#: app/scripts/services/utils.service.js:436 +#: app/scripts/services/utils.service.js:504 msgid "Drivers disabled" msgstr "" -#: app/scripts/services/utils.service.js:415 -#: app/scripts/services/utils.service.js:462 +#: app/scripts/services/utils.service.js:433 +#: app/scripts/services/utils.service.js:485 msgid "Drivers enabled" msgstr "" -#: app/scripts/services/tools.service.js:217 +#: app/scripts/services/tools.service.js:230 msgid "Duplicated FPGA I/O ports" msgstr "FPGAren E/S portuak bikoiztuak" -#: app/views/menu.html:100 +#: app/scripts/services/blocks.service.js:314 +msgid "Duplicated block attributes" +msgstr "" + +#: app/views/menu.html:85 msgid "Edit" msgstr "Editatu" -#: app/views/menu.html:241 +#: app/views/menu.html:226 msgid "Enable" msgstr "Enable" -#: app/views/menu.html:135 +#: app/views/menu.html:120 msgid "English" msgstr "Ingelesa" -#: app/scripts/services/graph.service.js:438 -#: app/scripts/services/graph.service.js:496 +#: app/scripts/services/blocks.service.js:126 +#, fuzzy +msgid "Enter the constant blocks" +msgstr "Blokearen etiketa sartu" + +#: app/scripts/services/blocks.service.js:213 msgid "Enter the input ports" msgstr "" -#: app/scripts/services/graph.service.js:439 -#: app/scripts/services/graph.service.js:536 +#: app/scripts/services/blocks.service.js:214 msgid "Enter the output ports" msgstr "" -#: app/scripts/controllers/menu.js:233 -msgid "Enter the project's image path" -msgstr "Proiektuaren irudi bidea sartu" +#: app/scripts/services/blocks.service.js:215 +#, fuzzy +msgid "Enter the parameters" +msgstr "Proiektuari izena jarri" + +#: app/scripts/services/blocks.service.js:57 +#, fuzzy +msgid "Enter the ports" +msgstr "Blokearen portuak sartu" -#: app/scripts/controllers/menu.js:82 -msgid "Enter the project's title" +#: app/scripts/controllers/menu.js:73 +#, fuzzy +msgid "Enter the project name" msgstr "Proiektuari izena jarri" -#: app/scripts/controllers/menu.js:241 +#: app/scripts/controllers/menu.js:249 msgid "Enter the remote hostname user@host (experimental)" msgstr "Enter the remote hostname user@host (experimental)" -#: app/scripts/services/tools.service.js:317 +#: app/scripts/services/tools.service.js:329 msgid "Error: default toolchain not found in '{{dir}}'" msgstr "" -#: app/scripts/services/utils.service.js:610 +#: app/scripts/services/utils.service.js:800 msgid "Error: {{error}}" msgstr "Errorea: {{error}}" @@ -208,32 +248,28 @@ msgstr "Errorea: {{error}}" msgid "Examples" msgstr "Adibideak" -#: app/scripts/services/tools.service.js:175 +#: app/scripts/services/tools.service.js:187 msgid "Execute remote {{label}} ..." msgstr "Execute remote {{label}} ..." -#: app/views/menu.html:80 +#: app/views/menu.html:61 msgid "Export" msgstr "Esportatu" -#: app/views/menu.html:76 -msgid "Export as block" -msgstr "Blokea bezala esportatu" - -#: app/scripts/services/tools.service.js:449 +#: app/scripts/services/tools.service.js:461 msgid "Extract default apio files..." msgstr "" -#: app/scripts/services/tools.service.js:459 +#: app/scripts/services/tools.service.js:471 msgid "Extract default apio packages..." msgstr "" -#: app/scripts/services/tools.service.js:437 +#: app/scripts/services/tools.service.js:449 msgid "Extract virtual env files..." msgstr "" -#: app/scripts/services/tools.service.js:211 -#: app/scripts/services/tools.service.js:214 +#: app/scripts/services/tools.service.js:224 +#: app/scripts/services/tools.service.js:227 msgid "FPGA I/O ports not defined" msgstr "FPGAren E/S portuak definitu gabe" @@ -241,321 +277,377 @@ msgstr "FPGAren E/S portuak definitu gabe" msgid "File" msgstr "Fitxategia" -#: app/scripts/services/common.service.js:125 +#: app/scripts/services/project.service.js:241 msgid "" "File {{file}} already exists in the project path. Do you want to replace it?" msgstr "" -#: app/scripts/services/tools.service.js:148 +#: app/scripts/services/tools.service.js:163 msgid "File {{file}} does not exist" msgstr "{{file}} fitxeroa ez da existitzen" -#: app/scripts/services/common.service.js:153 +#: app/scripts/services/project.service.js:273 msgid "File {{file}} imported" msgstr "" -#: app/views/menu.html:159 +#: app/views/menu.html:144 msgid "French" msgstr "" -#: app/scripts/services/common.service.js:223 +#: app/scripts/controllers/menu.js:176 msgid "GTKWave exported" msgstr "GTKWave esportatua" -#: app/views/menu.html:147 +#: app/views/menu.html:132 msgid "Galician" msgstr "Galiziako" -#: app/views/menu.html:254 +#: app/views/menu.html:239 msgid "Help" msgstr "Laguntza" -#: app/scripts/services/utils.service.js:452 +#: app/scripts/services/utils.service.js:474 msgid "Homebrew is required" msgstr "Homebrew is required" -#: app/views/menu.html:120 -msgid "Image path" +#: app/scripts/services/utils.service.js:681 +#, fuzzy +msgid "Image" msgstr "Ruta de la imagen" -#: app/scripts/controllers/menu.js:322 +#: app/scripts/controllers/menu.js:309 msgid "Image {{name}} saved" msgstr "" -#: app/views/menu.html:73 -msgid "Import block" -msgstr "Blokea inportatu" - -#: app/views/menu.html:289 +#: app/views/menu.html:277 msgid "Info" msgstr "Info" -#: app/views/menu.html:290 +#: app/views/menu.html:273 msgid "Input" msgstr "Sarrera" -#: app/views/menu.html:215 +#: app/views/menu.html:200 msgid "Install" msgstr "" -#: app/scripts/services/tools.service.js:454 +#: app/scripts/services/tools.service.js:466 msgid "Install default apio..." msgstr "" -#: app/scripts/services/tools.service.js:503 +#: app/scripts/services/tools.service.js:515 msgid "Installation completed" msgstr "Instalazioa amaitua" -#: app/scripts/services/tools.service.js:346 -#: app/scripts/services/tools.service.js:383 +#: app/scripts/services/tools.service.js:358 +#: app/scripts/services/tools.service.js:395 msgid "Installing toolchain" msgstr "Toolchain instalatzen" -#: app/scripts/services/tools.service.js:419 -#: app/scripts/services/utils.service.js:455 +#: app/scripts/services/tools.service.js:431 +#: app/scripts/services/utils.service.js:478 msgid "Internet connection required" msgstr "Internet konexioa behar da" -#: app/scripts/services/graph.service.js:134 +#: app/scripts/services/graph.service.js:133 msgid "Invalid Pull up connection:
                block already connected" msgstr "" -#: app/scripts/services/graph.service.js:150 +#: app/scripts/services/graph.service.js:149 msgid "Invalid Pull up connection:
                only Input blocks allowed" msgstr "" -#: app/scripts/services/graph.service.js:141 +#: app/scripts/services/graph.service.js:140 msgid "Invalid block connection:
                Pull up already connected" msgstr "" -#: app/scripts/services/graph.service.js:113 +#: app/scripts/services/graph.service.js:104 +#: app/scripts/services/graph.service.js:111 +#: app/scripts/services/graph.service.js:97 msgid "Invalid connection" msgstr "" -#: app/scripts/services/graph.service.js:127 -msgid "Invalid multiple input connections" +#: app/scripts/services/graph.service.js:168 +msgid "Invalid connection: →" msgstr "" -#: app/scripts/services/graph.service.js:298 -msgid "Label updated" -msgstr "Etiketa freskatua" +#: app/scripts/services/graph.service.js:126 +msgid "Invalid multiple input connections" +msgstr "" -#: app/views/menu.html:131 +#: app/views/menu.html:116 msgid "Language" msgstr "Hizkuntza" -#: app/scripts/services/tools.service.js:442 +#: app/scripts/services/blocks.service.js:127 +#: app/scripts/services/blocks.service.js:697 +msgid "Local parameter" +msgstr "" + +#: app/scripts/services/tools.service.js:454 msgid "Make virtual env..." msgstr "" +#: app/scripts/services/utils.service.js:665 +msgid "Name" +msgstr "" + #: app/views/menu.html:27 -msgid "New project" -msgstr "Proiektu berria" +msgid "New" +msgstr "" -#: app/scripts/services/common.service.js:36 +#: app/scripts/services/project.service.js:44 msgid "New project {{name}} created" msgstr "{{name}} proiektu sortuta" -#: app/scripts/controllers/main.js:14 +#: app/scripts/controllers/main.js:15 msgid "OK" msgstr "" +#: app/scripts/services/project.service.js:188 +#: app/scripts/services/project.service.js:60 +#, fuzzy +msgid "Old project format" +msgstr "Proiektu formatua okerra: {{name}}" + #: app/views/menu.html:30 -msgid "Open project" -msgstr "Ireki proiektua" +msgid "Open" +msgstr "" + +#: app/scripts/services/utils.service.js:688 +msgid "Open SVG" +msgstr "" -#: app/scripts/services/common.service.js:156 +#: app/scripts/services/project.service.js:276 msgid "Original file {{file}} does not exist" msgstr "" -#: app/views/menu.html:291 +#: app/views/menu.html:274 msgid "Output" msgstr "Irteera" -#: app/scripts/services/common.service.js:203 +#: app/scripts/controllers/menu.js:158 msgid "PCF file exported" msgstr "PCF fitxategia esportatua" -#: app/views/menu.html:117 +#: app/views/menu.html:102 msgid "Preferences" msgstr "" -#: app/scripts/services/common.service.js:55 +#: app/views/menu.html:105 +msgid "Project information" +msgstr "" + +#: app/scripts/services/project.service.js:64 msgid "Project {{name}} loaded" msgstr "{{name}} proiektua irekita" -#: app/scripts/services/common.service.js:68 +#: app/scripts/services/project.service.js:160 msgid "Project {{name}} saved" msgstr "{{name}} proiektua gordeta" -#: app/scripts/services/tools.service.js:430 +#: app/scripts/services/tools.service.js:442 msgid "Python 2.7 is required" msgstr "" -#: app/views/project.html:3 +#: app/views/menu.html:79 +msgid "Quit" +msgstr "" + +#: app/views/design.html:4 msgid "Read only" msgstr "Irakurtzeko soilik" -#: app/scripts/services/tools.service.js:243 +#: app/scripts/services/tools.service.js:255 msgid "Remote host {{name}} not connected" msgstr "Remote host {{name}} not connected" -#: app/views/menu.html:125 +#: app/views/menu.html:110 msgid "Remote hostname" msgstr "" -#: app/views/menu.html:223 +#: app/views/menu.html:208 msgid "Remove" msgstr "Ezabatu" -#: app/views/menu.html:110 +#: app/views/menu.html:95 msgid "Remove selected" msgstr "Aukeratua ezabatu" -#: app/views/menu.html:228 +#: app/scripts/services/utils.service.js:690 +#, fuzzy +msgid "Reset SVG" +msgstr "Bista reseteatu" + +#: app/views/menu.html:213 msgid "Reset default" msgstr "" -#: app/views/menu.html:103 +#: app/views/menu.html:88 msgid "Reset view" msgstr "Bista reseteatu" -#: app/views/menu.html:66 +#: app/views/menu.html:54 msgid "Save" msgstr "Gorde" -#: app/views/menu.html:69 +#: app/scripts/services/utils.service.js:689 +#, fuzzy +msgid "Save SVG" +msgstr "Gorde honela" + +#: app/views/menu.html:57 msgid "Save as" msgstr "Gorde honela" -#: app/views/menu.html:267 +#: app/views/menu.html:252 msgid "Source code" msgstr "Jatorrizko kodea" -#: app/views/menu.html:141 +#: app/views/menu.html:126 msgid "Spanish" msgstr "Gaztelera" -#: app/scripts/services/tools.service.js:164 +#: app/scripts/services/tools.service.js:176 msgid "Synchronize remote files ..." msgstr "Synchronize remote files ..." -#: app/views/menu.html:50 -msgid "Templates" -msgstr "Ereduak" - -#: app/views/menu.html:89 +#: app/views/menu.html:70 msgid "Testbench" msgstr "Testbench esportatua" -#: app/scripts/services/common.service.js:213 +#: app/scripts/controllers/menu.js:167 msgid "Testbench exported" msgstr "Testbench esportatua" -#: app/scripts/controllers/menu.js:379 +#: app/scripts/controllers/menu.js:367 msgid "" "The current FPGA I/O configuration will be lost. Do you want to change to " "{{name}} board?" msgstr "" "FPGAaren E/S configurazioa galduko da. {{name}} plaka aldatu nahi duzu?" -#: app/scripts/controllers/menu.js:103 app/scripts/controllers/menu.js:126 +#: app/scripts/controllers/menu.js:105 app/scripts/controllers/menu.js:90 msgid "" "The current project will be removed. Do you want to continue loading the " "project?" msgstr "Proiektu hau ezabatuko da. Proiektua irekitzen jarraitu nahi duzu?" -#: app/scripts/services/tools.service.js:322 +#: app/scripts/services/tools.service.js:334 msgid "The toolchain will be removed. Do you want to continue?" msgstr "" -#: app/scripts/services/tools.service.js:310 +#: app/scripts/services/tools.service.js:322 msgid "The toolchain will be restored to default. Do you want to continue?" msgstr "" -#: app/scripts/services/tools.service.js:302 +#: app/scripts/services/tools.service.js:314 msgid "" "The toolchain will be updated. This operation requires Internet connection. " "Do you want to continue?" msgstr "" -#: app/scripts/services/common.service.js:95 +#: app/scripts/services/project.service.js:210 msgid "" "This import operation requires a project path. You need to save the current " "project. Do you want to continue?" msgstr "" -#: app/views/menu.html:211 +#: app/views/menu.html:196 msgid "Toolchain" msgstr "Toolchain" -#: app/scripts/services/tools.service.js:504 +#: app/scripts/services/tools.service.js:516 msgid "Toolchain installed" msgstr "Toolchain instalatua" -#: app/scripts/services/tools.service.js:508 +#: app/scripts/services/tools.service.js:520 msgid "Toolchain not installed" msgstr "" -#: app/scripts/services/tools.service.js:79 -#: app/scripts/services/utils.service.js:493 -#: app/scripts/services/utils.service.js:509 +#: app/scripts/services/tools.service.js:91 +#: app/scripts/services/utils.service.js:516 +#: app/scripts/services/utils.service.js:532 msgid "Toolchain not installed. Please, install the toolchain" msgstr "" -#: app/scripts/services/tools.service.js:326 +#: app/scripts/services/tools.service.js:338 msgid "Toolchain removed" msgstr "Toolchain ezabatuta" -#: app/views/menu.html:198 +#: app/views/menu.html:183 msgid "Tools" msgstr "Erremintak" -#: app/scripts/services/tools.service.js:208 +#: app/scripts/services/tools.service.js:221 msgid "Unknown board" msgstr "Plaka ezezaguna" -#: app/views/menu.html:218 +#: app/views/menu.html:203 msgid "Update" msgstr "" -#: app/scripts/services/graph.service.js:292 -msgid "Update the port label" +#: app/scripts/services/blocks.service.js:696 +#, fuzzy +msgid "Update the block label" +msgstr "Blokearen etiketa sartu" + +#: app/scripts/services/blocks.service.js:644 +msgid "Update the port" msgstr "" -#: app/views/menu.html:207 +#: app/views/menu.html:192 msgid "Upload" msgstr "Kargatu" -#: app/views/menu.html:201 +#: app/views/menu.html:186 msgid "Verify" msgstr "Egiaztatu" -#: app/scripts/services/common.service.js:193 +#: app/scripts/controllers/menu.js:149 msgid "Verilog code exported" msgstr "Verilog kodea esportatua" -#: app/views/menu.html:260 +#: app/scripts/services/utils.service.js:666 app/views/menu.html:245 msgid "Version" msgstr "Bertsioa" -#: app/views/menu.html:171 +#: app/views/menu.html:156 msgid "View" msgstr "Ikusi" -#: app/views/menu.html:257 +#: app/views/menu.html:242 msgid "View license" msgstr "Lizentzia ikusi" -#: app/scripts/services/graph.service.js:593 +#: app/scripts/services/blocks.service.js:58 +#: app/scripts/services/blocks.service.js:645 +msgid "Virtual port" +msgstr "" + +#: app/scripts/services/blocks.service.js:348 msgid "Wrong block format: {{type}}" msgstr "Blokearen formatua okerra: {{type}}" -#: app/scripts/services/common.service.js:58 +#: app/scripts/services/blocks.service.js:146 +#: app/scripts/services/blocks.service.js:263 +#, fuzzy +msgid "Wrong parameter name {{name}}" +msgstr "Proiektu formatua okerra: {{name}}" + +#: app/scripts/services/blocks.service.js:233 +#: app/scripts/services/blocks.service.js:248 +#: app/scripts/services/blocks.service.js:688 +#: app/scripts/services/blocks.service.js:77 +#, fuzzy +msgid "Wrong port name {{name}}" +msgstr "Proiektu formatua okerra: {{name}}" + +#: app/scripts/services/project.service.js:72 msgid "Wrong project format: {{name}}" msgstr "Proiektu formatua okerra: {{name}}" -#: app/scripts/services/tools.service.js:240 +#: app/scripts/services/tools.service.js:252 msgid "Wrong remote hostname {{name}}" msgstr "" @@ -564,7 +656,7 @@ msgstr "" msgid "and" msgstr "And" -#: app/views/project.html:4 +#: app/views/design.html:5 msgid "back" msgstr "" @@ -583,6 +675,21 @@ msgstr "" msgid "config" msgstr "Config" +#. contadorAsc +#: app/resources/blocks/labels.js:60 +msgid "contadorAsc" +msgstr "" + +#. contadorDes +#: app/resources/blocks/labels.js:62 +msgid "contadorDes" +msgstr "" + +#. Debouncer +#: app/resources/blocks/labels.js:58 +msgid "debouncer" +msgstr "" + #. Demux 1:2 #: app/resources/blocks/labels.js:18 msgid "demux_1_2" @@ -609,17 +716,17 @@ msgid "dff_sr" msgstr "Bistable D" #. Build done -#: app/scripts/services/tools.service.js:255 +#: app/scripts/services/tools.service.js:267 msgid "done_build" msgstr "Sintetizatua egina" #. Upload done -#: app/scripts/services/tools.service.js:257 +#: app/scripts/services/tools.service.js:269 msgid "done_upload" msgstr "Karga egina" #. Verification done -#: app/scripts/services/tools.service.js:253 +#: app/scripts/services/tools.service.js:265 msgid "done_verify" msgstr "Egiaztapena egina" @@ -689,17 +796,17 @@ msgid "sequential" msgstr "" #. Start building ... -#: app/scripts/services/tools.service.js:45 +#: app/scripts/services/tools.service.js:57 msgid "start_build" msgstr "Sintetizatua hasi ..." #. Start uploading ... -#: app/scripts/services/tools.service.js:47 +#: app/scripts/services/tools.service.js:59 msgid "start_upload" msgstr "Karga hasi ..." #. Start verification ... -#: app/scripts/services/tools.service.js:43 +#: app/scripts/services/tools.service.js:55 msgid "start_verify" msgstr "Egiaztapena hasi ..." @@ -718,7 +825,7 @@ msgstr "Bistable T" msgid "tri_state" msgstr "Tri-state" -#: app/scripts/app.js:38 app/scripts/controllers/menu.js:83 +#: app/scripts/app.js:42 app/scripts/controllers/menu.js:74 msgid "untitled" msgstr "Izenik gabe" @@ -732,22 +839,34 @@ msgstr "Xnor" msgid "xor" msgstr "Xor" -#: app/scripts/controllers/menu.js:370 +#: app/scripts/controllers/menu.js:357 msgid "{{board}} datasheet not defined" msgstr "" -#: app/scripts/controllers/menu.js:360 +#: app/scripts/controllers/menu.js:347 msgid "{{board}} pinout not defined" msgstr "" +#~ msgid "Block exported as {{name}}" +#~ msgstr "Blokea {{name}} bezala esportatua" + +#~ msgid "Enter the project's image path" +#~ msgstr "Proiektuaren irudi bidea sartu" + +#~ msgid "Import block" +#~ msgstr "Blokea inportatu" + +#~ msgid "New project" +#~ msgstr "Proiektu berria" + +#~ msgid "Open project" +#~ msgstr "Ireki proiektua" + +#~ msgid "Templates" +#~ msgstr "Ereduak" + #~ msgid "comb" #~ msgstr "Comb" #~ msgid "sec" #~ msgstr "Sec" - -#~ msgid "Enter the block's label" -#~ msgstr "Blokearen etiketa sartu" - -#~ msgid "Enter the block's ports" -#~ msgstr "Blokearen portuak sartu" diff --git a/app/resources/locale/fr_FR/fr_FR.po b/app/resources/locale/fr_FR/fr_FR.po index 90de44b13..3b478a73e 100644 --- a/app/resources/locale/fr_FR/fr_FR.po +++ b/app/resources/locale/fr_FR/fr_FR.po @@ -9,7 +9,7 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: Poedit 1.8.7.1\n" +"X-Generator: Poedit 1.5.4\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" #. 1. Basic @@ -32,12 +32,12 @@ msgstr "2. Switch led" msgid "3_switch_and_gate" msgstr "3. Switch and gate" -#: app/scripts/services/utils.service.js:421 -#: app/scripts/services/utils.service.js:496 +#: app/scripts/services/utils.service.js:439 +#: app/scripts/services/utils.service.js:519 msgid "Unplug and reconnect the board" msgstr "Débrancher et reconnecter la carte" -#: app/scripts/services/utils.service.js:487 +#: app/scripts/services/utils.service.js:510 msgid "" "

                FTDI driver installation instructions

                1. Connect the FPGA " "board
                2. Replace the (Interface 0) driver of the board by " @@ -47,7 +47,7 @@ msgstr "" "carte FPGA
                3. Remplacer le pilote (Interface 0) de la carte par " "libusbK
                4. Débrancher puis rebrancher la carte
                " -#: app/scripts/services/utils.service.js:503 +#: app/scripts/services/utils.service.js:526 msgid "" "

                FTDI driver uninstallation instructions

                1. Find the FPGA USB " "Device
                2. Select the board interface and uninstall the driver
                " @@ -56,160 +56,200 @@ msgstr "" "périphérique USB FPGA
              • Sélectionner la carte interface et " "désinstaller le pilote
                • " -#: app/views/menu.html:275 +#: app/views/menu.html:260 msgid "About Icestudio" msgstr "À propos d'Icestudio" -#: app/scripts/controllers/menu.js:421 +#: app/scripts/controllers/menu.js:415 msgid "Add a block to start" msgstr "Ajouter un bloc pour commencer" -#: app/views/menu.html:285 +#: app/views/menu.html:50 +#, fuzzy +msgid "Add as block" +msgstr "Ajouter un bloc pour commencer" + +#: app/scripts/services/utils.service.js:668 +msgid "Author" +msgstr "" + +#: app/views/menu.html:270 msgid "Basic" msgstr "Basique" -#: app/views/menu.html:153 +#: app/views/menu.html:138 msgid "Basque" msgstr "Basque" -#: app/scripts/services/common.service.js:183 -msgid "Block exported as {{name}}" -msgstr "Bloc exporté comme {{name}}" +#: app/scripts/services/blocks.service.js:674 +#: app/scripts/services/blocks.service.js:683 +#: app/scripts/services/blocks.service.js:713 +#: app/scripts/services/blocks.service.js:730 +#, fuzzy +msgid "Block updated" +msgstr "Titre mis à jour" -#: app/scripts/services/common.service.js:164 +#: app/scripts/services/project.service.js:293 msgid "Block {{name}} imported" msgstr "Bloc {{name}} importé" -#: app/scripts/services/tools.service.js:205 +#: app/scripts/services/tools.service.js:218 msgid "Board {{name}} not detected" msgstr "Carte {{name}} non détectée" -#: app/scripts/controllers/menu.js:383 app/scripts/controllers/menu.js:390 +#: app/scripts/controllers/menu.js:371 app/scripts/controllers/menu.js:378 msgid "Board {{name}} selected" msgstr "Carte {{name}} séléctionnée" -#: app/views/menu.html:186 +#: app/views/menu.html:171 msgid "Boards" msgstr "Cartes" -#: app/views/menu.html:204 +#: app/views/menu.html:189 msgid "Build" msgstr "Construire" -#: app/scripts/controllers/main.js:15 +#: app/scripts/controllers/main.js:16 msgid "Cancel" msgstr "Annuler" -#: app/scripts/services/tools.service.js:417 +#: app/scripts/services/tools.service.js:429 msgid "Check Internet connection..." msgstr "Vérifier la connexion Internet..." -#: app/scripts/services/tools.service.js:425 +#: app/scripts/services/tools.service.js:437 msgid "Check Python..." msgstr "Vérifier Python..." -#: app/views/menu.html:113 +#: app/views/menu.html:98 msgid "Clear all" msgstr "Tout nettoyer" -#: app/views/menu.html:107 +#: app/views/menu.html:92 msgid "Clone selected" msgstr "Cloner la selection" -#: app/views/menu.html:288 +#: app/views/menu.html:276 msgid "Code" msgstr "Code" -#: app/views/menu.html:271 +#: app/views/menu.html:256 msgid "Community forum" msgstr "Forum communautaire" -#: app/views/menu.html:180 +#: app/views/menu.html:275 +msgid "Constant" +msgstr "" + +#: app/views/menu.html:165 msgid "Datasheet" msgstr "Documentation" -#: app/scripts/services/tools.service.js:294 +#: app/scripts/services/tools.service.js:306 msgid "" "Default toolchain not found. Toolchain will be downloaded. This operation " "requires Internet connection. Do you want to continue?" msgstr "" "La toolchain par default n'a pas été trouvée. La toolchain va être " -"téléchargée. Cette operation nécessite une connexion internet." -"Voulez-vous continuer ?" +"téléchargée. Cette operation nécessite une connexion internet.Voulez-vous " +"continuer ?" + +#: app/scripts/services/utils.service.js:667 +msgid "Description" +msgstr "" -#: app/views/menu.html:245 +#: app/views/menu.html:230 msgid "Disable" msgstr "Désactiver" -#: app/scripts/controllers/menu.js:256 +#: app/scripts/controllers/menu.js:222 msgid "Do you want to clear all?" msgstr "Voulez vous tout nettoyer?" -#: app/scripts/controllers/menu.js:269 +#: app/scripts/controllers/menu.js:192 +#, fuzzy +msgid "Do you want to exit the application?" +msgstr "Voulez vous supprimer le bloc séléctionné?" + +#: app/scripts/controllers/menu.js:213 msgid "Do you want to remove the selected block?" msgstr "Voulez vous supprimer le bloc séléctionné?" -#: app/views/menu.html:264 +#: app/views/menu.html:249 msgid "Documentation" msgstr "Documentation" -#: app/views/menu.html:238 +#: app/views/menu.html:223 msgid "Drivers" msgstr "Pilote" -#: app/scripts/services/utils.service.js:418 -#: app/scripts/services/utils.service.js:481 +#: app/scripts/services/utils.service.js:436 +#: app/scripts/services/utils.service.js:504 msgid "Drivers disabled" msgstr "Pilote désactivé" -#: app/scripts/services/utils.service.js:415 -#: app/scripts/services/utils.service.js:462 +#: app/scripts/services/utils.service.js:433 +#: app/scripts/services/utils.service.js:485 msgid "Drivers enabled" msgstr "Pilote activé" -#: app/scripts/services/tools.service.js:217 +#: app/scripts/services/tools.service.js:230 msgid "Duplicated FPGA I/O ports" msgstr "Ports d'entrée sortie FPGA dupliqué" -#: app/views/menu.html:100 +#: app/scripts/services/blocks.service.js:314 +msgid "Duplicated block attributes" +msgstr "" + +#: app/views/menu.html:85 msgid "Edit" msgstr "Édition" -#: app/views/menu.html:241 +#: app/views/menu.html:226 msgid "Enable" msgstr "Activer" -#: app/views/menu.html:135 +#: app/views/menu.html:120 msgid "English" msgstr "Anglais" -#: app/scripts/services/graph.service.js:438 -#: app/scripts/services/graph.service.js:496 +#: app/scripts/services/blocks.service.js:126 +#, fuzzy +msgid "Enter the constant blocks" +msgstr "Entrer les ports de sortie" + +#: app/scripts/services/blocks.service.js:213 msgid "Enter the input ports" msgstr "Entrer les ports d'entrée" -#: app/scripts/services/graph.service.js:439 -#: app/scripts/services/graph.service.js:536 +#: app/scripts/services/blocks.service.js:214 msgid "Enter the output ports" msgstr "Entrer les ports de sortie" -#: app/scripts/controllers/menu.js:233 -msgid "Enter the project's image path" -msgstr "Entrer le chemin image du projet" +#: app/scripts/services/blocks.service.js:215 +#, fuzzy +msgid "Enter the parameters" +msgstr "Entrer les ports d'entrée" + +#: app/scripts/services/blocks.service.js:57 +#, fuzzy +msgid "Enter the ports" +msgstr "Entrer les ports d'entrée" -#: app/scripts/controllers/menu.js:82 -msgid "Enter the project's title" +#: app/scripts/controllers/menu.js:73 +#, fuzzy +msgid "Enter the project name" msgstr "Entrer un nom de projet" -#: app/scripts/controllers/menu.js:241 +#: app/scripts/controllers/menu.js:249 msgid "Enter the remote hostname user@host (experimental)" msgstr "Entrer le hostname distant user@host (experimentale)" -#: app/scripts/services/tools.service.js:317 +#: app/scripts/services/tools.service.js:329 msgid "Error: default toolchain not found in '{{dir}}'" msgstr "Erreur: La toolchaine par défaut n'a pas été trouvée dans '{{dir}}'" -#: app/scripts/services/utils.service.js:610 +#: app/scripts/services/utils.service.js:800 msgid "Error: {{error}}" msgstr "Erreur: {{error}}" @@ -217,32 +257,28 @@ msgstr "Erreur: {{error}}" msgid "Examples" msgstr "Exemples" -#: app/scripts/services/tools.service.js:175 +#: app/scripts/services/tools.service.js:187 msgid "Execute remote {{label}} ..." msgstr "Executer à distance {{label}} ..." -#: app/views/menu.html:80 +#: app/views/menu.html:61 msgid "Export" msgstr "Exporter" -#: app/views/menu.html:76 -msgid "Export as block" -msgstr "Exporter un bloc" - -#: app/scripts/services/tools.service.js:449 +#: app/scripts/services/tools.service.js:461 msgid "Extract default apio files..." msgstr "Extraction des fichiers apio par défaut..." -#: app/scripts/services/tools.service.js:459 +#: app/scripts/services/tools.service.js:471 msgid "Extract default apio packages..." msgstr "Extraction des packets apio par défaut" -#: app/scripts/services/tools.service.js:437 +#: app/scripts/services/tools.service.js:449 msgid "Extract virtual env files..." msgstr "Extraction des fichiers d'environnement virtuels" -#: app/scripts/services/tools.service.js:211 -#: app/scripts/services/tools.service.js:214 +#: app/scripts/services/tools.service.js:224 +#: app/scripts/services/tools.service.js:227 msgid "FPGA I/O ports not defined" msgstr "Ports d'entrée sortie FPGA non définits" @@ -250,220 +286,253 @@ msgstr "Ports d'entrée sortie FPGA non définits" msgid "File" msgstr "Fichier" -#: app/scripts/services/common.service.js:125 +#: app/scripts/services/project.service.js:241 msgid "" "File {{file}} already exists in the project path. Do you want to replace it?" msgstr "" -"Le Fichier {{file}} existe déjà dans le chemin du projet. Voulez vous le" -"remplacer ?" +"Le Fichier {{file}} existe déjà dans le chemin du projet. Voulez vous " +"leremplacer ?" -#: app/scripts/services/tools.service.js:148 +#: app/scripts/services/tools.service.js:163 msgid "File {{file}} does not exist" msgstr "Le fichier {{file}} n'existe pas" -#: app/scripts/services/common.service.js:153 +#: app/scripts/services/project.service.js:273 msgid "File {{file}} imported" msgstr "Fichier {{file}} importé" -#: app/views/menu.html:159 +#: app/views/menu.html:144 msgid "French" msgstr "Français" -#: app/scripts/services/common.service.js:223 +#: app/scripts/controllers/menu.js:176 msgid "GTKWave exported" msgstr "GTKWave exporté" -#: app/views/menu.html:147 +#: app/views/menu.html:132 msgid "Galician" msgstr "Galois" -#: app/views/menu.html:254 +#: app/views/menu.html:239 msgid "Help" msgstr "Aide" -#: app/scripts/services/utils.service.js:452 +#: app/scripts/services/utils.service.js:474 msgid "Homebrew is required" msgstr "Homebrew est requis" -#: app/views/menu.html:120 -msgid "Image path" +#: app/scripts/services/utils.service.js:681 +#, fuzzy +msgid "Image" msgstr "Chemin image" -#: app/scripts/controllers/menu.js:322 +#: app/scripts/controllers/menu.js:309 msgid "Image {{name}} saved" msgstr "Image {{name}} sauvée" -#: app/views/menu.html:73 -msgid "Import block" -msgstr "Importer un bloc" - -#: app/views/menu.html:289 +#: app/views/menu.html:277 msgid "Info" msgstr "Info" -#: app/views/menu.html:290 +#: app/views/menu.html:273 msgid "Input" msgstr "Entrée" -#: app/views/menu.html:215 +#: app/views/menu.html:200 msgid "Install" msgstr "Installation" -#: app/scripts/services/tools.service.js:454 +#: app/scripts/services/tools.service.js:466 msgid "Install default apio..." msgstr "Installer l'apio par défaut..." -#: app/scripts/services/tools.service.js:503 +#: app/scripts/services/tools.service.js:515 msgid "Installation completed" msgstr "Installation terminée" -#: app/scripts/services/tools.service.js:346 -#: app/scripts/services/tools.service.js:383 +#: app/scripts/services/tools.service.js:358 +#: app/scripts/services/tools.service.js:395 msgid "Installing toolchain" msgstr "Installation de la toolchain" -#: app/scripts/services/tools.service.js:419 -#: app/scripts/services/utils.service.js:455 +#: app/scripts/services/tools.service.js:431 +#: app/scripts/services/utils.service.js:478 msgid "Internet connection required" msgstr "Une connexion internet est requise" -#: app/scripts/services/graph.service.js:134 +#: app/scripts/services/graph.service.js:133 msgid "Invalid Pull up connection:
                block already connected" msgstr "Connexion de Pull up invalide:
                Le bloc est déjà connecté" -#: app/scripts/services/graph.service.js:150 +#: app/scripts/services/graph.service.js:149 msgid "Invalid Pull up connection:
                only Input blocks allowed" msgstr "Connexion de Pull up invalide:
                Une seule entrée autorisée" -#: app/scripts/services/graph.service.js:141 +#: app/scripts/services/graph.service.js:140 msgid "Invalid block connection:
                Pull up already connected" msgstr "Connexion de bloc invalide:
                Pull up déjà connectée" -#: app/scripts/services/graph.service.js:113 +#: app/scripts/services/graph.service.js:104 +#: app/scripts/services/graph.service.js:111 +#: app/scripts/services/graph.service.js:97 msgid "Invalid connection" msgstr "Connexion invalide" -#: app/scripts/services/graph.service.js:127 +#: app/scripts/services/graph.service.js:168 +#, fuzzy +msgid "Invalid connection: →" +msgstr "Connexion invalide" + +#: app/scripts/services/graph.service.js:126 msgid "Invalid multiple input connections" msgstr "Connexions de multiples entrées invalides" -#: app/scripts/services/graph.service.js:298 -msgid "Label updated" -msgstr "Titre mis à jour" - -#: app/views/menu.html:131 +#: app/views/menu.html:116 msgid "Language" msgstr "Langage" -#: app/scripts/services/tools.service.js:442 +#: app/scripts/services/blocks.service.js:127 +#: app/scripts/services/blocks.service.js:697 +msgid "Local parameter" +msgstr "" + +#: app/scripts/services/tools.service.js:454 msgid "Make virtual env..." msgstr "Faire l'environnement virtuel..." +#: app/scripts/services/utils.service.js:665 +msgid "Name" +msgstr "" + #: app/views/menu.html:27 -msgid "New project" -msgstr "Nouveau projet" +msgid "New" +msgstr "" -#: app/scripts/services/common.service.js:36 +#: app/scripts/services/project.service.js:44 msgid "New project {{name}} created" msgstr "Nouveau projet {{name}} créé" -#: app/scripts/controllers/main.js:14 +#: app/scripts/controllers/main.js:15 msgid "OK" msgstr "OK" +#: app/scripts/services/project.service.js:188 +#: app/scripts/services/project.service.js:60 +#, fuzzy +msgid "Old project format" +msgstr "Mauvais format de projet: {{name}}" + #: app/views/menu.html:30 -msgid "Open project" -msgstr "Ouvrir un projet" +msgid "Open" +msgstr "" + +#: app/scripts/services/utils.service.js:688 +msgid "Open SVG" +msgstr "" -#: app/scripts/services/common.service.js:156 +#: app/scripts/services/project.service.js:276 msgid "Original file {{file}} does not exist" msgstr "Le fichier originel {{file}} n'éxiste pas" -#: app/views/menu.html:291 +#: app/views/menu.html:274 msgid "Output" msgstr "Sortie" -#: app/scripts/services/common.service.js:203 +#: app/scripts/controllers/menu.js:158 msgid "PCF file exported" msgstr "Fichier PCF exporté" -#: app/views/menu.html:117 +#: app/views/menu.html:102 msgid "Preferences" msgstr "Préférences" -#: app/scripts/services/common.service.js:55 +#: app/views/menu.html:105 +msgid "Project information" +msgstr "" + +#: app/scripts/services/project.service.js:64 msgid "Project {{name}} loaded" msgstr "Projet {{name}} chargé" -#: app/scripts/services/common.service.js:68 +#: app/scripts/services/project.service.js:160 msgid "Project {{name}} saved" msgstr "Projet {{name}} sauvegardé" -#: app/scripts/services/tools.service.js:430 +#: app/scripts/services/tools.service.js:442 msgid "Python 2.7 is required" msgstr "Python 2.7 est requis" -#: app/views/project.html:3 +#: app/views/menu.html:79 +msgid "Quit" +msgstr "" + +#: app/views/design.html:4 msgid "Read only" msgstr "Lecture seule" -#: app/scripts/services/tools.service.js:243 +#: app/scripts/services/tools.service.js:255 msgid "Remote host {{name}} not connected" msgstr "Remote host {{name}} not connected" -#: app/views/menu.html:125 +#: app/views/menu.html:110 msgid "Remote hostname" msgstr "Hostname distant" -#: app/views/menu.html:223 +#: app/views/menu.html:208 msgid "Remove" msgstr "Supprimer" -#: app/views/menu.html:110 +#: app/views/menu.html:95 msgid "Remove selected" msgstr "Supprimer la selection" -#: app/views/menu.html:228 +#: app/scripts/services/utils.service.js:690 +#, fuzzy +msgid "Reset SVG" +msgstr "Reinitialiser la vue" + +#: app/views/menu.html:213 msgid "Reset default" msgstr "Réinitialiser avec les paramètres par défaut" -#: app/views/menu.html:103 +#: app/views/menu.html:88 msgid "Reset view" msgstr "Reinitialiser la vue" -#: app/views/menu.html:66 +#: app/views/menu.html:54 msgid "Save" msgstr "Sauvegarder" -#: app/views/menu.html:69 +#: app/scripts/services/utils.service.js:689 +#, fuzzy +msgid "Save SVG" +msgstr "Sauvegarder sous" + +#: app/views/menu.html:57 msgid "Save as" msgstr "Sauvegarder sous" -#: app/views/menu.html:267 +#: app/views/menu.html:252 msgid "Source code" msgstr "Code source" -#: app/views/menu.html:141 +#: app/views/menu.html:126 msgid "Spanish" msgstr "Espagnole" -#: app/scripts/services/tools.service.js:164 +#: app/scripts/services/tools.service.js:176 msgid "Synchronize remote files ..." msgstr "Synchroniser les fichiers distants ..." -#: app/views/menu.html:50 -msgid "Templates" -msgstr "Modèles" - -#: app/views/menu.html:89 +#: app/views/menu.html:70 msgid "Testbench" msgstr "Banc de tests exporté" -#: app/scripts/services/common.service.js:213 +#: app/scripts/controllers/menu.js:167 msgid "Testbench exported" msgstr "Banc de tests exporté" -#: app/scripts/controllers/menu.js:379 +#: app/scripts/controllers/menu.js:367 msgid "" "The current FPGA I/O configuration will be lost. Do you want to change to " "{{name}} board?" @@ -471,106 +540,132 @@ msgstr "" "La configuration des entrées sorties du FPGA actuel va être perdue. Voulez " "vous changer pour la carte {{name}}?" -#: app/scripts/controllers/menu.js:103 app/scripts/controllers/menu.js:126 +#: app/scripts/controllers/menu.js:105 app/scripts/controllers/menu.js:90 msgid "" "The current project will be removed. Do you want to continue loading the " "project?" msgstr "Le projet actuel sera supprimé. Continuer de charger le projet?" -#: app/scripts/services/tools.service.js:322 +#: app/scripts/services/tools.service.js:334 msgid "The toolchain will be removed. Do you want to continue?" -msgstr "Les répertoires de configuration d'Icestudio et apio vont être supprimés. " +msgstr "" +"Les répertoires de configuration d'Icestudio et apio vont être supprimés. " "Voulez-vous continuer?" -#: app/scripts/services/tools.service.js:310 +#: app/scripts/services/tools.service.js:322 msgid "The toolchain will be restored to default. Do you want to continue?" msgstr "La toolchain va être restaurée par défaut. Voulez vous continuer ?" -#: app/scripts/services/tools.service.js:302 +#: app/scripts/services/tools.service.js:314 msgid "" "The toolchain will be updated. This operation requires Internet connection. " "Do you want to continue?" msgstr "" -#: app/scripts/services/common.service.js:95 +#: app/scripts/services/project.service.js:210 msgid "" "This import operation requires a project path. You need to save the current " "project. Do you want to continue?" msgstr "" -"Cette opération d'import requière un chemin de projet (path). Vous devez" -" sauvez le projet actuel. Voulez vous continuer ?" +"Cette opération d'import requière un chemin de projet (path). Vous devez " +"sauvez le projet actuel. Voulez vous continuer ?" -#: app/views/menu.html:211 +#: app/views/menu.html:196 msgid "Toolchain" msgstr "Toolchain" -#: app/scripts/services/tools.service.js:504 +#: app/scripts/services/tools.service.js:516 msgid "Toolchain installed" msgstr "La toolchain est installée" -#: app/scripts/services/tools.service.js:508 +#: app/scripts/services/tools.service.js:520 msgid "Toolchain not installed" msgstr "La toolchain n'est pas à jour" -#: app/scripts/services/tools.service.js:79 -#: app/scripts/services/utils.service.js:493 -#: app/scripts/services/utils.service.js:509 +#: app/scripts/services/tools.service.js:91 +#: app/scripts/services/utils.service.js:516 +#: app/scripts/services/utils.service.js:532 msgid "Toolchain not installed. Please, install the toolchain" msgstr "La toolchain n'est pas à jour. Installer, ou mettre à jour svp" -#: app/scripts/services/tools.service.js:326 +#: app/scripts/services/tools.service.js:338 msgid "Toolchain removed" msgstr "Toolchain supprimée" -#: app/views/menu.html:198 +#: app/views/menu.html:183 msgid "Tools" msgstr "Outils" -#: app/scripts/services/tools.service.js:208 +#: app/scripts/services/tools.service.js:221 msgid "Unknown board" msgstr "Carte inconnue" -#: app/views/menu.html:218 +#: app/views/menu.html:203 msgid "Update" msgstr "" -#: app/scripts/services/graph.service.js:292 -msgid "Update the port label" -msgstr "" +#: app/scripts/services/blocks.service.js:696 +#, fuzzy +msgid "Update the block label" +msgstr "Entrer le titre du bloc" + +#: app/scripts/services/blocks.service.js:644 +#, fuzzy +msgid "Update the port" +msgstr "Entrer les ports d'entrée" -#: app/views/menu.html:207 +#: app/views/menu.html:192 msgid "Upload" msgstr "Télécharger" -#: app/views/menu.html:201 +#: app/views/menu.html:186 msgid "Verify" msgstr "Verifier" -#: app/scripts/services/common.service.js:193 +#: app/scripts/controllers/menu.js:149 msgid "Verilog code exported" msgstr "Code Verilog exporté" -#: app/views/menu.html:260 +#: app/scripts/services/utils.service.js:666 app/views/menu.html:245 msgid "Version" msgstr "Version" -#: app/views/menu.html:171 +#: app/views/menu.html:156 msgid "View" msgstr "Vue" -#: app/views/menu.html:257 +#: app/views/menu.html:242 msgid "View license" msgstr "Voir la licence" -#: app/scripts/services/graph.service.js:593 +#: app/scripts/services/blocks.service.js:58 +#: app/scripts/services/blocks.service.js:645 +msgid "Virtual port" +msgstr "" + +#: app/scripts/services/blocks.service.js:348 msgid "Wrong block format: {{type}}" msgstr "Mauvais format de bloc: {{type}}" -#: app/scripts/services/common.service.js:58 +#: app/scripts/services/blocks.service.js:146 +#: app/scripts/services/blocks.service.js:263 +#, fuzzy +msgid "Wrong parameter name {{name}}" +msgstr "Mauvais hostname distant {{name}}" + +#: app/scripts/services/blocks.service.js:233 +#: app/scripts/services/blocks.service.js:248 +#: app/scripts/services/blocks.service.js:688 +#: app/scripts/services/blocks.service.js:77 +#, fuzzy +msgid "Wrong port name {{name}}" +msgstr "Mauvais hostname distant {{name}}" + +#: app/scripts/services/project.service.js:72 msgid "Wrong project format: {{name}}" msgstr "Mauvais format de projet: {{name}}" -#: app/scripts/services/tools.service.js:240 +#: app/scripts/services/tools.service.js:252 msgid "Wrong remote hostname {{name}}" msgstr "Mauvais hostname distant {{name}}" @@ -579,7 +674,7 @@ msgstr "Mauvais hostname distant {{name}}" msgid "and" msgstr "Et" -#: app/views/project.html:4 +#: app/views/design.html:5 msgid "back" msgstr "retour" @@ -598,6 +693,21 @@ msgstr "Combinatoire" msgid "config" msgstr "Configuration" +#. contadorAsc +#: app/resources/blocks/labels.js:60 +msgid "contadorAsc" +msgstr "" + +#. contadorDes +#: app/resources/blocks/labels.js:62 +msgid "contadorDes" +msgstr "" + +#. Debouncer +#: app/resources/blocks/labels.js:58 +msgid "debouncer" +msgstr "" + #. Demux 1:2 #: app/resources/blocks/labels.js:18 msgid "demux_1_2" @@ -624,17 +734,17 @@ msgid "dff_sr" msgstr "D flip-flop" #. Build done -#: app/scripts/services/tools.service.js:255 +#: app/scripts/services/tools.service.js:267 msgid "done_build" msgstr "Construction terminée" #. Upload done -#: app/scripts/services/tools.service.js:257 +#: app/scripts/services/tools.service.js:269 msgid "done_upload" msgstr "Téléchargement terminé" #. Verification done -#: app/scripts/services/tools.service.js:253 +#: app/scripts/services/tools.service.js:265 msgid "done_verify" msgstr "Vérification faite" @@ -704,17 +814,17 @@ msgid "sequential" msgstr "Séquentiel" #. Start building ... -#: app/scripts/services/tools.service.js:45 +#: app/scripts/services/tools.service.js:57 msgid "start_build" msgstr "Début de la construction ..." #. Start uploading ... -#: app/scripts/services/tools.service.js:47 +#: app/scripts/services/tools.service.js:59 msgid "start_upload" msgstr "Début du téléchargement ..." #. Start verification ... -#: app/scripts/services/tools.service.js:43 +#: app/scripts/services/tools.service.js:55 msgid "start_verify" msgstr "Début de la verification ..." @@ -733,7 +843,7 @@ msgstr "T flip-flop" msgid "tri_state" msgstr "Tri-state" -#: app/scripts/app.js:38 app/scripts/controllers/menu.js:83 +#: app/scripts/app.js:42 app/scripts/controllers/menu.js:74 msgid "untitled" msgstr "sans titre" @@ -747,14 +857,35 @@ msgstr "Xnor" msgid "xor" msgstr "Xor" -#: app/scripts/controllers/menu.js:370 +#: app/scripts/controllers/menu.js:357 msgid "{{board}} datasheet not defined" msgstr "" -#: app/scripts/controllers/menu.js:360 +#: app/scripts/controllers/menu.js:347 msgid "{{board}} pinout not defined" msgstr "" +#~ msgid "Block exported as {{name}}" +#~ msgstr "Bloc exporté comme {{name}}" + +#~ msgid "Enter the project's image path" +#~ msgstr "Entrer le chemin image du projet" + +#~ msgid "Export as block" +#~ msgstr "Exporter un bloc" + +#~ msgid "Import block" +#~ msgstr "Importer un bloc" + +#~ msgid "New project" +#~ msgstr "Nouveau projet" + +#~ msgid "Open project" +#~ msgstr "Ouvrir un projet" + +#~ msgid "Templates" +#~ msgstr "Modèles" + #~ msgid "Datasheet not defined" #~ msgstr "Documentation non définie" @@ -764,8 +895,5 @@ msgstr "" #~ msgid "sec" #~ msgstr "Séquentiel" -#~ msgid "Enter the block's label" -#~ msgstr "Entrer le titre du bloc" - #~ msgid "Enter the block's ports" #~ msgstr "Entrer les port du bloc" diff --git a/app/resources/locale/gl_ES/gl_ES.po b/app/resources/locale/gl_ES/gl_ES.po index 5537d7090..e70b3c024 100644 --- a/app/resources/locale/gl_ES/gl_ES.po +++ b/app/resources/locale/gl_ES/gl_ES.po @@ -9,7 +9,7 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: Poedit 1.8.7.1\n" +"X-Generator: Poedit 1.5.4\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" #. 1. Basic @@ -32,175 +32,215 @@ msgstr "2. Interruptor con led" msgid "3_switch_and_gate" msgstr "3. Interruptor con porta and" -#: app/scripts/services/utils.service.js:421 -#: app/scripts/services/utils.service.js:496 +#: app/scripts/services/utils.service.js:439 +#: app/scripts/services/utils.service.js:519 msgid "Unplug and reconnect the board" msgstr "" -#: app/scripts/services/utils.service.js:487 +#: app/scripts/services/utils.service.js:510 msgid "" "

                FTDI driver installation instructions

                1. Connect the FPGA " "board
                2. Replace the (Interface 0) driver of the board by " "libusbK
                3. Unplug and reconnect the board
                " msgstr "" -#: app/scripts/services/utils.service.js:503 +#: app/scripts/services/utils.service.js:526 msgid "" "

                FTDI driver uninstallation instructions

                1. Find the FPGA USB " "Device
                2. Select the board interface and uninstall the driver
                " msgstr "" -#: app/views/menu.html:275 +#: app/views/menu.html:260 msgid "About Icestudio" msgstr "Acerca de Icestudio" -#: app/scripts/controllers/menu.js:421 +#: app/scripts/controllers/menu.js:415 msgid "Add a block to start" msgstr "" -#: app/views/menu.html:285 +#: app/views/menu.html:50 +#, fuzzy +msgid "Add as block" +msgstr "Exportar como bloque" + +#: app/scripts/services/utils.service.js:668 +msgid "Author" +msgstr "" + +#: app/views/menu.html:270 msgid "Basic" msgstr "Básico" -#: app/views/menu.html:153 +#: app/views/menu.html:138 msgid "Basque" msgstr "Euskera" -#: app/scripts/services/common.service.js:183 -msgid "Block exported as {{name}}" -msgstr "Bloque exportado como {{name}}" +#: app/scripts/services/blocks.service.js:674 +#: app/scripts/services/blocks.service.js:683 +#: app/scripts/services/blocks.service.js:713 +#: app/scripts/services/blocks.service.js:730 +#, fuzzy +msgid "Block updated" +msgstr "Etiqueta actualizada" -#: app/scripts/services/common.service.js:164 +#: app/scripts/services/project.service.js:293 msgid "Block {{name}} imported" msgstr "Bloque {{name}} importado" -#: app/scripts/services/tools.service.js:205 +#: app/scripts/services/tools.service.js:218 msgid "Board {{name}} not detected" msgstr "Placa {{name}} non detectada" -#: app/scripts/controllers/menu.js:383 app/scripts/controllers/menu.js:390 +#: app/scripts/controllers/menu.js:371 app/scripts/controllers/menu.js:378 msgid "Board {{name}} selected" msgstr "Placa {{name}} seleccionada" -#: app/views/menu.html:186 +#: app/views/menu.html:171 msgid "Boards" msgstr "Placas" -#: app/views/menu.html:204 +#: app/views/menu.html:189 msgid "Build" msgstr "Sintetizar" -#: app/scripts/controllers/main.js:15 +#: app/scripts/controllers/main.js:16 msgid "Cancel" msgstr "" -#: app/scripts/services/tools.service.js:417 +#: app/scripts/services/tools.service.js:429 msgid "Check Internet connection..." msgstr "" -#: app/scripts/services/tools.service.js:425 +#: app/scripts/services/tools.service.js:437 msgid "Check Python..." msgstr "" -#: app/views/menu.html:113 +#: app/views/menu.html:98 msgid "Clear all" msgstr "Suprimir todo" -#: app/views/menu.html:107 +#: app/views/menu.html:92 msgid "Clone selected" msgstr "Clonar seleccionado" -#: app/views/menu.html:288 +#: app/views/menu.html:276 msgid "Code" msgstr "Código" -#: app/views/menu.html:271 +#: app/views/menu.html:256 msgid "Community forum" msgstr "Foro da comunidade" -#: app/views/menu.html:180 +#: app/views/menu.html:275 +msgid "Constant" +msgstr "" + +#: app/views/menu.html:165 msgid "Datasheet" msgstr "" -#: app/scripts/services/tools.service.js:294 +#: app/scripts/services/tools.service.js:306 msgid "" "Default toolchain not found. Toolchain will be downloaded. This operation " "requires Internet connection. Do you want to continue?" msgstr "" -#: app/views/menu.html:245 +#: app/scripts/services/utils.service.js:667 +msgid "Description" +msgstr "" + +#: app/views/menu.html:230 msgid "Disable" msgstr "" -#: app/scripts/controllers/menu.js:256 +#: app/scripts/controllers/menu.js:222 msgid "Do you want to clear all?" msgstr "¿Desexa borrar todo?" -#: app/scripts/controllers/menu.js:269 +#: app/scripts/controllers/menu.js:192 +#, fuzzy +msgid "Do you want to exit the application?" +msgstr "¿Desexa eliminar o bloque seleccionado?" + +#: app/scripts/controllers/menu.js:213 msgid "Do you want to remove the selected block?" msgstr "¿Desexa eliminar o bloque seleccionado?" -#: app/views/menu.html:264 +#: app/views/menu.html:249 msgid "Documentation" msgstr "Documentación" -#: app/views/menu.html:238 +#: app/views/menu.html:223 msgid "Drivers" msgstr "" -#: app/scripts/services/utils.service.js:418 -#: app/scripts/services/utils.service.js:481 +#: app/scripts/services/utils.service.js:436 +#: app/scripts/services/utils.service.js:504 msgid "Drivers disabled" msgstr "" -#: app/scripts/services/utils.service.js:415 -#: app/scripts/services/utils.service.js:462 +#: app/scripts/services/utils.service.js:433 +#: app/scripts/services/utils.service.js:485 msgid "Drivers enabled" msgstr "" -#: app/scripts/services/tools.service.js:217 +#: app/scripts/services/tools.service.js:230 msgid "Duplicated FPGA I/O ports" msgstr "Portos E/S da FPGA duplicados" -#: app/views/menu.html:100 +#: app/scripts/services/blocks.service.js:314 +msgid "Duplicated block attributes" +msgstr "" + +#: app/views/menu.html:85 msgid "Edit" msgstr "Editar" -#: app/views/menu.html:241 +#: app/views/menu.html:226 msgid "Enable" msgstr "" -#: app/views/menu.html:135 +#: app/views/menu.html:120 msgid "English" msgstr "Inglés" -#: app/scripts/services/graph.service.js:438 -#: app/scripts/services/graph.service.js:496 +#: app/scripts/services/blocks.service.js:126 +#, fuzzy +msgid "Enter the constant blocks" +msgstr "Introduza a etiqueta para o bloque" + +#: app/scripts/services/blocks.service.js:213 msgid "Enter the input ports" msgstr "" -#: app/scripts/services/graph.service.js:439 -#: app/scripts/services/graph.service.js:536 +#: app/scripts/services/blocks.service.js:214 msgid "Enter the output ports" msgstr "" -#: app/scripts/controllers/menu.js:233 -msgid "Enter the project's image path" -msgstr "Introduza a ruta da imaxe do proxecto" +#: app/scripts/services/blocks.service.js:215 +#, fuzzy +msgid "Enter the parameters" +msgstr "Introduza o título do proxecto" + +#: app/scripts/services/blocks.service.js:57 +#, fuzzy +msgid "Enter the ports" +msgstr "Introduza os portos para o bloque" -#: app/scripts/controllers/menu.js:82 -msgid "Enter the project's title" +#: app/scripts/controllers/menu.js:73 +#, fuzzy +msgid "Enter the project name" msgstr "Introduza o título do proxecto" -#: app/scripts/controllers/menu.js:241 +#: app/scripts/controllers/menu.js:249 msgid "Enter the remote hostname user@host (experimental)" msgstr "Enter the remote hostname user@host (experimental)" -#: app/scripts/services/tools.service.js:317 +#: app/scripts/services/tools.service.js:329 msgid "Error: default toolchain not found in '{{dir}}'" msgstr "" -#: app/scripts/services/utils.service.js:610 +#: app/scripts/services/utils.service.js:800 msgid "Error: {{error}}" msgstr "Error: {{error}}" @@ -208,32 +248,28 @@ msgstr "Error: {{error}}" msgid "Examples" msgstr "Exemplos" -#: app/scripts/services/tools.service.js:175 +#: app/scripts/services/tools.service.js:187 msgid "Execute remote {{label}} ..." msgstr "Execute remote {{label}} ..." -#: app/views/menu.html:80 +#: app/views/menu.html:61 msgid "Export" msgstr "Exportar" -#: app/views/menu.html:76 -msgid "Export as block" -msgstr "Exportar como bloque" - -#: app/scripts/services/tools.service.js:449 +#: app/scripts/services/tools.service.js:461 msgid "Extract default apio files..." msgstr "" -#: app/scripts/services/tools.service.js:459 +#: app/scripts/services/tools.service.js:471 msgid "Extract default apio packages..." msgstr "" -#: app/scripts/services/tools.service.js:437 +#: app/scripts/services/tools.service.js:449 msgid "Extract virtual env files..." msgstr "" -#: app/scripts/services/tools.service.js:211 -#: app/scripts/services/tools.service.js:214 +#: app/scripts/services/tools.service.js:224 +#: app/scripts/services/tools.service.js:227 msgid "FPGA I/O ports not defined" msgstr "Portos E/S da FPGA non definidos" @@ -241,218 +277,250 @@ msgstr "Portos E/S da FPGA non definidos" msgid "File" msgstr "Ficheiro" -#: app/scripts/services/common.service.js:125 +#: app/scripts/services/project.service.js:241 msgid "" "File {{file}} already exists in the project path. Do you want to replace it?" msgstr "" -#: app/scripts/services/tools.service.js:148 +#: app/scripts/services/tools.service.js:163 msgid "File {{file}} does not exist" msgstr "O ficheiro {{file}} non existe" -#: app/scripts/services/common.service.js:153 +#: app/scripts/services/project.service.js:273 msgid "File {{file}} imported" msgstr "" -#: app/views/menu.html:159 +#: app/views/menu.html:144 msgid "French" msgstr "" -#: app/scripts/services/common.service.js:223 +#: app/scripts/controllers/menu.js:176 msgid "GTKWave exported" msgstr "GTKWave exportado" -#: app/views/menu.html:147 +#: app/views/menu.html:132 msgid "Galician" msgstr "Galego" -#: app/views/menu.html:254 +#: app/views/menu.html:239 msgid "Help" msgstr "Axuda" -#: app/scripts/services/utils.service.js:452 +#: app/scripts/services/utils.service.js:474 msgid "Homebrew is required" msgstr "" -#: app/views/menu.html:120 -msgid "Image path" +#: app/scripts/services/utils.service.js:681 +#, fuzzy +msgid "Image" msgstr "Ruta da imaxe" -#: app/scripts/controllers/menu.js:322 +#: app/scripts/controllers/menu.js:309 msgid "Image {{name}} saved" msgstr "" -#: app/views/menu.html:73 -msgid "Import block" -msgstr "Importar bloque" - -#: app/views/menu.html:289 +#: app/views/menu.html:277 msgid "Info" msgstr "Info" -#: app/views/menu.html:290 +#: app/views/menu.html:273 msgid "Input" msgstr "Entrada" -#: app/views/menu.html:215 +#: app/views/menu.html:200 msgid "Install" msgstr "" -#: app/scripts/services/tools.service.js:454 +#: app/scripts/services/tools.service.js:466 msgid "Install default apio..." msgstr "" -#: app/scripts/services/tools.service.js:503 +#: app/scripts/services/tools.service.js:515 msgid "Installation completed" msgstr "Instalación completada" -#: app/scripts/services/tools.service.js:346 -#: app/scripts/services/tools.service.js:383 +#: app/scripts/services/tools.service.js:358 +#: app/scripts/services/tools.service.js:395 msgid "Installing toolchain" msgstr "Instalando a toolchain" -#: app/scripts/services/tools.service.js:419 -#: app/scripts/services/utils.service.js:455 +#: app/scripts/services/tools.service.js:431 +#: app/scripts/services/utils.service.js:478 msgid "Internet connection required" msgstr "Requírese dunha conexión a Internet" -#: app/scripts/services/graph.service.js:134 +#: app/scripts/services/graph.service.js:133 msgid "Invalid Pull up connection:
                block already connected" msgstr "" -#: app/scripts/services/graph.service.js:150 +#: app/scripts/services/graph.service.js:149 msgid "Invalid Pull up connection:
                only Input blocks allowed" msgstr "" -#: app/scripts/services/graph.service.js:141 +#: app/scripts/services/graph.service.js:140 msgid "Invalid block connection:
                Pull up already connected" msgstr "" -#: app/scripts/services/graph.service.js:113 +#: app/scripts/services/graph.service.js:104 +#: app/scripts/services/graph.service.js:111 +#: app/scripts/services/graph.service.js:97 msgid "Invalid connection" msgstr "" -#: app/scripts/services/graph.service.js:127 -msgid "Invalid multiple input connections" +#: app/scripts/services/graph.service.js:168 +msgid "Invalid connection: →" msgstr "" -#: app/scripts/services/graph.service.js:298 -msgid "Label updated" -msgstr "Etiqueta actualizada" +#: app/scripts/services/graph.service.js:126 +msgid "Invalid multiple input connections" +msgstr "" -#: app/views/menu.html:131 +#: app/views/menu.html:116 msgid "Language" msgstr "Idioma" -#: app/scripts/services/tools.service.js:442 +#: app/scripts/services/blocks.service.js:127 +#: app/scripts/services/blocks.service.js:697 +msgid "Local parameter" +msgstr "" + +#: app/scripts/services/tools.service.js:454 msgid "Make virtual env..." msgstr "" +#: app/scripts/services/utils.service.js:665 +msgid "Name" +msgstr "" + #: app/views/menu.html:27 -msgid "New project" -msgstr "Novo proxecto" +msgid "New" +msgstr "" -#: app/scripts/services/common.service.js:36 +#: app/scripts/services/project.service.js:44 msgid "New project {{name}} created" msgstr "Novo proxecto {{name}} creado" -#: app/scripts/controllers/main.js:14 +#: app/scripts/controllers/main.js:15 msgid "OK" msgstr "" +#: app/scripts/services/project.service.js:188 +#: app/scripts/services/project.service.js:60 +#, fuzzy +msgid "Old project format" +msgstr "Formato de proxecto incorrecto: {{name}}\"" + #: app/views/menu.html:30 -msgid "Open project" -msgstr "Abrir proxecto" +msgid "Open" +msgstr "" + +#: app/scripts/services/utils.service.js:688 +msgid "Open SVG" +msgstr "" -#: app/scripts/services/common.service.js:156 +#: app/scripts/services/project.service.js:276 msgid "Original file {{file}} does not exist" msgstr "" -#: app/views/menu.html:291 +#: app/views/menu.html:274 msgid "Output" msgstr "Saída" -#: app/scripts/services/common.service.js:203 +#: app/scripts/controllers/menu.js:158 msgid "PCF file exported" msgstr "Ficheiro PCF exportado" -#: app/views/menu.html:117 +#: app/views/menu.html:102 msgid "Preferences" msgstr "" -#: app/scripts/services/common.service.js:55 +#: app/views/menu.html:105 +msgid "Project information" +msgstr "" + +#: app/scripts/services/project.service.js:64 msgid "Project {{name}} loaded" msgstr "Proxecto {{name}} cargado" -#: app/scripts/services/common.service.js:68 +#: app/scripts/services/project.service.js:160 msgid "Project {{name}} saved" msgstr "Proxecto {{name}} gardado" -#: app/scripts/services/tools.service.js:430 +#: app/scripts/services/tools.service.js:442 msgid "Python 2.7 is required" msgstr "" -#: app/views/project.html:3 +#: app/views/menu.html:79 +msgid "Quit" +msgstr "" + +#: app/views/design.html:4 msgid "Read only" msgstr "Só lectura" -#: app/scripts/services/tools.service.js:243 +#: app/scripts/services/tools.service.js:255 msgid "Remote host {{name}} not connected" msgstr "" -#: app/views/menu.html:125 +#: app/views/menu.html:110 msgid "Remote hostname" msgstr "" -#: app/views/menu.html:223 +#: app/views/menu.html:208 msgid "Remove" msgstr "Eliminar" -#: app/views/menu.html:110 +#: app/views/menu.html:95 msgid "Remove selected" msgstr "Suprimir seleccionado" -#: app/views/menu.html:228 +#: app/scripts/services/utils.service.js:690 +#, fuzzy +msgid "Reset SVG" +msgstr "Restablecer vista" + +#: app/views/menu.html:213 msgid "Reset default" msgstr "" -#: app/views/menu.html:103 +#: app/views/menu.html:88 msgid "Reset view" msgstr "Restablecer vista" -#: app/views/menu.html:66 +#: app/views/menu.html:54 msgid "Save" msgstr "Gardar" -#: app/views/menu.html:69 +#: app/scripts/services/utils.service.js:689 +#, fuzzy +msgid "Save SVG" +msgstr "Gardar como" + +#: app/views/menu.html:57 msgid "Save as" msgstr "Gardar como" -#: app/views/menu.html:267 +#: app/views/menu.html:252 msgid "Source code" msgstr "Código fonte" -#: app/views/menu.html:141 +#: app/views/menu.html:126 msgid "Spanish" msgstr "Castelán" -#: app/scripts/services/tools.service.js:164 +#: app/scripts/services/tools.service.js:176 msgid "Synchronize remote files ..." msgstr "Synchronize remote files ..." -#: app/views/menu.html:50 -msgid "Templates" -msgstr "Modelos" - -#: app/views/menu.html:89 +#: app/views/menu.html:70 msgid "Testbench" msgstr "Testbench" -#: app/scripts/services/common.service.js:213 +#: app/scripts/controllers/menu.js:167 msgid "Testbench exported" msgstr "Testbench exportado" -#: app/scripts/controllers/menu.js:379 +#: app/scripts/controllers/menu.js:367 msgid "" "The current FPGA I/O configuration will be lost. Do you want to change to " "{{name}} board?" @@ -460,103 +528,127 @@ msgstr "" "A configuración actual de E/S da FPGA perderase. ¿Desexa cambiar á placa " "{{name}}?" -#: app/scripts/controllers/menu.js:103 app/scripts/controllers/menu.js:126 +#: app/scripts/controllers/menu.js:105 app/scripts/controllers/menu.js:90 msgid "" "The current project will be removed. Do you want to continue loading the " "project?" msgstr "O proxecto actual perderase. ¿Desexa continuar abrindo o proxecto?" -#: app/scripts/services/tools.service.js:322 +#: app/scripts/services/tools.service.js:334 msgid "The toolchain will be removed. Do you want to continue?" msgstr "" -#: app/scripts/services/tools.service.js:310 +#: app/scripts/services/tools.service.js:322 msgid "The toolchain will be restored to default. Do you want to continue?" msgstr "" -#: app/scripts/services/tools.service.js:302 +#: app/scripts/services/tools.service.js:314 msgid "" "The toolchain will be updated. This operation requires Internet connection. " "Do you want to continue?" msgstr "" -#: app/scripts/services/common.service.js:95 +#: app/scripts/services/project.service.js:210 msgid "" "This import operation requires a project path. You need to save the current " "project. Do you want to continue?" msgstr "" -#: app/views/menu.html:211 +#: app/views/menu.html:196 msgid "Toolchain" msgstr "Toolchain" -#: app/scripts/services/tools.service.js:504 +#: app/scripts/services/tools.service.js:516 msgid "Toolchain installed" msgstr "Toolchain instalada" -#: app/scripts/services/tools.service.js:508 +#: app/scripts/services/tools.service.js:520 msgid "Toolchain not installed" msgstr "" -#: app/scripts/services/tools.service.js:79 -#: app/scripts/services/utils.service.js:493 -#: app/scripts/services/utils.service.js:509 +#: app/scripts/services/tools.service.js:91 +#: app/scripts/services/utils.service.js:516 +#: app/scripts/services/utils.service.js:532 msgid "Toolchain not installed. Please, install the toolchain" msgstr "" -#: app/scripts/services/tools.service.js:326 +#: app/scripts/services/tools.service.js:338 msgid "Toolchain removed" msgstr "Toolchain eliminada" -#: app/views/menu.html:198 +#: app/views/menu.html:183 msgid "Tools" msgstr "Ferramentas" -#: app/scripts/services/tools.service.js:208 +#: app/scripts/services/tools.service.js:221 msgid "Unknown board" msgstr "Placa desconocida" -#: app/views/menu.html:218 +#: app/views/menu.html:203 msgid "Update" msgstr "" -#: app/scripts/services/graph.service.js:292 -msgid "Update the port label" +#: app/scripts/services/blocks.service.js:696 +#, fuzzy +msgid "Update the block label" +msgstr "Introduza a etiqueta para o bloque" + +#: app/scripts/services/blocks.service.js:644 +msgid "Update the port" msgstr "" -#: app/views/menu.html:207 +#: app/views/menu.html:192 msgid "Upload" msgstr "Cargar" -#: app/views/menu.html:201 +#: app/views/menu.html:186 msgid "Verify" msgstr "Verificar" -#: app/scripts/services/common.service.js:193 +#: app/scripts/controllers/menu.js:149 msgid "Verilog code exported" msgstr "Código Verilog exportado" -#: app/views/menu.html:260 +#: app/scripts/services/utils.service.js:666 app/views/menu.html:245 msgid "Version" msgstr "Versión" -#: app/views/menu.html:171 +#: app/views/menu.html:156 msgid "View" msgstr "Ver" -#: app/views/menu.html:257 +#: app/views/menu.html:242 msgid "View license" msgstr "Ver licenza" -#: app/scripts/services/graph.service.js:593 +#: app/scripts/services/blocks.service.js:58 +#: app/scripts/services/blocks.service.js:645 +msgid "Virtual port" +msgstr "" + +#: app/scripts/services/blocks.service.js:348 msgid "Wrong block format: {{type}}" msgstr "Formato de bloque incorrecto: {{type}}" -#: app/scripts/services/common.service.js:58 +#: app/scripts/services/blocks.service.js:146 +#: app/scripts/services/blocks.service.js:263 +#, fuzzy +msgid "Wrong parameter name {{name}}" +msgstr "Formato de proxecto incorrecto: {{name}}\"" + +#: app/scripts/services/blocks.service.js:233 +#: app/scripts/services/blocks.service.js:248 +#: app/scripts/services/blocks.service.js:688 +#: app/scripts/services/blocks.service.js:77 +#, fuzzy +msgid "Wrong port name {{name}}" +msgstr "Formato de proxecto incorrecto: {{name}}\"" + +#: app/scripts/services/project.service.js:72 msgid "Wrong project format: {{name}}" msgstr "Formato de proxecto incorrecto: {{name}}\"" -#: app/scripts/services/tools.service.js:240 +#: app/scripts/services/tools.service.js:252 msgid "Wrong remote hostname {{name}}" msgstr "" @@ -565,7 +657,7 @@ msgstr "" msgid "and" msgstr "And" -#: app/views/project.html:4 +#: app/views/design.html:5 msgid "back" msgstr "" @@ -584,6 +676,21 @@ msgstr "" msgid "config" msgstr "Config" +#. contadorAsc +#: app/resources/blocks/labels.js:60 +msgid "contadorAsc" +msgstr "" + +#. contadorDes +#: app/resources/blocks/labels.js:62 +msgid "contadorDes" +msgstr "" + +#. Debouncer +#: app/resources/blocks/labels.js:58 +msgid "debouncer" +msgstr "" + #. Demux 1:2 #: app/resources/blocks/labels.js:18 msgid "demux_1_2" @@ -610,17 +717,17 @@ msgid "dff_sr" msgstr "Bistable D" #. Build done -#: app/scripts/services/tools.service.js:255 +#: app/scripts/services/tools.service.js:267 msgid "done_build" msgstr "Sintetizado realizado" #. Upload done -#: app/scripts/services/tools.service.js:257 +#: app/scripts/services/tools.service.js:269 msgid "done_upload" msgstr "Carga realizada" #. Verification done -#: app/scripts/services/tools.service.js:253 +#: app/scripts/services/tools.service.js:265 msgid "done_verify" msgstr "Verificación realizada" @@ -690,17 +797,17 @@ msgid "sequential" msgstr "" #. Start building ... -#: app/scripts/services/tools.service.js:45 +#: app/scripts/services/tools.service.js:57 msgid "start_build" msgstr "Iniciar a sintetizado ..." #. Start uploading ... -#: app/scripts/services/tools.service.js:47 +#: app/scripts/services/tools.service.js:59 msgid "start_upload" msgstr "Iniciar a carga ..." #. Start verification ... -#: app/scripts/services/tools.service.js:43 +#: app/scripts/services/tools.service.js:55 msgid "start_verify" msgstr "Iniciar a verificación ..." @@ -719,7 +826,7 @@ msgstr "Bistable T" msgid "tri_state" msgstr "Tri-state" -#: app/scripts/app.js:38 app/scripts/controllers/menu.js:83 +#: app/scripts/app.js:42 app/scripts/controllers/menu.js:74 msgid "untitled" msgstr "Sen título" @@ -733,22 +840,34 @@ msgstr "Xnor" msgid "xor" msgstr "Xor" -#: app/scripts/controllers/menu.js:370 +#: app/scripts/controllers/menu.js:357 msgid "{{board}} datasheet not defined" msgstr "" -#: app/scripts/controllers/menu.js:360 +#: app/scripts/controllers/menu.js:347 msgid "{{board}} pinout not defined" msgstr "" +#~ msgid "Block exported as {{name}}" +#~ msgstr "Bloque exportado como {{name}}" + +#~ msgid "Enter the project's image path" +#~ msgstr "Introduza a ruta da imaxe do proxecto" + +#~ msgid "Import block" +#~ msgstr "Importar bloque" + +#~ msgid "New project" +#~ msgstr "Novo proxecto" + +#~ msgid "Open project" +#~ msgstr "Abrir proxecto" + +#~ msgid "Templates" +#~ msgstr "Modelos" + #~ msgid "comb" #~ msgstr "Comb" #~ msgid "sec" #~ msgstr "Sec" - -#~ msgid "Enter the block's label" -#~ msgstr "Introduza a etiqueta para o bloque" - -#~ msgid "Enter the block's ports" -#~ msgstr "Introduza os portos para o bloque" diff --git a/app/resources/locale/template.pot b/app/resources/locale/template.pot index 6a5a25ca1..7ae8c31ac 100644 --- a/app/resources/locale/template.pot +++ b/app/resources/locale/template.pot @@ -24,169 +24,202 @@ msgstr "" msgid "3_switch_and_gate" msgstr "" -#: app/scripts/services/utils.service.js:421 -#: app/scripts/services/utils.service.js:496 +#: app/scripts/services/utils.service.js:439 +#: app/scripts/services/utils.service.js:519 msgid "Unplug and reconnect the board" msgstr "" -#: app/scripts/services/utils.service.js:487 +#: app/scripts/services/utils.service.js:510 msgid "

                FTDI driver installation instructions

                1. Connect the FPGA board
                2. Replace the (Interface 0) driver of the board by libusbK
                3. Unplug and reconnect the board
                " msgstr "" -#: app/scripts/services/utils.service.js:503 +#: app/scripts/services/utils.service.js:526 msgid "

                FTDI driver uninstallation instructions

                1. Find the FPGA USB Device
                2. Select the board interface and uninstall the driver
                " msgstr "" -#: app/views/menu.html:275 +#: app/views/menu.html:260 msgid "About Icestudio" msgstr "" -#: app/scripts/controllers/menu.js:421 +#: app/scripts/controllers/menu.js:415 msgid "Add a block to start" msgstr "" -#: app/views/menu.html:285 +#: app/views/menu.html:50 +msgid "Add as block" +msgstr "" + +#: app/scripts/services/utils.service.js:668 +msgid "Author" +msgstr "" + +#: app/views/menu.html:270 msgid "Basic" msgstr "" -#: app/views/menu.html:153 +#: app/views/menu.html:138 msgid "Basque" msgstr "" -#: app/scripts/services/common.service.js:183 -msgid "Block exported as {{name}}" +#: app/scripts/services/blocks.service.js:674 +#: app/scripts/services/blocks.service.js:683 +#: app/scripts/services/blocks.service.js:713 +#: app/scripts/services/blocks.service.js:730 +msgid "Block updated" msgstr "" -#: app/scripts/services/common.service.js:164 +#: app/scripts/services/project.service.js:293 msgid "Block {{name}} imported" msgstr "" -#: app/scripts/services/tools.service.js:205 +#: app/scripts/services/tools.service.js:218 msgid "Board {{name}} not detected" msgstr "" -#: app/scripts/controllers/menu.js:383 -#: app/scripts/controllers/menu.js:390 +#: app/scripts/controllers/menu.js:371 +#: app/scripts/controllers/menu.js:378 msgid "Board {{name}} selected" msgstr "" -#: app/views/menu.html:186 +#: app/views/menu.html:171 msgid "Boards" msgstr "" -#: app/views/menu.html:204 +#: app/views/menu.html:189 msgid "Build" msgstr "" -#: app/scripts/controllers/main.js:15 +#: app/scripts/controllers/main.js:16 msgid "Cancel" msgstr "" -#: app/scripts/services/tools.service.js:417 +#: app/scripts/services/tools.service.js:429 msgid "Check Internet connection..." msgstr "" -#: app/scripts/services/tools.service.js:425 +#: app/scripts/services/tools.service.js:437 msgid "Check Python..." msgstr "" -#: app/views/menu.html:113 +#: app/views/menu.html:98 msgid "Clear all" msgstr "" -#: app/views/menu.html:107 +#: app/views/menu.html:92 msgid "Clone selected" msgstr "" -#: app/views/menu.html:288 +#: app/views/menu.html:276 msgid "Code" msgstr "" -#: app/views/menu.html:271 +#: app/views/menu.html:256 msgid "Community forum" msgstr "" -#: app/views/menu.html:180 +#: app/views/menu.html:275 +msgid "Constant" +msgstr "" + +#: app/views/menu.html:165 msgid "Datasheet" msgstr "" -#: app/scripts/services/tools.service.js:294 +#: app/scripts/services/tools.service.js:306 msgid "Default toolchain not found. Toolchain will be downloaded. This operation requires Internet connection. Do you want to continue?" msgstr "" -#: app/views/menu.html:245 +#: app/scripts/services/utils.service.js:667 +msgid "Description" +msgstr "" + +#: app/views/menu.html:230 msgid "Disable" msgstr "" -#: app/scripts/controllers/menu.js:256 +#: app/scripts/controllers/menu.js:222 msgid "Do you want to clear all?" msgstr "" -#: app/scripts/controllers/menu.js:269 +#: app/scripts/controllers/menu.js:192 +msgid "Do you want to exit the application?" +msgstr "" + +#: app/scripts/controllers/menu.js:213 msgid "Do you want to remove the selected block?" msgstr "" -#: app/views/menu.html:264 +#: app/views/menu.html:249 msgid "Documentation" msgstr "" -#: app/views/menu.html:238 +#: app/views/menu.html:223 msgid "Drivers" msgstr "" -#: app/scripts/services/utils.service.js:418 -#: app/scripts/services/utils.service.js:481 +#: app/scripts/services/utils.service.js:436 +#: app/scripts/services/utils.service.js:504 msgid "Drivers disabled" msgstr "" -#: app/scripts/services/utils.service.js:415 -#: app/scripts/services/utils.service.js:462 +#: app/scripts/services/utils.service.js:433 +#: app/scripts/services/utils.service.js:485 msgid "Drivers enabled" msgstr "" -#: app/scripts/services/tools.service.js:217 +#: app/scripts/services/tools.service.js:230 msgid "Duplicated FPGA I/O ports" msgstr "" -#: app/views/menu.html:100 +#: app/scripts/services/blocks.service.js:314 +msgid "Duplicated block attributes" +msgstr "" + +#: app/views/menu.html:85 msgid "Edit" msgstr "" -#: app/views/menu.html:241 +#: app/views/menu.html:226 msgid "Enable" msgstr "" -#: app/views/menu.html:135 +#: app/views/menu.html:120 msgid "English" msgstr "" -#: app/scripts/services/graph.service.js:438 -#: app/scripts/services/graph.service.js:496 +#: app/scripts/services/blocks.service.js:126 +msgid "Enter the constant blocks" +msgstr "" + +#: app/scripts/services/blocks.service.js:213 msgid "Enter the input ports" msgstr "" -#: app/scripts/services/graph.service.js:439 -#: app/scripts/services/graph.service.js:536 +#: app/scripts/services/blocks.service.js:214 msgid "Enter the output ports" msgstr "" -#: app/scripts/controllers/menu.js:233 -msgid "Enter the project's image path" +#: app/scripts/services/blocks.service.js:215 +msgid "Enter the parameters" +msgstr "" + +#: app/scripts/services/blocks.service.js:57 +msgid "Enter the ports" msgstr "" -#: app/scripts/controllers/menu.js:82 -msgid "Enter the project's title" +#: app/scripts/controllers/menu.js:73 +msgid "Enter the project name" msgstr "" -#: app/scripts/controllers/menu.js:241 +#: app/scripts/controllers/menu.js:249 msgid "Enter the remote hostname user@host (experimental)" msgstr "" -#: app/scripts/services/tools.service.js:317 +#: app/scripts/services/tools.service.js:329 msgid "Error: default toolchain not found in '{{dir}}'" msgstr "" -#: app/scripts/services/utils.service.js:610 +#: app/scripts/services/utils.service.js:800 msgid "Error: {{error}}" msgstr "" @@ -194,32 +227,28 @@ msgstr "" msgid "Examples" msgstr "" -#: app/scripts/services/tools.service.js:175 +#: app/scripts/services/tools.service.js:187 msgid "Execute remote {{label}} ..." msgstr "" -#: app/views/menu.html:80 +#: app/views/menu.html:61 msgid "Export" msgstr "" -#: app/views/menu.html:76 -msgid "Export as block" -msgstr "" - -#: app/scripts/services/tools.service.js:449 +#: app/scripts/services/tools.service.js:461 msgid "Extract default apio files..." msgstr "" -#: app/scripts/services/tools.service.js:459 +#: app/scripts/services/tools.service.js:471 msgid "Extract default apio packages..." msgstr "" -#: app/scripts/services/tools.service.js:437 +#: app/scripts/services/tools.service.js:449 msgid "Extract virtual env files..." msgstr "" -#: app/scripts/services/tools.service.js:211 -#: app/scripts/services/tools.service.js:214 +#: app/scripts/services/tools.service.js:224 +#: app/scripts/services/tools.service.js:227 msgid "FPGA I/O ports not defined" msgstr "" @@ -227,312 +256,362 @@ msgstr "" msgid "File" msgstr "" -#: app/scripts/services/common.service.js:125 +#: app/scripts/services/project.service.js:241 msgid "File {{file}} already exists in the project path. Do you want to replace it?" msgstr "" -#: app/scripts/services/tools.service.js:148 +#: app/scripts/services/tools.service.js:163 msgid "File {{file}} does not exist" msgstr "" -#: app/scripts/services/common.service.js:153 +#: app/scripts/services/project.service.js:273 msgid "File {{file}} imported" msgstr "" -#: app/views/menu.html:159 +#: app/views/menu.html:144 msgid "French" msgstr "" -#: app/scripts/services/common.service.js:223 +#: app/scripts/controllers/menu.js:176 msgid "GTKWave exported" msgstr "" -#: app/views/menu.html:147 +#: app/views/menu.html:132 msgid "Galician" msgstr "" -#: app/views/menu.html:254 +#: app/views/menu.html:239 msgid "Help" msgstr "" -#: app/scripts/services/utils.service.js:452 +#: app/scripts/services/utils.service.js:474 msgid "Homebrew is required" msgstr "" -#: app/views/menu.html:120 -msgid "Image path" +#: app/scripts/services/utils.service.js:681 +msgid "Image" msgstr "" -#: app/scripts/controllers/menu.js:322 +#: app/scripts/controllers/menu.js:309 msgid "Image {{name}} saved" msgstr "" -#: app/views/menu.html:73 -msgid "Import block" -msgstr "" - -#: app/views/menu.html:289 +#: app/views/menu.html:277 msgid "Info" msgstr "" -#: app/views/menu.html:290 +#: app/views/menu.html:273 msgid "Input" msgstr "" -#: app/views/menu.html:215 +#: app/views/menu.html:200 msgid "Install" msgstr "" -#: app/scripts/services/tools.service.js:454 +#: app/scripts/services/tools.service.js:466 msgid "Install default apio..." msgstr "" -#: app/scripts/services/tools.service.js:503 +#: app/scripts/services/tools.service.js:515 msgid "Installation completed" msgstr "" -#: app/scripts/services/tools.service.js:346 -#: app/scripts/services/tools.service.js:383 +#: app/scripts/services/tools.service.js:358 +#: app/scripts/services/tools.service.js:395 msgid "Installing toolchain" msgstr "" -#: app/scripts/services/tools.service.js:419 -#: app/scripts/services/utils.service.js:455 +#: app/scripts/services/tools.service.js:431 +#: app/scripts/services/utils.service.js:478 msgid "Internet connection required" msgstr "" -#: app/scripts/services/graph.service.js:134 +#: app/scripts/services/graph.service.js:133 msgid "Invalid Pull up connection:
                block already connected" msgstr "" -#: app/scripts/services/graph.service.js:150 +#: app/scripts/services/graph.service.js:149 msgid "Invalid Pull up connection:
                only Input blocks allowed" msgstr "" -#: app/scripts/services/graph.service.js:141 +#: app/scripts/services/graph.service.js:140 msgid "Invalid block connection:
                Pull up already connected" msgstr "" -#: app/scripts/services/graph.service.js:113 +#: app/scripts/services/graph.service.js:104 +#: app/scripts/services/graph.service.js:111 +#: app/scripts/services/graph.service.js:97 msgid "Invalid connection" msgstr "" -#: app/scripts/services/graph.service.js:127 -msgid "Invalid multiple input connections" +#: app/scripts/services/graph.service.js:168 +msgid "Invalid connection: →" msgstr "" -#: app/scripts/services/graph.service.js:298 -msgid "Label updated" +#: app/scripts/services/graph.service.js:126 +msgid "Invalid multiple input connections" msgstr "" -#: app/views/menu.html:131 +#: app/views/menu.html:116 msgid "Language" msgstr "" -#: app/scripts/services/tools.service.js:442 +#: app/scripts/services/blocks.service.js:127 +#: app/scripts/services/blocks.service.js:697 +msgid "Local parameter" +msgstr "" + +#: app/scripts/services/tools.service.js:454 msgid "Make virtual env..." msgstr "" +#: app/scripts/services/utils.service.js:665 +msgid "Name" +msgstr "" + #: app/views/menu.html:27 -msgid "New project" +msgid "New" msgstr "" -#: app/scripts/services/common.service.js:36 +#: app/scripts/services/project.service.js:44 msgid "New project {{name}} created" msgstr "" -#: app/scripts/controllers/main.js:14 +#: app/scripts/controllers/main.js:15 msgid "OK" msgstr "" +#: app/scripts/services/project.service.js:188 +#: app/scripts/services/project.service.js:60 +msgid "Old project format" +msgstr "" + #: app/views/menu.html:30 -msgid "Open project" +msgid "Open" msgstr "" -#: app/scripts/services/common.service.js:156 +#: app/scripts/services/utils.service.js:688 +msgid "Open SVG" +msgstr "" + +#: app/scripts/services/project.service.js:276 msgid "Original file {{file}} does not exist" msgstr "" -#: app/views/menu.html:291 +#: app/views/menu.html:274 msgid "Output" msgstr "" -#: app/scripts/services/common.service.js:203 +#: app/scripts/controllers/menu.js:158 msgid "PCF file exported" msgstr "" -#: app/views/menu.html:117 +#: app/views/menu.html:102 msgid "Preferences" msgstr "" -#: app/scripts/services/common.service.js:55 +#: app/views/menu.html:105 +msgid "Project information" +msgstr "" + +#: app/scripts/services/project.service.js:64 msgid "Project {{name}} loaded" msgstr "" -#: app/scripts/services/common.service.js:68 +#: app/scripts/services/project.service.js:160 msgid "Project {{name}} saved" msgstr "" -#: app/scripts/services/tools.service.js:430 +#: app/scripts/services/tools.service.js:442 msgid "Python 2.7 is required" msgstr "" -#: app/views/project.html:3 +#: app/views/menu.html:79 +msgid "Quit" +msgstr "" + +#: app/views/design.html:4 msgid "Read only" msgstr "" -#: app/scripts/services/tools.service.js:243 +#: app/scripts/services/tools.service.js:255 msgid "Remote host {{name}} not connected" msgstr "" -#: app/views/menu.html:125 +#: app/views/menu.html:110 msgid "Remote hostname" msgstr "" -#: app/views/menu.html:223 +#: app/views/menu.html:208 msgid "Remove" msgstr "" -#: app/views/menu.html:110 +#: app/views/menu.html:95 msgid "Remove selected" msgstr "" -#: app/views/menu.html:228 +#: app/scripts/services/utils.service.js:690 +msgid "Reset SVG" +msgstr "" + +#: app/views/menu.html:213 msgid "Reset default" msgstr "" -#: app/views/menu.html:103 +#: app/views/menu.html:88 msgid "Reset view" msgstr "" -#: app/views/menu.html:66 +#: app/views/menu.html:54 msgid "Save" msgstr "" -#: app/views/menu.html:69 +#: app/scripts/services/utils.service.js:689 +msgid "Save SVG" +msgstr "" + +#: app/views/menu.html:57 msgid "Save as" msgstr "" -#: app/views/menu.html:267 +#: app/views/menu.html:252 msgid "Source code" msgstr "" -#: app/views/menu.html:141 +#: app/views/menu.html:126 msgid "Spanish" msgstr "" -#: app/scripts/services/tools.service.js:164 +#: app/scripts/services/tools.service.js:176 msgid "Synchronize remote files ..." msgstr "" -#: app/views/menu.html:50 -msgid "Templates" -msgstr "" - -#: app/views/menu.html:89 +#: app/views/menu.html:70 msgid "Testbench" msgstr "" -#: app/scripts/services/common.service.js:213 +#: app/scripts/controllers/menu.js:167 msgid "Testbench exported" msgstr "" -#: app/scripts/controllers/menu.js:379 +#: app/scripts/controllers/menu.js:367 msgid "The current FPGA I/O configuration will be lost. Do you want to change to {{name}} board?" msgstr "" -#: app/scripts/controllers/menu.js:103 -#: app/scripts/controllers/menu.js:126 +#: app/scripts/controllers/menu.js:105 +#: app/scripts/controllers/menu.js:90 msgid "The current project will be removed. Do you want to continue loading the project?" msgstr "" -#: app/scripts/services/tools.service.js:322 +#: app/scripts/services/tools.service.js:334 msgid "The toolchain will be removed. Do you want to continue?" msgstr "" -#: app/scripts/services/tools.service.js:310 +#: app/scripts/services/tools.service.js:322 msgid "The toolchain will be restored to default. Do you want to continue?" msgstr "" -#: app/scripts/services/tools.service.js:302 +#: app/scripts/services/tools.service.js:314 msgid "The toolchain will be updated. This operation requires Internet connection. Do you want to continue?" msgstr "" -#: app/scripts/services/common.service.js:95 +#: app/scripts/services/project.service.js:210 msgid "This import operation requires a project path. You need to save the current project. Do you want to continue?" msgstr "" -#: app/views/menu.html:211 +#: app/views/menu.html:196 msgid "Toolchain" msgstr "" -#: app/scripts/services/tools.service.js:504 +#: app/scripts/services/tools.service.js:516 msgid "Toolchain installed" msgstr "" -#: app/scripts/services/tools.service.js:508 +#: app/scripts/services/tools.service.js:520 msgid "Toolchain not installed" msgstr "" -#: app/scripts/services/tools.service.js:79 -#: app/scripts/services/utils.service.js:493 -#: app/scripts/services/utils.service.js:509 +#: app/scripts/services/tools.service.js:91 +#: app/scripts/services/utils.service.js:516 +#: app/scripts/services/utils.service.js:532 msgid "Toolchain not installed. Please, install the toolchain" msgstr "" -#: app/scripts/services/tools.service.js:326 +#: app/scripts/services/tools.service.js:338 msgid "Toolchain removed" msgstr "" -#: app/views/menu.html:198 +#: app/views/menu.html:183 msgid "Tools" msgstr "" -#: app/scripts/services/tools.service.js:208 +#: app/scripts/services/tools.service.js:221 msgid "Unknown board" msgstr "" -#: app/views/menu.html:218 +#: app/views/menu.html:203 msgid "Update" msgstr "" -#: app/scripts/services/graph.service.js:292 -msgid "Update the port label" +#: app/scripts/services/blocks.service.js:696 +msgid "Update the block label" +msgstr "" + +#: app/scripts/services/blocks.service.js:644 +msgid "Update the port" msgstr "" -#: app/views/menu.html:207 +#: app/views/menu.html:192 msgid "Upload" msgstr "" -#: app/views/menu.html:201 +#: app/views/menu.html:186 msgid "Verify" msgstr "" -#: app/scripts/services/common.service.js:193 +#: app/scripts/controllers/menu.js:149 msgid "Verilog code exported" msgstr "" -#: app/views/menu.html:260 +#: app/scripts/services/utils.service.js:666 +#: app/views/menu.html:245 msgid "Version" msgstr "" -#: app/views/menu.html:171 +#: app/views/menu.html:156 msgid "View" msgstr "" -#: app/views/menu.html:257 +#: app/views/menu.html:242 msgid "View license" msgstr "" -#: app/scripts/services/graph.service.js:593 +#: app/scripts/services/blocks.service.js:58 +#: app/scripts/services/blocks.service.js:645 +msgid "Virtual port" +msgstr "" + +#: app/scripts/services/blocks.service.js:348 msgid "Wrong block format: {{type}}" msgstr "" -#: app/scripts/services/common.service.js:58 +#: app/scripts/services/blocks.service.js:146 +#: app/scripts/services/blocks.service.js:263 +msgid "Wrong parameter name {{name}}" +msgstr "" + +#: app/scripts/services/blocks.service.js:233 +#: app/scripts/services/blocks.service.js:248 +#: app/scripts/services/blocks.service.js:688 +#: app/scripts/services/blocks.service.js:77 +msgid "Wrong port name {{name}}" +msgstr "" + +#: app/scripts/services/project.service.js:72 msgid "Wrong project format: {{name}}" msgstr "" -#: app/scripts/services/tools.service.js:240 +#: app/scripts/services/tools.service.js:252 msgid "Wrong remote hostname {{name}}" msgstr "" @@ -541,7 +620,7 @@ msgstr "" msgid "and" msgstr "" -#: app/views/project.html:4 +#: app/views/design.html:5 msgid "back" msgstr "" @@ -560,8 +639,18 @@ msgstr "" msgid "config" msgstr "" +#. contadorAsc +#: app/resources/blocks/labels.js:60 +msgid "contadorAsc" +msgstr "" + +#. contadorDes +#: app/resources/blocks/labels.js:62 +msgid "contadorDes" +msgstr "" + #. Debouncer -#: app/resources/blocks/labels.js:57 +#: app/resources/blocks/labels.js:58 msgid "debouncer" msgstr "" @@ -591,17 +680,17 @@ msgid "dff_sr" msgstr "" #. Build done -#: app/scripts/services/tools.service.js:255 +#: app/scripts/services/tools.service.js:267 msgid "done_build" msgstr "" #. Upload done -#: app/scripts/services/tools.service.js:257 +#: app/scripts/services/tools.service.js:269 msgid "done_upload" msgstr "" #. Verification done -#: app/scripts/services/tools.service.js:253 +#: app/scripts/services/tools.service.js:265 msgid "done_verify" msgstr "" @@ -671,17 +760,17 @@ msgid "sequential" msgstr "" #. Start building ... -#: app/scripts/services/tools.service.js:45 +#: app/scripts/services/tools.service.js:57 msgid "start_build" msgstr "" #. Start uploading ... -#: app/scripts/services/tools.service.js:47 +#: app/scripts/services/tools.service.js:59 msgid "start_upload" msgstr "" #. Start verification ... -#: app/scripts/services/tools.service.js:43 +#: app/scripts/services/tools.service.js:55 msgid "start_verify" msgstr "" @@ -700,8 +789,8 @@ msgstr "" msgid "tri_state" msgstr "" -#: app/scripts/app.js:38 -#: app/scripts/controllers/menu.js:83 +#: app/scripts/app.js:42 +#: app/scripts/controllers/menu.js:74 msgid "untitled" msgstr "" @@ -715,10 +804,10 @@ msgstr "" msgid "xor" msgstr "" -#: app/scripts/controllers/menu.js:370 +#: app/scripts/controllers/menu.js:357 msgid "{{board}} datasheet not defined" msgstr "" -#: app/scripts/controllers/menu.js:360 +#: app/scripts/controllers/menu.js:347 msgid "{{board}} pinout not defined" msgstr "" From f7c4d10d3331f3804d70d65b9dc5767a002ab041 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jes=C3=BAs=20Arroyo=20Torrens?= Date: Thu, 22 Dec 2016 20:17:57 +0100 Subject: [PATCH 084/169] Update Readme --- README.md | 27 +++++++++++++++------------ 1 file changed, 15 insertions(+), 12 deletions(-) diff --git a/README.md b/README.md index 9fd328e31..29b531d66 100644 --- a/README.md +++ b/README.md @@ -17,19 +17,9 @@ Supported boards: * [icoBOARD 1.0](http://icoboard.org/about-icoboard.html) * [Kéfir I](http://fpgalibre.sourceforge.net/Kefir/) -## Version 0.2.3 +## Version 0.3.0-beta -### Installation - -1. Install [Python 2.7](https://www.python.org) - -2. Download the [release](https://github.com/FPGAwars/icestudio/releases), unzip and execute **icestudio** - -**Documentation: http://icestudio.readthedocs.io** - -Supported on Linux, Windows and Mac OSX. - - +If you want to add blocks or examples, please contribute to [icestudio-blocks](https://github.com/FPGAwars/icestudio-blocks) or [icestudio-examples](https://github.com/FPGAwars/icestudio-examples). ## Development @@ -95,6 +85,19 @@ There is a [Wishlist](https://github.com/FPGAwars/icestudio/wiki/Wishlist:-propo We use the GitHub issues to schedule our new features and improvements. +## Version 0.2.3 (stable) + +### Installation + +1. Install [Python 2.7](https://www.python.org) + +2. Download the [release](https://github.com/FPGAwars/icestudio/releases), unzip and execute **icestudio** + +**Documentation: http://icestudio.readthedocs.io** + +Supported on Linux, Windows and Mac OSX. + + ## Version 0.1 From 1831c696325e27a0656bc9054b770d0bbbafc160 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jes=C3=BAs=20Arroyo=20Torrens?= Date: Fri, 23 Dec 2016 01:26:03 +0100 Subject: [PATCH 085/169] Prune added block dependencies. Update examples --- .../logic/combinational/contadorAsc.ice | 10 +- .../logic/combinational/contadorDes.ice | 10 +- .../examples/icestick/1_basic/1_led_on.ice | 12 +- .../examples/icezum/1_basic/1_led_on.ice | 12 +- .../icezum/1_basic/3_switch_and_gate.ice | 30 +- app/scripts/services/blocks.service.js | 13 +- app/scripts/services/project.service.js | 29 +- samples/assign.ice | 6 +- samples/complex.ice | 359 +++++++----------- 9 files changed, 183 insertions(+), 298 deletions(-) diff --git a/app/resources/blocks/logic/combinational/contadorAsc.ice b/app/resources/blocks/logic/combinational/contadorAsc.ice index 800d368d8..51bc38063 100644 --- a/app/resources/blocks/logic/combinational/contadorAsc.ice +++ b/app/resources/blocks/logic/combinational/contadorAsc.ice @@ -317,7 +317,6 @@ "image": "%3Csvg%20xmlns=%22http://www.w3.org/2000/svg%22%20width=%2247.303%22%20height=%2227.648%22%20viewBox=%220%200%2044.346456%2025.919999%22%3E%3Ctext%20style=%22line-height:125%25%22%20x=%22325.218%22%20y=%22315.455%22%20font-weight=%22400%22%20font-size=%2212.669%22%20font-family=%22sans-serif%22%20letter-spacing=%220%22%20word-spacing=%220%22%20transform=%22translate(-307.01%20-298.51)%22%3E%3Ctspan%20x=%22325.218%22%20y=%22315.455%22%20style=%22-inkscape-font-specification:'Courier%2010%20Pitch'%22%20font-family=%22Courier%2010%20Pitch%22%3E1%3C/tspan%3E%3C/text%3E%3C/svg%3E" }, "design": { - "board": "icezum", "graph": { "blocks": [ { @@ -346,14 +345,7 @@ "type": "basic.output", "data": { "name": "", - "pins": [ - { - "index": "0", - "name": "", - "value": "0" - } - ], - "virtual": true + "size": 1 }, "position": { "x": 608, diff --git a/app/resources/blocks/logic/combinational/contadorDes.ice b/app/resources/blocks/logic/combinational/contadorDes.ice index 03efd2c52..685459c2a 100644 --- a/app/resources/blocks/logic/combinational/contadorDes.ice +++ b/app/resources/blocks/logic/combinational/contadorDes.ice @@ -317,7 +317,6 @@ "image": "%3Csvg%20xmlns=%22http://www.w3.org/2000/svg%22%20width=%2247.303%22%20height=%2227.648%22%20viewBox=%220%200%2044.346456%2025.919999%22%3E%3Ctext%20style=%22line-height:125%25%22%20x=%22325.218%22%20y=%22315.455%22%20font-weight=%22400%22%20font-size=%2212.669%22%20font-family=%22sans-serif%22%20letter-spacing=%220%22%20word-spacing=%220%22%20transform=%22translate(-307.01%20-298.51)%22%3E%3Ctspan%20x=%22325.218%22%20y=%22315.455%22%20style=%22-inkscape-font-specification:'Courier%2010%20Pitch'%22%20font-family=%22Courier%2010%20Pitch%22%3E1%3C/tspan%3E%3C/text%3E%3C/svg%3E" }, "design": { - "board": "icezum", "graph": { "blocks": [ { @@ -346,14 +345,7 @@ "type": "basic.output", "data": { "name": "", - "pins": [ - { - "index": "0", - "name": "", - "value": "0" - } - ], - "virtual": true + "size": 1 }, "position": { "x": 608, diff --git a/app/resources/examples/icestick/1_basic/1_led_on.ice b/app/resources/examples/icestick/1_basic/1_led_on.ice index c34f87a6a..6740a60c2 100644 --- a/app/resources/examples/icestick/1_basic/1_led_on.ice +++ b/app/resources/examples/icestick/1_basic/1_led_on.ice @@ -85,7 +85,6 @@ "image": "%3Csvg%20xmlns=%22http://www.w3.org/2000/svg%22%20width=%2247.303%22%20height=%2227.648%22%20viewBox=%220%200%2044.346456%2025.919999%22%3E%3Ctext%20style=%22line-height:125%25%22%20x=%22325.218%22%20y=%22315.455%22%20font-weight=%22400%22%20font-size=%2212.669%22%20font-family=%22sans-serif%22%20letter-spacing=%220%22%20word-spacing=%220%22%20transform=%22translate(-307.01%20-298.51)%22%3E%3Ctspan%20x=%22325.218%22%20y=%22315.455%22%20style=%22-inkscape-font-specification:'Courier%2010%20Pitch'%22%20font-family=%22Courier%2010%20Pitch%22%3E1%3C/tspan%3E%3C/text%3E%3C/svg%3E" }, "design": { - "board": "icezum", "graph": { "blocks": [ { @@ -114,14 +113,7 @@ "type": "basic.output", "data": { "name": "", - "pins": [ - { - "index": "0", - "name": "", - "value": "0" - } - ], - "virtual": true + "size": 1 }, "position": { "x": 608, @@ -161,4 +153,4 @@ "zoom": 1 } } -} \ No newline at end of file +} diff --git a/app/resources/examples/icezum/1_basic/1_led_on.ice b/app/resources/examples/icezum/1_basic/1_led_on.ice index c66fb5642..11c6e25f2 100644 --- a/app/resources/examples/icezum/1_basic/1_led_on.ice +++ b/app/resources/examples/icezum/1_basic/1_led_on.ice @@ -85,7 +85,6 @@ "image": "%3Csvg%20xmlns=%22http://www.w3.org/2000/svg%22%20width=%2247.303%22%20height=%2227.648%22%20viewBox=%220%200%2044.346456%2025.919999%22%3E%3Ctext%20style=%22line-height:125%25%22%20x=%22325.218%22%20y=%22315.455%22%20font-weight=%22400%22%20font-size=%2212.669%22%20font-family=%22sans-serif%22%20letter-spacing=%220%22%20word-spacing=%220%22%20transform=%22translate(-307.01%20-298.51)%22%3E%3Ctspan%20x=%22325.218%22%20y=%22315.455%22%20style=%22-inkscape-font-specification:'Courier%2010%20Pitch'%22%20font-family=%22Courier%2010%20Pitch%22%3E1%3C/tspan%3E%3C/text%3E%3C/svg%3E" }, "design": { - "board": "icezum", "graph": { "blocks": [ { @@ -114,14 +113,7 @@ "type": "basic.output", "data": { "name": "", - "pins": [ - { - "index": "0", - "name": "", - "value": "0" - } - ], - "virtual": true + "size": 1 }, "position": { "x": 608, @@ -161,4 +153,4 @@ "zoom": 1 } } -} \ No newline at end of file +} diff --git a/app/resources/examples/icezum/1_basic/3_switch_and_gate.ice b/app/resources/examples/icezum/1_basic/3_switch_and_gate.ice index 3a7a02bf6..b358e414b 100644 --- a/app/resources/examples/icezum/1_basic/3_switch_and_gate.ice +++ b/app/resources/examples/icezum/1_basic/3_switch_and_gate.ice @@ -143,7 +143,6 @@ "image": "%3Csvg%20xmlns=%22http://www.w3.org/2000/svg%22%20viewBox=%22-252%20400.9%2090%2040%22%3E%3Cpath%20d=%22M-252%20409.9h26v2h-26zM-252%20429.9h27v2h-27z%22/%3E%3Cpath%20d=%22M-227%20400.9v39.9h20.4c11.3%200%2020-9%2020-20s-8.7-20-20-20H-227zm2.9%202.8h17.6c9.8%200%2016.7%207.6%2016.7%2017.1%200%209.5-7.4%2017.1-17.1%2017.1H-224c-.1.1-.1-34.2-.1-34.2z%22/%3E%3Cpath%20d=%22M-187.911%20419.9H-162v2h-25.911z%22/%3E%3C/svg%3E" }, "design": { - "board": "icezum", "graph": { "blocks": [ { @@ -181,14 +180,7 @@ "type": "basic.input", "data": { "name": "", - "pins": [ - { - "index": "0", - "name": "", - "value": "0" - } - ], - "virtual": true + "size": 1 }, "position": { "x": 64, @@ -200,14 +192,7 @@ "type": "basic.output", "data": { "name": "", - "pins": [ - { - "index": "0", - "name": "", - "value": "0" - } - ], - "virtual": true + "size": 1 }, "position": { "x": 752, @@ -219,14 +204,7 @@ "type": "basic.input", "data": { "name": "", - "pins": [ - { - "index": "0", - "name": "", - "value": "0" - } - ], - "virtual": true + "size": 1 }, "position": { "x": 64, @@ -286,4 +264,4 @@ "zoom": 1 } } -} \ No newline at end of file +} diff --git a/app/scripts/services/blocks.service.js b/app/scripts/services/blocks.service.js index fff0cdcb6..b72ca2bd9 100644 --- a/app/scripts/services/blocks.service.js +++ b/app/scripts/services/blocks.service.js @@ -370,10 +370,11 @@ angular.module('icestudio') } function loadBasicInput(instance, disabled) { + var data = instance.data; var rightPorts = [{ id: 'out', label: '', - size: instance.data.pins.length, + size: data.pins ? data.pins.length : data.size, gridUnits: 8 }]; var cell = new joint.shapes.ice.Input({ @@ -389,10 +390,11 @@ angular.module('icestudio') } function loadBasicOutput(instance, disabled) { + var data = instance.data; var leftPorts = [{ id: 'in', label: '', - size: instance.data.pins.length, + size: data.pins ? data.pins.length : data.size, gridUnits: 8 }]; var cell = new joint.shapes.ice.Output({ @@ -492,19 +494,22 @@ angular.module('icestudio') var gridsize = 8; for (i in block.design.graph.blocks) { + var data; var item = block.design.graph.blocks[i]; if (item.type === 'basic.input') { + data = block.design.graph.blocks[i].data; leftPorts.push({ id: item.id, label: item.data.name + (item.data.range ? item.data.range : ''), - size: block.design.graph.blocks[i].data.pins.length + size: data.pins ? data.pins.length : data.size }); } else if (item.type === 'basic.output') { + data = block.design.graph.blocks[i].data; rightPorts.push({ id: item.id, label: item.data.name + (item.data.range ? item.data.range : ''), - size: block.design.graph.blocks[i].data.pins.length + size: data.pins ? data.pins.length : data.size }); } else if (item.type === 'basic.constant') { diff --git a/app/scripts/services/project.service.js b/app/scripts/services/project.service.js index b7236b61c..675124715 100644 --- a/app/scripts/services/project.service.js +++ b/app/scripts/services/project.service.js @@ -279,22 +279,32 @@ angular.module('icestudio') } function doImportBlock(name, block) { - // Convert project to block - delete block.design.board; - for (var i in block.design.graph.blocks) { - if (block.design.graph.blocks[i].type === 'basic.input' || - block.design.graph.blocks[i].type === 'basic.output') { - delete block.design.graph.blocks[i].data.pin; - } - } // Add block - graph.createBlock(name, block); + block = pruneDependency(block); self.project.design.deps[name] = block; + graph.createBlock(name, block); alertify.success(gettextCatalog.getString('Block {{name}} imported', { name: utils.bold(name) })); } }); }; + function pruneDependency(block) { + // Remove all unnecessary information for a dependency: + // - board, FPGA I/O pins (->size), virtual flag + delete block.design.board; + var i, size; + for (i in block.design.graph.blocks) { + if (block.design.graph.blocks[i].type === 'basic.input' || + block.design.graph.blocks[i].type === 'basic.output') { + size = block.design.graph.blocks[i].data.pins.length; + block.design.graph.blocks[i].data.size = size; + delete block.design.graph.blocks[i].data.pins; + delete block.design.graph.blocks[i].data.virtual; + } + } + return block; + } + this.update = function(callback) { var graphData = graph.toJSON(); @@ -363,6 +373,7 @@ angular.module('icestudio') this.addBlock = function(type, block) { if (block) { block = _safeLoad(block); + block = pruneDependency(block); this.project.design.deps[type] = block; } graph.createBlock(type, block); diff --git a/samples/assign.ice b/samples/assign.ice index 8cf289611..50dcb99ed 100644 --- a/samples/assign.ice +++ b/samples/assign.ice @@ -94,11 +94,11 @@ "value": "95" } ], - "virtual": false + "virtual": true }, "position": { - "x": 672, - "y": 248 + "x": 680, + "y": 296 } } ], diff --git a/samples/complex.ice b/samples/complex.ice index ab8b6a58c..1aa2d559a 100644 --- a/samples/complex.ice +++ b/samples/complex.ice @@ -25,7 +25,7 @@ } }, { - "id": "6c168fad-742d-42aa-a286-ec235bf61951", + "id": "6f0cbf26-fd2e-4fa2-b55a-5f93e7af02c7", "type": "assign", "position": { "x": 120, @@ -33,15 +33,15 @@ } }, { - "id": "731465bb-f103-4cf5-a273-79b43e628246", + "id": "85073adf-db9b-4850-83de-8f9af24478ee", "type": "mux", "position": { - "x": 352, + "x": 336, "y": 200 } }, { - "id": "fab70b68-1a4e-426c-8a29-fa02328401e7", + "id": "28a13e1c-47e8-4b22-b3f1-271bd5762ed7", "type": "not", "position": { "x": 528, @@ -121,49 +121,39 @@ "wires": [ { "source": { - "block": "bfebb831-8b03-43e1-9b87-013f1b5a9cdf", - "port": "constant-out" + "block": "21e9e7f9-9b8a-4fca-904d-e266f1496454", + "port": "out" }, "target": { - "block": "6c168fad-742d-42aa-a286-ec235bf61951", - "port": "909655b9-5ef0-4c45-9494-c0238d2e4732" - } + "block": "6c809d38-547d-4c70-92eb-2d5c389429e7", + "port": "in" + }, + "size": 2 }, { "source": { - "block": "6c168fad-742d-42aa-a286-ec235bf61951", - "port": "ef743d41-5941-4831-becd-0d930c4eed54" + "block": "21e9e7f9-9b8a-4fca-904d-e266f1496454", + "port": "out" }, "target": { - "block": "731465bb-f103-4cf5-a273-79b43e628246", - "port": "95f8c313-6e18-4ee3-b9cf-7266dec53c93" + "block": "85073adf-db9b-4850-83de-8f9af24478ee", + "port": "f6528039-852b-41f9-aa41-268994b3f631" }, - "size": 4 + "size": 2 }, { "source": { - "block": "731465bb-f103-4cf5-a273-79b43e628246", + "block": "85073adf-db9b-4850-83de-8f9af24478ee", "port": "60d40fc8-3388-4066-8f0a-af17e179a9bd" }, "target": { - "block": "fab70b68-1a4e-426c-8a29-fa02328401e7", + "block": "28a13e1c-47e8-4b22-b3f1-271bd5762ed7", "port": "a4058fa5-b66e-4e5e-b542-28d7c3e9d3cd" } }, { "source": { - "block": "21e9e7f9-9b8a-4fca-904d-e266f1496454", - "port": "out" - }, - "target": { - "block": "731465bb-f103-4cf5-a273-79b43e628246", - "port": "f6528039-852b-41f9-aa41-268994b3f631" - }, - "size": 2 - }, - { - "source": { - "block": "fab70b68-1a4e-426c-8a29-fa02328401e7", + "block": "28a13e1c-47e8-4b22-b3f1-271bd5762ed7", "port": "07895985-9d14-4a6f-8f2d-b2a6ddf61852" }, "target": { @@ -173,19 +163,29 @@ }, { "source": { - "block": "21e9e7f9-9b8a-4fca-904d-e266f1496454", - "port": "out" + "block": "6f0cbf26-fd2e-4fa2-b55a-5f93e7af02c7", + "port": "ef743d41-5941-4831-becd-0d930c4eed54" }, "target": { - "block": "6c809d38-547d-4c70-92eb-2d5c389429e7", - "port": "in" + "block": "85073adf-db9b-4850-83de-8f9af24478ee", + "port": "95f8c313-6e18-4ee3-b9cf-7266dec53c93" }, - "size": 2 + "size": 4 + }, + { + "source": { + "block": "bfebb831-8b03-43e1-9b87-013f1b5a9cdf", + "port": "constant-out" + }, + "target": { + "block": "6f0cbf26-fd2e-4fa2-b55a-5f93e7af02c7", + "port": "909655b9-5ef0-4c45-9494-c0238d2e4732" + } } ] }, "deps": { - "assign": { + "not": { "version": "1.0", "package": { "name": "", @@ -198,127 +198,76 @@ "graph": { "blocks": [ { - "id": "909655b9-5ef0-4c45-9494-c0238d2e4732", - "type": "basic.constant", - "data": { - "name": "Value", - "value": "4'b1110", - "local": false - }, - "position": { - "x": 192, - "y": 56 - } - }, - { - "id": "7e351e09-634d-407c-ab7e-452519468292", - "type": "basic.constant", - "data": { - "name": "offset", - "value": "0", - "local": true - }, - "position": { - "x": 384, - "y": 56 - } - }, - { - "id": "b6bc7556-6362-45ca-80e5-6db7a3100c7d", + "id": "364b95cc-e8ff-4c65-b332-d6125c5968ee", "type": "basic.code", "data": { - "code": "assign out = C + D;", - "params": [ - { - "name": "C" - }, - { - "name": "D" - } - ], + "code": "// NOT logic gate\nassign b = ~a;", + "params": [], "ports": { - "in": [], + "in": [ + { + "name": "a", + "size": 1 + } + ], "out": [ { - "name": "out", - "range": "[3:0]", - "size": 4 + "name": "b", + "size": 1 } ] } }, "position": { - "x": 144, - "y": 200 + "x": 248, + "y": 88 } }, { - "id": "ef743d41-5941-4831-becd-0d930c4eed54", + "id": "a4058fa5-b66e-4e5e-b542-28d7c3e9d3cd", + "type": "basic.input", + "data": { + "name": "", + "size": 1 + }, + "position": { + "x": 72, + "y": 184 + } + }, + { + "id": "07895985-9d14-4a6f-8f2d-b2a6ddf61852", "type": "basic.output", "data": { - "name": "out", - "range": "[3:0]", - "pins": [ - { - "index": "3", - "name": "LED3", - "value": "98" - }, - { - "index": "2", - "name": "LED2", - "value": "97" - }, - { - "index": "1", - "name": "LED1", - "value": "96" - }, - { - "index": "0", - "name": "LED0", - "value": "95" - } - ], - "virtual": false + "name": "", + "size": 1 }, "position": { - "x": 672, - "y": 248 + "x": 728, + "y": 184 } } ], "wires": [ { "source": { - "block": "909655b9-5ef0-4c45-9494-c0238d2e4732", - "port": "constant-out" - }, - "target": { - "block": "b6bc7556-6362-45ca-80e5-6db7a3100c7d", - "port": "C" - } - }, - { - "source": { - "block": "7e351e09-634d-407c-ab7e-452519468292", - "port": "constant-out" + "block": "a4058fa5-b66e-4e5e-b542-28d7c3e9d3cd", + "port": "out" }, "target": { - "block": "b6bc7556-6362-45ca-80e5-6db7a3100c7d", - "port": "D" + "block": "364b95cc-e8ff-4c65-b332-d6125c5968ee", + "port": "a" } }, { "source": { - "block": "b6bc7556-6362-45ca-80e5-6db7a3100c7d", - "port": "out" + "block": "364b95cc-e8ff-4c65-b332-d6125c5968ee", + "port": "b" }, "target": { - "block": "ef743d41-5941-4831-becd-0d930c4eed54", + "block": "07895985-9d14-4a6f-8f2d-b2a6ddf61852", "port": "in" - }, - "size": 4 + } } ] }, @@ -382,29 +331,7 @@ "data": { "name": "d", "range": "[3:0]", - "pins": [ - { - "index": "3", - "name": "", - "value": 0 - }, - { - "index": "2", - "name": "", - "value": 0 - }, - { - "index": "1", - "name": "", - "value": 0 - }, - { - "index": "0", - "name": "", - "value": 0 - } - ], - "virtual": true + "size": 4 }, "position": { "x": 48, @@ -416,14 +343,7 @@ "type": "basic.output", "data": { "name": "out", - "pins": [ - { - "index": "0", - "name": "", - "value": 0 - } - ], - "virtual": true + "size": 1 }, "position": { "x": 760, @@ -436,19 +356,7 @@ "data": { "name": "s", "range": "[1:0]", - "pins": [ - { - "index": "1", - "name": "", - "value": 0 - }, - { - "index": "0", - "name": "", - "value": 0 - } - ], - "virtual": true + "size": 2 }, "position": { "x": 48, @@ -501,7 +409,7 @@ } } }, - "not": { + "assign": { "version": "1.0", "package": { "name": "", @@ -514,90 +422,105 @@ "graph": { "blocks": [ { - "id": "364b95cc-e8ff-4c65-b332-d6125c5968ee", - "type": "basic.code", + "id": "909655b9-5ef0-4c45-9494-c0238d2e4732", + "type": "basic.constant", "data": { - "code": "// NOT logic gate\nassign b = ~a;", - "params": [], - "ports": { - "in": [ - { - "name": "a", - "size": 1 - } - ], - "out": [ - { - "name": "b", - "size": 1 - } - ] - } + "name": "Value", + "value": "4'b1110", + "local": false }, "position": { - "x": 248, - "y": 88 + "x": 192, + "y": 56 } }, { - "id": "a4058fa5-b66e-4e5e-b542-28d7c3e9d3cd", - "type": "basic.input", + "id": "7e351e09-634d-407c-ab7e-452519468292", + "type": "basic.constant", "data": { - "name": "", - "pins": [ + "name": "offset", + "value": "0", + "local": true + }, + "position": { + "x": 384, + "y": 56 + } + }, + { + "id": "b6bc7556-6362-45ca-80e5-6db7a3100c7d", + "type": "basic.code", + "data": { + "code": "assign out = C + D;", + "params": [ { - "index": "0", - "name": "", - "value": 0 + "name": "C" + }, + { + "name": "D" } ], - "virtual": true + "ports": { + "in": [], + "out": [ + { + "name": "out", + "range": "[3:0]", + "size": 4 + } + ] + } }, "position": { - "x": 72, - "y": 184 + "x": 144, + "y": 200 } }, { - "id": "07895985-9d14-4a6f-8f2d-b2a6ddf61852", + "id": "ef743d41-5941-4831-becd-0d930c4eed54", "type": "basic.output", "data": { - "name": "", - "pins": [ - { - "index": "0", - "name": "", - "value": 0 - } - ], - "virtual": true + "name": "out", + "range": "[3:0]", + "size": 4 }, "position": { - "x": 728, - "y": 184 + "x": 680, + "y": 296 } } ], "wires": [ { "source": { - "block": "a4058fa5-b66e-4e5e-b542-28d7c3e9d3cd", - "port": "out" + "block": "909655b9-5ef0-4c45-9494-c0238d2e4732", + "port": "constant-out" }, "target": { - "block": "364b95cc-e8ff-4c65-b332-d6125c5968ee", - "port": "a" + "block": "b6bc7556-6362-45ca-80e5-6db7a3100c7d", + "port": "C" } }, { "source": { - "block": "364b95cc-e8ff-4c65-b332-d6125c5968ee", - "port": "b" + "block": "7e351e09-634d-407c-ab7e-452519468292", + "port": "constant-out" }, "target": { - "block": "07895985-9d14-4a6f-8f2d-b2a6ddf61852", - "port": "in" + "block": "b6bc7556-6362-45ca-80e5-6db7a3100c7d", + "port": "D" } + }, + { + "source": { + "block": "b6bc7556-6362-45ca-80e5-6db7a3100c7d", + "port": "out" + }, + "target": { + "block": "ef743d41-5941-4831-becd-0d930c4eed54", + "port": "in" + }, + "size": 4 } ] }, From 5899ff58ef0e5cdac125be038a6eaed3841cc3b2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jes=C3=BAs=20Arroyo=20Torrens?= Date: Fri, 23 Dec 2016 02:59:22 +0100 Subject: [PATCH 086/169] Add constants and buses to the "Testbench" and "GTKWave" compilers --- app/scripts/services/compiler.service.js | 135 +++++++++++++++++------ 1 file changed, 104 insertions(+), 31 deletions(-) diff --git a/app/scripts/services/compiler.service.js b/app/scripts/services/compiler.service.js index c01e911b0..87f18f71a 100644 --- a/app/scripts/services/compiler.service.js +++ b/app/scripts/services/compiler.service.js @@ -400,7 +400,7 @@ angular.module('icestudio') } function testbenchCompiler(project) { - var i, o, w; + var i, o, p; var code = ''; code += '// Testbench template\n\n'; @@ -413,37 +413,61 @@ angular.module('icestudio') var content = '\n'; content += '// Simulation time: 100ns (10 * 10ns)\n'; - content += 'parameter DURATION = 10;\n\n'; - - var io = mainIO(project); - var input = io[0]; - var output = io[1]; + content += 'parameter DURATION = 10;\n'; + + // Parameters + var _params = []; + var params = mainParams(project); + if (params.length > 0) { + content += '\n// TODO: edit the module parameters here\n'; + content += '// e.g. localparam constant_value = 1;\n'; + for (p in params) { + content += 'localparam ' + params[p].name + ' = ' + params[p].value + ';\n'; + _params.push(' .' + params[p].id + '(' + params[p].name + ')'); + } + } // Input/Output - content += '// Input/Output\n'; + var io = mainIO(project); + var input = io.input; + var output = io.output; + content += '\n// Input/Output\n'; + var _ports = []; for (i in input) { - content += 'reg ' + input[i].label + ';\n'; + content += 'reg ' + (input[i].range ? input[i].range + ' ': '') + input[i].name + ';\n'; + _ports.push(' .' + input[i].id + '(' + input[i].name + ')'); } for (o in output) { - content += 'wire ' + output[o].label + ';\n'; + content += 'wire ' + (output[o].range ? output[o].range + ' ': '') + output[o].name + ';\n'; + _ports.push(' .' + output[o].id + '(' + output[o].name + ')'); } - var wires = input.concat(output); - // Module instance content += '\n// Module instance\n'; - content += 'main MAIN (\n'; - var connections = []; - for (w in wires) { - connections.push(' .' + wires[w].id + '(' + wires[w].label + ')'); + content += 'main'; + + //-- Parameters + if (_params.length > 0) { + content += ' #(\n'; + content += _params.join(',\n'); + content += '\n)'; } - content += connections.join(',\n'); - content += '\n);\n'; + + content += ' MAIN'; + + //-- Ports + if (_ports.length > 0) { + content += ' (\n'; + content += _ports.join(',\n'); + content += '\n)'; + } + + content += ';\n'; // Clock signal var hasClk = false; for (i in input) { - if (input[i].label.toLowerCase() === 'input_clk') { + if (input[i].name.toLowerCase() === 'input_clk') { hasClk = true; break; } @@ -461,7 +485,7 @@ angular.module('icestudio') content += ' // e.g. input_value = 1;\n'; content += ' // e.g. #2 input_value = 0;\n'; for (i in input) { - content += ' ' + input[i].label + ' = 0;\n'; + content += ' ' + input[i].name + ' = 0;\n'; } content += '\n'; content += ' #(DURATION) $display("End of simulation");\n'; @@ -482,12 +506,14 @@ angular.module('icestudio') var code = ''; var io = mainIO(project); - var input = io[0]; - var output = io[1]; + var input = io.input; + var output = io.output; - var wires = input.concat(output); - for (var w in wires) { - code += 'main_tb.' + wires[w].label + '\n'; + for (var i in input) { + code += 'main_tb.' + input[i].name + (input[i].range ? input[i].range: '') + '\n'; + } + for (var o in output) { + code += 'main_tb.' + output[o].name + (output[o].range ? output[o].range: '') + '\n'; } return code; @@ -502,26 +528,73 @@ angular.module('icestudio') for (var i in graph.blocks) { var block = graph.blocks[i]; if (block.type === 'basic.input') { - if (block.data.label) { - input.push({ id: digestId(block.id), label: 'input_' + block.data.label.replace(' ', '_') }); + if (block.data.name) { + input.push({ + id: digestId(block.id), + name: 'input_' + block.data.name, + range: block.data.range + }); } else { - input.push({ id: digestId(block.id), label: 'input_' + inputUnnamed.toString() }); + input.push({ + id: digestId(block.id), + name: 'input_' + inputUnnamed.toString(), + }); inputUnnamed += 1; } } else if (block.type === 'basic.output') { - if (block.data.label) { - output.push({ id: digestId(block.id), label: 'output_' + block.data.label.replace(' ', '_') }); + if (block.data.name) { + output.push({ + id: digestId(block.id), + name: 'output_' + block.data.name, + range: block.data.range + }); } else { - output.push({ id: digestId(block.id), label: 'output_' + outputUnnamed.toString() }); + output.push({ + id: digestId(block.id), + name: 'output_' + outputUnnamed.toString() + }); outputUnnamed += 1; } } } - return [input, output]; + return { + input: input, + output: output + }; + } + + function mainParams(project) { + var params = []; + var paramsUnnamed = 0; + var graph = project.design.graph; + for (var i in graph.blocks) { + var block = graph.blocks[i]; + if (block.type === 'basic.constant') { + if (!block.data.local) { + if (block.data.name) { + params.push({ + id: digestId(block.id), + name: 'constant_' + block.data.name, + value: block.data.value + }); + } + else { + params.push({ + id: digestId(block.id), + name: 'constant_' + paramsUnnamed.toString(), + value: block.data.value + }); + paramsUnnamed += 1; + } + } + } + } + + return params; } }); From 56c7e744f0cbf4d5ee6b9ac47e2f7a58d532641d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jes=C3=BAs=20Arroyo=20Torrens?= Date: Fri, 23 Dec 2016 11:08:28 +0100 Subject: [PATCH 087/169] Update block position when size changes --- app/scripts/plugins/shapes/joint.shapes.js | 7 ------- app/scripts/services/blocks.service.js | 19 +++++++++++++++++-- 2 files changed, 17 insertions(+), 9 deletions(-) diff --git a/app/scripts/plugins/shapes/joint.shapes.js b/app/scripts/plugins/shapes/joint.shapes.js index 094479257..2c0baab21 100644 --- a/app/scripts/plugins/shapes/joint.shapes.js +++ b/app/scripts/plugins/shapes/joint.shapes.js @@ -396,9 +396,6 @@ joint.shapes.ice.IOView = joint.shapes.ice.ModelView.extend({ this.$box.find('label').text(name ? name : ' '); - // Virtual -> FPGA I/O - // FPGA I/O -> Virtual - if (virtual) { // Virtual port (green) $(fpgaPortId).addClass('hidden'); @@ -411,10 +408,6 @@ joint.shapes.ice.IOView = joint.shapes.ice.ModelView.extend({ $(fpgaPortId).removeClass('hidden'); if (this.pins) { this.model.attributes.size.height = 32 + 32 * this.pins.length; - // TODO: move block and wire - //var bbox = this.model.getBBox(); - //var state = this.model.attributes.state; - //this.$box.css({ top: bbox.y * state.zoom + state.pan.y }); } } }, diff --git a/app/scripts/services/blocks.service.js b/app/scripts/services/blocks.service.js index b72ca2bd9..6d5a11b38 100644 --- a/app/scripts/services/blocks.service.js +++ b/app/scripts/services/blocks.service.js @@ -653,6 +653,7 @@ angular.module('icestudio') block.data.virtual ], function(evt, values) { + var oldSize, newSize, offset = 0; var label = values[0].replace(/ /g, ''); var virtual = values[1]; // Validate values @@ -661,17 +662,25 @@ angular.module('icestudio') evt.cancel = false; if ((block.data.range ? block.data.range : '') !== (portInfo.rangestr ? portInfo.rangestr : '')) { + var pins = getPins(portInfo); + oldSize = block.data.virtual ? 1 : (block.data.pins ? block.data.pins.length : 1); + newSize = virtual ? 1 : (pins ? pins.length : 1); + // Update block position when size changes + offset = 16 * (oldSize - newSize); // Create new block var blockInstance = { id: null, data: { name: portInfo.name, range: portInfo.rangestr, - pins: getPins(portInfo), + pins: pins, virtual: virtual }, type: block.blockType, - position: block.position + position: { + x: block.position.x, + y: block.position.y + offset + } }; if (addCellCallback) { addCellCallback(loadBasic(blockInstance)); @@ -681,9 +690,15 @@ angular.module('icestudio') } else if (block.data.name !== portInfo.name || block.data.virtual !== virtual) { + var size = block.data.pins ? block.data.pins.length : 1; + oldSize = block.data.virtual ? 1 : size; + newSize = virtual ? 1 : size; + // Update block position when size changes + offset = 16 * (oldSize - newSize); // Edit block block.data.name = portInfo.name; block.data.virtual = virtual; + block.position.y += offset; cellView.render(); alertify.success(gettextCatalog.getString('Block updated')); } From 290772dcde81c28974559608b09c85957992dcbb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jes=C3=BAs=20Arroyo=20Torrens?= Date: Fri, 23 Dec 2016 12:03:22 +0100 Subject: [PATCH 088/169] Remove "size": 1 in projects. Blocks and examples updated --- app/resources/blocks/bit/0.ice | 5 ++- app/resources/blocks/bit/1.ice | 3 +- app/resources/blocks/config/pull_up.ice | 6 ++-- app/resources/blocks/config/pull_up_inv.ice | 6 ++-- app/resources/blocks/config/tri_state.ice | 12 +++---- app/resources/blocks/labels.js | 4 --- .../blocks/logic/combinational/demux_1_2.ice | 12 +++---- .../blocks/logic/combinational/demux_1_4.ice | 21 ++++------- .../blocks/logic/combinational/demux_1_8.ice | 36 +++++++------------ .../logic/combinational/hex_7seg_ca.ice | 33 ++++++----------- .../logic/combinational/hex_7seg_cc.ice | 33 ++++++----------- .../blocks/logic/combinational/mux_2_1.ice | 12 +++---- .../blocks/logic/combinational/mux_4_1.ice | 21 ++++------- app/resources/blocks/logic/gate/and.ice | 9 ++--- app/resources/blocks/logic/gate/nand.ice | 9 ++--- app/resources/blocks/logic/gate/nor.ice | 9 ++--- app/resources/blocks/logic/gate/not.ice | 6 ++-- app/resources/blocks/logic/gate/or.ice | 9 ++--- app/resources/blocks/logic/gate/xnor.ice | 9 ++--- app/resources/blocks/logic/gate/xor.ice | 9 ++--- .../blocks/logic/sequential/debouncer.ice | 9 ++--- .../blocks/logic/sequential/dff_ar.ice | 18 ++++------ .../blocks/logic/sequential/dff_sr.ice | 18 ++++------ .../blocks/logic/sequential/tff_ar.ice | 18 ++++------ .../blocks/logic/sequential/tff_sr.ice | 18 ++++------ .../examples/icestick/1_basic/1_led_on.ice | 6 ++-- .../icestick/1_basic}/contadorAsc.ice | 27 +++++--------- .../icestick/1_basic}/contadorDes.ice | 27 +++++--------- .../examples/icezum/1_basic/1_led_on.ice | 6 ++-- .../icezum/1_basic/3_switch_and_gate.ice | 18 ++++------ app/resources/examples/labels.js | 12 ++++--- app/scripts/plugins/shapes/joint.shapes.js | 4 +-- app/scripts/services/blocks.service.js | 34 +++++++++--------- app/scripts/services/project.service.js | 27 +++++++------- samples/assign.ice | 2 +- samples/block.ice | 5 ++- samples/complex.ice | 20 ++++------- samples/mux.ice | 5 ++- samples/not.ice | 8 ++--- 39 files changed, 199 insertions(+), 347 deletions(-) rename app/resources/{blocks/logic/combinational => examples/icestick/1_basic}/contadorAsc.ice (94%) rename app/resources/{blocks/logic/combinational => examples/icestick/1_basic}/contadorDes.ice (94%) diff --git a/app/resources/blocks/bit/0.ice b/app/resources/blocks/bit/0.ice index 3c7f9feba..7a3093203 100644 --- a/app/resources/blocks/bit/0.ice +++ b/app/resources/blocks/bit/0.ice @@ -21,8 +21,7 @@ "in": [], "out": [ { - "name": "v", - "size": 1 + "name": "v" } ] } @@ -74,4 +73,4 @@ "zoom": 1 } } -} +} \ No newline at end of file diff --git a/app/resources/blocks/bit/1.ice b/app/resources/blocks/bit/1.ice index 87964be30..796330712 100644 --- a/app/resources/blocks/bit/1.ice +++ b/app/resources/blocks/bit/1.ice @@ -21,8 +21,7 @@ "in": [], "out": [ { - "name": "v", - "size": 1 + "name": "v" } ] } diff --git a/app/resources/blocks/config/pull_up.ice b/app/resources/blocks/config/pull_up.ice index d0a3a3e8c..468b408c2 100644 --- a/app/resources/blocks/config/pull_up.ice +++ b/app/resources/blocks/config/pull_up.ice @@ -20,14 +20,12 @@ "ports": { "in": [ { - "name": "i", - "size": 1 + "name": "i" } ], "out": [ { - "name": "o", - "size": 1 + "name": "o" } ] } diff --git a/app/resources/blocks/config/pull_up_inv.ice b/app/resources/blocks/config/pull_up_inv.ice index 129e0c67c..b89fae0e6 100644 --- a/app/resources/blocks/config/pull_up_inv.ice +++ b/app/resources/blocks/config/pull_up_inv.ice @@ -20,14 +20,12 @@ "ports": { "in": [ { - "name": "i", - "size": 1 + "name": "i" } ], "out": [ { - "name": "o", - "size": 1 + "name": "o" } ] } diff --git a/app/resources/blocks/config/tri_state.ice b/app/resources/blocks/config/tri_state.ice index 7168cffa6..366f25b1d 100644 --- a/app/resources/blocks/config/tri_state.ice +++ b/app/resources/blocks/config/tri_state.ice @@ -20,22 +20,18 @@ "ports": { "in": [ { - "name": "pin", - "size": 1 + "name": "pin" }, { - "name": "oe", - "size": 1 + "name": "oe" }, { - "name": "din", - "size": 1 + "name": "din" } ], "out": [ { - "name": "dout", - "size": 1 + "name": "dout" } ] } diff --git a/app/resources/blocks/labels.js b/app/resources/blocks/labels.js index 6915fe19f..f45415c3d 100644 --- a/app/resources/blocks/labels.js +++ b/app/resources/blocks/labels.js @@ -56,7 +56,3 @@ gettext('tff_ar'); gettext('tff_sr'); /// Debouncer gettext('debouncer'); -/// contadorAsc -gettext('contadorAsc'); -/// contadorDes -gettext('contadorDes'); diff --git a/app/resources/blocks/logic/combinational/demux_1_2.ice b/app/resources/blocks/logic/combinational/demux_1_2.ice index 6e35eb0a4..177e2eaf9 100644 --- a/app/resources/blocks/logic/combinational/demux_1_2.ice +++ b/app/resources/blocks/logic/combinational/demux_1_2.ice @@ -20,22 +20,18 @@ "ports": { "in": [ { - "name": "in0", - "size": 1 + "name": "in0" }, { - "name": "sel0", - "size": 1 + "name": "sel0" } ], "out": [ { - "name": "out0", - "size": 1 + "name": "out0" }, { - "name": "out1", - "size": 1 + "name": "out1" } ] } diff --git a/app/resources/blocks/logic/combinational/demux_1_4.ice b/app/resources/blocks/logic/combinational/demux_1_4.ice index 216ad1229..48fd98053 100644 --- a/app/resources/blocks/logic/combinational/demux_1_4.ice +++ b/app/resources/blocks/logic/combinational/demux_1_4.ice @@ -39,34 +39,27 @@ "ports": { "in": [ { - "name": "in0", - "size": 1 + "name": "in0" }, { - "name": "sel0", - "size": 1 + "name": "sel0" }, { - "name": "sel1", - "size": 1 + "name": "sel1" } ], "out": [ { - "name": "out0", - "size": 1 + "name": "out0" }, { - "name": "out1", - "size": 1 + "name": "out1" }, { - "name": "out2", - "size": 1 + "name": "out2" }, { - "name": "out3", - "size": 1 + "name": "out3" } ] } diff --git a/app/resources/blocks/logic/combinational/demux_1_8.ice b/app/resources/blocks/logic/combinational/demux_1_8.ice index 823421011..7ccb9a900 100644 --- a/app/resources/blocks/logic/combinational/demux_1_8.ice +++ b/app/resources/blocks/logic/combinational/demux_1_8.ice @@ -96,54 +96,42 @@ "ports": { "in": [ { - "name": "in0", - "size": 1 + "name": "in0" }, { - "name": "sel0", - "size": 1 + "name": "sel0" }, { - "name": "sel1", - "size": 1 + "name": "sel1" }, { - "name": "sel2", - "size": 1 + "name": "sel2" } ], "out": [ { - "name": "out0", - "size": 1 + "name": "out0" }, { - "name": "out1", - "size": 1 + "name": "out1" }, { - "name": "out2", - "size": 1 + "name": "out2" }, { - "name": "out3", - "size": 1 + "name": "out3" }, { - "name": "out4", - "size": 1 + "name": "out4" }, { - "name": "out5", - "size": 1 + "name": "out5" }, { - "name": "out6", - "size": 1 + "name": "out6" }, { - "name": "out7", - "size": 1 + "name": "out7" } ] } diff --git a/app/resources/blocks/logic/combinational/hex_7seg_ca.ice b/app/resources/blocks/logic/combinational/hex_7seg_ca.ice index 4435b169b..3c76dbe3f 100644 --- a/app/resources/blocks/logic/combinational/hex_7seg_ca.ice +++ b/app/resources/blocks/logic/combinational/hex_7seg_ca.ice @@ -77,50 +77,39 @@ "ports": { "in": [ { - "name": "h0", - "size": 1 + "name": "h0" }, { - "name": "h1", - "size": 1 + "name": "h1" }, { - "name": "h2", - "size": 1 + "name": "h2" }, { - "name": "h3", - "size": 1 + "name": "h3" } ], "out": [ { - "name": "a", - "size": 1 + "name": "a" }, { - "name": "b", - "size": 1 + "name": "b" }, { - "name": "c", - "size": 1 + "name": "c" }, { - "name": "d", - "size": 1 + "name": "d" }, { - "name": "e", - "size": 1 + "name": "e" }, { - "name": "f", - "size": 1 + "name": "f" }, { - "name": "g", - "size": 1 + "name": "g" } ] } diff --git a/app/resources/blocks/logic/combinational/hex_7seg_cc.ice b/app/resources/blocks/logic/combinational/hex_7seg_cc.ice index 9d64d44c5..c86f12e85 100644 --- a/app/resources/blocks/logic/combinational/hex_7seg_cc.ice +++ b/app/resources/blocks/logic/combinational/hex_7seg_cc.ice @@ -77,50 +77,39 @@ "ports": { "in": [ { - "name": "h0", - "size": 1 + "name": "h0" }, { - "name": "h1", - "size": 1 + "name": "h1" }, { - "name": "h2", - "size": 1 + "name": "h2" }, { - "name": "h3", - "size": 1 + "name": "h3" } ], "out": [ { - "name": "a", - "size": 1 + "name": "a" }, { - "name": "b", - "size": 1 + "name": "b" }, { - "name": "c", - "size": 1 + "name": "c" }, { - "name": "d", - "size": 1 + "name": "d" }, { - "name": "e", - "size": 1 + "name": "e" }, { - "name": "f", - "size": 1 + "name": "f" }, { - "name": "g", - "size": 1 + "name": "g" } ] } diff --git a/app/resources/blocks/logic/combinational/mux_2_1.ice b/app/resources/blocks/logic/combinational/mux_2_1.ice index 1e939fdf3..f091a2f4b 100644 --- a/app/resources/blocks/logic/combinational/mux_2_1.ice +++ b/app/resources/blocks/logic/combinational/mux_2_1.ice @@ -20,22 +20,18 @@ "ports": { "in": [ { - "name": "in0", - "size": 1 + "name": "in0" }, { - "name": "in1", - "size": 1 + "name": "in1" }, { - "name": "sel0", - "size": 1 + "name": "sel0" } ], "out": [ { - "name": "o", - "size": 1 + "name": "o" } ] } diff --git a/app/resources/blocks/logic/combinational/mux_4_1.ice b/app/resources/blocks/logic/combinational/mux_4_1.ice index 66b25ea73..93d1bba3a 100644 --- a/app/resources/blocks/logic/combinational/mux_4_1.ice +++ b/app/resources/blocks/logic/combinational/mux_4_1.ice @@ -58,34 +58,27 @@ "ports": { "in": [ { - "name": "in0", - "size": 1 + "name": "in0" }, { - "name": "in1", - "size": 1 + "name": "in1" }, { - "name": "in2", - "size": 1 + "name": "in2" }, { - "name": "in3", - "size": 1 + "name": "in3" }, { - "name": "sel0", - "size": 1 + "name": "sel0" }, { - "name": "sel1", - "size": 1 + "name": "sel1" } ], "out": [ { - "name": "o", - "size": 1 + "name": "o" } ] } diff --git a/app/resources/blocks/logic/gate/and.ice b/app/resources/blocks/logic/gate/and.ice index 41d70ac1c..e7c76f789 100644 --- a/app/resources/blocks/logic/gate/and.ice +++ b/app/resources/blocks/logic/gate/and.ice @@ -20,18 +20,15 @@ "ports": { "in": [ { - "name": "a", - "size": 1 + "name": "a" }, { - "name": "b", - "size": 1 + "name": "b" } ], "out": [ { - "name": "c", - "size": 1 + "name": "c" } ] } diff --git a/app/resources/blocks/logic/gate/nand.ice b/app/resources/blocks/logic/gate/nand.ice index cb8a28934..7cfc60c7a 100644 --- a/app/resources/blocks/logic/gate/nand.ice +++ b/app/resources/blocks/logic/gate/nand.ice @@ -20,18 +20,15 @@ "ports": { "in": [ { - "name": "a", - "size": 1 + "name": "a" }, { - "name": "b", - "size": 1 + "name": "b" } ], "out": [ { - "name": "c", - "size": 1 + "name": "c" } ] } diff --git a/app/resources/blocks/logic/gate/nor.ice b/app/resources/blocks/logic/gate/nor.ice index b1157273c..d9d75bacf 100644 --- a/app/resources/blocks/logic/gate/nor.ice +++ b/app/resources/blocks/logic/gate/nor.ice @@ -20,18 +20,15 @@ "ports": { "in": [ { - "name": "a", - "size": 1 + "name": "a" }, { - "name": "b", - "size": 1 + "name": "b" } ], "out": [ { - "name": "c", - "size": 1 + "name": "c" } ] } diff --git a/app/resources/blocks/logic/gate/not.ice b/app/resources/blocks/logic/gate/not.ice index 12ff9752b..712e579c3 100644 --- a/app/resources/blocks/logic/gate/not.ice +++ b/app/resources/blocks/logic/gate/not.ice @@ -20,14 +20,12 @@ "ports": { "in": [ { - "name": "a", - "size": 1 + "name": "a" } ], "out": [ { - "name": "c", - "size": 1 + "name": "c" } ] } diff --git a/app/resources/blocks/logic/gate/or.ice b/app/resources/blocks/logic/gate/or.ice index 440294bb7..90769baf6 100644 --- a/app/resources/blocks/logic/gate/or.ice +++ b/app/resources/blocks/logic/gate/or.ice @@ -20,18 +20,15 @@ "ports": { "in": [ { - "name": "a", - "size": 1 + "name": "a" }, { - "name": "b", - "size": 1 + "name": "b" } ], "out": [ { - "name": "c", - "size": 1 + "name": "c" } ] } diff --git a/app/resources/blocks/logic/gate/xnor.ice b/app/resources/blocks/logic/gate/xnor.ice index b90ac28a1..529f288e6 100644 --- a/app/resources/blocks/logic/gate/xnor.ice +++ b/app/resources/blocks/logic/gate/xnor.ice @@ -20,18 +20,15 @@ "ports": { "in": [ { - "name": "a", - "size": 1 + "name": "a" }, { - "name": "b", - "size": 1 + "name": "b" } ], "out": [ { - "name": "c", - "size": 1 + "name": "c" } ] } diff --git a/app/resources/blocks/logic/gate/xor.ice b/app/resources/blocks/logic/gate/xor.ice index b0a081f16..463a088f1 100644 --- a/app/resources/blocks/logic/gate/xor.ice +++ b/app/resources/blocks/logic/gate/xor.ice @@ -20,18 +20,15 @@ "ports": { "in": [ { - "name": "a", - "size": 1 + "name": "a" }, { - "name": "b", - "size": 1 + "name": "b" } ], "out": [ { - "name": "c", - "size": 1 + "name": "c" } ] } diff --git a/app/resources/blocks/logic/sequential/debouncer.ice b/app/resources/blocks/logic/sequential/debouncer.ice index 3b6019dd2..c49e1de35 100644 --- a/app/resources/blocks/logic/sequential/debouncer.ice +++ b/app/resources/blocks/logic/sequential/debouncer.ice @@ -20,18 +20,15 @@ "ports": { "in": [ { - "name": "clk", - "size": 1 + "name": "clk" }, { - "name": "in", - "size": 1 + "name": "in" } ], "out": [ { - "name": "out", - "size": 1 + "name": "out" } ] } diff --git a/app/resources/blocks/logic/sequential/dff_ar.ice b/app/resources/blocks/logic/sequential/dff_ar.ice index 7f04bfbc3..55c82d609 100644 --- a/app/resources/blocks/logic/sequential/dff_ar.ice +++ b/app/resources/blocks/logic/sequential/dff_ar.ice @@ -39,30 +39,24 @@ "ports": { "in": [ { - "name": "d", - "size": 1 + "name": "d" }, { - "name": "en", - "size": 1 + "name": "en" }, { - "name": "rst_n", - "size": 1 + "name": "rst_n" }, { - "name": "clk", - "size": 1 + "name": "clk" } ], "out": [ { - "name": "q", - "size": 1 + "name": "q" }, { - "name": "q_n", - "size": 1 + "name": "q_n" } ] } diff --git a/app/resources/blocks/logic/sequential/dff_sr.ice b/app/resources/blocks/logic/sequential/dff_sr.ice index f57c59a0d..9779e1902 100644 --- a/app/resources/blocks/logic/sequential/dff_sr.ice +++ b/app/resources/blocks/logic/sequential/dff_sr.ice @@ -39,30 +39,24 @@ "ports": { "in": [ { - "name": "d", - "size": 1 + "name": "d" }, { - "name": "en", - "size": 1 + "name": "en" }, { - "name": "rst_n", - "size": 1 + "name": "rst_n" }, { - "name": "clk", - "size": 1 + "name": "clk" } ], "out": [ { - "name": "q", - "size": 1 + "name": "q" }, { - "name": "q_n", - "size": 1 + "name": "q_n" } ] } diff --git a/app/resources/blocks/logic/sequential/tff_ar.ice b/app/resources/blocks/logic/sequential/tff_ar.ice index 0c1d6ba47..b4cc0fbbb 100644 --- a/app/resources/blocks/logic/sequential/tff_ar.ice +++ b/app/resources/blocks/logic/sequential/tff_ar.ice @@ -39,30 +39,24 @@ "ports": { "in": [ { - "name": "t", - "size": 1 + "name": "t" }, { - "name": "en", - "size": 1 + "name": "en" }, { - "name": "rst_n", - "size": 1 + "name": "rst_n" }, { - "name": "clk", - "size": 1 + "name": "clk" } ], "out": [ { - "name": "q", - "size": 1 + "name": "q" }, { - "name": "q_n", - "size": 1 + "name": "q_n" } ] } diff --git a/app/resources/blocks/logic/sequential/tff_sr.ice b/app/resources/blocks/logic/sequential/tff_sr.ice index 825b32d4f..884cbad2a 100644 --- a/app/resources/blocks/logic/sequential/tff_sr.ice +++ b/app/resources/blocks/logic/sequential/tff_sr.ice @@ -39,30 +39,24 @@ "ports": { "in": [ { - "name": "t", - "size": 1 + "name": "t" }, { - "name": "en", - "size": 1 + "name": "en" }, { - "name": "rst_n", - "size": 1 + "name": "rst_n" }, { - "name": "clk", - "size": 1 + "name": "clk" } ], "out": [ { - "name": "q", - "size": 1 + "name": "q" }, { - "name": "q_n", - "size": 1 + "name": "q_n" } ] } diff --git a/app/resources/examples/icestick/1_basic/1_led_on.ice b/app/resources/examples/icestick/1_basic/1_led_on.ice index 6740a60c2..1dc568425 100644 --- a/app/resources/examples/icestick/1_basic/1_led_on.ice +++ b/app/resources/examples/icestick/1_basic/1_led_on.ice @@ -97,8 +97,7 @@ "in": [], "out": [ { - "name": "v", - "size": 1 + "name": "v" } ] } @@ -112,8 +111,7 @@ "id": "19c8f68d-5022-487f-9ab0-f0a3cd58bead", "type": "basic.output", "data": { - "name": "", - "size": 1 + "name": "" }, "position": { "x": 608, diff --git a/app/resources/blocks/logic/combinational/contadorAsc.ice b/app/resources/examples/icestick/1_basic/contadorAsc.ice similarity index 94% rename from app/resources/blocks/logic/combinational/contadorAsc.ice rename to app/resources/examples/icestick/1_basic/contadorAsc.ice index 51bc38063..b31deca9e 100644 --- a/app/resources/blocks/logic/combinational/contadorAsc.ice +++ b/app/resources/examples/icestick/1_basic/contadorAsc.ice @@ -72,34 +72,27 @@ "ports": { "in": [ { - "name": "en", - "size": 1 + "name": "en" }, { - "name": "clk", - "size": 1 + "name": "clk" } ], "out": [ { - "name": "o0", - "size": 1 + "name": "o0" }, { - "name": "o1", - "size": 1 + "name": "o1" }, { - "name": "o2", - "size": 1 + "name": "o2" }, { - "name": "o3", - "size": 1 + "name": "o3" }, { - "name": "tc", - "size": 1 + "name": "tc" } ] } @@ -329,8 +322,7 @@ "in": [], "out": [ { - "name": "v", - "size": 1 + "name": "v" } ] } @@ -344,8 +336,7 @@ "id": "19c8f68d-5022-487f-9ab0-f0a3cd58bead", "type": "basic.output", "data": { - "name": "", - "size": 1 + "name": "" }, "position": { "x": 608, diff --git a/app/resources/blocks/logic/combinational/contadorDes.ice b/app/resources/examples/icestick/1_basic/contadorDes.ice similarity index 94% rename from app/resources/blocks/logic/combinational/contadorDes.ice rename to app/resources/examples/icestick/1_basic/contadorDes.ice index 685459c2a..e0371ab2d 100644 --- a/app/resources/blocks/logic/combinational/contadorDes.ice +++ b/app/resources/examples/icestick/1_basic/contadorDes.ice @@ -72,34 +72,27 @@ "ports": { "in": [ { - "name": "en", - "size": 1 + "name": "en" }, { - "name": "clk", - "size": 1 + "name": "clk" } ], "out": [ { - "name": "o0", - "size": 1 + "name": "o0" }, { - "name": "o1", - "size": 1 + "name": "o1" }, { - "name": "o2", - "size": 1 + "name": "o2" }, { - "name": "o3", - "size": 1 + "name": "o3" }, { - "name": "tc", - "size": 1 + "name": "tc" } ] } @@ -329,8 +322,7 @@ "in": [], "out": [ { - "name": "v", - "size": 1 + "name": "v" } ] } @@ -344,8 +336,7 @@ "id": "19c8f68d-5022-487f-9ab0-f0a3cd58bead", "type": "basic.output", "data": { - "name": "", - "size": 1 + "name": "" }, "position": { "x": 608, diff --git a/app/resources/examples/icezum/1_basic/1_led_on.ice b/app/resources/examples/icezum/1_basic/1_led_on.ice index 11c6e25f2..230f59129 100644 --- a/app/resources/examples/icezum/1_basic/1_led_on.ice +++ b/app/resources/examples/icezum/1_basic/1_led_on.ice @@ -97,8 +97,7 @@ "in": [], "out": [ { - "name": "v", - "size": 1 + "name": "v" } ] } @@ -112,8 +111,7 @@ "id": "19c8f68d-5022-487f-9ab0-f0a3cd58bead", "type": "basic.output", "data": { - "name": "", - "size": 1 + "name": "" }, "position": { "x": 608, diff --git a/app/resources/examples/icezum/1_basic/3_switch_and_gate.ice b/app/resources/examples/icezum/1_basic/3_switch_and_gate.ice index b358e414b..94a22055f 100644 --- a/app/resources/examples/icezum/1_basic/3_switch_and_gate.ice +++ b/app/resources/examples/icezum/1_basic/3_switch_and_gate.ice @@ -154,18 +154,15 @@ "ports": { "in": [ { - "name": "a", - "size": 1 + "name": "a" }, { - "name": "b", - "size": 1 + "name": "b" } ], "out": [ { - "name": "c", - "size": 1 + "name": "c" } ] } @@ -179,8 +176,7 @@ "id": "18c2ebc7-5152-439c-9b3f-851c59bac834", "type": "basic.input", "data": { - "name": "", - "size": 1 + "name": "" }, "position": { "x": 64, @@ -191,8 +187,7 @@ "id": "664caf9e-5f40-4df4-800a-b626af702e62", "type": "basic.output", "data": { - "name": "", - "size": 1 + "name": "" }, "position": { "x": 752, @@ -203,8 +198,7 @@ "id": "97b51945-d716-4b6c-9db9-970d08541249", "type": "basic.input", "data": { - "name": "", - "size": 1 + "name": "" }, "position": { "x": 64, diff --git a/app/resources/examples/labels.js b/app/resources/examples/labels.js index 73c95cac6..5d2b29508 100644 --- a/app/resources/examples/labels.js +++ b/app/resources/examples/labels.js @@ -1,10 +1,14 @@ // In this file the examples labels are annotated for translation /// 1. Basic -gettext('1_basic') +gettext('1_basic'); /// 1. Led on -gettext('1_led_on') +gettext('1_led_on'); /// 2. Switch led -gettext('2_switch_led') +gettext('2_switch_led'); /// 3. Switch and gate -gettext('3_switch_and_gate') +gettext('3_switch_and_gate'); +/// contadorAsc +gettext('contadorAsc'); +/// contadorDes +gettext('contadorDes'); diff --git a/app/scripts/plugins/shapes/joint.shapes.js b/app/scripts/plugins/shapes/joint.shapes.js index 2c0baab21..bc3ccf03e 100644 --- a/app/scripts/plugins/shapes/joint.shapes.js +++ b/app/scripts/plugins/shapes/joint.shapes.js @@ -391,10 +391,10 @@ joint.shapes.ice.IOView = joint.shapes.ice.ModelView.extend({ var virtualPortId = '#virtualPort' + this.id; var fpgaPortId = '#fpgaPort' + this.id; var data = this.model.get('data'); - var name = data.name + (data.range ? data.range : ''); + var name = data.name + (data.range || ''); var virtual = data.virtual || this.model.get('disabled'); - this.$box.find('label').text(name ? name : ' '); + this.$box.find('label').text(name || ''); if (virtual) { // Virtual port (green) diff --git a/app/scripts/services/blocks.service.js b/app/scripts/services/blocks.service.js index 6d5a11b38..8ee2f1d66 100644 --- a/app/scripts/services/blocks.service.js +++ b/app/scripts/services/blocks.service.js @@ -191,13 +191,13 @@ angular.module('icestudio') var inPorts = []; for (index in block.data.ports.in) { port = block.data.ports.in[index]; - inPorts.push(port.name + (port.range ? port.range : '')); + inPorts.push(port.name + (port.range || '')); } defaultValues[0] = inPorts.join(' , '); var outPorts = []; for (index in block.data.ports.out) { port = block.data.ports.out[index]; - outPorts.push(port.name + (port.range ? port.range : '')); + outPorts.push(port.name + (port.range || '')); } defaultValues[1] = outPorts.join(' , '); } @@ -274,7 +274,7 @@ angular.module('icestudio') blockInstance.data.ports.in.push({ name: inPortInfos[i].name, range: inPortInfos[i].rangestr, - size: pins.length + size: (pins.length > 1) ? pins.length : undefined }); allNames.push(inPortInfos[i].name); } @@ -286,7 +286,7 @@ angular.module('icestudio') blockInstance.data.ports.out.push({ name: outPortInfos[o].name, range: outPortInfos[o].rangestr, - size: pins.length + size: (pins.length > 1) ? pins.length : undefined }); allNames.push(outPortInfos[o].name); } @@ -374,7 +374,7 @@ angular.module('icestudio') var rightPorts = [{ id: 'out', label: '', - size: data.pins ? data.pins.length : data.size, + size: data.pins ? data.pins.length : (data.size || 1), gridUnits: 8 }]; var cell = new joint.shapes.ice.Input({ @@ -394,7 +394,7 @@ angular.module('icestudio') var leftPorts = [{ id: 'in', label: '', - size: data.pins ? data.pins.length : data.size, + size: data.pins ? data.pins.length : (data.size || 1), gridUnits: 8 }]; var cell = new joint.shapes.ice.Output({ @@ -436,8 +436,8 @@ angular.module('icestudio') port = instance.data.ports.in[i]; leftPorts.push({ id: port.name, - label: port.name + (port.range ? port.range : ''), - size: port.size, + label: port.name + (port.range || ''), + size: port.size || 1, gridUnits: 32 }); } @@ -446,8 +446,8 @@ angular.module('icestudio') port = instance.data.ports.out[o]; rightPorts.push({ id: port.name, - label: port.name + (port.range ? port.range : ''), - size: port.size, + label: port.name + (port.range || ''), + size: port.size || 1, gridUnits: 32 }); } @@ -500,16 +500,16 @@ angular.module('icestudio') data = block.design.graph.blocks[i].data; leftPorts.push({ id: item.id, - label: item.data.name + (item.data.range ? item.data.range : ''), - size: data.pins ? data.pins.length : data.size + label: item.data.name + (item.data.range || ''), + size: data.pins ? data.pins.length : (data.size || 1) }); } else if (item.type === 'basic.output') { data = block.design.graph.blocks[i].data; rightPorts.push({ id: item.id, - label: item.data.name + (item.data.range ? item.data.range : ''), - size: data.pins ? data.pins.length : data.size + label: item.data.name + (item.data.range || ''), + size: data.pins ? data.pins.length : (data.size || 1) }); } else if (item.type === 'basic.constant') { @@ -649,7 +649,7 @@ angular.module('icestudio') gettextCatalog.getString('Update the port'), gettextCatalog.getString('Virtual port') ], [ - block.data.name + (block.data.range ? block.data.range : ''), + block.data.name + (block.data.range || ''), block.data.virtual ], function(evt, values) { @@ -660,8 +660,8 @@ angular.module('icestudio') var portInfo = utils.parsePortLabel(label); if (portInfo) { evt.cancel = false; - if ((block.data.range ? block.data.range : '') !== - (portInfo.rangestr ? portInfo.rangestr : '')) { + if ((block.data.range || '') !== + (portInfo.rangestr || '')) { var pins = getPins(portInfo); oldSize = block.data.virtual ? 1 : (block.data.pins ? block.data.pins.length : 1); newSize = virtual ? 1 : (pins ? pins.length : 1); diff --git a/app/scripts/services/project.service.js b/app/scripts/services/project.service.js index 675124715..5c83a5693 100644 --- a/app/scripts/services/project.service.js +++ b/app/scripts/services/project.service.js @@ -112,16 +112,14 @@ angular.module('icestudio') var inPorts = []; for (var i in block.data.ports.in) { inPorts.push({ - name: block.data.ports.in[i], - size: 1 + name: block.data.ports.in[i] }); } var outPorts = []; for (var o in block.data.ports.out) { outPorts.push({ - name: block.data.ports.out[o], - size: 1 + name: block.data.ports.out[o] }); } block.data = { @@ -290,14 +288,14 @@ angular.module('icestudio') function pruneDependency(block) { // Remove all unnecessary information for a dependency: - // - board, FPGA I/O pins (->size), virtual flag + // - board, FPGA I/O pins (->size if >1), virtual flag delete block.design.board; - var i, size; + var i, pins; for (i in block.design.graph.blocks) { if (block.design.graph.blocks[i].type === 'basic.input' || block.design.graph.blocks[i].type === 'basic.output') { - size = block.design.graph.blocks[i].data.pins.length; - block.design.graph.blocks[i].data.size = size; + pins = block.design.graph.blocks[i].data.pins; + block.design.graph.blocks[i].data.size = (pins.length > 1) ? pins.length : undefined; delete block.design.graph.blocks[i].data.pins; delete block.design.graph.blocks[i].data.virtual; } @@ -337,17 +335,22 @@ angular.module('icestudio') var wire = {}; wire.source = { block: cell.source.id, port: cell.source.port }; wire.target = { block: cell.target.id, port: cell.target.port }; - if (cell.size > 1) { - wire.size = cell.size; - } wire.vertices = cell.vertices; + wire.size = (cell.size > 1) ? cell.size : undefined; wires.push(wire); } } - this.project.design.state = graph.getState(); + var state = graph.getState(); this.project.design.board = boards.selectedBoard.name; this.project.design.graph = { blocks: blocks, wires: wires }; + this.project.design.state = { + pan: { + x: parseFloat(state.pan.x.toFixed(4)), + y: parseFloat(state.pan.y.toFixed(4)) + }, + zoom: parseFloat(state.zoom.toFixed(4)) + }; if (callback) { callback(); diff --git a/samples/assign.ice b/samples/assign.ice index 50dcb99ed..9d2a76963 100644 --- a/samples/assign.ice +++ b/samples/assign.ice @@ -145,4 +145,4 @@ "zoom": 1 } } -} \ No newline at end of file +} diff --git a/samples/block.ice b/samples/block.ice index 6609d744c..3d3a09bf2 100644 --- a/samples/block.ice +++ b/samples/block.ice @@ -91,8 +91,7 @@ "ports": { "in": [ { - "name": "a", - "size": 1 + "name": "a" } ], "out": [ @@ -227,4 +226,4 @@ "zoom": 0.8154432847623143 } } -} \ No newline at end of file +} diff --git a/samples/complex.ice b/samples/complex.ice index 1aa2d559a..edfb97b84 100644 --- a/samples/complex.ice +++ b/samples/complex.ice @@ -206,14 +206,12 @@ "ports": { "in": [ { - "name": "a", - "size": 1 + "name": "a" } ], "out": [ { - "name": "b", - "size": 1 + "name": "b" } ] } @@ -227,8 +225,7 @@ "id": "a4058fa5-b66e-4e5e-b542-28d7c3e9d3cd", "type": "basic.input", "data": { - "name": "", - "size": 1 + "name": "" }, "position": { "x": 72, @@ -239,8 +236,7 @@ "id": "07895985-9d14-4a6f-8f2d-b2a6ddf61852", "type": "basic.output", "data": { - "name": "", - "size": 1 + "name": "" }, "position": { "x": 728, @@ -314,8 +310,7 @@ ], "out": [ { - "name": "out", - "size": 1 + "name": "out" } ] } @@ -342,8 +337,7 @@ "id": "60d40fc8-3388-4066-8f0a-af17e179a9bd", "type": "basic.output", "data": { - "name": "out", - "size": 1 + "name": "out" }, "position": { "x": 760, @@ -543,4 +537,4 @@ "zoom": 1 } } -} \ No newline at end of file +} diff --git a/samples/mux.ice b/samples/mux.ice index f4d921c39..094892628 100644 --- a/samples/mux.ice +++ b/samples/mux.ice @@ -32,8 +32,7 @@ ], "out": [ { - "name": "out", - "size": 1 + "name": "out" } ] } @@ -167,4 +166,4 @@ "zoom": 1 } } -} \ No newline at end of file +} diff --git a/samples/not.ice b/samples/not.ice index 426794ebe..ec261d053 100644 --- a/samples/not.ice +++ b/samples/not.ice @@ -20,14 +20,12 @@ "ports": { "in": [ { - "name": "a", - "size": 1 + "name": "a" } ], "out": [ { - "name": "b", - "size": 1 + "name": "b" } ] } @@ -108,4 +106,4 @@ "zoom": 1 } } -} \ No newline at end of file +} From 0a7eb3655b672b24c8130b0648d5310da038d0ad Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jes=C3=BAs=20Arroyo=20Torrens?= Date: Fri, 23 Dec 2016 12:16:15 +0100 Subject: [PATCH 089/169] Update spanish translation --- README.md | 2 +- app/resources/locale/en/en.po | 42 +++++----- app/resources/locale/es_ES/es_ES.po | 114 +++++++++++--------------- app/resources/locale/eu_ES/eu_ES.po | 38 ++++----- app/resources/locale/fr_FR/fr_FR.po | 38 ++++----- app/resources/locale/gl_ES/gl_ES.po | 38 ++++----- app/resources/locale/template.pot | 38 ++++----- app/scripts/services/graph.service.js | 2 +- 8 files changed, 148 insertions(+), 164 deletions(-) diff --git a/README.md b/README.md index 29b531d66..77c3a1648 100644 --- a/README.md +++ b/README.md @@ -68,7 +68,7 @@ NOTE: in Mac OS X this command also generates a **dmg** package. | Language | Translated strings | |:----------:|:------------------------------------------:| | English | ![Progress](http://progressed.io/bar/100) | -| Spanish | ![Progress](http://progressed.io/bar/83) | +| Spanish | ![Progress](http://progressed.io/bar/100) | | French | ![Progress](http://progressed.io/bar/81) | | Basque | ![Progress](http://progressed.io/bar/56) | | Galician | ![Progress](http://progressed.io/bar/54) | diff --git a/app/resources/locale/en/en.po b/app/resources/locale/en/en.po index 1fd2672cc..beae55aeb 100644 --- a/app/resources/locale/en/en.po +++ b/app/resources/locale/en/en.po @@ -15,7 +15,7 @@ msgstr "" #. 1. Basic #: app/resources/examples/labels.js:4 msgid "1_basic" -msgstr "1_basic" +msgstr "1. Basic" #. 1. Led on #: app/resources/examples/labels.js:6 @@ -79,14 +79,14 @@ msgstr "Basic" msgid "Basque" msgstr "Basque" -#: app/scripts/services/blocks.service.js:674 -#: app/scripts/services/blocks.service.js:683 -#: app/scripts/services/blocks.service.js:713 -#: app/scripts/services/blocks.service.js:730 +#: app/scripts/services/blocks.service.js:688 +#: app/scripts/services/blocks.service.js:703 +#: app/scripts/services/blocks.service.js:733 +#: app/scripts/services/blocks.service.js:750 msgid "Block updated" msgstr "Block updated" -#: app/scripts/services/project.service.js:293 +#: app/scripts/services/project.service.js:284 msgid "Block {{name}} imported" msgstr "Block {{name}} imported" @@ -277,7 +277,7 @@ msgstr "FPGA I/O ports not defined" msgid "File" msgstr "File" -#: app/scripts/services/project.service.js:241 +#: app/scripts/services/project.service.js:239 msgid "" "File {{file}} already exists in the project path. Do you want to replace it?" msgstr "" @@ -287,7 +287,7 @@ msgstr "" msgid "File {{file}} does not exist" msgstr "File {{file}} does not exist" -#: app/scripts/services/project.service.js:273 +#: app/scripts/services/project.service.js:271 msgid "File {{file}} imported" msgstr "File {{file}} imported" @@ -368,8 +368,8 @@ msgid "Invalid connection" msgstr "Invalid connection" #: app/scripts/services/graph.service.js:168 -msgid "Invalid connection: →" -msgstr "Invalid connection: →" +msgid "Invalid connection: {{a}} → {{b}}" +msgstr "Invalid connection: {{a}} → {{b}}" #: app/scripts/services/graph.service.js:126 msgid "Invalid multiple input connections" @@ -380,7 +380,7 @@ msgid "Language" msgstr "Language" #: app/scripts/services/blocks.service.js:127 -#: app/scripts/services/blocks.service.js:697 +#: app/scripts/services/blocks.service.js:717 msgid "Local parameter" msgstr "Local parameter" @@ -404,7 +404,7 @@ msgstr "New project {{name}} created" msgid "OK" msgstr "OK" -#: app/scripts/services/project.service.js:188 +#: app/scripts/services/project.service.js:186 #: app/scripts/services/project.service.js:60 msgid "Old project format" msgstr "Old project format" @@ -417,7 +417,7 @@ msgstr "Open" msgid "Open SVG" msgstr "Open SVG" -#: app/scripts/services/project.service.js:276 +#: app/scripts/services/project.service.js:274 msgid "Original file {{file}} does not exist" msgstr "Original file {{file}} does not exist" @@ -441,7 +441,7 @@ msgstr "Project information" msgid "Project {{name}} loaded" msgstr "Project {{name}} loaded" -#: app/scripts/services/project.service.js:160 +#: app/scripts/services/project.service.js:158 msgid "Project {{name}} saved" msgstr "Project {{name}} saved" @@ -549,7 +549,7 @@ msgstr "" "The toolchain will be updated. This operation requires Internet connection. " "Do you want to continue?" -#: app/scripts/services/project.service.js:210 +#: app/scripts/services/project.service.js:208 msgid "" "This import operation requires a project path. You need to save the current " "project. Do you want to continue?" @@ -591,11 +591,11 @@ msgstr "Unknown board" msgid "Update" msgstr "Update" -#: app/scripts/services/blocks.service.js:696 +#: app/scripts/services/blocks.service.js:716 msgid "Update the block label" msgstr "Update the block label" -#: app/scripts/services/blocks.service.js:644 +#: app/scripts/services/blocks.service.js:649 msgid "Update the port" msgstr "Update the port" @@ -624,7 +624,7 @@ msgid "View license" msgstr "View license" #: app/scripts/services/blocks.service.js:58 -#: app/scripts/services/blocks.service.js:645 +#: app/scripts/services/blocks.service.js:650 msgid "Virtual port" msgstr "Virtual port" @@ -639,7 +639,7 @@ msgstr "Wrong parameter name {{name}}" #: app/scripts/services/blocks.service.js:233 #: app/scripts/services/blocks.service.js:248 -#: app/scripts/services/blocks.service.js:688 +#: app/scripts/services/blocks.service.js:708 #: app/scripts/services/blocks.service.js:77 msgid "Wrong port name {{name}}" msgstr "Wrong port name {{name}}" @@ -677,12 +677,12 @@ msgid "config" msgstr "Config" #. contadorAsc -#: app/resources/blocks/labels.js:60 +#: app/resources/examples/labels.js:12 msgid "contadorAsc" msgstr "contadorAsc" #. contadorDes -#: app/resources/blocks/labels.js:62 +#: app/resources/examples/labels.js:14 msgid "contadorDes" msgstr "contadorDes" diff --git a/app/resources/locale/es_ES/es_ES.po b/app/resources/locale/es_ES/es_ES.po index 8c44a0fbd..8f32c1385 100644 --- a/app/resources/locale/es_ES/es_ES.po +++ b/app/resources/locale/es_ES/es_ES.po @@ -65,13 +65,12 @@ msgid "Add a block to start" msgstr "Añade un bloque para comenzar" #: app/views/menu.html:50 -#, fuzzy msgid "Add as block" -msgstr "Añade un bloque para comenzar" +msgstr "Añadir como bloque" #: app/scripts/services/utils.service.js:668 msgid "Author" -msgstr "" +msgstr "Autor" #: app/views/menu.html:270 msgid "Basic" @@ -81,15 +80,14 @@ msgstr "Básico" msgid "Basque" msgstr "Euskera" -#: app/scripts/services/blocks.service.js:674 -#: app/scripts/services/blocks.service.js:683 -#: app/scripts/services/blocks.service.js:713 -#: app/scripts/services/blocks.service.js:730 -#, fuzzy +#: app/scripts/services/blocks.service.js:688 +#: app/scripts/services/blocks.service.js:703 +#: app/scripts/services/blocks.service.js:733 +#: app/scripts/services/blocks.service.js:750 msgid "Block updated" -msgstr "Etiqueta actualizada" +msgstr "Bloque actualizado" -#: app/scripts/services/project.service.js:293 +#: app/scripts/services/project.service.js:284 msgid "Block {{name}} imported" msgstr "Bloque {{name}} importado" @@ -139,7 +137,7 @@ msgstr "Foro de la comunidad" #: app/views/menu.html:275 msgid "Constant" -msgstr "" +msgstr "Constante" #: app/views/menu.html:165 msgid "Datasheet" @@ -155,7 +153,7 @@ msgstr "" #: app/scripts/services/utils.service.js:667 msgid "Description" -msgstr "" +msgstr "Descripción" #: app/views/menu.html:230 msgid "Disable" @@ -166,9 +164,8 @@ msgid "Do you want to clear all?" msgstr "¿Deseas borrar todo?" #: app/scripts/controllers/menu.js:192 -#, fuzzy msgid "Do you want to exit the application?" -msgstr "¿Deseas eliminar el bloque seleccionado?" +msgstr "¿Deseas salir de la aplicación?" #: app/scripts/controllers/menu.js:213 msgid "Do you want to remove the selected block?" @@ -198,7 +195,7 @@ msgstr "Puertos E/S de la FPGA duplicados" #: app/scripts/services/blocks.service.js:314 msgid "Duplicated block attributes" -msgstr "" +msgstr "Atributos del bloque duplicados" #: app/views/menu.html:85 msgid "Edit" @@ -213,9 +210,8 @@ msgid "English" msgstr "Inglés" #: app/scripts/services/blocks.service.js:126 -#, fuzzy msgid "Enter the constant blocks" -msgstr "Introduce los puertos de salida" +msgstr "Introduce los bloques constante" #: app/scripts/services/blocks.service.js:213 msgid "Enter the input ports" @@ -226,19 +222,16 @@ msgid "Enter the output ports" msgstr "Introduce los puertos de salida" #: app/scripts/services/blocks.service.js:215 -#, fuzzy msgid "Enter the parameters" -msgstr "Introduce los puertos de entrada" +msgstr "Introduce los parámetros" #: app/scripts/services/blocks.service.js:57 -#, fuzzy msgid "Enter the ports" -msgstr "Introduce los puertos de entrada" +msgstr "Introduce los puertos" #: app/scripts/controllers/menu.js:73 -#, fuzzy msgid "Enter the project name" -msgstr "Introduce el título del proyecto" +msgstr "Introduce el nombre del proyecto" #: app/scripts/controllers/menu.js:249 msgid "Enter the remote hostname user@host (experimental)" @@ -285,7 +278,7 @@ msgstr "Puertos E/S de la FPGA no definidos" msgid "File" msgstr "Archivo" -#: app/scripts/services/project.service.js:241 +#: app/scripts/services/project.service.js:239 msgid "" "File {{file}} already exists in the project path. Do you want to replace it?" msgstr "" @@ -296,7 +289,7 @@ msgstr "" msgid "File {{file}} does not exist" msgstr "El archivo {{file}} no existe" -#: app/scripts/services/project.service.js:273 +#: app/scripts/services/project.service.js:271 msgid "File {{file}} imported" msgstr "Archivo {{file}} importado" @@ -321,9 +314,8 @@ msgid "Homebrew is required" msgstr "Es necesario Homebrew" #: app/scripts/services/utils.service.js:681 -#, fuzzy msgid "Image" -msgstr "Ruta de la imagen" +msgstr "Imagen" #: app/scripts/controllers/menu.js:309 msgid "Image {{name}} saved" @@ -380,9 +372,8 @@ msgid "Invalid connection" msgstr "Conexión no válida" #: app/scripts/services/graph.service.js:168 -#, fuzzy -msgid "Invalid connection: →" -msgstr "Conexión no válida" +msgid "Invalid connection: {{a}} → {{b}}" +msgstr "Conexión no válida: {{a}} → {{b}}" #: app/scripts/services/graph.service.js:126 msgid "Invalid multiple input connections" @@ -393,9 +384,9 @@ msgid "Language" msgstr "Idioma" #: app/scripts/services/blocks.service.js:127 -#: app/scripts/services/blocks.service.js:697 +#: app/scripts/services/blocks.service.js:717 msgid "Local parameter" -msgstr "" +msgstr "Parámetro local" #: app/scripts/services/tools.service.js:454 msgid "Make virtual env..." @@ -403,11 +394,11 @@ msgstr "Crear virtual env..." #: app/scripts/services/utils.service.js:665 msgid "Name" -msgstr "" +msgstr "Nombre" #: app/views/menu.html:27 msgid "New" -msgstr "" +msgstr "Nuevo" #: app/scripts/services/project.service.js:44 msgid "New project {{name}} created" @@ -417,21 +408,20 @@ msgstr "Nuevo proyecto {{name}} creado" msgid "OK" msgstr "OK" -#: app/scripts/services/project.service.js:188 +#: app/scripts/services/project.service.js:186 #: app/scripts/services/project.service.js:60 -#, fuzzy msgid "Old project format" -msgstr "Formato de proyecto incorrecto: {{name}}" +msgstr "Formato de proyecto antiguo" #: app/views/menu.html:30 msgid "Open" -msgstr "" +msgstr "Abrir" #: app/scripts/services/utils.service.js:688 msgid "Open SVG" -msgstr "" +msgstr "Abrir SVG" -#: app/scripts/services/project.service.js:276 +#: app/scripts/services/project.service.js:274 msgid "Original file {{file}} does not exist" msgstr "El archivo original {{file}} no existe" @@ -449,13 +439,13 @@ msgstr "Preferencias" #: app/views/menu.html:105 msgid "Project information" -msgstr "" +msgstr "Información del proyecto" #: app/scripts/services/project.service.js:64 msgid "Project {{name}} loaded" msgstr "Proyecto {{name}} cargado" -#: app/scripts/services/project.service.js:160 +#: app/scripts/services/project.service.js:158 msgid "Project {{name}} saved" msgstr "Proyecto {{name}} guardado" @@ -465,7 +455,7 @@ msgstr "Es necesario Python 2.7" #: app/views/menu.html:79 msgid "Quit" -msgstr "" +msgstr "Salir" #: app/views/design.html:4 msgid "Read only" @@ -488,9 +478,8 @@ msgid "Remove selected" msgstr "Eliminar seleccionado" #: app/scripts/services/utils.service.js:690 -#, fuzzy msgid "Reset SVG" -msgstr "Resetear vista" +msgstr "Resetear SVG" #: app/views/menu.html:213 msgid "Reset default" @@ -505,9 +494,8 @@ msgid "Save" msgstr "Guardar" #: app/scripts/services/utils.service.js:689 -#, fuzzy msgid "Save SVG" -msgstr "Guardar como" +msgstr "Guardar SVG" #: app/views/menu.html:57 msgid "Save as" @@ -564,7 +552,7 @@ msgstr "" "La toolchain será actualizada. Esta operación requiere conexión a Internet. " "¿Deseas continuar?" -#: app/scripts/services/project.service.js:210 +#: app/scripts/services/project.service.js:208 msgid "" "This import operation requires a project path. You need to save the current " "project. Do you want to continue?" @@ -606,15 +594,13 @@ msgstr "Placa desconocida" msgid "Update" msgstr "Actualizar" -#: app/scripts/services/blocks.service.js:696 -#, fuzzy +#: app/scripts/services/blocks.service.js:716 msgid "Update the block label" -msgstr "Actualizar la etiqueta del puerto" +msgstr "Actualizar la etiqueta del bloque" -#: app/scripts/services/blocks.service.js:644 -#, fuzzy +#: app/scripts/services/blocks.service.js:649 msgid "Update the port" -msgstr "Actualizar la etiqueta del puerto" +msgstr "Actualizar el puerto" #: app/views/menu.html:192 msgid "Upload" @@ -641,9 +627,9 @@ msgid "View license" msgstr "Ver licencia" #: app/scripts/services/blocks.service.js:58 -#: app/scripts/services/blocks.service.js:645 +#: app/scripts/services/blocks.service.js:650 msgid "Virtual port" -msgstr "" +msgstr "Puerto virtual" #: app/scripts/services/blocks.service.js:348 msgid "Wrong block format: {{type}}" @@ -651,17 +637,15 @@ msgstr "Formato de bloque incorrecto: {{type}}" #: app/scripts/services/blocks.service.js:146 #: app/scripts/services/blocks.service.js:263 -#, fuzzy msgid "Wrong parameter name {{name}}" -msgstr "Nombre del host remoto incorrecto {{name}}" +msgstr "Nombre del parámetro {{name}} incorrecto" #: app/scripts/services/blocks.service.js:233 #: app/scripts/services/blocks.service.js:248 -#: app/scripts/services/blocks.service.js:688 +#: app/scripts/services/blocks.service.js:708 #: app/scripts/services/blocks.service.js:77 -#, fuzzy msgid "Wrong port name {{name}}" -msgstr "Nombre del host remoto incorrecto {{name}}" +msgstr "Nombre del puerto {{name}} incorrecto" #: app/scripts/services/project.service.js:72 msgid "Wrong project format: {{name}}" @@ -696,14 +680,14 @@ msgid "config" msgstr "Config" #. contadorAsc -#: app/resources/blocks/labels.js:60 +#: app/resources/examples/labels.js:12 msgid "contadorAsc" -msgstr "" +msgstr "Contador ascendente" #. contadorDes -#: app/resources/blocks/labels.js:62 +#: app/resources/examples/labels.js:14 msgid "contadorDes" -msgstr "" +msgstr "Contador descendente" #. Debouncer #: app/resources/blocks/labels.js:58 diff --git a/app/resources/locale/eu_ES/eu_ES.po b/app/resources/locale/eu_ES/eu_ES.po index ee1849bba..83569a133 100644 --- a/app/resources/locale/eu_ES/eu_ES.po +++ b/app/resources/locale/eu_ES/eu_ES.po @@ -75,15 +75,15 @@ msgstr "Basikoa" msgid "Basque" msgstr "Euskera" -#: app/scripts/services/blocks.service.js:674 -#: app/scripts/services/blocks.service.js:683 -#: app/scripts/services/blocks.service.js:713 -#: app/scripts/services/blocks.service.js:730 +#: app/scripts/services/blocks.service.js:688 +#: app/scripts/services/blocks.service.js:703 +#: app/scripts/services/blocks.service.js:733 +#: app/scripts/services/blocks.service.js:750 #, fuzzy msgid "Block updated" msgstr "Etiketa freskatua" -#: app/scripts/services/project.service.js:293 +#: app/scripts/services/project.service.js:284 msgid "Block {{name}} imported" msgstr "{{name}} blokea importatua" @@ -277,7 +277,7 @@ msgstr "FPGAren E/S portuak definitu gabe" msgid "File" msgstr "Fitxategia" -#: app/scripts/services/project.service.js:241 +#: app/scripts/services/project.service.js:239 msgid "" "File {{file}} already exists in the project path. Do you want to replace it?" msgstr "" @@ -286,7 +286,7 @@ msgstr "" msgid "File {{file}} does not exist" msgstr "{{file}} fitxeroa ez da existitzen" -#: app/scripts/services/project.service.js:273 +#: app/scripts/services/project.service.js:271 msgid "File {{file}} imported" msgstr "" @@ -368,7 +368,7 @@ msgid "Invalid connection" msgstr "" #: app/scripts/services/graph.service.js:168 -msgid "Invalid connection: →" +msgid "Invalid connection: {{a}} → {{b}}" msgstr "" #: app/scripts/services/graph.service.js:126 @@ -380,7 +380,7 @@ msgid "Language" msgstr "Hizkuntza" #: app/scripts/services/blocks.service.js:127 -#: app/scripts/services/blocks.service.js:697 +#: app/scripts/services/blocks.service.js:717 msgid "Local parameter" msgstr "" @@ -404,7 +404,7 @@ msgstr "{{name}} proiektu sortuta" msgid "OK" msgstr "" -#: app/scripts/services/project.service.js:188 +#: app/scripts/services/project.service.js:186 #: app/scripts/services/project.service.js:60 #, fuzzy msgid "Old project format" @@ -418,7 +418,7 @@ msgstr "" msgid "Open SVG" msgstr "" -#: app/scripts/services/project.service.js:276 +#: app/scripts/services/project.service.js:274 msgid "Original file {{file}} does not exist" msgstr "" @@ -442,7 +442,7 @@ msgstr "" msgid "Project {{name}} loaded" msgstr "{{name}} proiektua irekita" -#: app/scripts/services/project.service.js:160 +#: app/scripts/services/project.service.js:158 msgid "Project {{name}} saved" msgstr "{{name}} proiektua gordeta" @@ -547,7 +547,7 @@ msgid "" "Do you want to continue?" msgstr "" -#: app/scripts/services/project.service.js:210 +#: app/scripts/services/project.service.js:208 msgid "" "This import operation requires a project path. You need to save the current " "project. Do you want to continue?" @@ -587,12 +587,12 @@ msgstr "Plaka ezezaguna" msgid "Update" msgstr "" -#: app/scripts/services/blocks.service.js:696 +#: app/scripts/services/blocks.service.js:716 #, fuzzy msgid "Update the block label" msgstr "Blokearen etiketa sartu" -#: app/scripts/services/blocks.service.js:644 +#: app/scripts/services/blocks.service.js:649 msgid "Update the port" msgstr "" @@ -621,7 +621,7 @@ msgid "View license" msgstr "Lizentzia ikusi" #: app/scripts/services/blocks.service.js:58 -#: app/scripts/services/blocks.service.js:645 +#: app/scripts/services/blocks.service.js:650 msgid "Virtual port" msgstr "" @@ -637,7 +637,7 @@ msgstr "Proiektu formatua okerra: {{name}}" #: app/scripts/services/blocks.service.js:233 #: app/scripts/services/blocks.service.js:248 -#: app/scripts/services/blocks.service.js:688 +#: app/scripts/services/blocks.service.js:708 #: app/scripts/services/blocks.service.js:77 #, fuzzy msgid "Wrong port name {{name}}" @@ -676,12 +676,12 @@ msgid "config" msgstr "Config" #. contadorAsc -#: app/resources/blocks/labels.js:60 +#: app/resources/examples/labels.js:12 msgid "contadorAsc" msgstr "" #. contadorDes -#: app/resources/blocks/labels.js:62 +#: app/resources/examples/labels.js:14 msgid "contadorDes" msgstr "" diff --git a/app/resources/locale/fr_FR/fr_FR.po b/app/resources/locale/fr_FR/fr_FR.po index 3b478a73e..94a8f4716 100644 --- a/app/resources/locale/fr_FR/fr_FR.po +++ b/app/resources/locale/fr_FR/fr_FR.po @@ -81,15 +81,15 @@ msgstr "Basique" msgid "Basque" msgstr "Basque" -#: app/scripts/services/blocks.service.js:674 -#: app/scripts/services/blocks.service.js:683 -#: app/scripts/services/blocks.service.js:713 -#: app/scripts/services/blocks.service.js:730 +#: app/scripts/services/blocks.service.js:688 +#: app/scripts/services/blocks.service.js:703 +#: app/scripts/services/blocks.service.js:733 +#: app/scripts/services/blocks.service.js:750 #, fuzzy msgid "Block updated" msgstr "Titre mis à jour" -#: app/scripts/services/project.service.js:293 +#: app/scripts/services/project.service.js:284 msgid "Block {{name}} imported" msgstr "Bloc {{name}} importé" @@ -286,7 +286,7 @@ msgstr "Ports d'entrée sortie FPGA non définits" msgid "File" msgstr "Fichier" -#: app/scripts/services/project.service.js:241 +#: app/scripts/services/project.service.js:239 msgid "" "File {{file}} already exists in the project path. Do you want to replace it?" msgstr "" @@ -297,7 +297,7 @@ msgstr "" msgid "File {{file}} does not exist" msgstr "Le fichier {{file}} n'existe pas" -#: app/scripts/services/project.service.js:273 +#: app/scripts/services/project.service.js:271 msgid "File {{file}} imported" msgstr "Fichier {{file}} importé" @@ -380,7 +380,7 @@ msgstr "Connexion invalide" #: app/scripts/services/graph.service.js:168 #, fuzzy -msgid "Invalid connection: →" +msgid "Invalid connection: {{a}} → {{b}}" msgstr "Connexion invalide" #: app/scripts/services/graph.service.js:126 @@ -392,7 +392,7 @@ msgid "Language" msgstr "Langage" #: app/scripts/services/blocks.service.js:127 -#: app/scripts/services/blocks.service.js:697 +#: app/scripts/services/blocks.service.js:717 msgid "Local parameter" msgstr "" @@ -416,7 +416,7 @@ msgstr "Nouveau projet {{name}} créé" msgid "OK" msgstr "OK" -#: app/scripts/services/project.service.js:188 +#: app/scripts/services/project.service.js:186 #: app/scripts/services/project.service.js:60 #, fuzzy msgid "Old project format" @@ -430,7 +430,7 @@ msgstr "" msgid "Open SVG" msgstr "" -#: app/scripts/services/project.service.js:276 +#: app/scripts/services/project.service.js:274 msgid "Original file {{file}} does not exist" msgstr "Le fichier originel {{file}} n'éxiste pas" @@ -454,7 +454,7 @@ msgstr "" msgid "Project {{name}} loaded" msgstr "Projet {{name}} chargé" -#: app/scripts/services/project.service.js:160 +#: app/scripts/services/project.service.js:158 msgid "Project {{name}} saved" msgstr "Projet {{name}} sauvegardé" @@ -562,7 +562,7 @@ msgid "" "Do you want to continue?" msgstr "" -#: app/scripts/services/project.service.js:210 +#: app/scripts/services/project.service.js:208 msgid "" "This import operation requires a project path. You need to save the current " "project. Do you want to continue?" @@ -604,12 +604,12 @@ msgstr "Carte inconnue" msgid "Update" msgstr "" -#: app/scripts/services/blocks.service.js:696 +#: app/scripts/services/blocks.service.js:716 #, fuzzy msgid "Update the block label" msgstr "Entrer le titre du bloc" -#: app/scripts/services/blocks.service.js:644 +#: app/scripts/services/blocks.service.js:649 #, fuzzy msgid "Update the port" msgstr "Entrer les ports d'entrée" @@ -639,7 +639,7 @@ msgid "View license" msgstr "Voir la licence" #: app/scripts/services/blocks.service.js:58 -#: app/scripts/services/blocks.service.js:645 +#: app/scripts/services/blocks.service.js:650 msgid "Virtual port" msgstr "" @@ -655,7 +655,7 @@ msgstr "Mauvais hostname distant {{name}}" #: app/scripts/services/blocks.service.js:233 #: app/scripts/services/blocks.service.js:248 -#: app/scripts/services/blocks.service.js:688 +#: app/scripts/services/blocks.service.js:708 #: app/scripts/services/blocks.service.js:77 #, fuzzy msgid "Wrong port name {{name}}" @@ -694,12 +694,12 @@ msgid "config" msgstr "Configuration" #. contadorAsc -#: app/resources/blocks/labels.js:60 +#: app/resources/examples/labels.js:12 msgid "contadorAsc" msgstr "" #. contadorDes -#: app/resources/blocks/labels.js:62 +#: app/resources/examples/labels.js:14 msgid "contadorDes" msgstr "" diff --git a/app/resources/locale/gl_ES/gl_ES.po b/app/resources/locale/gl_ES/gl_ES.po index e70b3c024..9d231db43 100644 --- a/app/resources/locale/gl_ES/gl_ES.po +++ b/app/resources/locale/gl_ES/gl_ES.po @@ -75,15 +75,15 @@ msgstr "Básico" msgid "Basque" msgstr "Euskera" -#: app/scripts/services/blocks.service.js:674 -#: app/scripts/services/blocks.service.js:683 -#: app/scripts/services/blocks.service.js:713 -#: app/scripts/services/blocks.service.js:730 +#: app/scripts/services/blocks.service.js:688 +#: app/scripts/services/blocks.service.js:703 +#: app/scripts/services/blocks.service.js:733 +#: app/scripts/services/blocks.service.js:750 #, fuzzy msgid "Block updated" msgstr "Etiqueta actualizada" -#: app/scripts/services/project.service.js:293 +#: app/scripts/services/project.service.js:284 msgid "Block {{name}} imported" msgstr "Bloque {{name}} importado" @@ -277,7 +277,7 @@ msgstr "Portos E/S da FPGA non definidos" msgid "File" msgstr "Ficheiro" -#: app/scripts/services/project.service.js:241 +#: app/scripts/services/project.service.js:239 msgid "" "File {{file}} already exists in the project path. Do you want to replace it?" msgstr "" @@ -286,7 +286,7 @@ msgstr "" msgid "File {{file}} does not exist" msgstr "O ficheiro {{file}} non existe" -#: app/scripts/services/project.service.js:273 +#: app/scripts/services/project.service.js:271 msgid "File {{file}} imported" msgstr "" @@ -368,7 +368,7 @@ msgid "Invalid connection" msgstr "" #: app/scripts/services/graph.service.js:168 -msgid "Invalid connection: →" +msgid "Invalid connection: {{a}} → {{b}}" msgstr "" #: app/scripts/services/graph.service.js:126 @@ -380,7 +380,7 @@ msgid "Language" msgstr "Idioma" #: app/scripts/services/blocks.service.js:127 -#: app/scripts/services/blocks.service.js:697 +#: app/scripts/services/blocks.service.js:717 msgid "Local parameter" msgstr "" @@ -404,7 +404,7 @@ msgstr "Novo proxecto {{name}} creado" msgid "OK" msgstr "" -#: app/scripts/services/project.service.js:188 +#: app/scripts/services/project.service.js:186 #: app/scripts/services/project.service.js:60 #, fuzzy msgid "Old project format" @@ -418,7 +418,7 @@ msgstr "" msgid "Open SVG" msgstr "" -#: app/scripts/services/project.service.js:276 +#: app/scripts/services/project.service.js:274 msgid "Original file {{file}} does not exist" msgstr "" @@ -442,7 +442,7 @@ msgstr "" msgid "Project {{name}} loaded" msgstr "Proxecto {{name}} cargado" -#: app/scripts/services/project.service.js:160 +#: app/scripts/services/project.service.js:158 msgid "Project {{name}} saved" msgstr "Proxecto {{name}} gardado" @@ -548,7 +548,7 @@ msgid "" "Do you want to continue?" msgstr "" -#: app/scripts/services/project.service.js:210 +#: app/scripts/services/project.service.js:208 msgid "" "This import operation requires a project path. You need to save the current " "project. Do you want to continue?" @@ -588,12 +588,12 @@ msgstr "Placa desconocida" msgid "Update" msgstr "" -#: app/scripts/services/blocks.service.js:696 +#: app/scripts/services/blocks.service.js:716 #, fuzzy msgid "Update the block label" msgstr "Introduza a etiqueta para o bloque" -#: app/scripts/services/blocks.service.js:644 +#: app/scripts/services/blocks.service.js:649 msgid "Update the port" msgstr "" @@ -622,7 +622,7 @@ msgid "View license" msgstr "Ver licenza" #: app/scripts/services/blocks.service.js:58 -#: app/scripts/services/blocks.service.js:645 +#: app/scripts/services/blocks.service.js:650 msgid "Virtual port" msgstr "" @@ -638,7 +638,7 @@ msgstr "Formato de proxecto incorrecto: {{name}}\"" #: app/scripts/services/blocks.service.js:233 #: app/scripts/services/blocks.service.js:248 -#: app/scripts/services/blocks.service.js:688 +#: app/scripts/services/blocks.service.js:708 #: app/scripts/services/blocks.service.js:77 #, fuzzy msgid "Wrong port name {{name}}" @@ -677,12 +677,12 @@ msgid "config" msgstr "Config" #. contadorAsc -#: app/resources/blocks/labels.js:60 +#: app/resources/examples/labels.js:12 msgid "contadorAsc" msgstr "" #. contadorDes -#: app/resources/blocks/labels.js:62 +#: app/resources/examples/labels.js:14 msgid "contadorDes" msgstr "" diff --git a/app/resources/locale/template.pot b/app/resources/locale/template.pot index 7ae8c31ac..2a1e9f06a 100644 --- a/app/resources/locale/template.pot +++ b/app/resources/locale/template.pot @@ -61,14 +61,14 @@ msgstr "" msgid "Basque" msgstr "" -#: app/scripts/services/blocks.service.js:674 -#: app/scripts/services/blocks.service.js:683 -#: app/scripts/services/blocks.service.js:713 -#: app/scripts/services/blocks.service.js:730 +#: app/scripts/services/blocks.service.js:688 +#: app/scripts/services/blocks.service.js:703 +#: app/scripts/services/blocks.service.js:733 +#: app/scripts/services/blocks.service.js:750 msgid "Block updated" msgstr "" -#: app/scripts/services/project.service.js:293 +#: app/scripts/services/project.service.js:284 msgid "Block {{name}} imported" msgstr "" @@ -256,7 +256,7 @@ msgstr "" msgid "File" msgstr "" -#: app/scripts/services/project.service.js:241 +#: app/scripts/services/project.service.js:239 msgid "File {{file}} already exists in the project path. Do you want to replace it?" msgstr "" @@ -264,7 +264,7 @@ msgstr "" msgid "File {{file}} does not exist" msgstr "" -#: app/scripts/services/project.service.js:273 +#: app/scripts/services/project.service.js:271 msgid "File {{file}} imported" msgstr "" @@ -345,7 +345,7 @@ msgid "Invalid connection" msgstr "" #: app/scripts/services/graph.service.js:168 -msgid "Invalid connection: →" +msgid "Invalid connection: {{a}} → {{b}}" msgstr "" #: app/scripts/services/graph.service.js:126 @@ -357,7 +357,7 @@ msgid "Language" msgstr "" #: app/scripts/services/blocks.service.js:127 -#: app/scripts/services/blocks.service.js:697 +#: app/scripts/services/blocks.service.js:717 msgid "Local parameter" msgstr "" @@ -381,7 +381,7 @@ msgstr "" msgid "OK" msgstr "" -#: app/scripts/services/project.service.js:188 +#: app/scripts/services/project.service.js:186 #: app/scripts/services/project.service.js:60 msgid "Old project format" msgstr "" @@ -394,7 +394,7 @@ msgstr "" msgid "Open SVG" msgstr "" -#: app/scripts/services/project.service.js:276 +#: app/scripts/services/project.service.js:274 msgid "Original file {{file}} does not exist" msgstr "" @@ -418,7 +418,7 @@ msgstr "" msgid "Project {{name}} loaded" msgstr "" -#: app/scripts/services/project.service.js:160 +#: app/scripts/services/project.service.js:158 msgid "Project {{name}} saved" msgstr "" @@ -515,7 +515,7 @@ msgstr "" msgid "The toolchain will be updated. This operation requires Internet connection. Do you want to continue?" msgstr "" -#: app/scripts/services/project.service.js:210 +#: app/scripts/services/project.service.js:208 msgid "This import operation requires a project path. You need to save the current project. Do you want to continue?" msgstr "" @@ -553,11 +553,11 @@ msgstr "" msgid "Update" msgstr "" -#: app/scripts/services/blocks.service.js:696 +#: app/scripts/services/blocks.service.js:716 msgid "Update the block label" msgstr "" -#: app/scripts/services/blocks.service.js:644 +#: app/scripts/services/blocks.service.js:649 msgid "Update the port" msgstr "" @@ -587,7 +587,7 @@ msgid "View license" msgstr "" #: app/scripts/services/blocks.service.js:58 -#: app/scripts/services/blocks.service.js:645 +#: app/scripts/services/blocks.service.js:650 msgid "Virtual port" msgstr "" @@ -602,7 +602,7 @@ msgstr "" #: app/scripts/services/blocks.service.js:233 #: app/scripts/services/blocks.service.js:248 -#: app/scripts/services/blocks.service.js:688 +#: app/scripts/services/blocks.service.js:708 #: app/scripts/services/blocks.service.js:77 msgid "Wrong port name {{name}}" msgstr "" @@ -640,12 +640,12 @@ msgid "config" msgstr "" #. contadorAsc -#: app/resources/blocks/labels.js:60 +#: app/resources/examples/labels.js:12 msgid "contadorAsc" msgstr "" #. contadorDes -#: app/resources/blocks/labels.js:62 +#: app/resources/examples/labels.js:14 msgid "contadorDes" msgstr "" diff --git a/app/scripts/services/graph.service.js b/app/scripts/services/graph.service.js index e270d347b..28a598273 100644 --- a/app/scripts/services/graph.service.js +++ b/app/scripts/services/graph.service.js @@ -165,7 +165,7 @@ angular.module('icestudio') tsize = tsize || 1; lsize = lsize || 1; if (tsize !== lsize) { - warning(gettextCatalog.getString('Invalid connection: ' + lsize + ' → ' + tsize)); + warning(gettextCatalog.getString('Invalid connection: {{a}} → {{b}}', { a: lsize, b: tsize })); return false; } // Prevent loop links From 8cd0a3c1ebc8c7cb11d3f2c04ec74e8c12200039 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jes=C3=BAs=20Arroyo=20Torrens?= Date: Fri, 23 Dec 2016 13:27:33 +0100 Subject: [PATCH 090/169] Release 0.3.0-beta. Update Readme. Add counter sample --- README.md | 34 ++- app/package.json | 2 +- doc/images/icestudio-0.3.0-beta.png | Bin 0 -> 53029 bytes package.json | 2 +- samples/counter.ice | 353 ++++++++++++++++++++++++++++ samples/div.v | 29 +++ 6 files changed, 408 insertions(+), 12 deletions(-) create mode 100644 doc/images/icestudio-0.3.0-beta.png create mode 100644 samples/counter.ice create mode 100644 samples/div.v diff --git a/README.md b/README.md index 77c3a1648..4363e52da 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ [![License](http://img.shields.io/:license-gpl-blue.svg)](http://opensource.org/licenses/GPL-2.0) -[![Documentation Status](https://readthedocs.org/projects/icestudio/badge/?version=stable)](http://icestudio.readthedocs.io/en/stable/) +[![Documentation Status](https://readthedocs.org/projects/icestudio/badge/?version=latest)](http://icestudio.readthedocs.io/en/latest) **Experimental** graphic editor for open FPGAs. Built on top of the [icestorm project](http://www.clifford.at/icestorm/). @@ -17,15 +17,29 @@ Supported boards: * [icoBOARD 1.0](http://icoboard.org/about-icoboard.html) * [Kéfir I](http://fpgalibre.sourceforge.net/Kefir/) -## Version 0.3.0-beta +Supported operating systems: -If you want to add blocks or examples, please contribute to [icestudio-blocks](https://github.com/FPGAwars/icestudio-blocks) or [icestudio-examples](https://github.com/FPGAwars/icestudio-examples). +* GNU/Linux +* Windows +* Mac OS X -## Development +## Version 0.3.0-beta (latest) + +### Installation + +1. Install [Python 2.7](https://www.python.org) + +2. Download the [release](https://github.com/FPGAwars/icestudio/releases/tag/0.3.0-beta), unzip and execute **icestudio** -Install [Python 2.7](https://www.python.org/downloads/release/python-2711/) +Documentation: http://icestudio.readthedocs.io/en/latest -Install [nodejs](https://github.com/nodejs/node) +NOTE: if you want to add blocks or examples, please contribute to [icestudio-blocks](https://github.com/FPGAwars/icestudio-blocks) or [icestudio-examples](https://github.com/FPGAwars/icestudio-examples). + + + +## Development + +Install [Python 2.7](https://www.python.org/downloads/release/python-2711/) and [nodejs](https://github.com/nodejs/node). Using [Atom](https://atom.io/) editor with [linter-jshint](https://atom.io/packages/linter-jshint). @@ -91,11 +105,9 @@ There is a [Wishlist](https://github.com/FPGAwars/icestudio/wiki/Wishlist:-propo 1. Install [Python 2.7](https://www.python.org) -2. Download the [release](https://github.com/FPGAwars/icestudio/releases), unzip and execute **icestudio** - -**Documentation: http://icestudio.readthedocs.io** +2. Download the [release](https://github.com/FPGAwars/icestudio/releases/tag/0.2.3), unzip and execute **icestudio** -Supported on Linux, Windows and Mac OSX. +Documentation: http://icestudio.readthedocs.io/en/stable @@ -126,6 +138,8 @@ Supported on Linux, Windows and Mac OSX. ## Contributors +* v0.3 + * v0.2 * [Tomás Calvo](https://github.com/tocalvo) * [Juan González (Obijuan)](https://github.com/Obijuan) diff --git a/app/package.json b/app/package.json index 5f1dcefe8..004a67c23 100644 --- a/app/package.json +++ b/app/package.json @@ -1,6 +1,6 @@ { "name": "icestudio", - "version": "0.3.0-dev", + "version": "0.3.0-beta", "description": "Experimental graphic editor for open FPGAs", "author": "Jesús Arroyo Torrens ", "repository": "https://github.com/FPGAwars/icestudio", diff --git a/doc/images/icestudio-0.3.0-beta.png b/doc/images/icestudio-0.3.0-beta.png new file mode 100644 index 0000000000000000000000000000000000000000..bd7a6857cbe317df4c7816c81ed2bd7add74dca4 GIT binary patch literal 53029 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∋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 literal 0 HcmV?d00001 diff --git a/package.json b/package.json index 59cfb67f8..9b88ce786 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "icestudio", - "version": "0.3.0-dev", + "version": "0.3.0-beta", "description": "Experimental graphic editor for open FPGAs", "author": "Jesús Arroyo Torrens ", "repository": "https://github.com/FPGAwars/icestudio", diff --git a/samples/counter.ice b/samples/counter.ice new file mode 100644 index 000000000..17931b94c --- /dev/null +++ b/samples/counter.ice @@ -0,0 +1,353 @@ +{ + "version": "1.0", + "package": { + "name": "", + "version": "", + "description": "", + "author": "", + "image": "" + }, + "design": { + "board": "icezum", + "graph": { + "blocks": [ + { + "id": "02460189-14a0-48d0-ad87-74faf9a1177e", + "type": "basic.constant", + "data": { + "name": "N", + "value": "20", + "local": false + }, + "position": { + "x": 376, + "y": 64 + } + }, + { + "id": "51e4e6a6-ef05-48e6-8f22-a355e6eda3ae", + "type": "bit.0", + "position": { + "x": 568, + "y": 64 + } + }, + { + "id": "1a49c635-92d6-4641-bd3b-dbd7604a76bf", + "type": "basic.output", + "data": { + "name": "LED 5", + "pins": [ + { + "index": "0", + "name": "LED5", + "value": "101" + } + ], + "virtual": false + }, + "position": { + "x": 752, + "y": 64 + } + }, + { + "id": "1f3764d6-7db2-4e5a-912d-a25aad6459e2", + "type": "basic.output", + "data": { + "name": "LED 4", + "pins": [ + { + "index": "0", + "name": "LED4", + "value": "99" + } + ], + "virtual": false + }, + "position": { + "x": 752, + "y": 144 + } + }, + { + "id": "e38831b6-fd92-4e35-9fea-17b439002721", + "type": "basic.code", + "data": { + "code": "// Counter 4 bit\n// @include div.v\n\nwire trig; reg c;\n\nDIV #(N) div (\n .clk(clk),\n .out(trig)\n);\n\nalways @(posedge trig) begin\n if (rst == 1)\n c <= 0;\n else if (ena == 1)\n c <= c + 1;\nend\n", + "params": [ + { + "name": "N" + } + ], + "ports": { + "in": [ + { + "name": "clk" + }, + { + "name": "ena" + }, + { + "name": "rst" + } + ], + "out": [ + { + "name": "c", + "range": "[3:0]", + "size": 4 + } + ] + } + }, + "position": { + "x": 232, + "y": 208 + } + }, + { + "id": "289670b6-0d76-4c0e-91ce-23f62b106fa5", + "type": "basic.input", + "data": { + "name": "clk", + "pins": [ + { + "index": "0", + "name": "CLK", + "value": "21" + } + ], + "virtual": false + }, + "position": { + "x": 40, + "y": 216 + } + }, + { + "id": "4c30cdb0-f1af-4af1-bb4b-12e443b84a17", + "type": "basic.output", + "data": { + "name": "LEDs", + "range": "[3:0]", + "pins": [ + { + "index": "3", + "name": "LED3", + "value": "98" + }, + { + "index": "2", + "name": "LED2", + "value": "97" + }, + { + "index": "1", + "name": "LED1", + "value": "96" + }, + { + "index": "0", + "name": "LED0", + "value": "95" + } + ], + "virtual": false + }, + "position": { + "x": 752, + "y": 256 + } + }, + { + "id": "9803de82-f844-48f0-9f6a-b428395073b4", + "type": "basic.input", + "data": { + "name": "Button 1", + "pins": [ + { + "index": "0", + "name": "SW1", + "value": "10" + } + ], + "virtual": false + }, + "position": { + "x": 40, + "y": 304 + } + }, + { + "id": "4caf869e-5202-4aa0-acbf-14fac565eaf1", + "type": "basic.input", + "data": { + "name": "Button 2", + "pins": [ + { + "index": "0", + "name": "SW2", + "value": "11" + } + ], + "virtual": false + }, + "position": { + "x": 40, + "y": 392 + } + } + ], + "wires": [ + { + "source": { + "block": "51e4e6a6-ef05-48e6-8f22-a355e6eda3ae", + "port": "19c8f68d-5022-487f-9ab0-f0a3cd58bead" + }, + "target": { + "block": "1f3764d6-7db2-4e5a-912d-a25aad6459e2", + "port": "in" + } + }, + { + "source": { + "block": "51e4e6a6-ef05-48e6-8f22-a355e6eda3ae", + "port": "19c8f68d-5022-487f-9ab0-f0a3cd58bead" + }, + "target": { + "block": "1a49c635-92d6-4641-bd3b-dbd7604a76bf", + "port": "in" + } + }, + { + "source": { + "block": "e38831b6-fd92-4e35-9fea-17b439002721", + "port": "c" + }, + "target": { + "block": "4c30cdb0-f1af-4af1-bb4b-12e443b84a17", + "port": "in" + }, + "size": 4 + }, + { + "source": { + "block": "289670b6-0d76-4c0e-91ce-23f62b106fa5", + "port": "out" + }, + "target": { + "block": "e38831b6-fd92-4e35-9fea-17b439002721", + "port": "clk" + } + }, + { + "source": { + "block": "02460189-14a0-48d0-ad87-74faf9a1177e", + "port": "constant-out" + }, + "target": { + "block": "e38831b6-fd92-4e35-9fea-17b439002721", + "port": "N" + } + }, + { + "source": { + "block": "9803de82-f844-48f0-9f6a-b428395073b4", + "port": "out" + }, + "target": { + "block": "e38831b6-fd92-4e35-9fea-17b439002721", + "port": "ena" + } + }, + { + "source": { + "block": "4caf869e-5202-4aa0-acbf-14fac565eaf1", + "port": "out" + }, + "target": { + "block": "e38831b6-fd92-4e35-9fea-17b439002721", + "port": "rst" + } + } + ] + }, + "deps": { + "bit.0": { + "version": "1.0", + "package": { + "name": "Bit 0", + "version": "1.0.0", + "description": "Assign 0 to the output wire", + "author": "Jesús Arroyo", + "image": "%3Csvg%20xmlns=%22http://www.w3.org/2000/svg%22%20width=%2247.303%22%20height=%2227.648%22%20viewBox=%220%200%2044.346456%2025.919999%22%3E%3Ctext%20style=%22line-height:125%25%22%20x=%22325.37%22%20y=%22315.373%22%20font-weight=%22400%22%20font-size=%2212.669%22%20font-family=%22sans-serif%22%20letter-spacing=%220%22%20word-spacing=%220%22%20transform=%22translate(-307.01%20-298.51)%22%3E%3Ctspan%20x=%22325.37%22%20y=%22315.373%22%20style=%22-inkscape-font-specification:'Courier%2010%20Pitch'%22%20font-family=%22Courier%2010%20Pitch%22%3E0%3C/tspan%3E%3C/text%3E%3C/svg%3E" + }, + "design": { + "graph": { + "blocks": [ + { + "id": "b959fb96-ac67-4aea-90b3-ed35a4c17bf5", + "type": "basic.code", + "data": { + "code": "// Bit 0\n\nassign v = 1'b0;", + "params": [], + "ports": { + "in": [], + "out": [ + { + "name": "v" + } + ] + } + }, + "position": { + "x": 96, + "y": 96 + } + }, + { + "id": "19c8f68d-5022-487f-9ab0-f0a3cd58bead", + "type": "basic.output", + "data": { + "name": "" + }, + "position": { + "x": 608, + "y": 192 + } + } + ], + "wires": [ + { + "source": { + "block": "b959fb96-ac67-4aea-90b3-ed35a4c17bf5", + "port": "v" + }, + "target": { + "block": "19c8f68d-5022-487f-9ab0-f0a3cd58bead", + "port": "in" + } + } + ] + }, + "deps": {}, + "state": { + "pan": { + "x": 0, + "y": 0 + }, + "zoom": 1 + } + } + } + }, + "state": { + "pan": { + "x": 0, + "y": 0 + }, + "zoom": 1 + } + } +} \ No newline at end of file diff --git a/samples/div.v b/samples/div.v new file mode 100644 index 000000000..9b8b495ed --- /dev/null +++ b/samples/div.v @@ -0,0 +1,29 @@ +module DIV (input clk, output out); + + parameter N = 22; + localparam M = $pow(2, N); // 2**N + + wire clk_temp; + reg [N - 1:0] c = 0; + reg dout; + + assign out = dout; + + always @(posedge clk) + if (M == 0) + c <= 0; + else if (c == M - 1) + c <= 0; + else + c <= c + 1; + + assign clk_temp = (c == 0) ? 1 : 0; + + always @(posedge clk) + if (N == 0) + out <= 0; + else if (clk_temp == 1) + + dout <= ~dout; + +endmodule From f93bd6f73e75ac688503f8882877a5cf6e58b75d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jes=C3=BAs=20Arroyo=20Torrens?= Date: Fri, 23 Dec 2016 13:41:29 +0100 Subject: [PATCH 091/169] Update main image in Readme --- doc/images/icestudio-0.3.0-beta.png | Bin 53029 -> 62051 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/doc/images/icestudio-0.3.0-beta.png b/doc/images/icestudio-0.3.0-beta.png index bd7a6857cbe317df4c7816c81ed2bd7add74dca4..a00ba8a9a643f9d22f2b8170b0e0a5584d904cdc 100644 GIT binary patch literal 62051 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 literal 53029 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∋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 From 014c11093f66207fbaedc2108ab29682ceed8077 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jes=C3=BAs=20Arroyo=20Torrens?= Date: Fri, 23 Dec 2016 19:58:19 +0100 Subject: [PATCH 092/169] Testbench compiler: escape spaces in variable names --- app/scripts/services/compiler.service.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/scripts/services/compiler.service.js b/app/scripts/services/compiler.service.js index 87f18f71a..f3671915d 100644 --- a/app/scripts/services/compiler.service.js +++ b/app/scripts/services/compiler.service.js @@ -531,7 +531,7 @@ angular.module('icestudio') if (block.data.name) { input.push({ id: digestId(block.id), - name: 'input_' + block.data.name, + name: 'input_' + block.data.name.replace(/ /g, '_'), range: block.data.range }); } @@ -547,7 +547,7 @@ angular.module('icestudio') if (block.data.name) { output.push({ id: digestId(block.id), - name: 'output_' + block.data.name, + name: 'output_' + block.data.name.replace(/ /g, '_'), range: block.data.range }); } @@ -578,7 +578,7 @@ angular.module('icestudio') if (block.data.name) { params.push({ id: digestId(block.id), - name: 'constant_' + block.data.name, + name: 'constant_' + block.data.name.replace(/ /g, '_'), value: block.data.value }); } From 753917a0ec521aa47c11e5c06d985c1dd12d2bf4 Mon Sep 17 00:00:00 2001 From: Lorea-Aldabaldetreku Date: Mon, 26 Dec 2016 15:30:03 +0100 Subject: [PATCH 093/169] =?UTF-8?q?Traducci=C3=B3n=20del=20euskara=20actua?= =?UTF-8?q?lizada?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/resources/locale/eu_ES/eu_ES_nuevo.po | 879 ++++++++++++++++++++++ 1 file changed, 879 insertions(+) create mode 100644 app/resources/locale/eu_ES/eu_ES_nuevo.po diff --git a/app/resources/locale/eu_ES/eu_ES_nuevo.po b/app/resources/locale/eu_ES/eu_ES_nuevo.po new file mode 100644 index 000000000..69c17f053 --- /dev/null +++ b/app/resources/locale/eu_ES/eu_ES_nuevo.po @@ -0,0 +1,879 @@ +msgid "" +msgstr "" +"Project-Id-Version: \n" +"POT-Creation-Date: \n" +"PO-Revision-Date: \n" +"Last-Translator: \n" +"Language-Team: \n" +"Language: eu_ES\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Generator: Poedit 1.8.11\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#. 1. Basic +#: app/resources/examples/labels.js:4 +msgid "1_basic" +msgstr "1. Oinarrizkoa" + +#. 1. Led on +#: app/resources/examples/labels.js:6 +msgid "1_led_on" +msgstr "1. Leda piztu" + +#. 2. Switch led +#: app/resources/examples/labels.js:8 +msgid "2_switch_led" +msgstr "2. Pultsadorea leda" + +#. 3. Switch and gate +#: app/resources/examples/labels.js:10 +msgid "3_switch_and_gate" +msgstr "3. Pultsadorea eta AND atea" + +#: app/scripts/services/utils.service.js:439 +#: app/scripts/services/utils.service.js:519 +msgid "Unplug and reconnect the board" +msgstr "Plaka deskonektatu eta konekta ezazu berriro" + +#: app/scripts/services/utils.service.js:510 +msgid "" +"

                FTDI driver installation instructions

                1. Connect the FPGA " +"board
                2. Replace the (Interface 0) driver of the board by " +"libusbK
                3. Unplug and reconnect the board
                " +msgstr "" +"

                FTDI driver-a instalatzeko instrukzioak

                1. FPGA plaka konekta " +"ezazu
                2. Plakaren (Interface 0) driver-a aldatu eta jar ezazu " +"honakoa: libusbK
                3. Plaka deskonektatu eta konekta ezazu " +"berriro
                " + +#: app/scripts/services/utils.service.js:526 +msgid "" +"

                FTDI driver uninstallation instructions

                1. Find the FPGA USB " +"Device
                2. Select the board interface and uninstall the driver
                " +msgstr "" +"

                FTDI driver-a desinstalatzeko instrukzioak

                1. FPGAren USB " +"gailua bila ezazu
                2. Plakaren interfazea hauta ezazu eta driver-a " +"desinstalatu
                " + +#: app/views/menu.html:260 +msgid "About Icestudio" +msgstr "Icestudio-ri buruz..." + +#: app/scripts/controllers/menu.js:415 +msgid "Add a block to start" +msgstr "Gehi ezazu bloke bat hasteko" + +#: app/views/menu.html:50 +msgid "Add as block" +msgstr "Blokea sortu" + +#: app/scripts/services/utils.service.js:668 +msgid "Author" +msgstr "Egilea" + +#: app/views/menu.html:270 +msgid "Basic" +msgstr "Oinarrizkoa" + +#: app/views/menu.html:138 +msgid "Basque" +msgstr "Euskara" + +#: app/scripts/services/blocks.service.js:688 +#: app/scripts/services/blocks.service.js:703 +#: app/scripts/services/blocks.service.js:733 +#: app/scripts/services/blocks.service.js:750 +msgid "Block updated" +msgstr "Etiketa freskatua dago" + +#: app/scripts/services/project.service.js:284 +msgid "Block {{name}} imported" +msgstr "{{name}} blokea inportatu duzu" + +#: app/scripts/services/tools.service.js:218 +msgid "Board {{name}} not detected" +msgstr "{{name}} plaka ez da aurkitu" + +#: app/scripts/controllers/menu.js:371 app/scripts/controllers/menu.js:378 +msgid "Board {{name}} selected" +msgstr "{{name}} plaka hautatu duzu" + +#: app/views/menu.html:171 +msgid "Boards" +msgstr "Plakak" + +#: app/views/menu.html:189 +msgid "Build" +msgstr "Sintetizatu" + +#: app/scripts/controllers/main.js:16 +msgid "Cancel" +msgstr "Utzi" + +#: app/scripts/services/tools.service.js:429 +msgid "Check Internet connection..." +msgstr "Interneteko sarbidea egiaztatu..." + +#: app/scripts/services/tools.service.js:437 +msgid "Check Python..." +msgstr "Python egiaztatu..." + +#: app/views/menu.html:98 +msgid "Clear all" +msgstr "Dena ezabatu" + +#: app/views/menu.html:92 +msgid "Clone selected" +msgstr "Hautua klonatu" + +#: app/views/menu.html:276 +msgid "Code" +msgstr "Kodea" + +#: app/views/menu.html:256 +msgid "Community forum" +msgstr "Komunitatearen foroa" + +#: app/views/menu.html:275 +msgid "Constant" +msgstr "Konstantea" + +#: app/views/menu.html:165 +msgid "Datasheet" +msgstr "Datu-fitxa" + +#: app/scripts/services/tools.service.js:306 +msgid "" +"Default toolchain not found. Toolchain will be downloaded. This operation " +"requires Internet connection. Do you want to continue?" +msgstr "" +"Toolchain lehenetsia ez da aurkitu. Hortaz, deskargatu egingo da. " +"Eragiketak Interneteko sarbidea behar du, jarraitu nahi al duzu?" + +#: app/scripts/services/utils.service.js:667 +msgid "Description" +msgstr "Azalpena" + +#: app/views/menu.html:230 +msgid "Disable" +msgstr "Desgaitu" + +#: app/scripts/controllers/menu.js:222 +msgid "Do you want to clear all?" +msgstr "Dena ezabatu nahi al duzu?" + +#: app/scripts/controllers/menu.js:192 +msgid "Do you want to exit the application?" +msgstr "Aplikazioa utzi nahi al duzu?" + +#: app/scripts/controllers/menu.js:213 +msgid "Do you want to remove the selected block?" +msgstr "Hautatutako blokea ezabatu nahi al duzu?" + +#: app/views/menu.html:249 +msgid "Documentation" +msgstr "Dokumentazioa" + +#: app/views/menu.html:223 +msgid "Drivers" +msgstr "Driverrak" + +#: app/scripts/services/utils.service.js:436 +#: app/scripts/services/utils.service.js:504 +msgid "Drivers disabled" +msgstr "Driverrak desgaitu dira" + +#: app/scripts/services/utils.service.js:433 +#: app/scripts/services/utils.service.js:485 +msgid "Drivers enabled" +msgstr "Driverrak gaitu dira" + +#: app/scripts/services/tools.service.js:230 +msgid "Duplicated FPGA I/O ports" +msgstr "FPGAren E/S portuak bikoiztu dira" + +#: app/scripts/services/blocks.service.js:314 +msgid "Duplicated block attributes" +msgstr "Blokearen ezaugarriak bikoiztu dira" + +#: app/views/menu.html:85 +msgid "Edit" +msgstr "Editatu" + +#: app/views/menu.html:226 +msgid "Enable" +msgstr "Onartu" + +#: app/views/menu.html:120 +msgid "English" +msgstr "Ingelesa" + +#: app/scripts/services/blocks.service.js:126 +msgid "Enter the constant blocks" +msgstr "Konstante-blokeak sar itzazu" + +#: app/scripts/services/blocks.service.js:213 +msgid "Enter the input ports" +msgstr "Sarrerako portuak sar itzazu" + +#: app/scripts/services/blocks.service.js:214 +msgid "Enter the output ports" +msgstr "Irteerako portuak sar itzazu" + +#: app/scripts/services/blocks.service.js:215 +msgid "Enter the parameters" +msgstr "Parametroak sar itzazu" + +#: app/scripts/services/blocks.service.js:57 +msgid "Enter the ports" +msgstr "Portuak sar itzazu" + +#: app/scripts/controllers/menu.js:73 +msgid "Enter the project name" +msgstr "Proiektuari izena eman" + +#: app/scripts/controllers/menu.js:249 +msgid "Enter the remote hostname user@host (experimental)" +msgstr "" +"Urrutiko ostalariaren izena sar ezazu erabiltzailea@host (esperimentala)" + +#: app/scripts/services/tools.service.js:329 +msgid "Error: default toolchain not found in '{{dir}}'" +msgstr "Errorea: Toolchain lehenetsia ez da '{{dir}}'-en aurkitu" + +#: app/scripts/services/utils.service.js:800 +msgid "Error: {{error}}" +msgstr "Errorea: {{error}}" + +#: app/views/menu.html:33 +msgid "Examples" +msgstr "Adibideak" + +#: app/scripts/services/tools.service.js:187 +msgid "Execute remote {{label}} ..." +msgstr "Exekutatu urrutiko {{label}} ..." + +#: app/views/menu.html:61 +msgid "Export" +msgstr "Esportatu" + +#: app/scripts/services/tools.service.js:461 +msgid "Extract default apio files..." +msgstr "Apio fitxategiak atera..." + +#: app/scripts/services/tools.service.js:471 +msgid "Extract default apio packages..." +msgstr "Apio pakete lehenetsiak atera..." + +#: app/scripts/services/tools.service.js:449 +msgid "Extract virtual env files..." +msgstr "Env birtualaren fitxategiak atera..." + +#: app/scripts/services/tools.service.js:224 +#: app/scripts/services/tools.service.js:227 +msgid "FPGA I/O ports not defined" +msgstr "FPGAren E/S portuak definitu gabe daude" + +#: app/views/menu.html:24 +msgid "File" +msgstr "Fitxategia" + +#: app/scripts/services/project.service.js:239 +msgid "" +"File {{file}} already exists in the project path. Do you want to replace it?" +msgstr "" +"Proiektuaren direktorioan {{file}} fitxategia dagoeneko bada. Fitxategia " +"ordeztu nahi al duzu?" + +#: app/scripts/services/tools.service.js:163 +msgid "File {{file}} does not exist" +msgstr "Ez dago {{file}} izeneko fitxategirik" + +#: app/scripts/services/project.service.js:271 +msgid "File {{file}} imported" +msgstr "{{file}} fitxategia inportatu da" + +#: app/views/menu.html:144 +msgid "French" +msgstr "Frantsesa" + +#: app/scripts/controllers/menu.js:176 +msgid "GTKWave exported" +msgstr "GTKWave-a esportatu da" + +#: app/views/menu.html:132 +msgid "Galician" +msgstr "Galegoa" + +#: app/views/menu.html:239 +msgid "Help" +msgstr "Laguntza" + +#: app/scripts/services/utils.service.js:474 +msgid "Homebrew is required" +msgstr "Homebrew-a behar da" + +#: app/scripts/services/utils.service.js:681 +msgid "Image" +msgstr "Irudia" + +#: app/scripts/controllers/menu.js:309 +msgid "Image {{name}} saved" +msgstr "{{name}} izeneko irudia gorde da" + +#: app/views/menu.html:277 +msgid "Info" +msgstr "Info" + +#: app/views/menu.html:273 +msgid "Input" +msgstr "Sarrera" + +#: app/views/menu.html:200 +msgid "Install" +msgstr "Instalatu" + +#: app/scripts/services/tools.service.js:466 +msgid "Install default apio..." +msgstr "Apio lehenetsia instalatu..." + +#: app/scripts/services/tools.service.js:515 +msgid "Installation completed" +msgstr "Instalazioa amaitu da" + +#: app/scripts/services/tools.service.js:358 +#: app/scripts/services/tools.service.js:395 +msgid "Installing toolchain" +msgstr "Toolchain-a instalatzen ari da" + +#: app/scripts/services/tools.service.js:431 +#: app/scripts/services/utils.service.js:478 +msgid "Internet connection required" +msgstr "Interneteko sarbidea behar da" + +#: app/scripts/services/graph.service.js:133 +msgid "Invalid Pull up connection:
                block already connected" +msgstr "" +"Pull up konexio baliogabea:
                blokea dagoeneko konektatua dago" + +#: app/scripts/services/graph.service.js:149 +msgid "Invalid Pull up connection:
                only Input blocks allowed" +msgstr "" +"Pull up konexio baliogabea:
                sarrera blokeak soilik dira " +"onargarriak" + +#: app/scripts/services/graph.service.js:140 +msgid "Invalid block connection:
                Pull up already connected" +msgstr "" +"Bloke konexio baliogabeak:
                Pull up -a dagoeneko konektatua dago" + +#: app/scripts/services/graph.service.js:104 +#: app/scripts/services/graph.service.js:111 +#: app/scripts/services/graph.service.js:97 +msgid "Invalid connection" +msgstr "Konexio baliogabea" + +#: app/scripts/services/graph.service.js:168 +msgid "Invalid connection: {{a}} → {{b}}" +msgstr "Konexio baliogabea: {{a}} → {{b}}" + +#: app/scripts/services/graph.service.js:126 +msgid "Invalid multiple input connections" +msgstr "Sarrerako konexio anitzak baliogabeak" + +#: app/views/menu.html:116 +msgid "Language" +msgstr "Hizkuntza" + +#: app/scripts/services/blocks.service.js:127 +#: app/scripts/services/blocks.service.js:717 +msgid "Local parameter" +msgstr "Parametro lokala" + +#: app/scripts/services/tools.service.js:454 +msgid "Make virtual env..." +msgstr "Env birtuala sortu..." + +#: app/scripts/services/utils.service.js:665 +msgid "Name" +msgstr "Izena" + +#: app/views/menu.html:27 +msgid "New" +msgstr "Berria" + +#: app/scripts/services/project.service.js:44 +msgid "New project {{name}} created" +msgstr "{{name}} proiektua sortu da" + +#: app/scripts/controllers/main.js:15 +msgid "OK" +msgstr "Ok" + +#: app/scripts/services/project.service.js:186 +#: app/scripts/services/project.service.js:60 +msgid "Old project format" +msgstr "Proiektu formatu zaharra" + +#: app/views/menu.html:30 +msgid "Open" +msgstr "Ireki" + +#: app/scripts/services/utils.service.js:688 +msgid "Open SVG" +msgstr "SVGa ireki" + +#: app/scripts/services/project.service.js:274 +msgid "Original file {{file}} does not exist" +msgstr "Jatorrizko {{file}} fitxategia ez dago" + +#: app/views/menu.html:274 +msgid "Output" +msgstr "Irteera" + +#: app/scripts/controllers/menu.js:158 +msgid "PCF file exported" +msgstr "PCF fitxategia esportatu da" + +#: app/views/menu.html:102 +msgid "Preferences" +msgstr "Lehentasunak" + +#: app/views/menu.html:105 +msgid "Project information" +msgstr "Proiektuaren informazioa" + +#: app/scripts/services/project.service.js:64 +msgid "Project {{name}} loaded" +msgstr "{{name}} proiektua kargatu da" + +#: app/scripts/services/project.service.js:158 +msgid "Project {{name}} saved" +msgstr "{{name}} proiektua gorde da" + +#: app/scripts/services/tools.service.js:442 +msgid "Python 2.7 is required" +msgstr "Python 2.7 behar da" + +#: app/views/menu.html:79 +msgid "Quit" +msgstr "Utzi" + +#: app/views/design.html:4 +msgid "Read only" +msgstr "Irakurtzeko soilik" + +#: app/scripts/services/tools.service.js:255 +msgid "Remote host {{name}} not connected" +msgstr "{{name}} urrutiko ostalaria ez dago konektatua" + +#: app/views/menu.html:110 +msgid "Remote hostname" +msgstr "Urrutiko ostalariaren izena" + +#: app/views/menu.html:208 +msgid "Remove" +msgstr "Ezabatu" + +#: app/views/menu.html:95 +msgid "Remove selected" +msgstr "Hautua ezabatu" + +#: app/scripts/services/utils.service.js:690 +msgid "Reset SVG" +msgstr "SVGa berrezarri" + +#: app/views/menu.html:213 +msgid "Reset default" +msgstr "Jatorrizkoa berrezarri" + +#: app/views/menu.html:88 +msgid "Reset view" +msgstr "Bista berrezarri" + +#: app/views/menu.html:54 +msgid "Save" +msgstr "Gorde" + +#: app/scripts/services/utils.service.js:689 +msgid "Save SVG" +msgstr "SVGa gorde" + +#: app/views/menu.html:57 +msgid "Save as" +msgstr "Gorde honela" + +#: app/views/menu.html:252 +msgid "Source code" +msgstr "Iturburu kodea" + +#: app/views/menu.html:126 +msgid "Spanish" +msgstr "Gaztelera" + +#: app/scripts/services/tools.service.js:176 +msgid "Synchronize remote files ..." +msgstr "Urrutiko fitxategiak sinkronizatu..." + +#: app/views/menu.html:70 +msgid "Testbench" +msgstr "Testbench " + +#: app/scripts/controllers/menu.js:167 +msgid "Testbench exported" +msgstr "Testbench-a esportatu da" + +#: app/scripts/controllers/menu.js:367 +msgid "" +"The current FPGA I/O configuration will be lost. Do you want to change to " +"{{name}} board?" +msgstr "" +"FPGAaren E/S konfigurazioa galduko da. {{name}} plaka aldatu nahi duzu?" + +#: app/scripts/controllers/menu.js:105 app/scripts/controllers/menu.js:90 +msgid "" +"The current project will be removed. Do you want to continue loading the " +"project?" +msgstr "Proiektu hau ezabatuko da. Proiektua irekitzen jarraitu nahi al duzu?" + +#: app/scripts/services/tools.service.js:334 +msgid "The toolchain will be removed. Do you want to continue?" +msgstr "Toolchain-a ezabatuko da. Jarraitu nahi al duzu?" + +#: app/scripts/services/tools.service.js:322 +msgid "The toolchain will be restored to default. Do you want to continue?" +msgstr "" +"Toolchain-aren jatorrizko balioak berrezarriko dira. Jarraitu nahi al duzu?" + +#: app/scripts/services/tools.service.js:314 +msgid "" +"The toolchain will be updated. This operation requires Internet connection. " +"Do you want to continue?" +msgstr "" +"Toolchain-a eguneratuko da. Operazio horrek Interneteko sarbidea behar du. " +"Jarraitu nahi al duzu?" + +#: app/scripts/services/project.service.js:208 +msgid "" +"This import operation requires a project path. You need to save the current " +"project. Do you want to continue?" +msgstr "" +"Inportazio operazioak proiektu-bidea behar du. Uneko proiektua gorde " +"beharko duzu. Jarraitu nahi al duzu?" + +#: app/views/menu.html:196 +msgid "Toolchain" +msgstr "Toolchain" + +#: app/scripts/services/tools.service.js:516 +msgid "Toolchain installed" +msgstr "Toolchain-a instalatu da" + +#: app/scripts/services/tools.service.js:520 +msgid "Toolchain not installed" +msgstr "Toolchain-a ez da instalatu" + +#: app/scripts/services/tools.service.js:91 +#: app/scripts/services/utils.service.js:516 +#: app/scripts/services/utils.service.js:532 +msgid "Toolchain not installed. Please, install the toolchain" +msgstr "Toolchain-a ez da instalatu. Mesedez, toolchaina instala ezazu" + +#: app/scripts/services/tools.service.js:338 +msgid "Toolchain removed" +msgstr "Toolchain-a ezabatu da" + +#: app/views/menu.html:183 +msgid "Tools" +msgstr "Tresnak" + +#: app/scripts/services/tools.service.js:221 +msgid "Unknown board" +msgstr "Plaka ezezaguna" + +#: app/views/menu.html:203 +msgid "Update" +msgstr "eguneratu" + +#: app/scripts/services/blocks.service.js:716 +msgid "Update the block label" +msgstr "Blokearen etiketa eguneratu" + +#: app/scripts/services/blocks.service.js:649 +msgid "Update the port" +msgstr "Portua eguneratu" + +#: app/views/menu.html:192 +msgid "Upload" +msgstr "Kargatu" + +#: app/views/menu.html:186 +msgid "Verify" +msgstr "Egiaztatu" + +#: app/scripts/controllers/menu.js:149 +msgid "Verilog code exported" +msgstr "Verilog kodea esportatu da" + +#: app/scripts/services/utils.service.js:666 app/views/menu.html:245 +msgid "Version" +msgstr "Bertsioa" + +#: app/views/menu.html:156 +msgid "View" +msgstr "Ikusi" + +#: app/views/menu.html:242 +msgid "View license" +msgstr "Lizentzia ikusi" + +#: app/scripts/services/blocks.service.js:58 +#: app/scripts/services/blocks.service.js:650 +msgid "Virtual port" +msgstr "Portu birtuala" + +#: app/scripts/services/blocks.service.js:348 +msgid "Wrong block format: {{type}}" +msgstr "Blokearen formatua okerra da: {{type}}" + +#: app/scripts/services/blocks.service.js:146 +#: app/scripts/services/blocks.service.js:263 +msgid "Wrong parameter name {{name}}" +msgstr "Parametroaren formatua okerra da: {{name}}" + +#: app/scripts/services/blocks.service.js:233 +#: app/scripts/services/blocks.service.js:248 +#: app/scripts/services/blocks.service.js:708 +#: app/scripts/services/blocks.service.js:77 +msgid "Wrong port name {{name}}" +msgstr "Portuaren izena okerra da: {{name}}" + +#: app/scripts/services/project.service.js:72 +msgid "Wrong project format: {{name}}" +msgstr "Proiektuaren formatua okerra da: {{name}}" + +#: app/scripts/services/tools.service.js:252 +msgid "Wrong remote hostname {{name}}" +msgstr "Urrutiko ostalariaren {{name}} izena okerra da" + +#. And +#: app/resources/blocks/labels.js:34 +msgid "and" +msgstr "And" + +#: app/views/design.html:5 +msgid "back" +msgstr "atzera" + +#. Bit +#: app/resources/blocks/labels.js:4 +msgid "bit" +msgstr "Bit" + +#. Combinational +#: app/resources/blocks/labels.js:16 +msgid "combinational" +msgstr "konbinazionala" + +#. Config +#: app/resources/blocks/labels.js:6 +msgid "config" +msgstr "config" + +#. contadorAsc +#: app/resources/examples/labels.js:12 +msgid "contadorAsc" +msgstr "Goranzko zenbatzailea" + +#. contadorDes +#: app/resources/examples/labels.js:14 +msgid "contadorDes" +msgstr "Beheranzko zenbatzailea" + +#. Debouncer +#: app/resources/blocks/labels.js:58 +msgid "debouncer" +msgstr "Erreboteen aurkakoa" + +#. Demux 1:2 +#: app/resources/blocks/labels.js:18 +msgid "demux_1_2" +msgstr "Demux 1:2" + +#. Demux 1:4 +#: app/resources/blocks/labels.js:20 +msgid "demux_1_4" +msgstr "Demux 1:4" + +#. Demux 1:8 +#: app/resources/blocks/labels.js:22 +msgid "demux_1_8" +msgstr "Demux 1:8" + +#. D flip-flop async +#: app/resources/blocks/labels.js:50 +msgid "dff_ar" +msgstr "D biegonkor asink" + +#. D flip-flop async +#: app/resources/blocks/labels.js:52 +msgid "dff_sr" +msgstr "D biegonkorra" + +#. Build done +#: app/scripts/services/tools.service.js:267 +msgid "done_build" +msgstr "Sintetizatua egin da" + +#. Upload done +#: app/scripts/services/tools.service.js:269 +msgid "done_upload" +msgstr "Karga egin da" + +#. Verification done +#: app/scripts/services/tools.service.js:265 +msgid "done_verify" +msgstr "Egiaztapena egin da" + +#. Gate +#: app/resources/blocks/labels.js:32 +msgid "gate" +msgstr "Atea" + +#. Hex 7 Segment CA +#: app/resources/blocks/labels.js:26 +msgid "hex_7seg_ca" +msgstr "Hex 7 Segment CA" + +#. Hex 7 Segment CC +#: app/resources/blocks/labels.js:24 +msgid "hex_7seg_cc" +msgstr "Hex 7 Segment CC" + +#. Logic +#: app/resources/blocks/labels.js:14 +msgid "logic" +msgstr "Logika" + +#. Mux 2:1 +#: app/resources/blocks/labels.js:28 +msgid "mux_2_1" +msgstr "Mux 2:1" + +#. Mux 4:1 +#: app/resources/blocks/labels.js:30 +msgid "mux_4_1" +msgstr "Mux 4:1" + +#. Nand +#: app/resources/blocks/labels.js:36 +msgid "nand" +msgstr "Nand" + +#. Nor +#: app/resources/blocks/labels.js:38 +msgid "nor" +msgstr "Nor" + +#. Not +#: app/resources/blocks/labels.js:40 +msgid "not" +msgstr "Not" + +#. Or +#: app/resources/blocks/labels.js:42 +msgid "or" +msgstr "Or" + +#. Pull up +#: app/resources/blocks/labels.js:8 +msgid "pull_up" +msgstr "Pull up" + +#. Pull up inv +#: app/resources/blocks/labels.js:10 +msgid "pull_up_inv" +msgstr "Pull up inv" + +#. Sequential +#: app/resources/blocks/labels.js:48 +msgid "sequential" +msgstr "Sekuentziala" + +#. Start building ... +#: app/scripts/services/tools.service.js:57 +msgid "start_build" +msgstr "Sintetizatua hasi ..." + +#. Start uploading ... +#: app/scripts/services/tools.service.js:59 +msgid "start_upload" +msgstr "Karga hasi ..." + +#. Start verification ... +#: app/scripts/services/tools.service.js:55 +msgid "start_verify" +msgstr "Egiaztapena hasi ..." + +#. T flip-flop async +#: app/resources/blocks/labels.js:54 +msgid "tff_ar" +msgstr "T biegonkor asink" + +#. T flip-flop +#: app/resources/blocks/labels.js:56 +msgid "tff_sr" +msgstr "T biegonkorra" + +#. Tri-state +#: app/resources/blocks/labels.js:12 +msgid "tri_state" +msgstr "Tri-state" + +#: app/scripts/app.js:42 app/scripts/controllers/menu.js:74 +msgid "untitled" +msgstr "Izenik gabe" + +#. Xnor +#: app/resources/blocks/labels.js:44 +msgid "xnor" +msgstr "Xnor" + +#. Xor +#: app/resources/blocks/labels.js:46 +msgid "xor" +msgstr "Xor" + +#: app/scripts/controllers/menu.js:357 +msgid "{{board}} datasheet not defined" +msgstr "{{board}} ez zehaztua" + +#: app/scripts/controllers/menu.js:347 +msgid "{{board}} pinout not defined" +msgstr "{{board}} pinout ez zehaztua" + +#~ msgid "Block exported as {{name}}" +#~ msgstr "Blokea {{name}} bezala esportatua" + +#~ msgid "Enter the project's image path" +#~ msgstr "Proiektuaren irudi bidea sartu" + +#~ msgid "Import block" +#~ msgstr "Blokea inportatu" + +#~ msgid "New project" +#~ msgstr "Proiektu berria" + +#~ msgid "Open project" +#~ msgstr "Ireki proiektua" + +#~ msgid "Templates" +#~ msgstr "Ereduak" + +#~ msgid "comb" +#~ msgstr "Comb" + +#~ msgid "sec" +#~ msgstr "Sec" From ec83d864b4907a7c49e897a7130b85230f7d3a63 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jes=C3=BAs=20Arroyo=20Torrens?= Date: Mon, 26 Dec 2016 16:53:57 +0100 Subject: [PATCH 094/169] Replace eu_ES translation --- README.md | 2 +- app/resources/locale/eu_ES/eu_ES.po | 284 +++---- app/resources/locale/eu_ES/eu_ES_nuevo.po | 879 ---------------------- 3 files changed, 146 insertions(+), 1019 deletions(-) delete mode 100644 app/resources/locale/eu_ES/eu_ES_nuevo.po diff --git a/README.md b/README.md index 4363e52da..092069291 100644 --- a/README.md +++ b/README.md @@ -83,8 +83,8 @@ NOTE: in Mac OS X this command also generates a **dmg** package. |:----------:|:------------------------------------------:| | English | ![Progress](http://progressed.io/bar/100) | | Spanish | ![Progress](http://progressed.io/bar/100) | +| Basque | ![Progress](http://progressed.io/bar/100) | | French | ![Progress](http://progressed.io/bar/81) | -| Basque | ![Progress](http://progressed.io/bar/56) | | Galician | ![Progress](http://progressed.io/bar/54) | **Contribute**: add or update the [translations](https://github.com/FPGAwars/icestudio/tree/develop/app/resources/locale) by following the [next instructions](https://angular-gettext.rocketeer.be/dev-guide/translate/#poedit). diff --git a/app/resources/locale/eu_ES/eu_ES.po b/app/resources/locale/eu_ES/eu_ES.po index 83569a133..ac93f1edc 100644 --- a/app/resources/locale/eu_ES/eu_ES.po +++ b/app/resources/locale/eu_ES/eu_ES.po @@ -15,27 +15,27 @@ msgstr "" #. 1. Basic #: app/resources/examples/labels.js:4 msgid "1_basic" -msgstr "1. Basikoa" +msgstr "1. Oinarrizkoa" #. 1. Led on #: app/resources/examples/labels.js:6 msgid "1_led_on" -msgstr "1. Led-a piztu" +msgstr "1. Leda piztu" #. 2. Switch led #: app/resources/examples/labels.js:8 msgid "2_switch_led" -msgstr "2. Etengailua led batekin" +msgstr "2. Pultsadorea leda" #. 3. Switch and gate #: app/resources/examples/labels.js:10 msgid "3_switch_and_gate" -msgstr "3. Etengailua and atearekin" +msgstr "3. Pultsadorea eta AND atea" #: app/scripts/services/utils.service.js:439 #: app/scripts/services/utils.service.js:519 msgid "Unplug and reconnect the board" -msgstr "" +msgstr "Plaka deskonektatu eta konekta ezazu berriro" #: app/scripts/services/utils.service.js:510 msgid "" @@ -43,57 +43,62 @@ msgid "" "board
              • Replace the (Interface 0) driver of the board by " "libusbK
              • Unplug and reconnect the board
                • " msgstr "" +"

                FTDI driver-a instalatzeko instrukzioak

                1. FPGA plaka konekta " +"ezazu
                2. Plakaren (Interface 0) driver-a aldatu eta jar ezazu " +"honakoa: libusbK
                3. Plaka deskonektatu eta konekta ezazu " +"berriro
                " #: app/scripts/services/utils.service.js:526 msgid "" "

                FTDI driver uninstallation instructions

                1. Find the FPGA USB " "Device
                2. Select the board interface and uninstall the driver
                " msgstr "" +"

                FTDI driver-a desinstalatzeko instrukzioak

                1. FPGAren USB " +"gailua bila ezazu
                2. Plakaren interfazea hauta ezazu eta driver-a " +"desinstalatu
                " #: app/views/menu.html:260 msgid "About Icestudio" -msgstr "Icestudio informazioa" +msgstr "Icestudio-ri buruz..." #: app/scripts/controllers/menu.js:415 msgid "Add a block to start" -msgstr "" +msgstr "Gehi ezazu bloke bat hasteko" #: app/views/menu.html:50 -#, fuzzy msgid "Add as block" -msgstr "Blokea bezala esportatu" +msgstr "Blokea sortu" #: app/scripts/services/utils.service.js:668 msgid "Author" -msgstr "" +msgstr "Egilea" #: app/views/menu.html:270 msgid "Basic" -msgstr "Basikoa" +msgstr "Oinarrizkoa" #: app/views/menu.html:138 msgid "Basque" -msgstr "Euskera" +msgstr "Euskara" #: app/scripts/services/blocks.service.js:688 #: app/scripts/services/blocks.service.js:703 #: app/scripts/services/blocks.service.js:733 #: app/scripts/services/blocks.service.js:750 -#, fuzzy msgid "Block updated" -msgstr "Etiketa freskatua" +msgstr "Etiketa freskatua dago" #: app/scripts/services/project.service.js:284 msgid "Block {{name}} imported" -msgstr "{{name}} blokea importatua" +msgstr "{{name}} blokea inportatu duzu" #: app/scripts/services/tools.service.js:218 msgid "Board {{name}} not detected" -msgstr "{{name}} plaka ez da aurkitzen" +msgstr "{{name}} plaka ez da aurkitu" #: app/scripts/controllers/menu.js:371 app/scripts/controllers/menu.js:378 msgid "Board {{name}} selected" -msgstr "{{name}} paka aukeratul" +msgstr "{{name}} plaka hautatu duzu" #: app/views/menu.html:171 msgid "Boards" @@ -105,15 +110,15 @@ msgstr "Sintetizatu" #: app/scripts/controllers/main.js:16 msgid "Cancel" -msgstr "" +msgstr "Utzi" #: app/scripts/services/tools.service.js:429 msgid "Check Internet connection..." -msgstr "" +msgstr "Interneteko sarbidea egiaztatu..." #: app/scripts/services/tools.service.js:437 msgid "Check Python..." -msgstr "" +msgstr "Python egiaztatu..." #: app/views/menu.html:98 msgid "Clear all" @@ -121,7 +126,7 @@ msgstr "Dena ezabatu" #: app/views/menu.html:92 msgid "Clone selected" -msgstr "Aukeratua klonatu" +msgstr "Hautua klonatu" #: app/views/menu.html:276 msgid "Code" @@ -133,64 +138,65 @@ msgstr "Komunitatearen foroa" #: app/views/menu.html:275 msgid "Constant" -msgstr "" +msgstr "Konstantea" #: app/views/menu.html:165 msgid "Datasheet" -msgstr "" +msgstr "Datu-fitxa" #: app/scripts/services/tools.service.js:306 msgid "" "Default toolchain not found. Toolchain will be downloaded. This operation " "requires Internet connection. Do you want to continue?" msgstr "" +"Toolchain lehenetsia ez da aurkitu. Hortaz, deskargatu egingo da. Eragiketak " +"Interneteko sarbidea behar du, jarraitu nahi al duzu?" #: app/scripts/services/utils.service.js:667 msgid "Description" -msgstr "" +msgstr "Azalpena" #: app/views/menu.html:230 msgid "Disable" -msgstr "" +msgstr "Desgaitu" #: app/scripts/controllers/menu.js:222 msgid "Do you want to clear all?" -msgstr "¿Dena ezabatu nahi duzu?" +msgstr "Dena ezabatu nahi al duzu?" #: app/scripts/controllers/menu.js:192 -#, fuzzy msgid "Do you want to exit the application?" -msgstr "¿Aukeratutako blokea ezabatu nahi duzu?" +msgstr "Aplikazioa utzi nahi al duzu?" #: app/scripts/controllers/menu.js:213 msgid "Do you want to remove the selected block?" -msgstr "¿Aukeratutako blokea ezabatu nahi duzu?" +msgstr "Hautatutako blokea ezabatu nahi al duzu?" #: app/views/menu.html:249 msgid "Documentation" -msgstr "Documentazioa" +msgstr "Dokumentazioa" #: app/views/menu.html:223 msgid "Drivers" -msgstr "" +msgstr "Driverrak" #: app/scripts/services/utils.service.js:436 #: app/scripts/services/utils.service.js:504 msgid "Drivers disabled" -msgstr "" +msgstr "Driverrak desgaitu dira" #: app/scripts/services/utils.service.js:433 #: app/scripts/services/utils.service.js:485 msgid "Drivers enabled" -msgstr "" +msgstr "Driverrak gaitu dira" #: app/scripts/services/tools.service.js:230 msgid "Duplicated FPGA I/O ports" -msgstr "FPGAren E/S portuak bikoiztuak" +msgstr "FPGAren E/S portuak bikoiztu dira" #: app/scripts/services/blocks.service.js:314 msgid "Duplicated block attributes" -msgstr "" +msgstr "Blokearen ezaugarriak bikoiztu dira" #: app/views/menu.html:85 msgid "Edit" @@ -198,47 +204,44 @@ msgstr "Editatu" #: app/views/menu.html:226 msgid "Enable" -msgstr "Enable" +msgstr "Onartu" #: app/views/menu.html:120 msgid "English" msgstr "Ingelesa" #: app/scripts/services/blocks.service.js:126 -#, fuzzy msgid "Enter the constant blocks" -msgstr "Blokearen etiketa sartu" +msgstr "Konstante-blokeak sar itzazu" #: app/scripts/services/blocks.service.js:213 msgid "Enter the input ports" -msgstr "" +msgstr "Sarrerako portuak sar itzazu" #: app/scripts/services/blocks.service.js:214 msgid "Enter the output ports" -msgstr "" +msgstr "Irteerako portuak sar itzazu" #: app/scripts/services/blocks.service.js:215 -#, fuzzy msgid "Enter the parameters" -msgstr "Proiektuari izena jarri" +msgstr "Parametroak sar itzazu" #: app/scripts/services/blocks.service.js:57 -#, fuzzy msgid "Enter the ports" -msgstr "Blokearen portuak sartu" +msgstr "Portuak sar itzazu" #: app/scripts/controllers/menu.js:73 -#, fuzzy msgid "Enter the project name" -msgstr "Proiektuari izena jarri" +msgstr "Proiektuari izena eman" #: app/scripts/controllers/menu.js:249 msgid "Enter the remote hostname user@host (experimental)" -msgstr "Enter the remote hostname user@host (experimental)" +msgstr "" +"Urrutiko ostalariaren izena sar ezazu erabiltzailea@host (esperimentala)" #: app/scripts/services/tools.service.js:329 msgid "Error: default toolchain not found in '{{dir}}'" -msgstr "" +msgstr "Errorea: Toolchain lehenetsia ez da '{{dir}}'-en aurkitu" #: app/scripts/services/utils.service.js:800 msgid "Error: {{error}}" @@ -250,7 +253,7 @@ msgstr "Adibideak" #: app/scripts/services/tools.service.js:187 msgid "Execute remote {{label}} ..." -msgstr "Execute remote {{label}} ..." +msgstr "Exekutatu urrutiko {{label}} ..." #: app/views/menu.html:61 msgid "Export" @@ -258,20 +261,20 @@ msgstr "Esportatu" #: app/scripts/services/tools.service.js:461 msgid "Extract default apio files..." -msgstr "" +msgstr "Apio fitxategiak atera..." #: app/scripts/services/tools.service.js:471 msgid "Extract default apio packages..." -msgstr "" +msgstr "Apio pakete lehenetsiak atera..." #: app/scripts/services/tools.service.js:449 msgid "Extract virtual env files..." -msgstr "" +msgstr "Env birtualaren fitxategiak atera..." #: app/scripts/services/tools.service.js:224 #: app/scripts/services/tools.service.js:227 msgid "FPGA I/O ports not defined" -msgstr "FPGAren E/S portuak definitu gabe" +msgstr "FPGAren E/S portuak definitu gabe daude" #: app/views/menu.html:24 msgid "File" @@ -281,26 +284,28 @@ msgstr "Fitxategia" msgid "" "File {{file}} already exists in the project path. Do you want to replace it?" msgstr "" +"Proiektuaren direktorioan {{file}} fitxategia dagoeneko bada. Fitxategia " +"ordeztu nahi al duzu?" #: app/scripts/services/tools.service.js:163 msgid "File {{file}} does not exist" -msgstr "{{file}} fitxeroa ez da existitzen" +msgstr "Ez dago {{file}} izeneko fitxategirik" #: app/scripts/services/project.service.js:271 msgid "File {{file}} imported" -msgstr "" +msgstr "{{file}} fitxategia inportatu da" #: app/views/menu.html:144 msgid "French" -msgstr "" +msgstr "Frantsesa" #: app/scripts/controllers/menu.js:176 msgid "GTKWave exported" -msgstr "GTKWave esportatua" +msgstr "GTKWave-a esportatu da" #: app/views/menu.html:132 msgid "Galician" -msgstr "Galiziako" +msgstr "Galegoa" #: app/views/menu.html:239 msgid "Help" @@ -308,16 +313,15 @@ msgstr "Laguntza" #: app/scripts/services/utils.service.js:474 msgid "Homebrew is required" -msgstr "Homebrew is required" +msgstr "Homebrew-a behar da" #: app/scripts/services/utils.service.js:681 -#, fuzzy msgid "Image" -msgstr "Ruta de la imagen" +msgstr "Irudia" #: app/scripts/controllers/menu.js:309 msgid "Image {{name}} saved" -msgstr "" +msgstr "{{name}} izeneko irudia gorde da" #: app/views/menu.html:277 msgid "Info" @@ -329,51 +333,54 @@ msgstr "Sarrera" #: app/views/menu.html:200 msgid "Install" -msgstr "" +msgstr "Instalatu" #: app/scripts/services/tools.service.js:466 msgid "Install default apio..." -msgstr "" +msgstr "Apio lehenetsia instalatu..." #: app/scripts/services/tools.service.js:515 msgid "Installation completed" -msgstr "Instalazioa amaitua" +msgstr "Instalazioa amaitu da" #: app/scripts/services/tools.service.js:358 #: app/scripts/services/tools.service.js:395 msgid "Installing toolchain" -msgstr "Toolchain instalatzen" +msgstr "Toolchain-a instalatzen ari da" #: app/scripts/services/tools.service.js:431 #: app/scripts/services/utils.service.js:478 msgid "Internet connection required" -msgstr "Internet konexioa behar da" +msgstr "Interneteko sarbidea behar da" #: app/scripts/services/graph.service.js:133 msgid "Invalid Pull up connection:
                block already connected" -msgstr "" +msgstr "Pull up konexio baliogabea:
                blokea dagoeneko konektatua dago" #: app/scripts/services/graph.service.js:149 msgid "Invalid Pull up connection:
                only Input blocks allowed" msgstr "" +"Pull up konexio baliogabea:
                sarrera blokeak soilik dira " +"onargarriak" #: app/scripts/services/graph.service.js:140 msgid "Invalid block connection:
                Pull up already connected" msgstr "" +"Bloke konexio baliogabeak:
                Pull up -a dagoeneko konektatua dago" #: app/scripts/services/graph.service.js:104 #: app/scripts/services/graph.service.js:111 #: app/scripts/services/graph.service.js:97 msgid "Invalid connection" -msgstr "" +msgstr "Konexio baliogabea" #: app/scripts/services/graph.service.js:168 msgid "Invalid connection: {{a}} → {{b}}" -msgstr "" +msgstr "Konexio baliogabea: {{a}} → {{b}}" #: app/scripts/services/graph.service.js:126 msgid "Invalid multiple input connections" -msgstr "" +msgstr "Sarrerako konexio anitzak baliogabeak" #: app/views/menu.html:116 msgid "Language" @@ -382,45 +389,44 @@ msgstr "Hizkuntza" #: app/scripts/services/blocks.service.js:127 #: app/scripts/services/blocks.service.js:717 msgid "Local parameter" -msgstr "" +msgstr "Parametro lokala" #: app/scripts/services/tools.service.js:454 msgid "Make virtual env..." -msgstr "" +msgstr "Env birtuala sortu..." #: app/scripts/services/utils.service.js:665 msgid "Name" -msgstr "" +msgstr "Izena" #: app/views/menu.html:27 msgid "New" -msgstr "" +msgstr "Berria" #: app/scripts/services/project.service.js:44 msgid "New project {{name}} created" -msgstr "{{name}} proiektu sortuta" +msgstr "{{name}} proiektua sortu da" #: app/scripts/controllers/main.js:15 msgid "OK" -msgstr "" +msgstr "Ok" #: app/scripts/services/project.service.js:186 #: app/scripts/services/project.service.js:60 -#, fuzzy msgid "Old project format" -msgstr "Proiektu formatua okerra: {{name}}" +msgstr "Proiektu formatu zaharra" #: app/views/menu.html:30 msgid "Open" -msgstr "" +msgstr "Ireki" #: app/scripts/services/utils.service.js:688 msgid "Open SVG" -msgstr "" +msgstr "SVGa ireki" #: app/scripts/services/project.service.js:274 msgid "Original file {{file}} does not exist" -msgstr "" +msgstr "Jatorrizko {{file}} fitxategia ez dago" #: app/views/menu.html:274 msgid "Output" @@ -428,31 +434,31 @@ msgstr "Irteera" #: app/scripts/controllers/menu.js:158 msgid "PCF file exported" -msgstr "PCF fitxategia esportatua" +msgstr "PCF fitxategia esportatu da" #: app/views/menu.html:102 msgid "Preferences" -msgstr "" +msgstr "Lehentasunak" #: app/views/menu.html:105 msgid "Project information" -msgstr "" +msgstr "Proiektuaren informazioa" #: app/scripts/services/project.service.js:64 msgid "Project {{name}} loaded" -msgstr "{{name}} proiektua irekita" +msgstr "{{name}} proiektua kargatu da" #: app/scripts/services/project.service.js:158 msgid "Project {{name}} saved" -msgstr "{{name}} proiektua gordeta" +msgstr "{{name}} proiektua gorde da" #: app/scripts/services/tools.service.js:442 msgid "Python 2.7 is required" -msgstr "" +msgstr "Python 2.7 behar da" #: app/views/menu.html:79 msgid "Quit" -msgstr "" +msgstr "Utzi" #: app/views/design.html:4 msgid "Read only" @@ -460,11 +466,11 @@ msgstr "Irakurtzeko soilik" #: app/scripts/services/tools.service.js:255 msgid "Remote host {{name}} not connected" -msgstr "Remote host {{name}} not connected" +msgstr "{{name}} urrutiko ostalaria ez dago konektatua" #: app/views/menu.html:110 msgid "Remote hostname" -msgstr "" +msgstr "Urrutiko ostalariaren izena" #: app/views/menu.html:208 msgid "Remove" @@ -472,29 +478,27 @@ msgstr "Ezabatu" #: app/views/menu.html:95 msgid "Remove selected" -msgstr "Aukeratua ezabatu" +msgstr "Hautua ezabatu" #: app/scripts/services/utils.service.js:690 -#, fuzzy msgid "Reset SVG" -msgstr "Bista reseteatu" +msgstr "SVGa berrezarri" #: app/views/menu.html:213 msgid "Reset default" -msgstr "" +msgstr "Jatorrizkoa berrezarri" #: app/views/menu.html:88 msgid "Reset view" -msgstr "Bista reseteatu" +msgstr "Bista berrezarri" #: app/views/menu.html:54 msgid "Save" msgstr "Gorde" #: app/scripts/services/utils.service.js:689 -#, fuzzy msgid "Save SVG" -msgstr "Gorde honela" +msgstr "SVGa gorde" #: app/views/menu.html:57 msgid "Save as" @@ -502,7 +506,7 @@ msgstr "Gorde honela" #: app/views/menu.html:252 msgid "Source code" -msgstr "Jatorrizko kodea" +msgstr "Iturburu kodea" #: app/views/menu.html:126 msgid "Spanish" @@ -510,48 +514,53 @@ msgstr "Gaztelera" #: app/scripts/services/tools.service.js:176 msgid "Synchronize remote files ..." -msgstr "Synchronize remote files ..." +msgstr "Urrutiko fitxategiak sinkronizatu..." #: app/views/menu.html:70 msgid "Testbench" -msgstr "Testbench esportatua" +msgstr "Testbench " #: app/scripts/controllers/menu.js:167 msgid "Testbench exported" -msgstr "Testbench esportatua" +msgstr "Testbench-a esportatu da" #: app/scripts/controllers/menu.js:367 msgid "" "The current FPGA I/O configuration will be lost. Do you want to change to " "{{name}} board?" msgstr "" -"FPGAaren E/S configurazioa galduko da. {{name}} plaka aldatu nahi duzu?" +"FPGAaren E/S konfigurazioa galduko da. {{name}} plaka aldatu nahi duzu?" #: app/scripts/controllers/menu.js:105 app/scripts/controllers/menu.js:90 msgid "" "The current project will be removed. Do you want to continue loading the " "project?" -msgstr "Proiektu hau ezabatuko da. Proiektua irekitzen jarraitu nahi duzu?" +msgstr "Proiektu hau ezabatuko da. Proiektua irekitzen jarraitu nahi al duzu?" #: app/scripts/services/tools.service.js:334 msgid "The toolchain will be removed. Do you want to continue?" -msgstr "" +msgstr "Toolchain-a ezabatuko da. Jarraitu nahi al duzu?" #: app/scripts/services/tools.service.js:322 msgid "The toolchain will be restored to default. Do you want to continue?" msgstr "" +"Toolchain-aren jatorrizko balioak berrezarriko dira. Jarraitu nahi al duzu?" #: app/scripts/services/tools.service.js:314 msgid "" "The toolchain will be updated. This operation requires Internet connection. " "Do you want to continue?" msgstr "" +"Toolchain-a eguneratuko da. Operazio horrek Interneteko sarbidea behar du. " +"Jarraitu nahi al duzu?" #: app/scripts/services/project.service.js:208 msgid "" "This import operation requires a project path. You need to save the current " "project. Do you want to continue?" msgstr "" +"Inportazio operazioak proiektu-bidea behar du. Uneko proiektua gorde " +"beharko duzu. Jarraitu nahi al duzu?" #: app/views/menu.html:196 msgid "Toolchain" @@ -559,25 +568,25 @@ msgstr "Toolchain" #: app/scripts/services/tools.service.js:516 msgid "Toolchain installed" -msgstr "Toolchain instalatua" +msgstr "Toolchain-a instalatu da" #: app/scripts/services/tools.service.js:520 msgid "Toolchain not installed" -msgstr "" +msgstr "Toolchain-a ez da instalatu" #: app/scripts/services/tools.service.js:91 #: app/scripts/services/utils.service.js:516 #: app/scripts/services/utils.service.js:532 msgid "Toolchain not installed. Please, install the toolchain" -msgstr "" +msgstr "Toolchain-a ez da instalatu. Mesedez, toolchaina instala ezazu" #: app/scripts/services/tools.service.js:338 msgid "Toolchain removed" -msgstr "Toolchain ezabatuta" +msgstr "Toolchain-a ezabatu da" #: app/views/menu.html:183 msgid "Tools" -msgstr "Erremintak" +msgstr "Tresnak" #: app/scripts/services/tools.service.js:221 msgid "Unknown board" @@ -585,16 +594,15 @@ msgstr "Plaka ezezaguna" #: app/views/menu.html:203 msgid "Update" -msgstr "" +msgstr "Eguneratu" #: app/scripts/services/blocks.service.js:716 -#, fuzzy msgid "Update the block label" -msgstr "Blokearen etiketa sartu" +msgstr "Blokearen etiketa eguneratu" #: app/scripts/services/blocks.service.js:649 msgid "Update the port" -msgstr "" +msgstr "Portua eguneratu" #: app/views/menu.html:192 msgid "Upload" @@ -606,7 +614,7 @@ msgstr "Egiaztatu" #: app/scripts/controllers/menu.js:149 msgid "Verilog code exported" -msgstr "Verilog kodea esportatua" +msgstr "Verilog kodea esportatu da" #: app/scripts/services/utils.service.js:666 app/views/menu.html:245 msgid "Version" @@ -623,33 +631,31 @@ msgstr "Lizentzia ikusi" #: app/scripts/services/blocks.service.js:58 #: app/scripts/services/blocks.service.js:650 msgid "Virtual port" -msgstr "" +msgstr "Portu birtuala" #: app/scripts/services/blocks.service.js:348 msgid "Wrong block format: {{type}}" -msgstr "Blokearen formatua okerra: {{type}}" +msgstr "Blokearen formatua okerra da: {{type}}" #: app/scripts/services/blocks.service.js:146 #: app/scripts/services/blocks.service.js:263 -#, fuzzy msgid "Wrong parameter name {{name}}" -msgstr "Proiektu formatua okerra: {{name}}" +msgstr "Parametroaren formatua okerra da: {{name}}" #: app/scripts/services/blocks.service.js:233 #: app/scripts/services/blocks.service.js:248 #: app/scripts/services/blocks.service.js:708 #: app/scripts/services/blocks.service.js:77 -#, fuzzy msgid "Wrong port name {{name}}" -msgstr "Proiektu formatua okerra: {{name}}" +msgstr "Portuaren izena okerra da: {{name}}" #: app/scripts/services/project.service.js:72 msgid "Wrong project format: {{name}}" -msgstr "Proiektu formatua okerra: {{name}}" +msgstr "Proiektuaren formatua okerra da: {{name}}" #: app/scripts/services/tools.service.js:252 msgid "Wrong remote hostname {{name}}" -msgstr "" +msgstr "Urrutiko ostalariaren {{name}} izena okerra da" #. And #: app/resources/blocks/labels.js:34 @@ -658,7 +664,7 @@ msgstr "And" #: app/views/design.html:5 msgid "back" -msgstr "" +msgstr "atzera" #. Bit #: app/resources/blocks/labels.js:4 @@ -668,7 +674,7 @@ msgstr "Bit" #. Combinational #: app/resources/blocks/labels.js:16 msgid "combinational" -msgstr "" +msgstr "Konbinazionala" #. Config #: app/resources/blocks/labels.js:6 @@ -678,17 +684,17 @@ msgstr "Config" #. contadorAsc #: app/resources/examples/labels.js:12 msgid "contadorAsc" -msgstr "" +msgstr "Goranzko zenbatzailea" #. contadorDes #: app/resources/examples/labels.js:14 msgid "contadorDes" -msgstr "" +msgstr "Beheranzko zenbatzailea" #. Debouncer #: app/resources/blocks/labels.js:58 msgid "debouncer" -msgstr "" +msgstr "Erreboteen aurkakoa" #. Demux 1:2 #: app/resources/blocks/labels.js:18 @@ -708,32 +714,32 @@ msgstr "Demux 1:8" #. D flip-flop async #: app/resources/blocks/labels.js:50 msgid "dff_ar" -msgstr "Bistable D asink" +msgstr "D biegonkor asink" #. D flip-flop async #: app/resources/blocks/labels.js:52 msgid "dff_sr" -msgstr "Bistable D" +msgstr "D biegonkorra" #. Build done #: app/scripts/services/tools.service.js:267 msgid "done_build" -msgstr "Sintetizatua egina" +msgstr "Sintetizatua egin da" #. Upload done #: app/scripts/services/tools.service.js:269 msgid "done_upload" -msgstr "Karga egina" +msgstr "Karga egin da" #. Verification done #: app/scripts/services/tools.service.js:265 msgid "done_verify" -msgstr "Egiaztapena egina" +msgstr "Egiaztapena egin da" #. Gate #: app/resources/blocks/labels.js:32 msgid "gate" -msgstr "Gate" +msgstr "Atea" #. Hex 7 Segment CA #: app/resources/blocks/labels.js:26 @@ -793,7 +799,7 @@ msgstr "Pull up inv" #. Sequential #: app/resources/blocks/labels.js:48 msgid "sequential" -msgstr "" +msgstr "Sekuentziala" #. Start building ... #: app/scripts/services/tools.service.js:57 @@ -813,12 +819,12 @@ msgstr "Egiaztapena hasi ..." #. T flip-flop async #: app/resources/blocks/labels.js:54 msgid "tff_ar" -msgstr "Bistable T asink" +msgstr "T biegonkor asink" #. T flip-flop #: app/resources/blocks/labels.js:56 msgid "tff_sr" -msgstr "Bistable T" +msgstr "T biegonkorra" #. Tri-state #: app/resources/blocks/labels.js:12 @@ -841,11 +847,11 @@ msgstr "Xor" #: app/scripts/controllers/menu.js:357 msgid "{{board}} datasheet not defined" -msgstr "" +msgstr "{{board}} ez zehaztua" #: app/scripts/controllers/menu.js:347 msgid "{{board}} pinout not defined" -msgstr "" +msgstr "{{board}} pinout ez zehaztua" #~ msgid "Block exported as {{name}}" #~ msgstr "Blokea {{name}} bezala esportatua" diff --git a/app/resources/locale/eu_ES/eu_ES_nuevo.po b/app/resources/locale/eu_ES/eu_ES_nuevo.po deleted file mode 100644 index 69c17f053..000000000 --- a/app/resources/locale/eu_ES/eu_ES_nuevo.po +++ /dev/null @@ -1,879 +0,0 @@ -msgid "" -msgstr "" -"Project-Id-Version: \n" -"POT-Creation-Date: \n" -"PO-Revision-Date: \n" -"Last-Translator: \n" -"Language-Team: \n" -"Language: eu_ES\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"X-Generator: Poedit 1.8.11\n" -"Plural-Forms: nplurals=2; plural=(n != 1);\n" - -#. 1. Basic -#: app/resources/examples/labels.js:4 -msgid "1_basic" -msgstr "1. Oinarrizkoa" - -#. 1. Led on -#: app/resources/examples/labels.js:6 -msgid "1_led_on" -msgstr "1. Leda piztu" - -#. 2. Switch led -#: app/resources/examples/labels.js:8 -msgid "2_switch_led" -msgstr "2. Pultsadorea leda" - -#. 3. Switch and gate -#: app/resources/examples/labels.js:10 -msgid "3_switch_and_gate" -msgstr "3. Pultsadorea eta AND atea" - -#: app/scripts/services/utils.service.js:439 -#: app/scripts/services/utils.service.js:519 -msgid "Unplug and reconnect the board" -msgstr "Plaka deskonektatu eta konekta ezazu berriro" - -#: app/scripts/services/utils.service.js:510 -msgid "" -"

                FTDI driver installation instructions

                1. Connect the FPGA " -"board
                2. Replace the (Interface 0) driver of the board by " -"libusbK
                3. Unplug and reconnect the board
                " -msgstr "" -"

                FTDI driver-a instalatzeko instrukzioak

                1. FPGA plaka konekta " -"ezazu
                2. Plakaren (Interface 0) driver-a aldatu eta jar ezazu " -"honakoa: libusbK
                3. Plaka deskonektatu eta konekta ezazu " -"berriro
                " - -#: app/scripts/services/utils.service.js:526 -msgid "" -"

                FTDI driver uninstallation instructions

                1. Find the FPGA USB " -"Device
                2. Select the board interface and uninstall the driver
                " -msgstr "" -"

                FTDI driver-a desinstalatzeko instrukzioak

                1. FPGAren USB " -"gailua bila ezazu
                2. Plakaren interfazea hauta ezazu eta driver-a " -"desinstalatu
                " - -#: app/views/menu.html:260 -msgid "About Icestudio" -msgstr "Icestudio-ri buruz..." - -#: app/scripts/controllers/menu.js:415 -msgid "Add a block to start" -msgstr "Gehi ezazu bloke bat hasteko" - -#: app/views/menu.html:50 -msgid "Add as block" -msgstr "Blokea sortu" - -#: app/scripts/services/utils.service.js:668 -msgid "Author" -msgstr "Egilea" - -#: app/views/menu.html:270 -msgid "Basic" -msgstr "Oinarrizkoa" - -#: app/views/menu.html:138 -msgid "Basque" -msgstr "Euskara" - -#: app/scripts/services/blocks.service.js:688 -#: app/scripts/services/blocks.service.js:703 -#: app/scripts/services/blocks.service.js:733 -#: app/scripts/services/blocks.service.js:750 -msgid "Block updated" -msgstr "Etiketa freskatua dago" - -#: app/scripts/services/project.service.js:284 -msgid "Block {{name}} imported" -msgstr "{{name}} blokea inportatu duzu" - -#: app/scripts/services/tools.service.js:218 -msgid "Board {{name}} not detected" -msgstr "{{name}} plaka ez da aurkitu" - -#: app/scripts/controllers/menu.js:371 app/scripts/controllers/menu.js:378 -msgid "Board {{name}} selected" -msgstr "{{name}} plaka hautatu duzu" - -#: app/views/menu.html:171 -msgid "Boards" -msgstr "Plakak" - -#: app/views/menu.html:189 -msgid "Build" -msgstr "Sintetizatu" - -#: app/scripts/controllers/main.js:16 -msgid "Cancel" -msgstr "Utzi" - -#: app/scripts/services/tools.service.js:429 -msgid "Check Internet connection..." -msgstr "Interneteko sarbidea egiaztatu..." - -#: app/scripts/services/tools.service.js:437 -msgid "Check Python..." -msgstr "Python egiaztatu..." - -#: app/views/menu.html:98 -msgid "Clear all" -msgstr "Dena ezabatu" - -#: app/views/menu.html:92 -msgid "Clone selected" -msgstr "Hautua klonatu" - -#: app/views/menu.html:276 -msgid "Code" -msgstr "Kodea" - -#: app/views/menu.html:256 -msgid "Community forum" -msgstr "Komunitatearen foroa" - -#: app/views/menu.html:275 -msgid "Constant" -msgstr "Konstantea" - -#: app/views/menu.html:165 -msgid "Datasheet" -msgstr "Datu-fitxa" - -#: app/scripts/services/tools.service.js:306 -msgid "" -"Default toolchain not found. Toolchain will be downloaded. This operation " -"requires Internet connection. Do you want to continue?" -msgstr "" -"Toolchain lehenetsia ez da aurkitu. Hortaz, deskargatu egingo da. " -"Eragiketak Interneteko sarbidea behar du, jarraitu nahi al duzu?" - -#: app/scripts/services/utils.service.js:667 -msgid "Description" -msgstr "Azalpena" - -#: app/views/menu.html:230 -msgid "Disable" -msgstr "Desgaitu" - -#: app/scripts/controllers/menu.js:222 -msgid "Do you want to clear all?" -msgstr "Dena ezabatu nahi al duzu?" - -#: app/scripts/controllers/menu.js:192 -msgid "Do you want to exit the application?" -msgstr "Aplikazioa utzi nahi al duzu?" - -#: app/scripts/controllers/menu.js:213 -msgid "Do you want to remove the selected block?" -msgstr "Hautatutako blokea ezabatu nahi al duzu?" - -#: app/views/menu.html:249 -msgid "Documentation" -msgstr "Dokumentazioa" - -#: app/views/menu.html:223 -msgid "Drivers" -msgstr "Driverrak" - -#: app/scripts/services/utils.service.js:436 -#: app/scripts/services/utils.service.js:504 -msgid "Drivers disabled" -msgstr "Driverrak desgaitu dira" - -#: app/scripts/services/utils.service.js:433 -#: app/scripts/services/utils.service.js:485 -msgid "Drivers enabled" -msgstr "Driverrak gaitu dira" - -#: app/scripts/services/tools.service.js:230 -msgid "Duplicated FPGA I/O ports" -msgstr "FPGAren E/S portuak bikoiztu dira" - -#: app/scripts/services/blocks.service.js:314 -msgid "Duplicated block attributes" -msgstr "Blokearen ezaugarriak bikoiztu dira" - -#: app/views/menu.html:85 -msgid "Edit" -msgstr "Editatu" - -#: app/views/menu.html:226 -msgid "Enable" -msgstr "Onartu" - -#: app/views/menu.html:120 -msgid "English" -msgstr "Ingelesa" - -#: app/scripts/services/blocks.service.js:126 -msgid "Enter the constant blocks" -msgstr "Konstante-blokeak sar itzazu" - -#: app/scripts/services/blocks.service.js:213 -msgid "Enter the input ports" -msgstr "Sarrerako portuak sar itzazu" - -#: app/scripts/services/blocks.service.js:214 -msgid "Enter the output ports" -msgstr "Irteerako portuak sar itzazu" - -#: app/scripts/services/blocks.service.js:215 -msgid "Enter the parameters" -msgstr "Parametroak sar itzazu" - -#: app/scripts/services/blocks.service.js:57 -msgid "Enter the ports" -msgstr "Portuak sar itzazu" - -#: app/scripts/controllers/menu.js:73 -msgid "Enter the project name" -msgstr "Proiektuari izena eman" - -#: app/scripts/controllers/menu.js:249 -msgid "Enter the remote hostname user@host (experimental)" -msgstr "" -"Urrutiko ostalariaren izena sar ezazu erabiltzailea@host (esperimentala)" - -#: app/scripts/services/tools.service.js:329 -msgid "Error: default toolchain not found in '{{dir}}'" -msgstr "Errorea: Toolchain lehenetsia ez da '{{dir}}'-en aurkitu" - -#: app/scripts/services/utils.service.js:800 -msgid "Error: {{error}}" -msgstr "Errorea: {{error}}" - -#: app/views/menu.html:33 -msgid "Examples" -msgstr "Adibideak" - -#: app/scripts/services/tools.service.js:187 -msgid "Execute remote {{label}} ..." -msgstr "Exekutatu urrutiko {{label}} ..." - -#: app/views/menu.html:61 -msgid "Export" -msgstr "Esportatu" - -#: app/scripts/services/tools.service.js:461 -msgid "Extract default apio files..." -msgstr "Apio fitxategiak atera..." - -#: app/scripts/services/tools.service.js:471 -msgid "Extract default apio packages..." -msgstr "Apio pakete lehenetsiak atera..." - -#: app/scripts/services/tools.service.js:449 -msgid "Extract virtual env files..." -msgstr "Env birtualaren fitxategiak atera..." - -#: app/scripts/services/tools.service.js:224 -#: app/scripts/services/tools.service.js:227 -msgid "FPGA I/O ports not defined" -msgstr "FPGAren E/S portuak definitu gabe daude" - -#: app/views/menu.html:24 -msgid "File" -msgstr "Fitxategia" - -#: app/scripts/services/project.service.js:239 -msgid "" -"File {{file}} already exists in the project path. Do you want to replace it?" -msgstr "" -"Proiektuaren direktorioan {{file}} fitxategia dagoeneko bada. Fitxategia " -"ordeztu nahi al duzu?" - -#: app/scripts/services/tools.service.js:163 -msgid "File {{file}} does not exist" -msgstr "Ez dago {{file}} izeneko fitxategirik" - -#: app/scripts/services/project.service.js:271 -msgid "File {{file}} imported" -msgstr "{{file}} fitxategia inportatu da" - -#: app/views/menu.html:144 -msgid "French" -msgstr "Frantsesa" - -#: app/scripts/controllers/menu.js:176 -msgid "GTKWave exported" -msgstr "GTKWave-a esportatu da" - -#: app/views/menu.html:132 -msgid "Galician" -msgstr "Galegoa" - -#: app/views/menu.html:239 -msgid "Help" -msgstr "Laguntza" - -#: app/scripts/services/utils.service.js:474 -msgid "Homebrew is required" -msgstr "Homebrew-a behar da" - -#: app/scripts/services/utils.service.js:681 -msgid "Image" -msgstr "Irudia" - -#: app/scripts/controllers/menu.js:309 -msgid "Image {{name}} saved" -msgstr "{{name}} izeneko irudia gorde da" - -#: app/views/menu.html:277 -msgid "Info" -msgstr "Info" - -#: app/views/menu.html:273 -msgid "Input" -msgstr "Sarrera" - -#: app/views/menu.html:200 -msgid "Install" -msgstr "Instalatu" - -#: app/scripts/services/tools.service.js:466 -msgid "Install default apio..." -msgstr "Apio lehenetsia instalatu..." - -#: app/scripts/services/tools.service.js:515 -msgid "Installation completed" -msgstr "Instalazioa amaitu da" - -#: app/scripts/services/tools.service.js:358 -#: app/scripts/services/tools.service.js:395 -msgid "Installing toolchain" -msgstr "Toolchain-a instalatzen ari da" - -#: app/scripts/services/tools.service.js:431 -#: app/scripts/services/utils.service.js:478 -msgid "Internet connection required" -msgstr "Interneteko sarbidea behar da" - -#: app/scripts/services/graph.service.js:133 -msgid "Invalid Pull up connection:
                block already connected" -msgstr "" -"Pull up konexio baliogabea:
                blokea dagoeneko konektatua dago" - -#: app/scripts/services/graph.service.js:149 -msgid "Invalid Pull up connection:
                only Input blocks allowed" -msgstr "" -"Pull up konexio baliogabea:
                sarrera blokeak soilik dira " -"onargarriak" - -#: app/scripts/services/graph.service.js:140 -msgid "Invalid block connection:
                Pull up already connected" -msgstr "" -"Bloke konexio baliogabeak:
                Pull up -a dagoeneko konektatua dago" - -#: app/scripts/services/graph.service.js:104 -#: app/scripts/services/graph.service.js:111 -#: app/scripts/services/graph.service.js:97 -msgid "Invalid connection" -msgstr "Konexio baliogabea" - -#: app/scripts/services/graph.service.js:168 -msgid "Invalid connection: {{a}} → {{b}}" -msgstr "Konexio baliogabea: {{a}} → {{b}}" - -#: app/scripts/services/graph.service.js:126 -msgid "Invalid multiple input connections" -msgstr "Sarrerako konexio anitzak baliogabeak" - -#: app/views/menu.html:116 -msgid "Language" -msgstr "Hizkuntza" - -#: app/scripts/services/blocks.service.js:127 -#: app/scripts/services/blocks.service.js:717 -msgid "Local parameter" -msgstr "Parametro lokala" - -#: app/scripts/services/tools.service.js:454 -msgid "Make virtual env..." -msgstr "Env birtuala sortu..." - -#: app/scripts/services/utils.service.js:665 -msgid "Name" -msgstr "Izena" - -#: app/views/menu.html:27 -msgid "New" -msgstr "Berria" - -#: app/scripts/services/project.service.js:44 -msgid "New project {{name}} created" -msgstr "{{name}} proiektua sortu da" - -#: app/scripts/controllers/main.js:15 -msgid "OK" -msgstr "Ok" - -#: app/scripts/services/project.service.js:186 -#: app/scripts/services/project.service.js:60 -msgid "Old project format" -msgstr "Proiektu formatu zaharra" - -#: app/views/menu.html:30 -msgid "Open" -msgstr "Ireki" - -#: app/scripts/services/utils.service.js:688 -msgid "Open SVG" -msgstr "SVGa ireki" - -#: app/scripts/services/project.service.js:274 -msgid "Original file {{file}} does not exist" -msgstr "Jatorrizko {{file}} fitxategia ez dago" - -#: app/views/menu.html:274 -msgid "Output" -msgstr "Irteera" - -#: app/scripts/controllers/menu.js:158 -msgid "PCF file exported" -msgstr "PCF fitxategia esportatu da" - -#: app/views/menu.html:102 -msgid "Preferences" -msgstr "Lehentasunak" - -#: app/views/menu.html:105 -msgid "Project information" -msgstr "Proiektuaren informazioa" - -#: app/scripts/services/project.service.js:64 -msgid "Project {{name}} loaded" -msgstr "{{name}} proiektua kargatu da" - -#: app/scripts/services/project.service.js:158 -msgid "Project {{name}} saved" -msgstr "{{name}} proiektua gorde da" - -#: app/scripts/services/tools.service.js:442 -msgid "Python 2.7 is required" -msgstr "Python 2.7 behar da" - -#: app/views/menu.html:79 -msgid "Quit" -msgstr "Utzi" - -#: app/views/design.html:4 -msgid "Read only" -msgstr "Irakurtzeko soilik" - -#: app/scripts/services/tools.service.js:255 -msgid "Remote host {{name}} not connected" -msgstr "{{name}} urrutiko ostalaria ez dago konektatua" - -#: app/views/menu.html:110 -msgid "Remote hostname" -msgstr "Urrutiko ostalariaren izena" - -#: app/views/menu.html:208 -msgid "Remove" -msgstr "Ezabatu" - -#: app/views/menu.html:95 -msgid "Remove selected" -msgstr "Hautua ezabatu" - -#: app/scripts/services/utils.service.js:690 -msgid "Reset SVG" -msgstr "SVGa berrezarri" - -#: app/views/menu.html:213 -msgid "Reset default" -msgstr "Jatorrizkoa berrezarri" - -#: app/views/menu.html:88 -msgid "Reset view" -msgstr "Bista berrezarri" - -#: app/views/menu.html:54 -msgid "Save" -msgstr "Gorde" - -#: app/scripts/services/utils.service.js:689 -msgid "Save SVG" -msgstr "SVGa gorde" - -#: app/views/menu.html:57 -msgid "Save as" -msgstr "Gorde honela" - -#: app/views/menu.html:252 -msgid "Source code" -msgstr "Iturburu kodea" - -#: app/views/menu.html:126 -msgid "Spanish" -msgstr "Gaztelera" - -#: app/scripts/services/tools.service.js:176 -msgid "Synchronize remote files ..." -msgstr "Urrutiko fitxategiak sinkronizatu..." - -#: app/views/menu.html:70 -msgid "Testbench" -msgstr "Testbench " - -#: app/scripts/controllers/menu.js:167 -msgid "Testbench exported" -msgstr "Testbench-a esportatu da" - -#: app/scripts/controllers/menu.js:367 -msgid "" -"The current FPGA I/O configuration will be lost. Do you want to change to " -"{{name}} board?" -msgstr "" -"FPGAaren E/S konfigurazioa galduko da. {{name}} plaka aldatu nahi duzu?" - -#: app/scripts/controllers/menu.js:105 app/scripts/controllers/menu.js:90 -msgid "" -"The current project will be removed. Do you want to continue loading the " -"project?" -msgstr "Proiektu hau ezabatuko da. Proiektua irekitzen jarraitu nahi al duzu?" - -#: app/scripts/services/tools.service.js:334 -msgid "The toolchain will be removed. Do you want to continue?" -msgstr "Toolchain-a ezabatuko da. Jarraitu nahi al duzu?" - -#: app/scripts/services/tools.service.js:322 -msgid "The toolchain will be restored to default. Do you want to continue?" -msgstr "" -"Toolchain-aren jatorrizko balioak berrezarriko dira. Jarraitu nahi al duzu?" - -#: app/scripts/services/tools.service.js:314 -msgid "" -"The toolchain will be updated. This operation requires Internet connection. " -"Do you want to continue?" -msgstr "" -"Toolchain-a eguneratuko da. Operazio horrek Interneteko sarbidea behar du. " -"Jarraitu nahi al duzu?" - -#: app/scripts/services/project.service.js:208 -msgid "" -"This import operation requires a project path. You need to save the current " -"project. Do you want to continue?" -msgstr "" -"Inportazio operazioak proiektu-bidea behar du. Uneko proiektua gorde " -"beharko duzu. Jarraitu nahi al duzu?" - -#: app/views/menu.html:196 -msgid "Toolchain" -msgstr "Toolchain" - -#: app/scripts/services/tools.service.js:516 -msgid "Toolchain installed" -msgstr "Toolchain-a instalatu da" - -#: app/scripts/services/tools.service.js:520 -msgid "Toolchain not installed" -msgstr "Toolchain-a ez da instalatu" - -#: app/scripts/services/tools.service.js:91 -#: app/scripts/services/utils.service.js:516 -#: app/scripts/services/utils.service.js:532 -msgid "Toolchain not installed. Please, install the toolchain" -msgstr "Toolchain-a ez da instalatu. Mesedez, toolchaina instala ezazu" - -#: app/scripts/services/tools.service.js:338 -msgid "Toolchain removed" -msgstr "Toolchain-a ezabatu da" - -#: app/views/menu.html:183 -msgid "Tools" -msgstr "Tresnak" - -#: app/scripts/services/tools.service.js:221 -msgid "Unknown board" -msgstr "Plaka ezezaguna" - -#: app/views/menu.html:203 -msgid "Update" -msgstr "eguneratu" - -#: app/scripts/services/blocks.service.js:716 -msgid "Update the block label" -msgstr "Blokearen etiketa eguneratu" - -#: app/scripts/services/blocks.service.js:649 -msgid "Update the port" -msgstr "Portua eguneratu" - -#: app/views/menu.html:192 -msgid "Upload" -msgstr "Kargatu" - -#: app/views/menu.html:186 -msgid "Verify" -msgstr "Egiaztatu" - -#: app/scripts/controllers/menu.js:149 -msgid "Verilog code exported" -msgstr "Verilog kodea esportatu da" - -#: app/scripts/services/utils.service.js:666 app/views/menu.html:245 -msgid "Version" -msgstr "Bertsioa" - -#: app/views/menu.html:156 -msgid "View" -msgstr "Ikusi" - -#: app/views/menu.html:242 -msgid "View license" -msgstr "Lizentzia ikusi" - -#: app/scripts/services/blocks.service.js:58 -#: app/scripts/services/blocks.service.js:650 -msgid "Virtual port" -msgstr "Portu birtuala" - -#: app/scripts/services/blocks.service.js:348 -msgid "Wrong block format: {{type}}" -msgstr "Blokearen formatua okerra da: {{type}}" - -#: app/scripts/services/blocks.service.js:146 -#: app/scripts/services/blocks.service.js:263 -msgid "Wrong parameter name {{name}}" -msgstr "Parametroaren formatua okerra da: {{name}}" - -#: app/scripts/services/blocks.service.js:233 -#: app/scripts/services/blocks.service.js:248 -#: app/scripts/services/blocks.service.js:708 -#: app/scripts/services/blocks.service.js:77 -msgid "Wrong port name {{name}}" -msgstr "Portuaren izena okerra da: {{name}}" - -#: app/scripts/services/project.service.js:72 -msgid "Wrong project format: {{name}}" -msgstr "Proiektuaren formatua okerra da: {{name}}" - -#: app/scripts/services/tools.service.js:252 -msgid "Wrong remote hostname {{name}}" -msgstr "Urrutiko ostalariaren {{name}} izena okerra da" - -#. And -#: app/resources/blocks/labels.js:34 -msgid "and" -msgstr "And" - -#: app/views/design.html:5 -msgid "back" -msgstr "atzera" - -#. Bit -#: app/resources/blocks/labels.js:4 -msgid "bit" -msgstr "Bit" - -#. Combinational -#: app/resources/blocks/labels.js:16 -msgid "combinational" -msgstr "konbinazionala" - -#. Config -#: app/resources/blocks/labels.js:6 -msgid "config" -msgstr "config" - -#. contadorAsc -#: app/resources/examples/labels.js:12 -msgid "contadorAsc" -msgstr "Goranzko zenbatzailea" - -#. contadorDes -#: app/resources/examples/labels.js:14 -msgid "contadorDes" -msgstr "Beheranzko zenbatzailea" - -#. Debouncer -#: app/resources/blocks/labels.js:58 -msgid "debouncer" -msgstr "Erreboteen aurkakoa" - -#. Demux 1:2 -#: app/resources/blocks/labels.js:18 -msgid "demux_1_2" -msgstr "Demux 1:2" - -#. Demux 1:4 -#: app/resources/blocks/labels.js:20 -msgid "demux_1_4" -msgstr "Demux 1:4" - -#. Demux 1:8 -#: app/resources/blocks/labels.js:22 -msgid "demux_1_8" -msgstr "Demux 1:8" - -#. D flip-flop async -#: app/resources/blocks/labels.js:50 -msgid "dff_ar" -msgstr "D biegonkor asink" - -#. D flip-flop async -#: app/resources/blocks/labels.js:52 -msgid "dff_sr" -msgstr "D biegonkorra" - -#. Build done -#: app/scripts/services/tools.service.js:267 -msgid "done_build" -msgstr "Sintetizatua egin da" - -#. Upload done -#: app/scripts/services/tools.service.js:269 -msgid "done_upload" -msgstr "Karga egin da" - -#. Verification done -#: app/scripts/services/tools.service.js:265 -msgid "done_verify" -msgstr "Egiaztapena egin da" - -#. Gate -#: app/resources/blocks/labels.js:32 -msgid "gate" -msgstr "Atea" - -#. Hex 7 Segment CA -#: app/resources/blocks/labels.js:26 -msgid "hex_7seg_ca" -msgstr "Hex 7 Segment CA" - -#. Hex 7 Segment CC -#: app/resources/blocks/labels.js:24 -msgid "hex_7seg_cc" -msgstr "Hex 7 Segment CC" - -#. Logic -#: app/resources/blocks/labels.js:14 -msgid "logic" -msgstr "Logika" - -#. Mux 2:1 -#: app/resources/blocks/labels.js:28 -msgid "mux_2_1" -msgstr "Mux 2:1" - -#. Mux 4:1 -#: app/resources/blocks/labels.js:30 -msgid "mux_4_1" -msgstr "Mux 4:1" - -#. Nand -#: app/resources/blocks/labels.js:36 -msgid "nand" -msgstr "Nand" - -#. Nor -#: app/resources/blocks/labels.js:38 -msgid "nor" -msgstr "Nor" - -#. Not -#: app/resources/blocks/labels.js:40 -msgid "not" -msgstr "Not" - -#. Or -#: app/resources/blocks/labels.js:42 -msgid "or" -msgstr "Or" - -#. Pull up -#: app/resources/blocks/labels.js:8 -msgid "pull_up" -msgstr "Pull up" - -#. Pull up inv -#: app/resources/blocks/labels.js:10 -msgid "pull_up_inv" -msgstr "Pull up inv" - -#. Sequential -#: app/resources/blocks/labels.js:48 -msgid "sequential" -msgstr "Sekuentziala" - -#. Start building ... -#: app/scripts/services/tools.service.js:57 -msgid "start_build" -msgstr "Sintetizatua hasi ..." - -#. Start uploading ... -#: app/scripts/services/tools.service.js:59 -msgid "start_upload" -msgstr "Karga hasi ..." - -#. Start verification ... -#: app/scripts/services/tools.service.js:55 -msgid "start_verify" -msgstr "Egiaztapena hasi ..." - -#. T flip-flop async -#: app/resources/blocks/labels.js:54 -msgid "tff_ar" -msgstr "T biegonkor asink" - -#. T flip-flop -#: app/resources/blocks/labels.js:56 -msgid "tff_sr" -msgstr "T biegonkorra" - -#. Tri-state -#: app/resources/blocks/labels.js:12 -msgid "tri_state" -msgstr "Tri-state" - -#: app/scripts/app.js:42 app/scripts/controllers/menu.js:74 -msgid "untitled" -msgstr "Izenik gabe" - -#. Xnor -#: app/resources/blocks/labels.js:44 -msgid "xnor" -msgstr "Xnor" - -#. Xor -#: app/resources/blocks/labels.js:46 -msgid "xor" -msgstr "Xor" - -#: app/scripts/controllers/menu.js:357 -msgid "{{board}} datasheet not defined" -msgstr "{{board}} ez zehaztua" - -#: app/scripts/controllers/menu.js:347 -msgid "{{board}} pinout not defined" -msgstr "{{board}} pinout ez zehaztua" - -#~ msgid "Block exported as {{name}}" -#~ msgstr "Blokea {{name}} bezala esportatua" - -#~ msgid "Enter the project's image path" -#~ msgstr "Proiektuaren irudi bidea sartu" - -#~ msgid "Import block" -#~ msgstr "Blokea inportatu" - -#~ msgid "New project" -#~ msgstr "Proiektu berria" - -#~ msgid "Open project" -#~ msgstr "Ireki proiektua" - -#~ msgid "Templates" -#~ msgstr "Ereduak" - -#~ msgid "comb" -#~ msgstr "Comb" - -#~ msgid "sec" -#~ msgstr "Sec" From 275e1f2f180596243508804b61841a502b910341 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jes=C3=BAs=20Arroyo=20Torrens?= Date: Tue, 3 Jan 2017 18:42:48 +0100 Subject: [PATCH 095/169] Update version beta2-dev. Happy new year! --- app/package.json | 2 +- app/scripts/controllers/menu.js | 2 +- package.json | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/package.json b/app/package.json index 004a67c23..ea17586fe 100644 --- a/app/package.json +++ b/app/package.json @@ -1,6 +1,6 @@ { "name": "icestudio", - "version": "0.3.0-beta", + "version": "0.3.0-beta2-dev", "description": "Experimental graphic editor for open FPGAs", "author": "Jesús Arroyo Torrens ", "repository": "https://github.com/FPGAwars/icestudio", diff --git a/app/scripts/controllers/menu.js b/app/scripts/controllers/menu.js index 5b8e59c6c..759f829aa 100644 --- a/app/scripts/controllers/menu.js +++ b/app/scripts/controllers/menu.js @@ -437,7 +437,7 @@ angular.module('icestudio') '

                Version: ' + $scope.version + '

                ', '

                License: GPL v2

                ', '

                Created by Jesús Arroyo Torrens

                ', - '

                © FPGAwars 2016

                ', + '

                © FPGAwars 2016-2017

                ', '
                ', '
                '].join('\n'); alertify.alert(content); diff --git a/package.json b/package.json index 9b88ce786..64fc9d6c3 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "icestudio", - "version": "0.3.0-beta", + "version": "0.3.0-beta2-dev", "description": "Experimental graphic editor for open FPGAs", "author": "Jesús Arroyo Torrens ", "repository": "https://github.com/FPGAwars/icestudio", From 93426e1d630871230b367360151140609204a847 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jes=C3=BAs=20Arroyo=20Torrens?= Date: Tue, 3 Jan 2017 18:43:30 +0100 Subject: [PATCH 096/169] Reduce wire port size --- .../plugins/connectors/joint.connectors.js | 2 +- app/scripts/plugins/shapes/joint.shapes.js | 35 ++++++++++--------- app/scripts/services/project.service.js | 2 +- 3 files changed, 20 insertions(+), 19 deletions(-) diff --git a/app/scripts/plugins/connectors/joint.connectors.js b/app/scripts/plugins/connectors/joint.connectors.js index c6b50c0d4..1a7983e0c 100644 --- a/app/scripts/plugins/connectors/joint.connectors.js +++ b/app/scripts/plugins/connectors/joint.connectors.js @@ -9,7 +9,7 @@ joint.connectors.ice = function(sourcePoint, targetPoint, vertices) { }); points.push({ x: targetPoint.x, y: targetPoint.y }); - var step = 16; + var step = 9; var n = points.length; var sq = { x: points[0].x - points[1].x, y: points[0].y - points[1].y }; diff --git a/app/scripts/plugins/shapes/joint.shapes.js b/app/scripts/plugins/shapes/joint.shapes.js index bc3ccf03e..7d84f4f5d 100644 --- a/app/scripts/plugins/shapes/joint.shapes.js +++ b/app/scripts/plugins/shapes/joint.shapes.js @@ -42,7 +42,7 @@ joint.shapes.ice.Model = joint.shapes.basic.Generic.extend({ 'fill-opacity': 0 }, '.port-body': { - r: 16, + r: 8, opacity: 0 }, '.leftPorts .port-body': { @@ -136,44 +136,45 @@ joint.shapes.ice.Model = joint.shapes.basic.Generic.extend({ attrs[portWireSelector]['pointer-events'] = 'none'; } + var offset = (port.size && port.size > 1) ? 6 : 0; var pos = Math.round((index + 0.5) / total * port.gridUnits) / port.gridUnits; switch (type) { case 'left': - attrs[portSelector]['ref-x'] = -16; + attrs[portSelector]['ref-x'] = -8; attrs[portSelector]['ref-y'] = pos; - attrs[portLabelSelector]['dx'] = 10; - attrs[portLabelSelector]['y'] = -10; + attrs[portLabelSelector]['dx'] = 4; + attrs[portLabelSelector]['y'] = -5-offset; attrs[portLabelSelector]['text-anchor'] = 'end'; attrs[portWireSelector]['y'] = pos; - attrs[portWireSelector]['d'] = 'M 0 0 L 32 0'; + attrs[portWireSelector]['d'] = 'M 0 0 L 16 0'; break; case 'right': - attrs[portSelector]['ref-dx'] = 16; + attrs[portSelector]['ref-dx'] = 8; attrs[portSelector]['ref-y'] = pos; - attrs[portLabelSelector]['dx'] = -10; - attrs[portLabelSelector]['y'] = -10; + attrs[portLabelSelector]['dx'] = -4; + attrs[portLabelSelector]['y'] = -5-offset; attrs[portLabelSelector]['text-anchor'] = 'start'; attrs[portWireSelector]['y'] = pos; - attrs[portWireSelector]['d'] = 'M 0 0 L -32 0'; + attrs[portWireSelector]['d'] = 'M 0 0 L -16 0'; break; case 'top': - attrs[portSelector]['ref-y'] = -16; + attrs[portSelector]['ref-y'] = -8; attrs[portSelector]['ref-x'] = pos; - attrs[portLabelSelector]['dx'] = 10; - attrs[portLabelSelector]['dy'] = 0; + attrs[portLabelSelector]['dx'] = 5+offset; + attrs[portLabelSelector]['y'] = 4; attrs[portLabelSelector]['text-anchor'] = 'start'; attrs[portWireSelector]['x'] = pos; - attrs[portWireSelector]['d'] = 'M 0 0 L 0 32'; + attrs[portWireSelector]['d'] = 'M 0 0 L 0 16'; break; case 'bottom': - attrs[portSelector]['ref-dy'] = 16; + attrs[portSelector]['ref-dy'] = 8; attrs[portSelector]['ref-x'] = pos; - attrs[portLabelSelector]['dx'] = 10; - attrs[portLabelSelector]['y'] = 0; + attrs[portLabelSelector]['dx'] = 5+offset; + attrs[portLabelSelector]['y'] = -4; attrs[portLabelSelector]['text-anchor'] = 'start'; attrs[portWireSelector]['x'] = pos; - attrs[portWireSelector]['d'] = 'M 0 0 L 0 -32'; + attrs[portWireSelector]['d'] = 'M 0 0 L 0 -16'; break; } diff --git a/app/scripts/services/project.service.js b/app/scripts/services/project.service.js index 5c83a5693..2a6e07707 100644 --- a/app/scripts/services/project.service.js +++ b/app/scripts/services/project.service.js @@ -295,7 +295,7 @@ angular.module('icestudio') if (block.design.graph.blocks[i].type === 'basic.input' || block.design.graph.blocks[i].type === 'basic.output') { pins = block.design.graph.blocks[i].data.pins; - block.design.graph.blocks[i].data.size = (pins.length > 1) ? pins.length : undefined; + block.design.graph.blocks[i].data.size = (pins && pins.length > 1) ? pins.length : undefined; delete block.design.graph.blocks[i].data.pins; delete block.design.graph.blocks[i].data.virtual; } From 37f7da5943a2848d77782e2f80d4e6b5a4c82f87 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jes=C3=BAs=20Arroyo=20Torrens?= Date: Tue, 3 Jan 2017 23:02:23 +0100 Subject: [PATCH 097/169] Add graph Edit > Undo/Redo actions --- app/index.html | 1 + app/scripts/controllers/menu.js | 12 +- app/scripts/plugins/dia/joint.dia.command.js | 315 +++++++++++++++++++ app/scripts/plugins/ui/joint.ui.js | 2 +- app/scripts/services/graph.service.js | 17 + app/views/menu.html | 9 +- 6 files changed, 352 insertions(+), 4 deletions(-) create mode 100755 app/scripts/plugins/dia/joint.dia.command.js diff --git a/app/index.html b/app/index.html index 3c8ecbce2..83711df7a 100644 --- a/app/index.html +++ b/app/index.html @@ -56,6 +56,7 @@ + diff --git a/app/scripts/controllers/menu.js b/app/scripts/controllers/menu.js index 5b8e59c6c..f77e7ce15 100644 --- a/app/scripts/controllers/menu.js +++ b/app/scripts/controllers/menu.js @@ -199,8 +199,12 @@ angular.module('icestudio') //-- Edit - $scope.resetView = function() { - graph.resetState(); + $scope.undoGraph = function() { + graph.undo(); + }; + + $scope.redoGraph = function() { + graph.redo(); }; $scope.cloneSelected = function() { @@ -226,6 +230,10 @@ angular.module('icestudio') }, function() {}); }; + $scope.resetView = function() { + graph.resetState(); + }; + $scope.setProjectInformation = function() { var p = project.project.package; var values = [ diff --git a/app/scripts/plugins/dia/joint.dia.command.js b/app/scripts/plugins/dia/joint.dia.command.js new file mode 100755 index 000000000..f6cb120ba --- /dev/null +++ b/app/scripts/plugins/dia/joint.dia.command.js @@ -0,0 +1,315 @@ +/*! JointJS+ - Set of JointJS compatible plugins + +Copyright (c) 2013 client IO + +Adapted to Icestudio Project. 2016-2017 + +This Source Code Form is subject to the terms of the JointJS+ License +, v. 1.0. If a copy of the JointJS+ License was not distributed with this +file, You can obtain one at http://jointjs.com/license/jointjs_plus_v1.txt + or from the JointJS+ archive as was distributed by client IO. See the LICENSE file.*/ + +'use strict'; + +joint.dia.CommandManager = Backbone.Model.extend({ + + defaults: { + cmdBeforeAdd: null, + cmdNameRegex: /^(?:add|remove|change:\w+)$/ + }, + + // length of prefix 'change:' in the event name + PREFIX_LENGTH: 7, + + initialize: function(options) { + + _.bindAll(this, 'initBatchCommand', 'storeBatchCommand'); + + this.graph = options.graph; + + this.reset(); + this.listen(); + }, + + listen: function() { + + this.listenTo(this.graph, 'all', this.addCommand, this); + + this.listenTo(this.graph, 'batch:start', this.initBatchCommand, this); + this.listenTo(this.graph, 'batch:stop', this.storeBatchCommand, this); + }, + + createCommand: function(options) { + + var cmd = { + action: undefined, + data: { id: undefined, type: undefined, previous: {}, next: {}}, + batch: options && options.batch + }; + + return cmd; + }, + + addCommand: function(cmdName, cell, graph, options) { + + if (!this.get('cmdNameRegex').test(cmdName)) { + return; + } + + if (typeof this.get('cmdBeforeAdd') === 'function' && !this.get('cmdBeforeAdd').apply(this, arguments)) { + return; + } + + var push = _.bind(function(cmd) { + + this.redoStack = []; + + if (!cmd.batch) { + this.undoStack.push(cmd); + this.trigger('add', cmd); + } else { + this.lastCmdIndex = Math.max(this.lastCmdIndex, 0); + // Commands possible thrown away. Someone might be interested. + this.trigger('batch', cmd); + } + + }, this); + + var command; + + if (this.batchCommand) { + // set command as the one used last. + // in most cases we are working with same object, doing same action + // etc. translate an object piece by piece + command = this.batchCommand[Math.max(this.lastCmdIndex,0)]; + + // Check if we are start working with new object or performing different action with it. + // Note, that command is uninitialized when lastCmdIndex equals -1. (see 'initBatchCommand()') + // in that case we are done, command we were looking for is already set + if (this.lastCmdIndex >= 0 && (command.data.id !== cell.id || command.action !== cmdName)) { + + // trying to find command first, which was performing same action with the object + // as we are doing now with cell + command = _.find(this.batchCommand, function(cmd, index) { + this.lastCmdIndex = index; + return cmd.data.id === cell.id && cmd.action === cmdName; + }, this); + + if (!command) { + // command with such an id and action was not found. Let's create new one + this.lastCmdIndex = this.batchCommand.push(this.createCommand({ batch: true })) - 1; + command = _.last(this.batchCommand); + } + } + + } else { + + // single command + command = this.createCommand(); + command.batch = false; + } + + if (cmdName === 'add' || cmdName === 'remove') { + + command.action = cmdName; + command.data.id = cell.id; + command.data.type = cell.attributes.type; + command.data.attributes = _.merge({}, cell.toJSON()); + command.options = options || {}; + + return push(command); + } + + // `changedAttribute` holds the attribute name corresponding + // to the change event triggered on the model. + var changedAttribute = cmdName.substr(this.PREFIX_LENGTH); + + if (!command.batch || !command.action) { + // Do this only once. Set previous box and action (also serves as a flag so that + // we don't repeat this branche). + command.action = cmdName; + command.data.id = cell.id; + command.data.type = cell.attributes.type; + command.data.previous[changedAttribute] = _.clone(cell.previous(changedAttribute)); + command.options = options || {}; + } + + command.data.next[changedAttribute] = _.clone(cell.get(changedAttribute)); + + return push(command); + }, + + // Batch commands are those that merge certain commands applied in a row (1) and those that + // hold multiple commands where one action consists of more than one command (2) + // (1) This is useful for e.g. when the user is dragging an object in the paper which would + // normally lead to 1px translation commands. Applying undo() on such commands separately is + // most likely undesirable. + // (2) e.g When you are removing an element, you don't want all links connected to that element, which + // are also being removed to be part of different command + + initBatchCommand: function() { + + if (!this.batchCommand) { + + this.batchCommand = [this.createCommand({ batch: true})]; + this.lastCmdIndex = -1; + + // batch level counts how many times has been initBatchCommand executed. + // It is useful when we doing an operation recursively. + this.batchLevel = 0; + + } else { + + // batch command is already active + this.batchLevel++; + } + }, + + storeBatchCommand: function() { + + // In order to store batch command it is necesary to run storeBatchCommand as many times as + // initBatchCommand was executed + if (this.batchCommand && this.batchLevel <= 0) { + + // checking if there is any valid command in batch + // for example: calling `initBatchCommand` immediately followed by `storeBatchCommand` + if (this.lastCmdIndex >= 0) { + + this.redoStack = []; + + this.undoStack.push(this.batchCommand); + this.trigger('add', this.batchCommand); + } + + delete this.batchCommand; + delete this.lastCmdIndex; + delete this.batchLevel; + + } else if (this.batchCommand && this.batchLevel > 0) { + + // low down batch command level, but not store it yet + this.batchLevel--; + } + }, + + revertCommand: function(command) { + + this.stopListening(); + + var batchCommand; + + if (_.isArray(command)) { + batchCommand = command; + } else { + batchCommand = [command]; + } + + for (var i = batchCommand.length - 1; i >= 0; i--) { + + var cmd = batchCommand[i], cell = this.graph.getCell(cmd.data.id); + + switch (cmd.action) { + + case 'add': + cell.remove(); + break; + + case 'remove': + this.graph.addCell(cmd.data.attributes); + break; + + default: + var attribute = cmd.action.substr(this.PREFIX_LENGTH); + cell.set(attribute, cmd.data.previous[attribute]); + break; + } + } + + this.listen(); + }, + + applyCommand: function(command) { + + this.stopListening(); + + var batchCommand; + + if (_.isArray(command)) { + batchCommand = command; + } else { + batchCommand = [command]; + } + + for (var i = 0; i < batchCommand.length; i++) { + + var cmd = batchCommand[i], cell = this.graph.getCell(cmd.data.id); + + switch (cmd.action) { + + case 'add': + this.graph.addCell(cmd.data.attributes); + break; + + case 'remove': + cell.remove(); + break; + + default: + var attribute = cmd.action.substr(this.PREFIX_LENGTH); + cell.set(attribute, cmd.data.next[attribute]); + break; + } + } + + this.listen(); + }, + + undo: function() { + + var command = this.undoStack.pop(); + + if (command) { + + this.revertCommand(command); + this.redoStack.push(command); + } + }, + + + redo: function() { + + var command = this.redoStack.pop(); + + if (command) { + + this.applyCommand(command); + this.undoStack.push(command); + } + }, + + cancel: function() { + + if (this.hasUndo()) { + + this.revertCommand(this.undoStack.pop()); + this.redoStack = []; + } + }, + + reset: function() { + + this.undoStack = []; + this.redoStack = []; + }, + + hasUndo: function() { + + return this.undoStack.length > 0; + }, + + hasRedo: function() { + + return this.redoStack.length > 0; + } + +}); diff --git a/app/scripts/plugins/ui/joint.ui.js b/app/scripts/plugins/ui/joint.ui.js index 9bebf6a99..61b709312 100644 --- a/app/scripts/plugins/ui/joint.ui.js +++ b/app/scripts/plugins/ui/joint.ui.js @@ -2,7 +2,7 @@ Copyright (c) 2013 client IO -Adapted to Icestudio Project. 2016 +Adapted to Icestudio Project. 2016-2017 This Source Code Form is subject to the terms of the JointJS+ License , v. 1.0. If a copy of the JointJS+ License was not distributed with this diff --git a/app/scripts/services/graph.service.js b/app/scripts/services/graph.service.js index 28a598273..e2e51ac10 100644 --- a/app/scripts/services/graph.service.js +++ b/app/scripts/services/graph.service.js @@ -17,6 +17,7 @@ angular.module('icestudio') var paper = null; var selection = null; var selectionView = null; + var commandManager = null; var dependencies = {}; this.breadcrumbs = [{ name: '' }]; @@ -226,6 +227,14 @@ angular.module('icestudio') } }); + // Command Manager + + commandManager = new joint.dia.CommandManager({ + graph: graph + }); + + // Selection View + selection = new Backbone.Collection(); selectionView = new joint.ui.SelectionView({ paper: paper, @@ -367,6 +376,14 @@ angular.module('icestudio') }); }; + this.undo = function() { + commandManager.undo(); + }; + + this.redo = function() { + commandManager.redo(); + }; + this.clearAll = function() { graph.clear(); this.appEnable(true); diff --git a/app/views/menu.html b/app/views/menu.html index 83dccb4a4..fc8b0270a 100644 --- a/app/views/menu.html +++ b/app/views/menu.html @@ -85,7 +85,10 @@ {{ 'Edit' | translate }}
                \ ' @@ -717,26 +706,59 @@ joint.shapes.ice.InfoView = joint.dia.ElementView.extend({ this.model.on('remove', this.removeBox, this); this.updateBox(); + this.updating = false; + + var selector = this.$box.find('#' + editorLabel); // Prevent paper from handling pointerdown. - this.$box.find('#' + editorLabel).on('mousedown click', function(evt) { evt.stopPropagation(); }); + selector.on('mousedown click', function(evt) { evt.stopPropagation(); }); + + var self = this; + this.editor = ace.edit(selector[0]); + this.editor.$blockScrolling = Infinity; + this.editor.commands.removeCommand('undo'); + this.editor.commands.removeCommand('redo'); + this.editor.getSession().on('change', function () { + if (!self.updating) { + console.log('change INFO'); + var value = self.editor.getSession().getValue(); + self.model.set('data', { + info: value, + cursor: self.editor.getCursorPosition() + }); + } + }); + this.editor.on('focus', function() { + $(document).trigger('disableSelected'); + }); + $('#' + blockLabel).resize(function () { + self.editor.resize(); + }); - this.$box.find('#' + editorLabel).append(this.model.get('data').info); - this.$box.find('#' + contentLabel).append(this.model.get('data').info); + this.renderValue(); }, render: function () { joint.dia.ElementView.prototype.render.apply(this, arguments); - this.paper.$el.append(this.$box); - this.updateBox(); - return this; + this.paper.$el.append(this.$box); + this.updateBox(); + return this; + }, + + renderValue: function() { + this.updating = true; + var data = this.model.get('data'); + this.editor.moveCursorTo(0, 0); + this.editor.getSession().setValue(data.info); + if (data.cursor) { + this.editor.moveCursorTo(data.cursor.row, data.cursor.column + 1); + } + this.updating = false; }, update: function () { - var id = sha1(this.model.get('id')).toString().substring(0, 6); - var editorLabel = 'editor' + id; - var editor = ace.edit(this.$box.find('#' + editorLabel)[0]); - editor.setReadOnly(this.model.get('disabled')); + this.renderValue(); + this.editor.setReadOnly(this.model.get('disabled')); joint.dia.ElementView.prototype.update.apply(this, arguments); }, diff --git a/app/scripts/services/blocks.service.js b/app/scripts/services/blocks.service.js index 12360623e..a4f73aa12 100644 --- a/app/scripts/services/blocks.service.js +++ b/app/scripts/services/blocks.service.js @@ -319,7 +319,7 @@ angular.module('icestudio') function newBasicInfo(addCellCallback) { var blockInstance = { id: null, - data: { info: '' }, + data: { info: '', cursor: { row: 0, column: 0 } }, type: 'basic.info', position: { x: 4 * gridsize, y: 30 * gridsize } }; @@ -698,7 +698,6 @@ angular.module('icestudio') newSize = virtual ? 1 : size; // Update block position when size changes offset = 16 * (oldSize - newSize); - console.log('offset',offset); // Edit block graph.startBatch('change'); var data = utils.clone(cellView.model.get('data')); From ada14987d193a515806bcb05494c4a3f9dbc60a7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jes=C3=BAs=20Arroyo=20Torrens?= Date: Tue, 10 Jan 2017 16:32:35 +0100 Subject: [PATCH 117/169] Fix I/O blocks change for Undo/Redo: bus <-> virtual --- app/scripts/plugins/dia/joint.dia.command.js | 16 +++++++++++++--- app/scripts/plugins/shapes/joint.shapes.js | 1 - app/scripts/services/blocks.service.js | 10 +++------- 3 files changed, 16 insertions(+), 11 deletions(-) diff --git a/app/scripts/plugins/dia/joint.dia.command.js b/app/scripts/plugins/dia/joint.dia.command.js index 5929ba720..ee122d005 100755 --- a/app/scripts/plugins/dia/joint.dia.command.js +++ b/app/scripts/plugins/dia/joint.dia.command.js @@ -47,7 +47,7 @@ joint.dia.CommandManager = Backbone.Model.extend({ addCommand: function(cmdName, cell, graph, options) { - console.log('all', cmdName); + console.log('all', cmdName, options); if (cmdName === 'change:labels') { return; @@ -224,9 +224,14 @@ joint.dia.CommandManager = Backbone.Model.extend({ break; default: + var options = null; var attribute = cmd.action.substr(this.PREFIX_LENGTH); console.log('revert', cmd.action, cmd); - cell.set(attribute, cmd.data.previous[attribute]); + if (attribute === 'data' && cmd.options.translateBy) { + cmd.options.ty *= -1; + options = cmd.options; + } + cell.set(attribute, cmd.data.previous[attribute], options); break; } @@ -268,9 +273,14 @@ joint.dia.CommandManager = Backbone.Model.extend({ break; default: + var options = null; var attribute = cmd.action.substr(this.PREFIX_LENGTH); console.log('apply', cmd.action, cmd); - cell.set(attribute, cmd.data.next[attribute]); + if (attribute === 'data' && cmd.options.translateBy) { + cmd.options.ty *= -1; + options = cmd.options; + } + cell.set(attribute, cmd.data.next[attribute], options); break; } diff --git a/app/scripts/plugins/shapes/joint.shapes.js b/app/scripts/plugins/shapes/joint.shapes.js index 3639d0538..4f45edb43 100644 --- a/app/scripts/plugins/shapes/joint.shapes.js +++ b/app/scripts/plugins/shapes/joint.shapes.js @@ -720,7 +720,6 @@ joint.shapes.ice.InfoView = joint.dia.ElementView.extend({ this.editor.commands.removeCommand('redo'); this.editor.getSession().on('change', function () { if (!self.updating) { - console.log('change INFO'); var value = self.editor.getSession().getValue(); self.model.set('data', { info: value, diff --git a/app/scripts/services/blocks.service.js b/app/scripts/services/blocks.service.js index a4f73aa12..08016ade7 100644 --- a/app/scripts/services/blocks.service.js +++ b/app/scripts/services/blocks.service.js @@ -700,15 +700,11 @@ angular.module('icestudio') offset = 16 * (oldSize - newSize); // Edit block graph.startBatch('change'); - var data = utils.clone(cellView.model.get('data')); + var data = utils.clone(block.data); data.name = portInfo.name; data.virtual = virtual; - cellView.model.set('data', data); - //block.position.y += offset; - cellView.model.set('position', { - x: block.position.x, - y: block.position.y + offset - }); + cellView.model.set('data', data, { translateBy: cellView.model.id, tx: 0, ty: -offset }); + cellView.model.translate(0, offset); graph.stopBatch('change'); cellView.render(); alertify.success(gettextCatalog.getString('Block updated')); From dda6c3150d623cc5a21439a25c22f0d26c79d37d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jes=C3=BAs=20Arroyo=20Torrens?= Date: Wed, 11 Jan 2017 14:31:17 +0100 Subject: [PATCH 118/169] Misc improvements --- app/scripts/controllers/menu.js | 2 +- app/scripts/plugins/shapes/joint.shapes.js | 7 +- app/scripts/services/blocks.service.js | 1 + app/scripts/services/graph.service.js | 85 ++++++++++++---------- app/scripts/services/tools.service.js | 7 ++ 5 files changed, 60 insertions(+), 42 deletions(-) diff --git a/app/scripts/controllers/menu.js b/app/scripts/controllers/menu.js index 2eb667af9..87398a8eb 100644 --- a/app/scripts/controllers/menu.js +++ b/app/scripts/controllers/menu.js @@ -247,7 +247,7 @@ angular.module('icestudio') } $scope.resetView = function() { - graph.resetState(); + graph.resetView(); }; $scope.fitContent = function () { diff --git a/app/scripts/plugins/shapes/joint.shapes.js b/app/scripts/plugins/shapes/joint.shapes.js index 4f45edb43..09f7f4974 100644 --- a/app/scripts/plugins/shapes/joint.shapes.js +++ b/app/scripts/plugins/shapes/joint.shapes.js @@ -383,9 +383,11 @@ joint.shapes.ice.IOView = joint.shapes.ice.ModelView.extend({ var name = target.find('option:selected').text(); var value = target.val(); var data = JSON.parse(JSON.stringify(this.model.get('data'))); + //if (name !== null && value !== null) { data.pins[i].name = name; data.pins[i].value = value; this.model.set('data', data); + //} //comboSelector.find('.select2-selection').css('font-size', this.computeFontSize(name)); }, this)); @@ -437,7 +439,10 @@ joint.shapes.ice.IOView = joint.shapes.ice.ModelView.extend({ var index = data.pins[i].index; var comboId = '#combo' + this.id + index; var comboSelector = this.$box.find(comboId); - comboSelector.val(data.pins[i].value).change(); + var value = data.pins[i].value; + if (value !== '0') { + comboSelector.val(value).change(); + } //var fontSize = this.computeFontSize(this.pins[i].name); //$('#select2-' + comboId + '-container').css('font-size', fontSize); } diff --git a/app/scripts/services/blocks.service.js b/app/scripts/services/blocks.service.js index 08016ade7..d719c2493 100644 --- a/app/scripts/services/blocks.service.js +++ b/app/scripts/services/blocks.service.js @@ -377,6 +377,7 @@ angular.module('icestudio') size: data.pins ? data.pins.length : (data.size || 1), gridUnits: 8 }]; + var cell = new joint.shapes.ice.Input({ id: instance.id, blockType: instance.type, diff --git a/app/scripts/services/graph.service.js b/app/scripts/services/graph.service.js index 2a383756a..d226fa59e 100644 --- a/app/scripts/services/graph.service.js +++ b/app/scripts/services/graph.service.js @@ -63,53 +63,58 @@ angular.module('icestudio') this.panAndZoom.pan(_state.pan); }; - this.resetState = function() { + this.resetView = function() { this.setState(null); }; this.fitContent = function() { - // Target box - var margin = 40; - var menuFooterHeight = 93; - var tbox = { - x: margin, - y: margin, - width: window.get().width - 2 * margin, - height: window.get().height - menuFooterHeight - 2 * margin - }; - // Source box - var sbox = V(paper.viewport).bbox(true, paper.svg); - sbox = { - x: sbox.x * state.zoom, - y: sbox.y * state.zoom, - width: sbox.width * state.zoom, - height: sbox.height * state.zoom - }; - var scale = 1; - if (tbox.width/sbox.width > tbox.height/sbox.height) { - scale = tbox.height / sbox.height; + if (!this.isEmpty()) { + // Target box + var margin = 40; + var menuFooterHeight = 93; + var tbox = { + x: margin, + y: margin, + width: window.get().width - 2 * margin, + height: window.get().height - menuFooterHeight - 2 * margin + }; + // Source box + var sbox = V(paper.viewport).bbox(true, paper.svg); + sbox = { + x: sbox.x * state.zoom, + y: sbox.y * state.zoom, + width: sbox.width * state.zoom, + height: sbox.height * state.zoom + }; + var scale = 1; + if (tbox.width/sbox.width > tbox.height/sbox.height) { + scale = tbox.height / sbox.height; + } + else { + scale = tbox.width / sbox.width; + } + if (state.zoom * scale > ZOOM_MAX) { + scale = ZOOM_MAX / state.zoom; + } + var target = { + x: tbox.x + tbox.width / 2, + y: tbox.y + tbox.height / 2 + }; + var source = { + x: sbox.x + sbox.width / 2, + y: sbox.y + sbox.height / 2 + }; + this.setState({ + pan: { + x: target.x - source.x * scale, + y: target.y - source.y * scale + }, + zoom: state.zoom * scale + }); } else { - scale = tbox.width / sbox.width; + this.resetView(); } - if (state.zoom * scale > ZOOM_MAX) { - scale = ZOOM_MAX / state.zoom; - } - var target = { - x: tbox.x + tbox.width / 2, - y: tbox.y + tbox.height / 2 - }; - var source = { - x: sbox.x + sbox.width / 2, - y: sbox.y + sbox.height / 2 - }; - this.setState({ - pan: { - x: target.x - source.x * scale, - y: target.y - source.y * scale - }, - zoom: state.zoom * scale - }); }; this.resetBreadcrumbs = function(name) { diff --git a/app/scripts/services/tools.service.js b/app/scripts/services/tools.service.js index 2a8a9b873..e7670c6ea 100644 --- a/app/scripts/services/tools.service.js +++ b/app/scripts/services/tools.service.js @@ -18,6 +18,7 @@ angular.module('icestudio') nodeRSync) { var currentAlert = null; + var taskRunning = false; var toolchain = { apio: '-', installed: false, disabled: false }; this.toolchain = toolchain; @@ -46,6 +47,10 @@ angular.module('icestudio') this.apio = function(commands) { var check = true; + if (taskRunning) { + return; + } + taskRunning = true; var code = this.generateCode(); if (code) { if (toolchain.installed || toolchain.disabled) { @@ -69,6 +74,7 @@ angular.module('icestudio') setTimeout(function() { angular.element('#menu').removeClass('disable-menu'); currentAlert.dismiss(true); + taskRunning = false; }, 1000); } }); @@ -77,6 +83,7 @@ angular.module('icestudio') setTimeout(function() { angular.element('#menu').removeClass('disable-menu'); currentAlert.dismiss(true); + taskRunning = false; $('body').removeClass('waiting'); }, 2000); } From df87514e23b0ebac71055948fdd4dea66b592f87 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jes=C3=BAs=20Arroyo=20Torrens?= Date: Thu, 12 Jan 2017 13:22:11 +0100 Subject: [PATCH 119/169] Add Code/Info block DELTAS to the command stack --- app/scripts/plugins/dia/joint.dia.command.js | 51 +++-- app/scripts/plugins/shapes/joint.shapes.js | 211 +++++++++++++------ app/scripts/services/blocks.service.js | 4 +- app/scripts/services/graph.service.js | 9 - app/scripts/services/project.service.js | 8 +- 5 files changed, 174 insertions(+), 109 deletions(-) diff --git a/app/scripts/plugins/dia/joint.dia.command.js b/app/scripts/plugins/dia/joint.dia.command.js index ee122d005..3f0f8a181 100755 --- a/app/scripts/plugins/dia/joint.dia.command.js +++ b/app/scripts/plugins/dia/joint.dia.command.js @@ -47,7 +47,7 @@ joint.dia.CommandManager = Backbone.Model.extend({ addCommand: function(cmdName, cell, graph, options) { - console.log('all', cmdName, options); + console.log('all', cmdName, cell, graph, options); if (cmdName === 'change:labels') { return; @@ -224,23 +224,31 @@ joint.dia.CommandManager = Backbone.Model.extend({ break; default: + var data = null; var options = null; var attribute = cmd.action.substr(this.PREFIX_LENGTH); - console.log('revert', cmd.action, cmd); + console.log('UNDO', cmd.action, cmd); if (attribute === 'data' && cmd.options.translateBy) { + // Invert relative movement cmd.options.ty *= -1; options = cmd.options; } - cell.set(attribute, cmd.data.previous[attribute], options); + if (cmd.data.type === 'ice.Code' || + cmd.data.type === 'ice.Info') { + data = cmd.data.next[attribute]; + } + else { + data = cmd.data.previous[attribute]; + } + cell.set(attribute, data, options); + if (cell) { + var cellView = this.paper.findViewByModel(cell); + if (cellView) { + cellView.apply({ undo: true }); + } + } break; } - - if (cell) { - var cellView = this.paper.findViewByModel(cell); - if (cellView && cellView.render) { - cellView.render(); - } - } } this.listen(); @@ -273,23 +281,24 @@ joint.dia.CommandManager = Backbone.Model.extend({ break; default: + var data = null; var options = null; var attribute = cmd.action.substr(this.PREFIX_LENGTH); - console.log('apply', cmd.action, cmd); + console.log('REDO', cmd.action, cmd); if (attribute === 'data' && cmd.options.translateBy) { cmd.options.ty *= -1; options = cmd.options; } - cell.set(attribute, cmd.data.next[attribute], options); + data = cmd.data.next[attribute]; + cell.set(attribute, data, options); + if (cell) { + var cellView = this.paper.findViewByModel(cell); + if (cellView) { + cellView.apply({ undo: false }); + } + } break; } - - if (cell) { - var cellView = this.paper.findViewByModel(cell); - if (cellView && cellView.render) { - cellView.render(); - } - } } this.listen(); @@ -299,8 +308,6 @@ joint.dia.CommandManager = Backbone.Model.extend({ var command = this.undoStack.pop(); - console.log('undo', command); - if (command) { if (command.action === 'add') { @@ -317,8 +324,6 @@ joint.dia.CommandManager = Backbone.Model.extend({ var command = this.redoStack.pop(); - console.log('redo', command); - if (command) { if (command.action === 'add') { diff --git a/app/scripts/plugins/shapes/joint.shapes.js b/app/scripts/plugins/shapes/joint.shapes.js index 09f7f4974..1ff9a3097 100644 --- a/app/scripts/plugins/shapes/joint.shapes.js +++ b/app/scripts/plugins/shapes/joint.shapes.js @@ -200,6 +200,10 @@ joint.shapes.ice.ModelView = joint.dia.ElementView.extend({ joint.dia.ElementView.prototype.initialize.apply(this, arguments); }, + apply: function() { + // No operation required + }, + render: function() { joint.dia.ElementView.prototype.render.apply(this, arguments); this.paper.$el.append(this.$box); @@ -214,16 +218,16 @@ joint.shapes.ice.ModelView = joint.dia.ElementView.extend({ var $bottomPorts = this.$('.bottomPorts').empty(); var portTemplate = _.template(this.model.portMarkup); - _.each(_.filter(this.model.ports, function (p) { return p.type === 'left'; }), function (port, index) { + _.each(_.filter(this.model.ports, function(p) { return p.type === 'left'; }), function(port, index) { $leftPorts.append(V(portTemplate({ id: index, port: port })).node); }); - _.each(_.filter(this.model.ports, function (p) { return p.type === 'right'; }), function (port, index) { + _.each(_.filter(this.model.ports, function(p) { return p.type === 'right'; }), function(port, index) { $rightPorts.append(V(portTemplate({ id: index, port: port })).node); }); - _.each(_.filter(this.model.ports, function (p) { return p.type === 'top'; }), function (port, index) { + _.each(_.filter(this.model.ports, function(p) { return p.type === 'top'; }), function(port, index) { $topPorts.append(V(portTemplate({ id: index, port: port })).node); }); - _.each(_.filter(this.model.ports, function (p) { return p.type === 'bottom'; }), function (port, index) { + _.each(_.filter(this.model.ports, function(p) { return p.type === 'bottom'; }), function(port, index) { $bottomPorts.append(V(portTemplate({ id: index, port: port })).node); }); }, @@ -383,22 +387,23 @@ joint.shapes.ice.IOView = joint.shapes.ice.ModelView.extend({ var name = target.find('option:selected').text(); var value = target.val(); var data = JSON.parse(JSON.stringify(this.model.get('data'))); - //if (name !== null && value !== null) { - data.pins[i].name = name; - data.pins[i].value = value; - this.model.set('data', data); - //} + if (name !== null && value !== null) { + data.pins[i].name = name; + data.pins[i].value = value; + this.model.set('data', data); + } //comboSelector.find('.select2-selection').css('font-size', this.computeFontSize(name)); }, this)); - // Render data + // Apply data if (!this.model.get('disabled')) { - this.renderChoices(); - this.renderValue(); + this.applyChoices(); + this.applyShape(); + this.applyValue(); } }, - renderBlock: function() { + applyShape: function() { var virtualPortId = '#virtualPort' + this.id; var fpgaPortId = '#fpgaPort' + this.id; var data = this.model.get('data'); @@ -423,7 +428,7 @@ joint.shapes.ice.IOView = joint.shapes.ice.ModelView.extend({ } }, - renderChoices: function() { + applyChoices: function() { var data = this.model.get('data'); if (data.pins) { for (var i in data.pins) { @@ -432,7 +437,7 @@ joint.shapes.ice.IOView = joint.shapes.ice.ModelView.extend({ } }, - renderValue: function() { + applyValue: function() { var data = this.model.get('data'); if (data.pins) { for (var i in data.pins) { @@ -440,16 +445,14 @@ joint.shapes.ice.IOView = joint.shapes.ice.ModelView.extend({ var comboId = '#combo' + this.id + index; var comboSelector = this.$box.find(comboId); var value = data.pins[i].value; - if (value !== '0') { - comboSelector.val(value).change(); - } + comboSelector.val(value).change(); //var fontSize = this.computeFontSize(this.pins[i].name); //$('#select2-' + comboId + '-container').css('font-size', fontSize); } } }, - clearValue: function () { + clearValue: function() { var data = this.model.get('data'); if (data.pins) { for (var i in data.pins) { @@ -465,10 +468,14 @@ joint.shapes.ice.IOView = joint.shapes.ice.ModelView.extend({ return Math.min(13, 17-n).toString() + 'px'; }, - update: function () { + apply: function() { + this.applyShape(); + this.applyValue(); + this.render(); + }, + + update: function() { this.renderPorts(); - this.renderBlock(); - this.renderValue(); joint.dia.ElementView.prototype.update.apply(this, arguments); } }); @@ -511,22 +518,24 @@ joint.shapes.ice.ConstantView = joint.shapes.ice.ModelView.extend({ data.value = $(evt.target).val(); this.model.set('data', data); }, this)); - }, + // Apply data + this.apply(); + }, - renderName: function () { + applyName: function() { var name = this.model.get('data').name; this.$box.find('label').text(name); }, - renderValue: function() { + applyValue: function() { if (this.model.get('disabled')) { this.$box.find('.constant-input').css({'pointer-events': 'none'}); } this.$box.find('.constant-input').val(this.model.get('data').value); }, - renderLocal: function() { + applyLocal: function() { if (this.model.get('data').local) { this.$box.find('p').removeClass('hidden'); } @@ -535,15 +544,18 @@ joint.shapes.ice.ConstantView = joint.shapes.ice.ModelView.extend({ } }, - clearValue: function () { + clearValue: function() { this.$box.find('.constant-input').val(''); }, - update: function () { + apply: function() { + this.applyName(); + this.applyValue(); + this.applyLocal(); + }, + + update: function() { this.renderPorts(); - this.renderName(); - this.renderValue(); - this.renderLocal(); joint.dia.ElementView.prototype.update.apply(this, arguments); } }); @@ -577,28 +589,17 @@ joint.shapes.ice.CodeView = joint.shapes.ice.ModelView.extend({ var id = sha1(this.model.get('id')).toString().substring(0, 6); var blockLabel = 'block' + id; var editorLabel = 'editor' + id; - var contentLabel = 'content' + id; this.$box = $(joint.util.template( '\
                \
                \ - \ \
                \ ' @@ -608,27 +609,71 @@ joint.shapes.ice.CodeView = joint.shapes.ice.ModelView.extend({ this.model.on('remove', this.removeBox, this); this.updateBox(); + this.updating = false; this.listenTo(this.model, 'process:ports', this.update); joint.dia.ElementView.prototype.initialize.apply(this, arguments); + var selector = this.$box.find('#' + editorLabel); + // Prevent paper from handling pointerdown. - this.$box.find('#' + editorLabel).on('mousedown click', function(evt) { evt.stopPropagation(); }); + selector.on('mousedown click', function(evt) { evt.stopPropagation(); }); + + var self = this; + this.editor = ace.edit(selector[0]); + this.editor.$blockScrolling = Infinity; + this.editor.commands.removeCommand('undo'); + this.editor.commands.removeCommand('redo'); + this.editor.session.on('change', function(delta) { + if (!self.updating) { + var data = JSON.parse(JSON.stringify(self.model.get('data'))); + data.code = self.editor.session.getValue(); + data.delta = delta; + self.model.set('data', data); + } + }); + this.editor.on('focus', function() { + $(document).trigger('disableSelected'); + }); + $('#' + blockLabel).resize(function() { + self.editor.resize(); + }); - this.$box.find('#' + editorLabel).append(this.model.get('data').code); - this.$box.find('#' + contentLabel).append(this.model.get('data').code); + // Apply data + this.apply(); }, - renderValue: function() { - var id = sha1(this.model.get('id')).toString().substring(0, 6); - var editorLabel = 'editor' + id; - var editor = ace.edit(this.$box.find('#' + editorLabel)[0]); - editor.setReadOnly(this.model.get('disabled')); + applyValue: function(opt) { + this.updating = true; + var dontselect = false; + var data = this.model.get('data'); + if (data.delta) { + var changes = [{ + group: 'doc', + deltas:[data.delta] + }]; + if (opt.undo) { + this.editor.session.undoChanges(changes, dontselect); + } + else { + this.editor.session.redoChanges(changes, dontselect); + } + } + else { + this.editor.session.setValue(data.code); + } + setTimeout(function(self) { + self.updating = false; + }, 0, this); + }, + + apply: function(opt) { + this.applyValue(opt); }, - update: function () { + update: function() { this.renderPorts(); - this.renderValue(); + this.editor.setReadOnly(this.model.get('disabled')); joint.dia.ElementView.prototype.update.apply(this, arguments); }, @@ -723,45 +768,61 @@ joint.shapes.ice.InfoView = joint.dia.ElementView.extend({ this.editor.$blockScrolling = Infinity; this.editor.commands.removeCommand('undo'); this.editor.commands.removeCommand('redo'); - this.editor.getSession().on('change', function () { + this.editor.session.on('change', function(delta) { if (!self.updating) { - var value = self.editor.getSession().getValue(); - self.model.set('data', { - info: value, - cursor: self.editor.getCursorPosition() - }); + var data = JSON.parse(JSON.stringify(self.model.get('data'))); + data.info = self.editor.session.getValue(); + data.delta = delta; + self.model.set('data', data); } }); this.editor.on('focus', function() { $(document).trigger('disableSelected'); }); - $('#' + blockLabel).resize(function () { + $('#' + blockLabel).resize(function() { self.editor.resize(); }); - this.renderValue(); + // Apply data + this.apply(); }, - render: function () { + render: function() { joint.dia.ElementView.prototype.render.apply(this, arguments); this.paper.$el.append(this.$box); this.updateBox(); return this; }, - renderValue: function() { + applyValue: function(opt) { this.updating = true; + var dontselect = false; var data = this.model.get('data'); - this.editor.moveCursorTo(0, 0); - this.editor.getSession().setValue(data.info); - if (data.cursor) { - this.editor.moveCursorTo(data.cursor.row, data.cursor.column + 1); + if (data.delta) { + var changes = [{ + group: 'doc', + deltas:[data.delta] + }]; + if (opt.undo) { + this.editor.session.undoChanges(changes, dontselect); + } + else { + this.editor.session.redoChanges(changes, dontselect); + } } - this.updating = false; + else { + this.editor.session.setValue(data.info); + } + setTimeout(function(self) { + self.updating = false; + }, 10, this); + }, + + apply: function(opt) { + this.applyValue(opt); }, - update: function () { - this.renderValue(); + update: function() { this.editor.setReadOnly(this.model.get('disabled')); joint.dia.ElementView.prototype.update.apply(this, arguments); }, @@ -776,6 +837,12 @@ joint.shapes.ice.InfoView = joint.dia.ElementView.extend({ top: bbox.y * state.zoom + state.pan.y }); }, + remove: function() { + // Remove delta to allow Session Value restore + delete this.model.attributes.data.delta; + joint.dia.LinkView.prototype.remove.apply(this, arguments); + }, + removeBox: function(/*evt*/) { this.$box.remove(); } @@ -869,6 +936,10 @@ joint.shapes.ice.WireView = joint.dia.LinkView.extend({ }, 0); }, + apply: function() { + this.render(); + }, + render: function() { joint.dia.LinkView.prototype.render.apply(this, arguments); // console.log('render'); diff --git a/app/scripts/services/blocks.service.js b/app/scripts/services/blocks.service.js index d719c2493..960e762f4 100644 --- a/app/scripts/services/blocks.service.js +++ b/app/scripts/services/blocks.service.js @@ -319,7 +319,7 @@ angular.module('icestudio') function newBasicInfo(addCellCallback) { var blockInstance = { id: null, - data: { info: '', cursor: { row: 0, column: 0 } }, + data: { info: '' }, type: 'basic.info', position: { x: 4 * gridsize, y: 30 * gridsize } }; @@ -707,7 +707,7 @@ angular.module('icestudio') cellView.model.set('data', data, { translateBy: cellView.model.id, tx: 0, ty: -offset }); cellView.model.translate(0, offset); graph.stopBatch('change'); - cellView.render(); + cellView.apply(); alertify.success(gettextCatalog.getString('Block updated')); } } diff --git a/app/scripts/services/graph.service.js b/app/scripts/services/graph.service.js index d226fa59e..c344a47d5 100644 --- a/app/scripts/services/graph.service.js +++ b/app/scripts/services/graph.service.js @@ -371,10 +371,6 @@ angular.module('icestudio') var type = cellView.model.attributes.blockType; if (type.indexOf('basic.') !== -1) { if (paper.options.enabled) { - if (type === 'basic.code') { - var content = self.getContent(cellView.model.id); - cellView.model.attributes.data.code = content; - } blocks.editBasic(type, cellView, function(cell) { addCell(cell); }); @@ -518,11 +514,6 @@ angular.module('icestudio') graph.attributes.cells.models = cells; }; - this.getContent = function(id) { - return paper.findViewByModel(id).$box.find( - '#content' + nodeSha1(id).toString().substring(0, 6)).val(); - }; - this.resetIOChoices = function() { var cells = graph.getCells(); // Reset choices in all i/o blocks diff --git a/app/scripts/services/project.service.js b/app/scripts/services/project.service.js index 49d72a129..ca293b6d0 100644 --- a/app/scripts/services/project.service.js +++ b/app/scripts/services/project.service.js @@ -325,11 +325,9 @@ angular.module('icestudio') block.type = cell.blockType; block.data = cell.data; block.position = cell.position; - if (cell.type === 'ice.Code') { - block.data.code = graph.getContent(cell.id); - } - else if (cell.type === 'ice.Info') { - block.data.info = graph.getContent(cell.id); + if (cell.type === 'ice.Code' || + cell.type === 'ice.Info') { + delete block.data.delta; } blocks.push(block); } From 415e8918166d7487df09393ec590cbfaa3c436b9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jes=C3=BAs=20Arroyo=20Torrens?= Date: Thu, 12 Jan 2017 14:52:31 +0100 Subject: [PATCH 120/169] Disable default Undo/Redo. Add Code block edition to Undo/Redo --- app/scripts/controllers/menu.js | 2 ++ app/scripts/plugins/shapes/joint.shapes.js | 29 +++++++++++----------- app/scripts/services/blocks.service.js | 14 ++++++----- 3 files changed, 24 insertions(+), 21 deletions(-) diff --git a/app/scripts/controllers/menu.js b/app/scripts/controllers/menu.js index 87398a8eb..ee5ce2dd2 100644 --- a/app/scripts/controllers/menu.js +++ b/app/scripts/controllers/menu.js @@ -326,9 +326,11 @@ angular.module('icestudio') case 90: if (event.shiftKey) { // Ctrl+Shift+Z $scope.redoGraph(); + event.preventDefault(); } else { // Ctrl+Z $scope.undoGraph(); + event.preventDefault(); } break; case 88: // Ctrl+X diff --git a/app/scripts/plugins/shapes/joint.shapes.js b/app/scripts/plugins/shapes/joint.shapes.js index 1ff9a3097..88002dcbc 100644 --- a/app/scripts/plugins/shapes/joint.shapes.js +++ b/app/scripts/plugins/shapes/joint.shapes.js @@ -379,21 +379,22 @@ joint.shapes.ice.IOView = joint.shapes.ice.ModelView.extend({ )()); // Prevent paper from handling pointerdown. + var self = this; var comboSelector = this.$box.find('.select2'); comboSelector.on('mousedown click', function(evt) { evt.stopPropagation(); }); - comboSelector.on('change', _.bind(function(evt) { + comboSelector.on('change', function(evt) { var target = $(evt.target); var i = target.attr('i'); var name = target.find('option:selected').text(); var value = target.val(); - var data = JSON.parse(JSON.stringify(this.model.get('data'))); + var data = JSON.parse(JSON.stringify(self.model.get('data'))); if (name !== null && value !== null) { data.pins[i].name = name; data.pins[i].value = value; - this.model.set('data', data); + self.model.set('data', data); } //comboSelector.find('.select2-selection').css('font-size', this.computeFontSize(name)); - }, this)); + }); // Apply data if (!this.model.get('disabled')) { @@ -511,13 +512,14 @@ joint.shapes.ice.ConstantView = joint.shapes.ice.ModelView.extend({ joint.shapes.ice.ModelView.prototype.initialize.apply(this, arguments); // Prevent paper from handling pointerdown. + var self = this; this.$box.find('.constant-input').on('mousedown click', function(evt) { evt.stopPropagation(); }); - - this.$box.find('.constant-input').on('change', _.bind(function(evt) { - var data = JSON.parse(JSON.stringify(this.model.get('data'))); - data.value = $(evt.target).val(); - this.model.set('data', data); - }, this)); + this.$box.find('.constant-input').on('input', function(evt) { + var target = $(evt.target); + var data = JSON.parse(JSON.stringify(self.model.get('data'))); + data.value = target.val(); + self.model.set('data', data); + }); // Apply data this.apply(); @@ -532,7 +534,8 @@ joint.shapes.ice.ConstantView = joint.shapes.ice.ModelView.extend({ if (this.model.get('disabled')) { this.$box.find('.constant-input').css({'pointer-events': 'none'}); } - this.$box.find('.constant-input').val(this.model.get('data').value); + var value = this.model.get('data').value; + this.$box.find('.constant-input').val(value); }, applyLocal: function() { @@ -544,10 +547,6 @@ joint.shapes.ice.ConstantView = joint.shapes.ice.ModelView.extend({ } }, - clearValue: function() { - this.$box.find('.constant-input').val(''); - }, - apply: function() { this.applyName(); this.applyValue(); diff --git a/app/scripts/services/blocks.service.js b/app/scripts/services/blocks.service.js index 960e762f4..f360823d9 100644 --- a/app/scripts/services/blocks.service.js +++ b/app/scripts/services/blocks.service.js @@ -734,18 +734,18 @@ angular.module('icestudio') if (block.data.name !== name || block.data.local !== local) { // Edit block - cellView.model.set('data', { - name: name, - value: block.data.value, - local: local - }); - cellView.render(); + var data = utils.clone(block.data); + data.name = name; + data.local = local; + cellView.model.set('data', data); + cellView.apply(); alertify.success(gettextCatalog.getString('Block updated')); } }); } function editBasicCode(cellView, addCellCallback) { + var graph = cellView.paper.model; var block = cellView.model.attributes; var blockInstance = { id: null, @@ -755,8 +755,10 @@ angular.module('icestudio') }; newBasicCode(function(cell) { if (addCellCallback) { + graph.startBatch('change'); addCellCallback(cell); cellView.model.remove(); + graph.stopBatch('change'); alertify.success(gettextCatalog.getString('Block updated')); } }, blockInstance); From 529c8a7b93850c8c58489ce9d56448770f920418 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jes=C3=BAs=20Arroyo=20Torrens?= Date: Thu, 12 Jan 2017 15:01:44 +0100 Subject: [PATCH 121/169] Batch step movements. Fix Code/Info Undo/Redo (position) --- app/scripts/plugins/dia/joint.dia.command.js | 5 +++-- app/scripts/services/graph.service.js | 2 ++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/app/scripts/plugins/dia/joint.dia.command.js b/app/scripts/plugins/dia/joint.dia.command.js index 3f0f8a181..14791d24b 100755 --- a/app/scripts/plugins/dia/joint.dia.command.js +++ b/app/scripts/plugins/dia/joint.dia.command.js @@ -233,8 +233,9 @@ joint.dia.CommandManager = Backbone.Model.extend({ cmd.options.ty *= -1; options = cmd.options; } - if (cmd.data.type === 'ice.Code' || - cmd.data.type === 'ice.Info') { + if (attribute === 'data' && + (cmd.data.type === 'ice.Code' || + cmd.data.type === 'ice.Info')) { data = cmd.data.next[attribute]; } else { diff --git a/app/scripts/services/graph.service.js b/app/scripts/services/graph.service.js index c344a47d5..9f66a2dd0 100644 --- a/app/scripts/services/graph.service.js +++ b/app/scripts/services/graph.service.js @@ -637,10 +637,12 @@ angular.module('icestudio') function step(offset) { if (selection) { + graph.startBatch('change'); selection.each(function(cell) { cell.translate(offset.x, offset.y); selectionView.updateBox(cell); }); + graph.stopBatch('change'); } } From f7c8eebaa8e6245d269476c3387934f34e9f9a82 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jes=C3=BAs=20Arroyo=20Torrens?= Date: Thu, 12 Jan 2017 17:45:33 +0100 Subject: [PATCH 122/169] Add Redo C*+Y. Group deltas by interval --- app/scripts/controllers/menu.js | 4 + app/scripts/plugins/dia/joint.dia.command.js | 1 + app/scripts/plugins/shapes/joint.shapes.js | 80 +++++++++++++++----- app/scripts/services/graph.service.js | 3 +- 4 files changed, 66 insertions(+), 22 deletions(-) diff --git a/app/scripts/controllers/menu.js b/app/scripts/controllers/menu.js index ee5ce2dd2..159e6c9db 100644 --- a/app/scripts/controllers/menu.js +++ b/app/scripts/controllers/menu.js @@ -333,6 +333,10 @@ angular.module('icestudio') event.preventDefault(); } break; + case 89: // Ctrl+Y + $scope.redoGraph(); + event.preventDefault(); + break; case 88: // Ctrl+X $scope.cutSelected(); break; diff --git a/app/scripts/plugins/dia/joint.dia.command.js b/app/scripts/plugins/dia/joint.dia.command.js index 14791d24b..5fd361d32 100755 --- a/app/scripts/plugins/dia/joint.dia.command.js +++ b/app/scripts/plugins/dia/joint.dia.command.js @@ -236,6 +236,7 @@ joint.dia.CommandManager = Backbone.Model.extend({ if (attribute === 'data' && (cmd.data.type === 'ice.Code' || cmd.data.type === 'ice.Info')) { + // Ace editor requires the next deltas to revert data = cmd.data.next[attribute]; } else { diff --git a/app/scripts/plugins/shapes/joint.shapes.js b/app/scripts/plugins/shapes/joint.shapes.js index 88002dcbc..f01b1fd0b 100644 --- a/app/scripts/plugins/shapes/joint.shapes.js +++ b/app/scripts/plugins/shapes/joint.shapes.js @@ -618,6 +618,11 @@ joint.shapes.ice.CodeView = joint.shapes.ice.ModelView.extend({ // Prevent paper from handling pointerdown. selector.on('mousedown click', function(evt) { evt.stopPropagation(); }); + this.deltas = []; + this.counter = 0; + this.timer = null; + var undoGroupingInterval = 300; + var self = this; this.editor = ace.edit(selector[0]); this.editor.$blockScrolling = Infinity; @@ -625,10 +630,25 @@ joint.shapes.ice.CodeView = joint.shapes.ice.ModelView.extend({ this.editor.commands.removeCommand('redo'); this.editor.session.on('change', function(delta) { if (!self.updating) { - var data = JSON.parse(JSON.stringify(self.model.get('data'))); - data.code = self.editor.session.getValue(); - data.delta = delta; - self.model.set('data', data); + // Check consecutive-change interval + if (Date.now() - self.counter < undoGroupingInterval) { + clearTimeout(self.timer); + } + // Update deltas + self.deltas = self.deltas.concat([delta]); + // Reset counter + self.counter = Date.now(); + // Launch timer to + self.timer = setTimeout(function() { + // Set data + var data = { + code: self.editor.session.getValue(), + deltas: self.deltas + }; + self.model.set('data', data); + // Reset deltas + self.deltas = []; + }, undoGroupingInterval); } }); this.editor.on('focus', function() { @@ -646,10 +666,10 @@ joint.shapes.ice.CodeView = joint.shapes.ice.ModelView.extend({ this.updating = true; var dontselect = false; var data = this.model.get('data'); - if (data.delta) { + if (data.deltas) { var changes = [{ group: 'doc', - deltas:[data.delta] + deltas: data.deltas }]; if (opt.undo) { this.editor.session.undoChanges(changes, dontselect); @@ -663,7 +683,7 @@ joint.shapes.ice.CodeView = joint.shapes.ice.ModelView.extend({ } setTimeout(function(self) { self.updating = false; - }, 0, this); + }, 10, this); }, apply: function(opt) { @@ -762,6 +782,11 @@ joint.shapes.ice.InfoView = joint.dia.ElementView.extend({ // Prevent paper from handling pointerdown. selector.on('mousedown click', function(evt) { evt.stopPropagation(); }); + this.deltas = []; + this.counter = 0; + this.timer = null; + var undoGroupingInterval = 300; + var self = this; this.editor = ace.edit(selector[0]); this.editor.$blockScrolling = Infinity; @@ -769,10 +794,25 @@ joint.shapes.ice.InfoView = joint.dia.ElementView.extend({ this.editor.commands.removeCommand('redo'); this.editor.session.on('change', function(delta) { if (!self.updating) { - var data = JSON.parse(JSON.stringify(self.model.get('data'))); - data.info = self.editor.session.getValue(); - data.delta = delta; - self.model.set('data', data); + // Check consecutive-change interval + if (Date.now() - self.counter < undoGroupingInterval) { + clearTimeout(self.timer); + } + // Update deltas + self.deltas = self.deltas.concat([delta]); + // Reset counter + self.counter = Date.now(); + // Launch timer to + self.timer = setTimeout(function() { + // Set data + var data = { + info: self.editor.session.getValue(), + deltas: self.deltas + }; + self.model.set('data', data); + // Reset deltas + self.deltas = []; + }, undoGroupingInterval); } }); this.editor.on('focus', function() { @@ -786,21 +826,14 @@ joint.shapes.ice.InfoView = joint.dia.ElementView.extend({ this.apply(); }, - render: function() { - joint.dia.ElementView.prototype.render.apply(this, arguments); - this.paper.$el.append(this.$box); - this.updateBox(); - return this; - }, - applyValue: function(opt) { this.updating = true; var dontselect = false; var data = this.model.get('data'); - if (data.delta) { + if (data.deltas) { var changes = [{ group: 'doc', - deltas:[data.delta] + deltas: data.deltas }]; if (opt.undo) { this.editor.session.undoChanges(changes, dontselect); @@ -821,6 +854,13 @@ joint.shapes.ice.InfoView = joint.dia.ElementView.extend({ this.applyValue(opt); }, + render: function() { + joint.dia.ElementView.prototype.render.apply(this, arguments); + this.paper.$el.append(this.$box); + this.updateBox(); + return this; + }, + update: function() { this.editor.setReadOnly(this.model.get('disabled')); joint.dia.ElementView.prototype.update.apply(this, arguments); diff --git a/app/scripts/services/graph.service.js b/app/scripts/services/graph.service.js index 9f66a2dd0..1fae4188a 100644 --- a/app/scripts/services/graph.service.js +++ b/app/scripts/services/graph.service.js @@ -7,8 +7,7 @@ angular.module('icestudio') blocks, utils, gettextCatalog, - window, - nodeSha1) { + window) { // Variables var z = { From 98480ca7c13003b96d1375ef6d486bb164fadbf5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jes=C3=BAs=20Arroyo=20Torrens?= Date: Thu, 12 Jan 2017 20:16:56 +0100 Subject: [PATCH 123/169] Remove add-remove sequences in a batch --- app/scripts/plugins/dia/joint.dia.command.js | 22 +++++++++++++++++--- app/scripts/plugins/shapes/joint.shapes.js | 16 +++++++------- app/scripts/services/graph.service.js | 2 +- app/scripts/services/project.service.js | 2 +- 4 files changed, 29 insertions(+), 13 deletions(-) diff --git a/app/scripts/plugins/dia/joint.dia.command.js b/app/scripts/plugins/dia/joint.dia.command.js index 5fd361d32..49ce743e2 100755 --- a/app/scripts/plugins/dia/joint.dia.command.js +++ b/app/scripts/plugins/dia/joint.dia.command.js @@ -47,12 +47,18 @@ joint.dia.CommandManager = Backbone.Model.extend({ addCommand: function(cmdName, cell, graph, options) { - console.log('all', cmdName, cell, graph, options); - - if (cmdName === 'change:labels') { + if (cmdName === 'change:labels' || + cmdName === 'change:z') { return; } + if (cmdName === 'change:target') { + if (!graph.id) { + // Invalid target + return; + } + } + if (!this.get('cmdNameRegex').test(cmdName)) { return; } @@ -112,6 +118,16 @@ joint.dia.CommandManager = Backbone.Model.extend({ if (cmdName === 'add' || cmdName === 'remove') { + // In a batch: delete an "add-remove" sequence if it is applied to the same cell + if (cmdName === 'remove' && this.batchCommand && this.lastCmdIndex > 0) { + var prevCommand = this.batchCommand[this.lastCmdIndex-1]; + if (prevCommand.action === 'add' && prevCommand.data.id === cell.id) { + this.batchCommand.pop(); + this.batchCommand.pop(); + return; + } + } + command.action = cmdName; command.data.id = cell.id; command.data.type = cell.attributes.type; diff --git a/app/scripts/plugins/shapes/joint.shapes.js b/app/scripts/plugins/shapes/joint.shapes.js index f01b1fd0b..46f7ba4fd 100644 --- a/app/scripts/plugins/shapes/joint.shapes.js +++ b/app/scripts/plugins/shapes/joint.shapes.js @@ -621,7 +621,7 @@ joint.shapes.ice.CodeView = joint.shapes.ice.ModelView.extend({ this.deltas = []; this.counter = 0; this.timer = null; - var undoGroupingInterval = 300; + var undoGroupingInterval = 200; var self = this; this.editor = ace.edit(selector[0]); @@ -636,8 +636,6 @@ joint.shapes.ice.CodeView = joint.shapes.ice.ModelView.extend({ } // Update deltas self.deltas = self.deltas.concat([delta]); - // Reset counter - self.counter = Date.now(); // Launch timer to self.timer = setTimeout(function() { // Set data @@ -649,6 +647,8 @@ joint.shapes.ice.CodeView = joint.shapes.ice.ModelView.extend({ // Reset deltas self.deltas = []; }, undoGroupingInterval); + // Reset counter + self.counter = Date.now(); } }); this.editor.on('focus', function() { @@ -666,7 +666,7 @@ joint.shapes.ice.CodeView = joint.shapes.ice.ModelView.extend({ this.updating = true; var dontselect = false; var data = this.model.get('data'); - if (data.deltas) { + if (data.deltas && opt) { var changes = [{ group: 'doc', deltas: data.deltas @@ -785,7 +785,7 @@ joint.shapes.ice.InfoView = joint.dia.ElementView.extend({ this.deltas = []; this.counter = 0; this.timer = null; - var undoGroupingInterval = 300; + var undoGroupingInterval = 200; var self = this; this.editor = ace.edit(selector[0]); @@ -800,8 +800,6 @@ joint.shapes.ice.InfoView = joint.dia.ElementView.extend({ } // Update deltas self.deltas = self.deltas.concat([delta]); - // Reset counter - self.counter = Date.now(); // Launch timer to self.timer = setTimeout(function() { // Set data @@ -813,6 +811,8 @@ joint.shapes.ice.InfoView = joint.dia.ElementView.extend({ // Reset deltas self.deltas = []; }, undoGroupingInterval); + // Reset counter + self.counter = Date.now(); } }); this.editor.on('focus', function() { @@ -830,7 +830,7 @@ joint.shapes.ice.InfoView = joint.dia.ElementView.extend({ this.updating = true; var dontselect = false; var data = this.model.get('data'); - if (data.deltas) { + if (data.deltas && opt) { var changes = [{ group: 'doc', deltas: data.deltas diff --git a/app/scripts/services/graph.service.js b/app/scripts/services/graph.service.js index 1fae4188a..430632405 100644 --- a/app/scripts/services/graph.service.js +++ b/app/scripts/services/graph.service.js @@ -523,7 +523,7 @@ angular.module('icestudio') type === 'basic.output') { cell.attributes.choices = boards.getPinoutHTML(); var view = paper.findViewByModel(cell.id); - view.renderChoices(); + view.applyChoices(); view.clearValue(); } } diff --git a/app/scripts/services/project.service.js b/app/scripts/services/project.service.js index ca293b6d0..1ae455bdb 100644 --- a/app/scripts/services/project.service.js +++ b/app/scripts/services/project.service.js @@ -327,7 +327,7 @@ angular.module('icestudio') block.position = cell.position; if (cell.type === 'ice.Code' || cell.type === 'ice.Info') { - delete block.data.delta; + delete block.data.deltas; } blocks.push(block); } From cbf70508502c748b3522c0e4e5ce071e33d37c4c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jes=C3=BAs=20Arroyo=20Torrens?= Date: Fri, 13 Jan 2017 08:49:16 +0100 Subject: [PATCH 124/169] Capture "changed" status --- app/scripts/app.js | 2 +- app/scripts/controllers/menu.js | 282 ++++++++++--------- app/scripts/plugins/dia/joint.dia.command.js | 28 +- app/scripts/plugins/shapes/joint.shapes.js | 4 +- app/scripts/services/project.service.js | 12 +- app/scripts/services/utils.service.js | 2 +- 6 files changed, 176 insertions(+), 154 deletions(-) diff --git a/app/scripts/app.js b/app/scripts/app.js index c32ff7005..5cb83d51b 100644 --- a/app/scripts/app.js +++ b/app/scripts/app.js @@ -39,6 +39,6 @@ angular } }); setTimeout(function() { - project.updateName(gettextCatalog.getString('untitled')); + project.updateTitle(gettextCatalog.getString('Untitled')); }, 100); }); diff --git a/app/scripts/controllers/menu.js b/app/scripts/controllers/menu.js index 159e6c9db..bbc05e3a3 100644 --- a/app/scripts/controllers/menu.js +++ b/app/scripts/controllers/menu.js @@ -71,7 +71,7 @@ angular.module('icestudio') $scope.newProject = function() { alertify.prompt( gettextCatalog.getString('Enter the project name'), - gettextCatalog.getString('untitled'), + gettextCatalog.getString('Untitled'), function(evt, name) { if (name) { project.new(name); @@ -117,6 +117,7 @@ angular.module('icestudio') var filepath = project.path; if (filepath) { project.save(filepath); + resetChanged(); } else { $scope.saveProjectAs(); @@ -127,6 +128,7 @@ angular.module('icestudio') utils.saveDialog('#input-save-project', '.ice', function(filepath) { updateWorkingdir(filepath); project.save(filepath); + resetChanged(); if (localCallback) { localCallback(); } @@ -287,7 +289,153 @@ angular.module('icestudio') } }; - // Key events + + //-- View + + $scope.showPCF = function() { + gui.Window.open('resources/viewers/plain/pcf.html?board=' + boards.selectedBoard.name, { + title: boards.selectedBoard.info.label + ' - PCF', + focus: true, + toolbar: false, + resizable: true, + width: 700, + height: 700, + icon: 'resources/images/icestudio-logo.png' + }); + }; + + $scope.showPinout = function() { + var board = boards.selectedBoard; + if (nodeFs.existsSync(nodePath.join('resources', 'boards', board.name, 'pinout.svg'))) { + gui.Window.open('resources/viewers/svg/pinout.html?board=' + board.name, { + title: boards.selectedBoard.info.label + ' - Pinout', + focus: true, + toolbar: false, + resizable: true, + width: 500, + height: 700, + icon: 'resources/images/icestudio-logo.png' + }); + } + else { + alertify.notify(gettextCatalog.getString('{{board}} pinout not defined', { board: utils.bold(board.info.label) }), 'warning', 5); + } + }; + + $scope.showDatasheet = function() { + var board = boards.selectedBoard; + if (board.info.datasheet) { + gui.Shell.openExternal(board.info.datasheet); + } + else { + alertify.notify(gettextCatalog.getString('{{board}} datasheet not defined', { board: utils.bold(board.info.label) }), 'error', 5); + } + }; + + + //-- Boards + + $scope.selectBoard = function(board) { + if (boards.selectedBoard.name !== board.name) { + if (!graph.isEmpty()) { + alertify.confirm(gettextCatalog.getString('The current FPGA I/O configuration will be lost. Do you want to change to {{name}} board?', { name: utils.bold(board.info.label) }), + function() { + boards.selectBoard(board.name); + graph.resetIOChoices(); + alertify.success(gettextCatalog.getString('Board {{name}} selected', { name: utils.bold(board.info.label) })); + utils.rootScopeSafeApply(); + }); + } + else { + boards.selectBoard(board.name); + graph.resetIOChoices(); + alertify.success(gettextCatalog.getString('Board {{name}} selected', { name: utils.bold(board.info.label) })); + } + } + }; + + + //-- Tools + + $scope.verifyCode = function() { + checkGraph(function() { + tools.verifyCode(); + }); + }; + + $scope.buildCode = function() { + checkGraph(function() { + tools.buildCode(); + }); + }; + + $scope.uploadCode = function() { + checkGraph(function() { + tools.uploadCode(); + }); + }; + + function checkGraph(callback, callback2) { + if (!graph.isEmpty()) { + if (callback) { + callback(); + } + } + else { + if (callback2) { + callback2(); + } + else { + alertify.notify(gettextCatalog.getString('Add a block to start'), 'warning', 5); + } + } + } + + + //-- Help + + $scope.openUrl = function(url) { + event.preventDefault(); + gui.Shell.openExternal(url); + }; + + $scope.about = function() { + var content = [ + '
                ', + '
                ', + ' ', + '
                ', + '
                ', + '

                Icestudio

                ', + '

                Graphic editor for open FPGAs

                ', + '

                Version: ' + $scope.version + '

                ', + '

                License: GPL v2

                ', + '

                Created by Jesús Arroyo Torrens

                ', + '

                © FPGAwars 2016

                ', + '
                ', + '
                '].join('\n'); + alertify.alert(content); + }; + + + // Events + + var storedUndoStack = []; + var currentUndoStack = []; + + $(document).on('stackChanged', function(evt, undoStack) { + currentUndoStack = undoStack; + project.changed = JSON.stringify(storedUndoStack) !== JSON.stringify(undoStack); + project.updateTitle(); + }); + + function resetChanged() { + storedUndoStack = currentUndoStack; + project.changed = false; + project.updateTitle(); + } + + // Shortcuts var promptShown = false; @@ -300,8 +448,6 @@ angular.module('icestudio') } }); - // Shortcuts - $(document).on('keydown', function(event) { if (graph.isEnabled() && !promptShown) { if (event.ctrlKey) { @@ -428,132 +574,4 @@ angular.module('icestudio') }); } - - //-- View - - $scope.showPCF = function() { - gui.Window.open('resources/viewers/plain/pcf.html?board=' + boards.selectedBoard.name, { - title: boards.selectedBoard.info.label + ' - PCF', - focus: true, - toolbar: false, - resizable: true, - width: 700, - height: 700, - icon: 'resources/images/icestudio-logo.png' - }); - }; - - $scope.showPinout = function() { - var board = boards.selectedBoard; - if (nodeFs.existsSync(nodePath.join('resources', 'boards', board.name, 'pinout.svg'))) { - gui.Window.open('resources/viewers/svg/pinout.html?board=' + board.name, { - title: boards.selectedBoard.info.label + ' - Pinout', - focus: true, - toolbar: false, - resizable: true, - width: 500, - height: 700, - icon: 'resources/images/icestudio-logo.png' - }); - } - else { - alertify.notify(gettextCatalog.getString('{{board}} pinout not defined', { board: utils.bold(board.info.label) }), 'warning', 5); - } - }; - - $scope.showDatasheet = function() { - var board = boards.selectedBoard; - if (board.info.datasheet) { - gui.Shell.openExternal(board.info.datasheet); - } - else { - alertify.notify(gettextCatalog.getString('{{board}} datasheet not defined', { board: utils.bold(board.info.label) }), 'error', 5); - } - }; - - - //-- Boards - - $scope.selectBoard = function(board) { - if (boards.selectedBoard.name !== board.name) { - if (!graph.isEmpty()) { - alertify.confirm(gettextCatalog.getString('The current FPGA I/O configuration will be lost. Do you want to change to {{name}} board?', { name: utils.bold(board.info.label) }), - function() { - boards.selectBoard(board.name); - graph.resetIOChoices(); - alertify.success(gettextCatalog.getString('Board {{name}} selected', { name: utils.bold(board.info.label) })); - utils.rootScopeSafeApply(); - }); - } - else { - boards.selectBoard(board.name); - graph.resetIOChoices(); - alertify.success(gettextCatalog.getString('Board {{name}} selected', { name: utils.bold(board.info.label) })); - } - } - }; - - - //-- Tools - - $scope.verifyCode = function() { - checkGraph(function() { - tools.verifyCode(); - }); - }; - - $scope.buildCode = function() { - checkGraph(function() { - tools.buildCode(); - }); - }; - - $scope.uploadCode = function() { - checkGraph(function() { - tools.uploadCode(); - }); - }; - - function checkGraph(callback, callback2) { - if (!graph.isEmpty()) { - if (callback) { - callback(); - } - } - else { - if (callback2) { - callback2(); - } - else { - alertify.notify(gettextCatalog.getString('Add a block to start'), 'warning', 5); - } - } - } - - - //-- Help - - $scope.openUrl = function(url) { - event.preventDefault(); - gui.Shell.openExternal(url); - }; - - $scope.about = function() { - var content = [ - '
                ', - '
                ', - ' ', - '
                ', - '
                ', - '

                Icestudio

                ', - '

                Graphic editor for open FPGAs

                ', - '

                Version: ' + $scope.version + '

                ', - '

                License: GPL v2

                ', - '

                Created by Jesús Arroyo Torrens

                ', - '

                © FPGAwars 2016

                ', - '
                ', - '
                '].join('\n'); - alertify.alert(content); - }; - }); diff --git a/app/scripts/plugins/dia/joint.dia.command.js b/app/scripts/plugins/dia/joint.dia.command.js index 49ce743e2..827846e2c 100755 --- a/app/scripts/plugins/dia/joint.dia.command.js +++ b/app/scripts/plugins/dia/joint.dia.command.js @@ -52,13 +52,6 @@ joint.dia.CommandManager = Backbone.Model.extend({ return; } - if (cmdName === 'change:target') { - if (!graph.id) { - // Invalid target - return; - } - } - if (!this.get('cmdNameRegex').test(cmdName)) { return; } @@ -73,6 +66,7 @@ joint.dia.CommandManager = Backbone.Model.extend({ if (!cmd.batch) { this.undoStack.push(cmd); + this.triggerChange(); this.trigger('add', cmd); } else { this.lastCmdIndex = Math.max(this.lastCmdIndex, 0); @@ -166,7 +160,7 @@ joint.dia.CommandManager = Backbone.Model.extend({ initBatchCommand: function() { - console.log('initBatchCommand', this.batchCommand); + //console.log('initBatchCommand', this.batchCommand); if (!this.batchCommand) { @@ -186,7 +180,7 @@ joint.dia.CommandManager = Backbone.Model.extend({ storeBatchCommand: function() { - console.log('storeBatchCommand', this.batchCommand, this.batchLevel); + //console.log('storeBatchCommand', this.batchCommand, this.batchLevel); // In order to store batch command it is necesary to run storeBatchCommand as many times as // initBatchCommand was executed @@ -198,8 +192,9 @@ joint.dia.CommandManager = Backbone.Model.extend({ this.redoStack = []; - this.undoStack.push(this.batchCommand); - this.trigger('add', this.batchCommand); + this.undoStack.push(this.batchCommand); + this.triggerChange(); + this.trigger('add', this.batchCommand); } delete this.batchCommand; @@ -243,7 +238,7 @@ joint.dia.CommandManager = Backbone.Model.extend({ var data = null; var options = null; var attribute = cmd.action.substr(this.PREFIX_LENGTH); - console.log('UNDO', cmd.action, cmd); + //console.log('UNDO', cmd.action, cmd); if (attribute === 'data' && cmd.options.translateBy) { // Invert relative movement cmd.options.ty *= -1; @@ -302,7 +297,7 @@ joint.dia.CommandManager = Backbone.Model.extend({ var data = null; var options = null; var attribute = cmd.action.substr(this.PREFIX_LENGTH); - console.log('REDO', cmd.action, cmd); + //console.log('REDO', cmd.action, cmd); if (attribute === 'data' && cmd.options.translateBy) { cmd.options.ty *= -1; options = cmd.options; @@ -325,6 +320,7 @@ joint.dia.CommandManager = Backbone.Model.extend({ undo: function(state) { var command = this.undoStack.pop(); + this.triggerChange(); if (command) { @@ -350,6 +346,7 @@ joint.dia.CommandManager = Backbone.Model.extend({ this.applyCommand(command); this.undoStack.push(command); + this.triggerChange(); } }, @@ -376,6 +373,11 @@ joint.dia.CommandManager = Backbone.Model.extend({ hasRedo: function() { return this.redoStack.length > 0; + }, + + triggerChange: function() { + var currentUndoStack = _.clone(this.undoStack); + $(document).trigger('stackChanged', [currentUndoStack]); } }); diff --git a/app/scripts/plugins/shapes/joint.shapes.js b/app/scripts/plugins/shapes/joint.shapes.js index 46f7ba4fd..b6d49e596 100644 --- a/app/scripts/plugins/shapes/joint.shapes.js +++ b/app/scripts/plugins/shapes/joint.shapes.js @@ -387,7 +387,7 @@ joint.shapes.ice.IOView = joint.shapes.ice.ModelView.extend({ var i = target.attr('i'); var name = target.find('option:selected').text(); var value = target.val(); - var data = JSON.parse(JSON.stringify(self.model.get('data'))); + var data = _.clone(self.model.get('data')); if (name !== null && value !== null) { data.pins[i].name = name; data.pins[i].value = value; @@ -516,7 +516,7 @@ joint.shapes.ice.ConstantView = joint.shapes.ice.ModelView.extend({ this.$box.find('.constant-input').on('mousedown click', function(evt) { evt.stopPropagation(); }); this.$box.find('.constant-input').on('input', function(evt) { var target = $(evt.target); - var data = JSON.parse(JSON.stringify(self.model.get('data'))); + var data = _.clone(self.model.get('data')); data.value = target.val(); self.model.set('data', data); }); diff --git a/app/scripts/services/project.service.js b/app/scripts/services/project.service.js index 1ae455bdb..4a5f8473b 100644 --- a/app/scripts/services/project.service.js +++ b/app/scripts/services/project.service.js @@ -13,6 +13,7 @@ angular.module('icestudio') this.name = ''; // Used in File dialogs this.path = ''; // Used in Save / Save as this.project = _default(); + this.changed = false; function _default() { return { @@ -36,7 +37,7 @@ angular.module('icestudio') this.new = function(name) { this.path = ''; this.project = _default(); - this.updateName(name); + this.updateTitle(name); graph.clearAll(); graph.resetCommandStack(); @@ -68,7 +69,7 @@ angular.module('icestudio') if (ret) { boards.selectBoard(this.project.design.board); - this.updateName(name); + this.updateTitle(name); } else { alertify.notify(gettextCatalog.getString('Wrong project format: {{name}}', { name: utils.bold(name) }), 'error', 30); @@ -152,7 +153,7 @@ angular.module('icestudio') this.save = function(filepath) { var name = utils.basename(filepath); this.path = filepath; - this.updateName(name); + this.updateTitle(name); sortGraph(); this.update(); @@ -357,12 +358,13 @@ angular.module('icestudio') } }; - this.updateName = function(name) { + this.updateTitle = function(name) { if (name) { this.name = name; graph.resetBreadcrumbs(name); - utils.updateWindowTitle(name + ' - Icestudio'); } + var title = (this.changed ? '●' : '') + this.name + ' ─ Icestudio'; + utils.updateWindowTitle(title); }; this.export = function(target, filepath, message) { diff --git a/app/scripts/services/utils.service.js b/app/scripts/services/utils.service.js index b2d1aaed7..e173ef2f0 100644 --- a/app/scripts/services/utils.service.js +++ b/app/scripts/services/utils.service.js @@ -900,7 +900,7 @@ angular.module('icestudio') }; this.clone = function(data) { - return JSON.parse(JSON.stringify(data)); + return _.clone(data); }; }); From fea7c9016f746e3a3b30405217c83b3276f26bf9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jes=C3=BAs=20Arroyo=20Torrens?= Date: Fri, 13 Jan 2017 11:42:07 +0100 Subject: [PATCH 125/169] Edit > New creates a new window --- app/package.json | 1 + app/scripts/controllers/menu.js | 32 ++++++++++++++++++-------------- app/views/menu.html | 4 ++-- 3 files changed, 21 insertions(+), 16 deletions(-) diff --git a/app/package.json b/app/package.json index 004a67c23..ec0d5b355 100644 --- a/app/package.json +++ b/app/package.json @@ -6,6 +6,7 @@ "repository": "https://github.com/FPGAwars/icestudio", "license": "GPL-2.0", "main": "index.html", + "single-instance": false, "window": { "width": 900, "height": 620, diff --git a/app/scripts/controllers/menu.js b/app/scripts/controllers/menu.js index bbc05e3a3..50f9b4c75 100644 --- a/app/scripts/controllers/menu.js +++ b/app/scripts/controllers/menu.js @@ -37,9 +37,7 @@ angular.module('icestudio') // Configure window var win = gui.Window.get(); win.on('close', function() { - this.hide(); - profile.save(); - this.close(true); + exit(); }); // Darwin fix for shortcuts @@ -69,17 +67,22 @@ angular.module('icestudio') //-- File $scope.newProject = function() { - alertify.prompt( - gettextCatalog.getString('Enter the project name'), - gettextCatalog.getString('Untitled'), - function(evt, name) { - if (name) { - project.new(name); - } - else { - evt.cancel = true; - } - }); + // TODO: issue if the first window is removed new windows + // are not well created. Fix: reload the new window + /* jshint -W106 */ + gui.Window.open('index.html', { + focus: true, + width: 900, + height: 620, + min_width: 800, + min_height: 200, + toolbar: false, + resizable: true, + x: (win ? win.x : 0) + 50, + y: (win ? win.y : 0) + 50, + icon: 'resources/images/icestudio-logo.png' + }); + /* jshint +W106 */ }; $scope.openProject = function() { @@ -193,6 +196,7 @@ angular.module('icestudio') alertify.confirm( gettextCatalog.getString('Do you want to exit the application?'), function() { + //win.hide(); profile.save(); win.close(true); }); diff --git a/app/views/menu.html b/app/views/menu.html index 2e7122f29..60516b894 100644 --- a/app/views/menu.html +++ b/app/views/menu.html @@ -83,12 +83,12 @@
              • {{ 'Edit' | translate }} -
                  +
                  • {{ 'Undo' | translate }}Ctrl+Z
                  • - {{ 'Redo' | translate }}Ctrl+Shift+Z + {{ 'Redo' | translate }}Ctrl+Y
                  • From f278b4df49da4c32d8569e23718ef24dd214b4d8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jes=C3=BAs=20Arroyo=20Torrens?= Date: Fri, 13 Jan 2017 11:53:29 +0100 Subject: [PATCH 126/169] Check project status before closing --- app/scripts/controllers/menu.js | 23 ++++++++++++++++------- 1 file changed, 16 insertions(+), 7 deletions(-) diff --git a/app/scripts/controllers/menu.js b/app/scripts/controllers/menu.js index 50f9b4c75..b39978ec8 100644 --- a/app/scripts/controllers/menu.js +++ b/app/scripts/controllers/menu.js @@ -193,13 +193,22 @@ angular.module('icestudio') }; function exit() { - alertify.confirm( - gettextCatalog.getString('Do you want to exit the application?'), - function() { - //win.hide(); - profile.save(); - win.close(true); - }); + if (project.changed) { + alertify.confirm( + '' + gettextCatalog.getString('Do you want to exit the application?') + '
                    ' + + gettextCatalog.getString('Your changes will be lost if you don’t save them'), + function() { + _exit(); + }); + } + else { + _exit(); + } + function _exit() { + //win.hide(); + profile.save(); + win.close(true); + } } From c587dbaa7c7794b988c5e123f7c3429e0b963d28 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jes=C3=BAs=20Arroyo=20Torrens?= Date: Fri, 13 Jan 2017 14:01:21 +0100 Subject: [PATCH 127/169] Edit > Open creates a new window if required --- app/scripts/controllers/menu.js | 105 ++++++++++++++++++++++---------- 1 file changed, 73 insertions(+), 32 deletions(-) diff --git a/app/scripts/controllers/menu.js b/app/scripts/controllers/menu.js index b39978ec8..6e7ce7383 100644 --- a/app/scripts/controllers/menu.js +++ b/app/scripts/controllers/menu.js @@ -10,9 +10,9 @@ angular.module('icestudio') resources, graph, tools, - gui, utils, gettextCatalog, + gui, _package, nodeFs, nodePath) { @@ -34,12 +34,33 @@ angular.module('icestudio') $scope.workingdir = ''; $scope.snapshotdir = ''; - // Configure window + var zeroProject = true; // New project without changes + + // Window events var win = gui.Window.get(); win.on('close', function() { exit(); }); + var openProject = false; + win.on('openProject', function(args) { + if (!openProject) { + updateWorkingdir(args.filepath); + project.open(args.filepath); + openProject = true; + zeroProject = false; + } + }); + + var loadProject = false; + win.on('loadProject', function(args) { + if (!loadProject) { + project.load(args.name, args.data); + loadProject = true; + zeroProject = false; + } + }); + // Darwin fix for shortcuts if (process.platform === 'darwin') { var mb = new gui.Menu({type: 'menubar'}); @@ -66,53 +87,72 @@ angular.module('icestudio') //-- File - $scope.newProject = function() { + function newWindow() { // TODO: issue if the first window is removed new windows // are not well created. Fix: reload the new window /* jshint -W106 */ - gui.Window.open('index.html', { + var _win = gui.Window.open('index.html', { focus: true, width: 900, height: 620, min_width: 800, min_height: 200, - toolbar: false, + toolbar: true, resizable: true, x: (win ? win.x : 0) + 50, y: (win ? win.y : 0) + 50, icon: 'resources/images/icestudio-logo.png' }); /* jshint +W106 */ + return _win; + } + + $scope.newProject = function() { + newWindow(); }; $scope.openProject = function() { utils.openDialog('#input-open-project', '.ice', function(filepath) { - updateWorkingdir(filepath); - checkGraph(function() { - alertify.confirm( - gettextCatalog.getString('The current project will be removed. Do you want to continue loading the project?'), - function() { - project.open(filepath); - }); - }, - function() { + if (zeroProject) { + // If this is the first action, open + // the projec in the same window + updateWorkingdir(filepath); project.open(filepath); - }); + zeroProject = false; + } + else if (project.changed || !equalWorkingFilepath(filepath)) { + // If this is not the first action, and + // the file path is different, open + // the project in a new window + var _win = newWindow(); + _win.on('loaded', function() { + setTimeout(function() { + _win.emit('openProject', { filepath: filepath }); + }, 200); + }); + } }); }; $scope.loadProject = function(name, data) { if (data) { - checkGraph(function() { - alertify.confirm( - gettextCatalog.getString('The current project will be removed. Do you want to continue loading the project?'), - function() { - project.load(name, data); - }); - }, - function() { + if (zeroProject) { + // If this is the first action, load + // the projec in the same window project.load(name, data); - }); + zeroProject = false; + } + else if (project.changed || (project.name !== name)) { + // If this is not the first action, and + // the project name is different, load + // the project in a new window + var _win = newWindow(); + _win.on('loaded', function() { + setTimeout(function() { + _win.emit('loadProject', { name: name, data: data }); + }, 200); + }); + } } }; @@ -188,6 +228,10 @@ angular.module('icestudio') $scope.workingdir = utils.dirname(filepath) + utils.sep; } + function equalWorkingFilepath(filepath) { + return $scope.workingdir + project.name + '.ice' === filepath; + } + $scope.quit = function() { exit(); }; @@ -195,7 +239,7 @@ angular.module('icestudio') function exit() { if (project.changed) { alertify.confirm( - '' + gettextCatalog.getString('Do you want to exit the application?') + '
                    ' + + '' + gettextCatalog.getString('Do you want to close the application?') + '
                    ' + gettextCatalog.getString('Your changes will be lost if you don’t save them'), function() { _exit(); @@ -388,19 +432,14 @@ angular.module('icestudio') }); }; - function checkGraph(callback, callback2) { + function checkGraph(callback) { if (!graph.isEmpty()) { if (callback) { callback(); } } else { - if (callback2) { - callback2(); - } - else { - alertify.notify(gettextCatalog.getString('Add a block to start'), 'warning', 5); - } + alertify.notify(gettextCatalog.getString('Add a block to start'), 'warning', 5); } } @@ -440,12 +479,14 @@ angular.module('icestudio') currentUndoStack = undoStack; project.changed = JSON.stringify(storedUndoStack) !== JSON.stringify(undoStack); project.updateTitle(); + zeroProject = false; }); function resetChanged() { storedUndoStack = currentUndoStack; project.changed = false; project.updateTitle(); + zeroProject = false; } // Shortcuts From 7dcea8a6fbd082d9a096f9e673be5049638250a0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jes=C3=BAs=20Arroyo=20Torrens?= Date: Fri, 13 Jan 2017 22:30:20 +0100 Subject: [PATCH 128/169] Add "board change" to the command stack --- app/scripts/controllers/menu.js | 13 ++- app/scripts/plugins/dia/joint.dia.command.js | 22 ++++- app/scripts/plugins/shapes/joint.shapes.js | 84 ++++++++++++-------- app/scripts/services/boards.service.js | 10 ++- app/scripts/services/graph.service.js | 17 +++- app/scripts/services/utils.service.js | 2 +- 6 files changed, 99 insertions(+), 49 deletions(-) diff --git a/app/scripts/controllers/menu.js b/app/scripts/controllers/menu.js index 6e7ce7383..8f3bcea7e 100644 --- a/app/scripts/controllers/menu.js +++ b/app/scripts/controllers/menu.js @@ -397,18 +397,17 @@ angular.module('icestudio') if (!graph.isEmpty()) { alertify.confirm(gettextCatalog.getString('The current FPGA I/O configuration will be lost. Do you want to change to {{name}} board?', { name: utils.bold(board.info.label) }), function() { - boards.selectBoard(board.name); - graph.resetIOChoices(); - alertify.success(gettextCatalog.getString('Board {{name}} selected', { name: utils.bold(board.info.label) })); - utils.rootScopeSafeApply(); + _boardSelected(); }); } else { - boards.selectBoard(board.name); - graph.resetIOChoices(); - alertify.success(gettextCatalog.getString('Board {{name}} selected', { name: utils.bold(board.info.label) })); + _boardSelected(); } } + function _boardSelected() { + graph.selectBoard(board.name); + alertify.success(gettextCatalog.getString('Board {{name}} selected', { name: utils.bold(board.info.label) })); + } }; diff --git a/app/scripts/plugins/dia/joint.dia.command.js b/app/scripts/plugins/dia/joint.dia.command.js index 827846e2c..224d1e2e8 100755 --- a/app/scripts/plugins/dia/joint.dia.command.js +++ b/app/scripts/plugins/dia/joint.dia.command.js @@ -9,7 +9,7 @@ joint.dia.CommandManager = Backbone.Model.extend({ defaults: { cmdBeforeAdd: null, - cmdNameRegex: /^(?:add|remove|change:\w+)$/ + cmdNameRegex: /^(?:add|remove|board|change:\w+)$/ }, // length of prefix 'change:' in the event name @@ -131,6 +131,14 @@ joint.dia.CommandManager = Backbone.Model.extend({ return push(command); } + if (cmdName === 'board') { + + command.action = cmdName; + command.data = cell.data; + + return push(command); + } + // `changedAttribute` holds the attribute name corresponding // to the change event triggered on the model. var changedAttribute = cmdName.substr(this.PREFIX_LENGTH); @@ -234,6 +242,10 @@ joint.dia.CommandManager = Backbone.Model.extend({ this.graph.addCell(cmd.data.attributes); break; + case 'board': + this.triggerBoard(cmd.data.previous); + break; + default: var data = null; var options = null; @@ -293,6 +305,10 @@ joint.dia.CommandManager = Backbone.Model.extend({ cell.remove(); break; + case 'board': + this.triggerBoard(cmd.data.next); + break; + default: var data = null; var options = null; @@ -378,6 +394,10 @@ joint.dia.CommandManager = Backbone.Model.extend({ triggerChange: function() { var currentUndoStack = _.clone(this.undoStack); $(document).trigger('stackChanged', [currentUndoStack]); + }, + + triggerBoard: function(name) { + $(document).trigger('boardChanged', [name]); } }); diff --git a/app/scripts/plugins/shapes/joint.shapes.js b/app/scripts/plugins/shapes/joint.shapes.js index b6d49e596..ec0a4e530 100644 --- a/app/scripts/plugins/shapes/joint.shapes.js +++ b/app/scripts/plugins/shapes/joint.shapes.js @@ -378,29 +378,32 @@ joint.shapes.ice.IOView = joint.shapes.ice.ModelView.extend({ ' )()); + this.updating = false; + // Prevent paper from handling pointerdown. var self = this; var comboSelector = this.$box.find('.select2'); comboSelector.on('mousedown click', function(evt) { evt.stopPropagation(); }); comboSelector.on('change', function(evt) { - var target = $(evt.target); - var i = target.attr('i'); - var name = target.find('option:selected').text(); - var value = target.val(); - var data = _.clone(self.model.get('data')); - if (name !== null && value !== null) { - data.pins[i].name = name; - data.pins[i].value = value; - self.model.set('data', data); + if (!self.updating) { + var target = $(evt.target); + var i = target.attr('i'); + var name = target.find('option:selected').text(); + var value = target.val(); + var data = JSON.parse(JSON.stringify(self.model.get('data'))); + if (name !== null && value !== null) { + data.pins[i].name = name; + data.pins[i].value = value; + self.model.set('data', data); + } } - //comboSelector.find('.select2-selection').css('font-size', this.computeFontSize(name)); }); // Apply data if (!this.model.get('disabled')) { this.applyChoices(); + this.applyValues(); this.applyShape(); - this.applyValue(); } }, @@ -438,30 +441,34 @@ joint.shapes.ice.IOView = joint.shapes.ice.ModelView.extend({ } }, - applyValue: function() { + applyValues: function() { + this.updating = true; var data = this.model.get('data'); - if (data.pins) { - for (var i in data.pins) { - var index = data.pins[i].index; - var comboId = '#combo' + this.id + index; - var comboSelector = this.$box.find(comboId); - var value = data.pins[i].value; - comboSelector.val(value).change(); - //var fontSize = this.computeFontSize(this.pins[i].name); - //$('#select2-' + comboId + '-container').css('font-size', fontSize); - } + for (var i in data.pins) { + var index = data.pins[i].index; + var comboId = '#combo' + this.id + index; + var comboSelector = this.$box.find(comboId); + var value = data.pins[i].value; + comboSelector.val(value).change(); } + this.updating = false; }, - clearValue: function() { - var data = this.model.get('data'); - if (data.pins) { - for (var i in data.pins) { - this.$box.find('#combo' + this.id + data.pins[i].index).val(''); - this.model.attributes.data.pins[i].name = ''; - this.model.attributes.data.pins[i].value = 0; - } + clearValues: function() { + this.updating = true; + var name = ''; + var value = 0; + var data = JSON.parse(JSON.stringify(this.model.get('data'))); + for (var i in data.pins) { + var index = data.pins[i].index; + var comboId = '#combo' + this.id + index; + var comboSelector = this.$box.find(comboId); + comboSelector.val(value).change(); + data.pins[i].name = name; + data.pins[i].value = value; } + this.model.set('data', data); + this.updating = false; }, computeFontSize: function(name) { @@ -470,8 +477,9 @@ joint.shapes.ice.IOView = joint.shapes.ice.ModelView.extend({ }, apply: function() { + this.applyChoices(); + this.applyValues(); this.applyShape(); - this.applyValue(); this.render(); }, @@ -511,14 +519,18 @@ joint.shapes.ice.ConstantView = joint.shapes.ice.ModelView.extend({ initialize: function() { joint.shapes.ice.ModelView.prototype.initialize.apply(this, arguments); + this.updating = false; + // Prevent paper from handling pointerdown. var self = this; this.$box.find('.constant-input').on('mousedown click', function(evt) { evt.stopPropagation(); }); this.$box.find('.constant-input').on('input', function(evt) { - var target = $(evt.target); - var data = _.clone(self.model.get('data')); - data.value = target.val(); - self.model.set('data', data); + if (!self.updating) { + var target = $(evt.target); + var data = JSON.parse(JSON.stringify(self.model.get('data'))); + data.value = target.val(); + self.model.set('data', data); + } }); // Apply data @@ -531,11 +543,13 @@ joint.shapes.ice.ConstantView = joint.shapes.ice.ModelView.extend({ }, applyValue: function() { + this.updating = true; if (this.model.get('disabled')) { this.$box.find('.constant-input').css({'pointer-events': 'none'}); } var value = this.model.get('data').value; this.$box.find('.constant-input').val(value); + this.updating = false; }, applyLocal: function() { diff --git a/app/scripts/services/boards.service.js b/app/scripts/services/boards.service.js index 565bdc338..329e3e57e 100644 --- a/app/scripts/services/boards.service.js +++ b/app/scripts/services/boards.service.js @@ -1,7 +1,8 @@ 'use strict'; angular.module('icestudio') - .service('boards', function(nodeFs, + .service('boards', function(utils, + nodeFs, nodePath) { this.pinoutHTML = ''; this.selectedBoard = null; @@ -37,6 +38,12 @@ angular.module('icestudio') return ret; } + var self = this; + + $(document).on('boardChanged', function(evt, name) { + self.selectBoard(name); + }); + this.selectBoard = function(name) { for (var i in this.currentBoards) { if (name === this.currentBoards[i].name) { @@ -45,6 +52,7 @@ angular.module('icestudio') break; } } + utils.rootScopeSafeApply(); }; // Set default board diff --git a/app/scripts/services/graph.service.js b/app/scripts/services/graph.service.js index 430632405..5b61269eb 100644 --- a/app/scripts/services/graph.service.js +++ b/app/scripts/services/graph.service.js @@ -513,20 +513,29 @@ angular.module('icestudio') graph.attributes.cells.models = cells; }; - this.resetIOChoices = function() { + this.selectBoard = function(boardName) { + graph.startBatch('change'); + // Trigger board event + var data = { + previous: boards.selectedBoard.name, + next: boardName + }; + graph.trigger('board', { data: data }); + boards.selectBoard(boardName); var cells = graph.getCells(); - // Reset choices in all i/o blocks + // Reset choices in all I/O blocks for (var i in cells) { var cell = cells[i]; var type = cell.attributes.blockType; if (type === 'basic.input' || type === 'basic.output') { - cell.attributes.choices = boards.getPinoutHTML(); var view = paper.findViewByModel(cell.id); + cell.set('choices', boards.getPinoutHTML()); + view.clearValues(); view.applyChoices(); - view.clearValue(); } } + graph.stopBatch('change'); }; this.resetCommandStack = function() { diff --git a/app/scripts/services/utils.service.js b/app/scripts/services/utils.service.js index e173ef2f0..b2d1aaed7 100644 --- a/app/scripts/services/utils.service.js +++ b/app/scripts/services/utils.service.js @@ -900,7 +900,7 @@ angular.module('icestudio') }; this.clone = function(data) { - return _.clone(data); + return JSON.parse(JSON.stringify(data)); }; }); From c477ff2881efc5623e2678713a2d86e3d22a845c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jes=C3=BAs=20Arroyo=20Torrens?= Date: Sat, 14 Jan 2017 09:23:38 +0100 Subject: [PATCH 129/169] Disable highlight and menu on mousedown --- app/scripts/controllers/menu.js | 6 +++-- app/scripts/services/graph.service.js | 36 ++++++++++++++++----------- 2 files changed, 26 insertions(+), 16 deletions(-) diff --git a/app/scripts/controllers/menu.js b/app/scripts/controllers/menu.js index cfb6b5165..d12a4ee78 100644 --- a/app/scripts/controllers/menu.js +++ b/app/scripts/controllers/menu.js @@ -74,7 +74,9 @@ angular.module('icestudio') // mouseover event $scope.showMenu = function (menu) { $timeout.cancel(timer); - $scope.status[menu] = true; + if (!graph.mousedown) { + $scope.status[menu] = true; + } }; // mouseleave event @@ -97,7 +99,7 @@ angular.module('icestudio') height: 620, min_width: 800, min_height: 200, - toolbar: true, + toolbar: false, resizable: true, x: (win ? win.x : 0) + 50, y: (win ? win.y : 0) + 50, diff --git a/app/scripts/services/graph.service.js b/app/scripts/services/graph.service.js index d6d487dd2..d0b139603 100644 --- a/app/scripts/services/graph.service.js +++ b/app/scripts/services/graph.service.js @@ -302,8 +302,9 @@ angular.module('icestudio') // Events + this.mousedown = false; + var self = this; - var mousedown = false; $('#paper').mousemove(function(event) { mousePosition = { x: event.offsetX, @@ -332,7 +333,7 @@ angular.module('icestudio') }); paper.on('cell:pointerup', function(cellView, evt/*, x, y*/) { - mousedown = false; + self.mousedown = false; if (paper.options.enabled) { if (!cellView.model.isLink()) { if (evt.which === 3) { @@ -356,7 +357,7 @@ angular.module('icestudio') }); paper.on('cell:pointerdown', function(/*cellView*/) { - mousedown = true; + self.mousedown = true; /*if (paper.options.enabled) { if (!cellView.model.isLink()) { if (cellView.$box.css('z-index') < z.index) { @@ -391,6 +392,7 @@ angular.module('icestudio') }); paper.on('blank:pointerdown', function(evt, x, y) { + self.mousedown = true; // Disable current focus document.activeElement.blur(); @@ -407,37 +409,42 @@ angular.module('icestudio') }); paper.on('cell:pointerup blank:pointerup', function(/*cellView, evt*/) { + self.mousedown = false; self.panAndZoom.disablePan(); }); paper.on('cell:mouseover', function(cellView/*, evt*/) { - if (!cellView.model.isLink()) { - cellView.$box.addClass('highlight'); - if (!mousedown && cellView && !cellView.model.isLink()) { - if (cellView.$box.css('z-index') < zIndex) { - cellView.$box.css('z-index', ++zIndex); + if (!self.mousedown) { + if (!cellView.model.isLink()) { + cellView.$box.addClass('highlight'); + if (cellView && !cellView.model.isLink()) { + if (cellView.$box.css('z-index') < z.index) { + cellView.$box.css('z-index', ++z.index); + } } } } }); paper.on('cell:mouseout', function(cellView/*, evt*/) { - if (!cellView.model.isLink()) { - cellView.$box.removeClass('highlight'); + if (!self.mousedown) { + if (!cellView.model.isLink()) { + cellView.$box.removeClass('highlight'); + } } }); graph.on('change:position', function(/*cell*/) { - if (!selectionView.isTranslating()) { + /*if (!selectionView.isTranslating()) { // Update wires on obstacles motion - /*var cells = graph.getCells(); + var cells = graph.getCells(); for (var i in cells) { var cell = cells[i]; if (cell.isLink()) { paper.findViewByModel(cell).update(); } - }*/ - } + } + }*/ }); }; @@ -482,6 +489,7 @@ angular.module('icestudio') } } else if (cells[i].attributes.type !== 'ice.Wire') { + // TODO: also on !mousedown if (value) { cellView.$el.find('.port-body').removeClass('disable-graph'); } From 334c1227a8d96ea40100460e572d07bf442a02c3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jes=C3=BAs=20Arroyo=20Torrens?= Date: Tue, 17 Jan 2017 14:21:17 +0100 Subject: [PATCH 130/169] Add new project format 1.1 --- app/index.html | 2 +- app/scripts/controllers/design.js | 16 ++-- app/scripts/controllers/menu.js | 22 +++-- app/scripts/services/blocks.service.js | 3 +- app/scripts/services/graph.service.js | 52 +++++------ app/scripts/services/project.service.js | 116 +++++++++++++++++------- app/scripts/services/utils.service.js | 8 ++ app/views/menu.html | 4 +- 8 files changed, 141 insertions(+), 82 deletions(-) diff --git a/app/index.html b/app/index.html index 1587487d7..ebada72b0 100644 --- a/app/index.html +++ b/app/index.html @@ -41,7 +41,7 @@ - + diff --git a/app/scripts/controllers/design.js b/app/scripts/controllers/design.js index 13040eefd..603f97e8f 100644 --- a/app/scripts/controllers/design.js +++ b/app/scripts/controllers/design.js @@ -32,17 +32,15 @@ angular.module('icestudio') }; function loadSelectedGraph() { - if (graph.breadcrumbs.length === 1) { - graph.loadDesign(project.project.design, false); + var n = graph.breadcrumbs.length; + if (n === 1) { + var design = project.get('design'); + graph.loadDesign(design, false); } else { - var p = project.project; - for (var i = 1; i < graph.breadcrumbs.length; i++) { - if (p.design && p.design.deps) { - p = p.design.deps[graph.breadcrumbs[i].name]; - } - } - graph.loadDesign(p.design, true); + var dependencies = project.get('dependencies'); + var type = graph.breadcrumbs[n-1].type; + graph.loadDesign(dependencies[type].design, true); } } diff --git a/app/scripts/controllers/menu.js b/app/scripts/controllers/menu.js index d12a4ee78..a9985298f 100644 --- a/app/scripts/controllers/menu.js +++ b/app/scripts/controllers/menu.js @@ -99,7 +99,7 @@ angular.module('icestudio') height: 620, min_width: 800, min_height: 200, - toolbar: false, + toolbar: true, resizable: true, x: (win ? win.x : 0) + 50, y: (win ? win.y : 0) + 50, @@ -161,8 +161,10 @@ angular.module('icestudio') $scope.saveProject = function() { var filepath = project.path; if (filepath) { - project.save(filepath); - resetChanged(); + if (project.changed) { + project.save(filepath); + resetChanged(); + } } else { $scope.saveProjectAs(); @@ -316,7 +318,7 @@ angular.module('icestudio') }; $scope.setProjectInformation = function() { - var p = project.project.package; + var p = project.get('package'); var values = [ p.name, p.version, @@ -325,11 +327,13 @@ angular.module('icestudio') p.image ]; utils.projectinfoprompt(values, function(evt, values) { - project.project.package.name = values[0]; - project.project.package.version = values[1]; - project.project.package.description = values[2]; - project.project.package.author = values[3]; - project.project.package.image = values[4]; + project.set('package', { + name: values[0], + version: values[1], + description: values[2], + author: values[3], + image: values[4] + }); }); }; diff --git a/app/scripts/services/blocks.service.js b/app/scripts/services/blocks.service.js index c70d68412..4e779e67f 100644 --- a/app/scripts/services/blocks.service.js +++ b/app/scripts/services/blocks.service.js @@ -338,8 +338,7 @@ angular.module('icestudio') block.design && block.design.graph && block.design.graph.blocks && - block.design.graph.wires && - block.design.deps) { + block.design.graph.wires) { if (addCellCallback) { addCellCallback(loadGeneric(blockInstance, block)); } diff --git a/app/scripts/services/graph.service.js b/app/scripts/services/graph.service.js index d0b139603..3351efe40 100644 --- a/app/scripts/services/graph.service.js +++ b/app/scripts/services/graph.service.js @@ -22,9 +22,9 @@ angular.module('icestudio') var commandManager = null; var clipboard = []; var mousePosition = { x: 0, y: 0 }; - var dependencies = {}; - this.breadcrumbs = [{ name: '' }]; + + this.breadcrumbs = [{ name: '', type: '' }]; var gridsize = 8; var state = { @@ -117,10 +117,7 @@ angular.module('icestudio') }; this.resetBreadcrumbs = function(name) { - if (this.breadcrumbs.length > 1) { - this.breadcrumbs = [{ name: name }]; - } - this.breadcrumbs[0].name = name; + this.breadcrumbs = [{ name: name, type: '' }]; utils.rootScopeSafeApply(); }; @@ -377,16 +374,18 @@ angular.module('icestudio') } } else { - self.breadcrumbs.push({ name: type }); + var name = dependencies[type].package.name; + var design = dependencies[type].design; + self.breadcrumbs.push({ name: name, type: type }); utils.rootScopeSafeApply(); z.index = 1; if (self.breadcrumbs.length === 2) { $rootScope.$broadcast('updateProject', function() { - self.loadDesign(dependencies[type].design, true); + self.loadDesign(design, true); }); } else { - self.loadDesign(dependencies[type].design, true); + self.loadDesign(design, true); } } }); @@ -501,17 +500,15 @@ angular.module('icestudio') }; this.createBlock = function(type, block) { - if (type.indexOf('basic.') !== -1) { - blocks.newBasic(type, function(cell) { - addCell(cell); - }); - } - else { - dependencies[type] = block; - blocks.newGeneric(type, block, function(cell) { - addCell(cell); - }); - } + blocks.newGeneric(type, block, function(cell) { + addCell(cell); + }); + }; + + this.createBasicBlock = function(type) { + blocks.newBasic(type, function(cell) { + addCell(cell); + }); }; this.toJSON = function() { @@ -685,20 +682,19 @@ angular.module('icestudio') return paper.options.enabled; }; - this.loadDesign = function(design, disabled, callback) { + this.loadDesign = function(design, disabled, deps, callback) { if (design && design.graph && design.graph.blocks && - design.graph.wires && - design.deps) { + design.graph.wires) { var i; var self = this; var blockInstances = design.graph.blocks; var wires = design.graph.wires; - var deps = design.deps; - - dependencies = design.deps; + if (deps) { + dependencies = deps; + } $('body').addClass('waiting'); @@ -717,8 +713,8 @@ angular.module('icestudio') cell = blocks.loadBasic(blockInstance, disabled); } else { - if (deps && deps[blockInstance.type]) { - cell = blocks.loadGeneric(blockInstance, deps[blockInstance.type]); + if (blockInstance.type in dependencies) { + cell = blocks.loadGeneric(blockInstance, dependencies[blockInstance.type]); } } addCell(cell); diff --git a/app/scripts/services/project.service.js b/app/scripts/services/project.service.js index 0d718bcf0..61de2417a 100644 --- a/app/scripts/services/project.service.js +++ b/app/scripts/services/project.service.js @@ -12,12 +12,13 @@ angular.module('icestudio') this.name = ''; // Used in File dialogs this.path = ''; // Used in Save / Save as - this.project = _default(); this.changed = false; + var project = _default(); + function _default() { return { - version: '1.0', + version: '1.1', package: { name: '', version: '', @@ -28,20 +29,48 @@ angular.module('icestudio') design: { board: '', graph: { blocks: [], wires: [] }, - deps: {}, state: { pan: { x: 0, y: 0 }, zoom: 1.0 } - } + }, + dependencies: {} }; } + /* Dependency format + { + package: { + name: '', + version: '', + description: '', + author: '', + image: '' + }, + design: { + graph: { blocks: [], wires: [] } + state: { pan: { x: 0, y: 0 }, zoom: 1.0 } + }, + } + */ + + this.get = function(key) { + if (key in project) { + return project[key]; + } + }; + + this.set = function(key, obj) { + if (key in project) { + project[key] = obj; + } + }; + this.new = function(name) { this.path = ''; - this.project = _default(); + project = _default(); this.updateTitle(name); graph.clearAll(); graph.resetCommandStack(); - graph.setState(this.project.design.state); + graph.setState(project.design.state); alertify.success(gettextCatalog.getString('New project {{name}} created', { name: utils.bold(name) })); }; @@ -61,14 +90,14 @@ angular.module('icestudio') if (!data.version) { alertify.notify(gettextCatalog.getString('Old project format'), 'warning', 5); } - this.project = _safeLoad(data); - var ret = graph.loadDesign(this.project.design, false, function() { + project = _safeLoad(data); + var ret = graph.loadDesign(project.design, false, project.dependencies, function() { graph.resetCommandStack(); alertify.success(gettextCatalog.getString('Project {{name}} loaded', { name: utils.bold(name) })); }); if (ret) { - boards.selectBoard(this.project.design.board); + boards.selectBoard(project.design.board); this.updateTitle(name); } else { @@ -79,6 +108,9 @@ angular.module('icestudio') function _safeLoad(data) { var project = {}; switch(data.version) { + case '1.1': + project = data; + break; case '1.0': project = data; break; @@ -157,7 +189,7 @@ angular.module('icestudio') sortGraph(); this.update(); - utils.saveFile(filepath, this.project, function() { + utils.saveFile(filepath, project, function() { alertify.success(gettextCatalog.getString('Project {{name}} saved', { name: utils.bold(name) })); }, true); }; @@ -190,7 +222,6 @@ angular.module('icestudio') } var block = _safeLoad(data); if (block) { - var name = utils.basename(filepath); var path = utils.dirname(filepath); // 1. Parse and find included files var code = JSON.stringify(block); @@ -203,7 +234,7 @@ angular.module('icestudio') copyIncludedFiles(function(success) { if (success) { // 4. Success: import block - doImportBlock(name, block); + doImportBlock(block); } }); } @@ -216,7 +247,7 @@ angular.module('icestudio') copyIncludedFiles(function(success) { if (success) { // 4. Success: import block - doImportBlock(name, block); + doImportBlock(block); } }); }, 500); @@ -227,7 +258,7 @@ angular.module('icestudio') else { // No included files to copy // 4. Import block - doImportBlock(name, block); + doImportBlock(block); } } @@ -279,19 +310,21 @@ angular.module('icestudio') return success; } - function doImportBlock(name, block) { + function doImportBlock(block) { // Add block block = pruneDependency(block); - self.project.design.deps[name] = block; - graph.createBlock(name, block); - alertify.success(gettextCatalog.getString('Block {{name}} imported', { name: utils.bold(name) })); + var type = utils.dependencyID(block); + mergeDependencies(type, block); + graph.createBlock(type, block); + alertify.success(gettextCatalog.getString('Block {{name}} imported', { name: utils.bold(block.package.name) })); } }); }; function pruneDependency(block) { // Remove all unnecessary information for a dependency: - // - board, FPGA I/O pins (->size if >1), virtual flag + // - version, board, FPGA I/O pins (->size if >1), virtual flag + delete block.version; delete block.design.board; var i, pins; for (i in block.design.graph.blocks) { @@ -306,6 +339,23 @@ angular.module('icestudio') return block; } + function mergeDependencies(type, block) { + if (type in project.dependencies) { + return; // If the block is already in dependencies + } + // Merge the block dependencies + var deps = block.dependencies; + for (var i in deps) { + var depType = utils.dependencyID(deps[i]); + if (!(depType in project.dependencies)) { + project.dependencies[depType] = deps[i]; + } + } + // Add the block as a dependency + delete block.dependencies; + project.dependencies[type] = block; + } + this.update = function(callback) { var graphData = graph.toJSON(); @@ -343,9 +393,9 @@ angular.module('icestudio') } var state = graph.getState(); - this.project.design.board = boards.selectedBoard.name; - this.project.design.graph = { blocks: blocks, wires: wires }; - this.project.design.state = { + project.design.board = boards.selectedBoard.name; + project.design.graph = { blocks: blocks, wires: wires }; + project.design.state = { pan: { x: parseFloat(state.pan.x.toFixed(4)), y: parseFloat(state.pan.y.toFixed(4)) @@ -369,30 +419,34 @@ angular.module('icestudio') this.export = function(target, filepath, message) { this.update(); - var data = compiler.generate(target, this.project); + var data = compiler.generate(target, project); utils.saveFile(filepath, data, function() { alertify.success(message); }, false); }; - this.addBlock = function(type, block) { - if (block) { - block = _safeLoad(block); + this.addBlock = function(arg) { + if (typeof arg === 'string' && arg.match(/basic\..+/g)) { + graph.createBasicBlock(arg); + } + else if (arg) { + var block = _safeLoad(arg); block = pruneDependency(block); - this.project.design.deps[type] = block; + var dependency = _.clone(block); + var type = utils.dependencyID(dependency); + project.design.deps[type] = block; + graph.createBlock(type, block); } - graph.createBlock(type, block); }; this.removeSelected = function() { - var self = this; graph.removeSelected(function(type) { - delete self.project.design.deps[type]; + delete project.design.deps[type]; }); }; this.clear = function() { - this.project = _default(); + project = _default(); graph.clearAll(); graph.resetBreadcrumbs(); graph.resetCommandStack(); diff --git a/app/scripts/services/utils.service.js b/app/scripts/services/utils.service.js index b2d1aaed7..2045de7e6 100644 --- a/app/scripts/services/utils.service.js +++ b/app/scripts/services/utils.service.js @@ -16,6 +16,7 @@ angular.module('icestudio') nodeSudo, nodeOnline, nodeGlob, + nodeSha1, SVGO) { const WIN32 = Boolean(process.platform.indexOf('win32') > -1); @@ -903,4 +904,11 @@ angular.module('icestudio') return JSON.parse(JSON.stringify(data)); }; + this.dependencyID = function(dependency) { + if (dependency.package && dependency.design) { + return nodeSha1(JSON.stringify(dependency.package) + + JSON.stringify(dependency.design)); + } + }; + }); diff --git a/app/views/menu.html b/app/views/menu.html index 60516b894..4101b1308 100644 --- a/app/views/menu.html +++ b/app/views/menu.html @@ -296,7 +296,7 @@ {{ blocks.name | translate }}
                    • - + {{ block.name | translate }} @@ -304,7 +304,7 @@
                      • - + {{ sblock.name | translate }}
                        • From 48d1bf17b7756bf3dc68bb386eef8da8f48f3afa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jes=C3=BAs=20Arroyo=20Torrens?= Date: Tue, 17 Jan 2017 14:42:57 +0100 Subject: [PATCH 131/169] Improve adding new format blocks --- app/scripts/controllers/menu.js | 6 +- app/scripts/services/graph.service.js | 11 ++-- app/scripts/services/project.service.js | 87 ++++++++++++------------- 3 files changed, 50 insertions(+), 54 deletions(-) diff --git a/app/scripts/controllers/menu.js b/app/scripts/controllers/menu.js index a9985298f..c22a28e4e 100644 --- a/app/scripts/controllers/menu.js +++ b/app/scripts/controllers/menu.js @@ -161,10 +161,8 @@ angular.module('icestudio') $scope.saveProject = function() { var filepath = project.path; if (filepath) { - if (project.changed) { - project.save(filepath); - resetChanged(); - } + project.save(filepath); + resetChanged(); } else { $scope.saveProjectAs(); diff --git a/app/scripts/services/graph.service.js b/app/scripts/services/graph.service.js index 3351efe40..08c29bb91 100644 --- a/app/scripts/services/graph.service.js +++ b/app/scripts/services/graph.service.js @@ -376,7 +376,7 @@ angular.module('icestudio') else { var name = dependencies[type].package.name; var design = dependencies[type].design; - self.breadcrumbs.push({ name: name, type: type }); + self.breadcrumbs.push({ name: name ? name : '#', type: type }); utils.rootScopeSafeApply(); z.index = 1; if (self.breadcrumbs.length === 2) { @@ -682,7 +682,11 @@ angular.module('icestudio') return paper.options.enabled; }; - this.loadDesign = function(design, disabled, deps, callback) { + this.setDependencies = function(_dependencies) { + dependencies = _dependencies; + }; + + this.loadDesign = function(design, disabled, callback) { if (design && design.graph && design.graph.blocks && @@ -692,9 +696,6 @@ angular.module('icestudio') var self = this; var blockInstances = design.graph.blocks; var wires = design.graph.wires; - if (deps) { - dependencies = deps; - } $('body').addClass('waiting'); diff --git a/app/scripts/services/project.service.js b/app/scripts/services/project.service.js index 61de2417a..a995a33ef 100644 --- a/app/scripts/services/project.service.js +++ b/app/scripts/services/project.service.js @@ -91,7 +91,8 @@ angular.module('icestudio') alertify.notify(gettextCatalog.getString('Old project format'), 'warning', 5); } project = _safeLoad(data); - var ret = graph.loadDesign(project.design, false, project.dependencies, function() { + graph.setDependencies(project.dependencies); + var ret = graph.loadDesign(project.design, false, function() { graph.resetCommandStack(); alertify.success(gettextCatalog.getString('Project {{name}} loaded', { name: utils.bold(name) })); }); @@ -311,51 +312,12 @@ angular.module('icestudio') } function doImportBlock(block) { - // Add block - block = pruneDependency(block); - var type = utils.dependencyID(block); - mergeDependencies(type, block); - graph.createBlock(type, block); + self.addBlock(block); alertify.success(gettextCatalog.getString('Block {{name}} imported', { name: utils.bold(block.package.name) })); } }); }; - function pruneDependency(block) { - // Remove all unnecessary information for a dependency: - // - version, board, FPGA I/O pins (->size if >1), virtual flag - delete block.version; - delete block.design.board; - var i, pins; - for (i in block.design.graph.blocks) { - if (block.design.graph.blocks[i].type === 'basic.input' || - block.design.graph.blocks[i].type === 'basic.output') { - pins = block.design.graph.blocks[i].data.pins; - block.design.graph.blocks[i].data.size = (pins && pins.length > 1) ? pins.length : undefined; - delete block.design.graph.blocks[i].data.pins; - delete block.design.graph.blocks[i].data.virtual; - } - } - return block; - } - - function mergeDependencies(type, block) { - if (type in project.dependencies) { - return; // If the block is already in dependencies - } - // Merge the block dependencies - var deps = block.dependencies; - for (var i in deps) { - var depType = utils.dependencyID(deps[i]); - if (!(depType in project.dependencies)) { - project.dependencies[depType] = deps[i]; - } - } - // Add the block as a dependency - delete block.dependencies; - project.dependencies[type] = block; - } - this.update = function(callback) { var graphData = graph.toJSON(); @@ -431,14 +393,49 @@ angular.module('icestudio') } else if (arg) { var block = _safeLoad(arg); - block = pruneDependency(block); - var dependency = _.clone(block); - var type = utils.dependencyID(dependency); - project.design.deps[type] = block; + block = pruneBlock(block); + var type = utils.dependencyID(block); + mergeDependencies(type, block); graph.createBlock(type, block); + graph.setDependencies(project.dependencies); } }; + function pruneBlock(block) { + // Remove all unnecessary information for a dependency: + // - version, board, FPGA I/O pins (->size if >1), virtual flag + delete block.version; + delete block.design.board; + var i, pins; + for (i in block.design.graph.blocks) { + if (block.design.graph.blocks[i].type === 'basic.input' || + block.design.graph.blocks[i].type === 'basic.output') { + pins = block.design.graph.blocks[i].data.pins; + block.design.graph.blocks[i].data.size = (pins && pins.length > 1) ? pins.length : undefined; + delete block.design.graph.blocks[i].data.pins; + delete block.design.graph.blocks[i].data.virtual; + } + } + return block; + } + + function mergeDependencies(type, block) { + if (type in project.dependencies) { + return; // If the block is already in dependencies + } + // Merge the block dependencies + var deps = block.dependencies; + for (var i in deps) { + var depType = utils.dependencyID(deps[i]); + if (!(depType in project.dependencies)) { + project.dependencies[depType] = deps[i]; + } + } + // Add the block as a dependency + delete block.dependencies; + project.dependencies[type] = block; + } + this.removeSelected = function() { graph.removeSelected(function(type) { delete project.design.deps[type]; From 0e1cb391446f62e8335480d6fb94fffb694c6772 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jes=C3=BAs=20Arroyo=20Torrens?= Date: Tue, 17 Jan 2017 16:30:15 +0100 Subject: [PATCH 132/169] Render Name in block --- app/scripts/services/blocks.service.js | 16 +--------------- 1 file changed, 1 insertion(+), 15 deletions(-) diff --git a/app/scripts/services/blocks.service.js b/app/scripts/services/blocks.service.js index 4e779e67f..ada7c9828 100644 --- a/app/scripts/services/blocks.service.js +++ b/app/scripts/services/blocks.service.js @@ -527,19 +527,9 @@ angular.module('icestudio') var height = 8 * gridsize; height = Math.max(4 * gridsize * numPortsHeight, height); - var blockLabel = instance.type.toUpperCase(); - var blockLabels = instance.type.split('.'); - var maxBlockLabel = ''; + var blockLabel = block.package.name; var width = 12 * gridsize; - for (var l in blockLabels) { - if (blockLabels[l].length > maxBlockLabel.length) { - maxBlockLabel = blockLabels[l]; - } - } - if (maxBlockLabel.length > 4) { - width = Math.min((maxBlockLabel.length + 8) * gridsize, 24 * gridsize); - } width = Math.max(4 * gridsize * numPortsWidth, width); var gridUnitsHeight = height / gridsize; @@ -558,10 +548,6 @@ angular.module('icestudio') bottomPorts[i].gridUnits = gridUnitsWidth; } - if (blockLabels.length > 1) { - blockLabel = blockLabels.join('
                        ').toUpperCase(); - } - var blockImage = ''; if (block.package.image) { width = 12 * gridsize; From d93aeb691f54225ce8732938e80c07a78194a12e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jes=C3=BAs=20Arroyo=20Torrens?= Date: Tue, 17 Jan 2017 17:58:12 +0100 Subject: [PATCH 133/169] Add dependencies update --- app/scripts/controllers/design.js | 4 +- app/scripts/services/graph.service.js | 24 +----------- app/scripts/services/project.service.js | 49 +++++++++++++++++++------ 3 files changed, 41 insertions(+), 36 deletions(-) diff --git a/app/scripts/controllers/design.js b/app/scripts/controllers/design.js index 603f97e8f..746e1d339 100644 --- a/app/scripts/controllers/design.js +++ b/app/scripts/controllers/design.js @@ -38,14 +38,14 @@ angular.module('icestudio') graph.loadDesign(design, false); } else { - var dependencies = project.get('dependencies'); + var dependencies = project.getAllDependencies(); var type = graph.breadcrumbs[n-1].type; graph.loadDesign(dependencies[type].design, true); } } $rootScope.$on('updateProject', function(event, callback) { - project.update(callback); + project.update(callback, false); }); }); diff --git a/app/scripts/services/graph.service.js b/app/scripts/services/graph.service.js index 08c29bb91..50f805140 100644 --- a/app/scripts/services/graph.service.js +++ b/app/scripts/services/graph.service.js @@ -373,7 +373,7 @@ angular.module('icestudio') }); } } - else { + else if (dependencies[type]) { var name = dependencies[type].package.name; var design = dependencies[type].design; self.breadcrumbs.push({ name: name ? name : '#', type: type }); @@ -608,18 +608,8 @@ angular.module('icestudio') return selection.length > 0; }; - this.removeSelected = function(removeDep) { + this.removeSelected = function() { if (selection) { - selection.each(function(cell) { - var type = cell.attributes.blockType; - if (!typeInGraph(type)) { - // Check if it is the last "type" block - if (removeDep) { - // Remove "type" dependency in the project - removeDep(type); - } - } - }); graph.removeCells(selection.models); selectionView.cancelSelection(); } @@ -664,16 +654,6 @@ angular.module('icestudio') } } - function typeInGraph(type) { - var cells = graph.getCells(); - for (var i in cells) { - if (cells[i].attributes.blockType === type) { - return true; - } - } - return false; - } - this.isEmpty = function() { return (graph.getCells().length === 0); }; diff --git a/app/scripts/services/project.service.js b/app/scripts/services/project.service.js index a995a33ef..0f6b90481 100644 --- a/app/scripts/services/project.service.js +++ b/app/scripts/services/project.service.js @@ -15,6 +15,7 @@ angular.module('icestudio') this.changed = false; var project = _default(); + var allDependencies = {}; function _default() { return { @@ -63,6 +64,10 @@ angular.module('icestudio') } }; + this.getAllDependencies = function() { + return allDependencies; + }; + this.new = function(name) { this.path = ''; project = _default(); @@ -91,7 +96,8 @@ angular.module('icestudio') alertify.notify(gettextCatalog.getString('Old project format'), 'warning', 5); } project = _safeLoad(data); - graph.setDependencies(project.dependencies); + allDependencies = project.dependencies; + graph.setDependencies(allDependencies); var ret = graph.loadDesign(project.design, false, function() { graph.resetCommandStack(); alertify.success(gettextCatalog.getString('Project {{name}} loaded', { name: utils.bold(name) })); @@ -177,9 +183,9 @@ angular.module('icestudio') break; } // Safe load all dependencies recursively - for (var d in project.design.deps) { + /*for (var d in project.design.deps) { project.design.deps[d] = _safeLoad(project.design.deps[d]); - } + }*/ return project; } @@ -318,7 +324,7 @@ angular.module('icestudio') }); }; - this.update = function(callback) { + this.update = function(callback, updateDependencies) { var graphData = graph.toJSON(); var blocks = []; @@ -365,11 +371,32 @@ angular.module('icestudio') zoom: parseFloat(state.zoom.toFixed(4)) }; + // Update dependencies + if (updateDependencies !== false) { + project.dependencies = []; + var types = findSubDependencies(project); + for (var i in types) { + project.dependencies.push(allDependencies[types[i]]); + } + } + if (callback) { callback(); } }; + function findSubDependencies(dependency) { + var subDependencies = []; + var blocks = dependency.design.graph.blocks; + for (var i in blocks) { + var type = blocks[i].type; + subDependencies.push(type); + var newSubDependencies = findSubDependencies(allDependencies[type]); + subDependencies = subDependencies.concat(newSubDependencies); + } + return _.unique(subDependencies); + } + this.updateTitle = function(name) { if (name) { this.name = name; @@ -397,7 +424,7 @@ angular.module('icestudio') var type = utils.dependencyID(block); mergeDependencies(type, block); graph.createBlock(type, block); - graph.setDependencies(project.dependencies); + graph.setDependencies(allDependencies); } }; @@ -420,26 +447,24 @@ angular.module('icestudio') } function mergeDependencies(type, block) { - if (type in project.dependencies) { + if (type in allDependencies) { return; // If the block is already in dependencies } // Merge the block dependencies var deps = block.dependencies; for (var i in deps) { var depType = utils.dependencyID(deps[i]); - if (!(depType in project.dependencies)) { - project.dependencies[depType] = deps[i]; + if (!(depType in allDependencies)) { + allDependencies[depType] = deps[i]; } } // Add the block as a dependency delete block.dependencies; - project.dependencies[type] = block; + allDependencies[type] = block; } this.removeSelected = function() { - graph.removeSelected(function(type) { - delete project.design.deps[type]; - }); + graph.removeSelected(); }; this.clear = function() { From 7edd23f7e22f3a649b9328dc0e5bb6c762abbd8a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jes=C3=BAs=20Arroyo=20Torrens?= Date: Tue, 17 Jan 2017 19:20:32 +0100 Subject: [PATCH 134/169] Update compiler to format 1.1 --- app/scripts/plugins/shapes/joint.shapes.js | 7 ++-- app/scripts/services/compiler.service.js | 42 ++++++++++++---------- app/scripts/services/project.service.js | 16 ++++++--- app/scripts/services/tools.service.js | 4 +-- 4 files changed, 39 insertions(+), 30 deletions(-) diff --git a/app/scripts/plugins/shapes/joint.shapes.js b/app/scripts/plugins/shapes/joint.shapes.js index 12160c176..54d9f772e 100644 --- a/app/scripts/plugins/shapes/joint.shapes.js +++ b/app/scripts/plugins/shapes/joint.shapes.js @@ -706,11 +706,10 @@ joint.shapes.ice.CodeView = joint.shapes.ice.ModelView.extend({ self.deltas = self.deltas.concat([delta]); // Launch timer to self.timer = setTimeout(function() { + var data = JSON.parse(JSON.stringify(self.model.get('data'))); // Set data - var data = { - code: self.editor.session.getValue(), - deltas: self.deltas - }; + data.code = self.editor.session.getValue(); + data.deltas = self.deltas; self.model.set('data', data); // Reset deltas self.deltas = []; diff --git a/app/scripts/services/compiler.service.js b/app/scripts/services/compiler.service.js index f3671915d..5214e4683 100644 --- a/app/scripts/services/compiler.service.js +++ b/app/scripts/services/compiler.service.js @@ -41,11 +41,9 @@ angular.module('icestudio') function digestId(id) { if (id.indexOf('-') !== -1) { - return 'v' + nodeSha1(id).toString().substring(0, 6); - } - else { - return id.replace(/\./g, '_'); - } + id = nodeSha1(id).toString(); + } + return 'v' + id.substring(0, 6); } function module(data) { @@ -233,7 +231,6 @@ angular.module('icestudio') var blocks = graph.blocks; for (var b in blocks) { - var instance = ''; var block = blocks[b]; if (block.type !== 'basic.input' && @@ -242,12 +239,13 @@ angular.module('icestudio') block.type !== 'basic.info') { // Header - instance += name; + + var instance = ''; if (block.type === 'basic.code') { - instance += '_' + digestId(block.id); + instance = digestId(block.id); } else { - instance += '_' + digestId(block.type); + instance = digestId(block.type); } //-- Parameters @@ -257,7 +255,10 @@ angular.module('icestudio') wire = graph.wires[w]; if ((block.id === wire.target.block) && (wire.source.port === 'constant-out')) { - var paramName = digestId(wire.target.port); + var paramName = wire.target.port; + if (block.type !== 'basic.code') { + paramName = digestId(paramName); + } var param = ''; param += ' .' + paramName; param += '(p' + w + ')'; @@ -282,12 +283,15 @@ angular.module('icestudio') var isConstant = false; wire = graph.wires[w]; if (block.id === wire.source.block) { - portName = digestId(wire.source.port); + portName = wire.source.port; } else if (block.id === wire.target.block) { - portName = digestId(wire.target.port); + portName = wire.target.port; isConstant = wire.source.port === 'constant-out'; } + if (portName && block.type !== 'basic.code') { + portName = digestId(portName); + } if (portName && !isConstant && portsNames.indexOf(portName) === -1) { portsNames.push(portName); @@ -299,10 +303,10 @@ angular.module('icestudio') } instance += ' (\n' + ports.join(',\n') + '\n);'; - } - if (instance) { - instances.push(instance); + if (instance) { + instances.push(instance); + } } } return instances; @@ -326,7 +330,7 @@ angular.module('icestudio') project.design.graph) { var graph = project.design.graph; - var deps = project.design.deps; + var dependencies = project.dependencies; // Main module @@ -342,8 +346,8 @@ angular.module('icestudio') // Dependencies modules - for (var d in deps) { - code += verilogCompiler(name + '_' + digestId(d), deps[d]); + for (var d in dependencies) { + code += verilogCompiler(digestId(d), dependencies[d]); } // Code modules @@ -353,7 +357,7 @@ angular.module('icestudio') if (block) { if (block.type === 'basic.code') { data = { - name: name + '_' + digestId(block.id), + name: digestId(block.id), params: block.data.params, ports: block.data.ports, content: block.data.code diff --git a/app/scripts/services/project.service.js b/app/scripts/services/project.service.js index 0f6b90481..7b1f37bc9 100644 --- a/app/scripts/services/project.service.js +++ b/app/scripts/services/project.service.js @@ -64,6 +64,10 @@ angular.module('icestudio') } }; + this.getProject = function() { + return project; + }; + this.getAllDependencies = function() { return allDependencies; }; @@ -373,10 +377,10 @@ angular.module('icestudio') // Update dependencies if (updateDependencies !== false) { - project.dependencies = []; + project.dependencies = {}; var types = findSubDependencies(project); for (var i in types) { - project.dependencies.push(allDependencies[types[i]]); + project.dependencies[types[i]] = allDependencies[types[i]]; } } @@ -390,9 +394,11 @@ angular.module('icestudio') var blocks = dependency.design.graph.blocks; for (var i in blocks) { var type = blocks[i].type; - subDependencies.push(type); - var newSubDependencies = findSubDependencies(allDependencies[type]); - subDependencies = subDependencies.concat(newSubDependencies); + if (type.indexOf('basic.') === -1) { + subDependencies.push(type); + var newSubDependencies = findSubDependencies(allDependencies[type]); + subDependencies = subDependencies.concat(newSubDependencies); + } } return _.unique(subDependencies); } diff --git a/app/scripts/services/tools.service.js b/app/scripts/services/tools.service.js index e7670c6ea..82cf10f2e 100644 --- a/app/scripts/services/tools.service.js +++ b/app/scripts/services/tools.service.js @@ -132,8 +132,8 @@ angular.module('icestudio') nodeFs.mkdirSync(buildPath); } project.update(); - var verilog = compiler.generate('verilog', project.project); - var pcf = compiler.generate('pcf', project.project); + var verilog = compiler.generate('verilog', project.getProject()); + var pcf = compiler.generate('pcf', project.getProject()); nodeFs.writeFileSync(nodePath.join(buildPath, 'main.v'), verilog, 'utf8'); nodeFs.writeFileSync(nodePath.join(buildPath, 'main.pcf'), pcf, 'utf8'); return verilog; From af6ef42ccb60d11800916228fd5e43a2694faf27 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jes=C3=BAs=20Arroyo=20Torrens?= Date: Tue, 17 Jan 2017 20:47:41 +0100 Subject: [PATCH 135/169] Convert blocks to format 1.1 --- app/resources/blocks/bit/0.ice | 6 ++-- app/resources/blocks/bit/1.ice | 8 ++--- app/resources/blocks/config/pull_up.ice | 8 ++--- app/resources/blocks/config/pull_up_inv.ice | 8 ++--- app/resources/blocks/config/tri_state.ice | 8 ++--- .../blocks/logic/combinational/demux_1_2.ice | 8 ++--- .../blocks/logic/combinational/demux_1_4.ice | 14 ++++---- .../blocks/logic/combinational/demux_1_8.ice | 14 ++++---- .../logic/combinational/hex_7seg_ca.ice | 14 ++++---- .../logic/combinational/hex_7seg_cc.ice | 14 ++++---- .../blocks/logic/combinational/mux_2_1.ice | 12 +++---- .../blocks/logic/combinational/mux_4_1.ice | 8 ++--- app/resources/blocks/logic/gate/and.ice | 8 ++--- app/resources/blocks/logic/gate/nand.ice | 8 ++--- app/resources/blocks/logic/gate/nor.ice | 8 ++--- app/resources/blocks/logic/gate/not.ice | 8 ++--- app/resources/blocks/logic/gate/or.ice | 8 ++--- app/resources/blocks/logic/gate/xnor.ice | 8 ++--- app/resources/blocks/logic/gate/xor.ice | 8 ++--- .../blocks/logic/sequential/debouncer.ice | 8 ++--- .../blocks/logic/sequential/dff_ar.ice | 8 ++--- .../blocks/logic/sequential/dff_sr.ice | 8 ++--- .../blocks/logic/sequential/tff_ar.ice | 8 ++--- .../blocks/logic/sequential/tff_sr.ice | 8 ++--- app/scripts/services/blocks.service.js | 2 +- app/scripts/services/compiler.service.js | 16 ++++----- app/scripts/services/project.service.js | 34 +++++++++++++------ app/scripts/services/tools.service.js | 4 +-- 28 files changed, 144 insertions(+), 130 deletions(-) diff --git a/app/resources/blocks/bit/0.ice b/app/resources/blocks/bit/0.ice index 7a3093203..e8fa3794f 100644 --- a/app/resources/blocks/bit/0.ice +++ b/app/resources/blocks/bit/0.ice @@ -1,5 +1,5 @@ { - "version": "1.0", + "version": "1.1", "package": { "name": "Bit 0", "version": "1.0.0", @@ -64,7 +64,6 @@ } ] }, - "deps": {}, "state": { "pan": { "x": 0, @@ -72,5 +71,6 @@ }, "zoom": 1 } - } + }, + "dependencies": {} } \ No newline at end of file diff --git a/app/resources/blocks/bit/1.ice b/app/resources/blocks/bit/1.ice index 796330712..91ec7a7da 100644 --- a/app/resources/blocks/bit/1.ice +++ b/app/resources/blocks/bit/1.ice @@ -1,5 +1,5 @@ { - "version": "1.0", + "version": "1.1", "package": { "name": "Bit 1", "version": "1.0.0", @@ -64,7 +64,6 @@ } ] }, - "deps": {}, "state": { "pan": { "x": 0, @@ -72,5 +71,6 @@ }, "zoom": 1 } - } -} + }, + "dependencies": {} +} \ No newline at end of file diff --git a/app/resources/blocks/config/pull_up.ice b/app/resources/blocks/config/pull_up.ice index 468b408c2..49b945609 100644 --- a/app/resources/blocks/config/pull_up.ice +++ b/app/resources/blocks/config/pull_up.ice @@ -1,5 +1,5 @@ { - "version": "1.0", + "version": "1.1", "package": { "name": "Pull up", "version": "1.0.0", @@ -97,7 +97,6 @@ } ] }, - "deps": {}, "state": { "pan": { "x": 0, @@ -105,5 +104,6 @@ }, "zoom": 1 } - } -} + }, + "dependencies": {} +} \ No newline at end of file diff --git a/app/resources/blocks/config/pull_up_inv.ice b/app/resources/blocks/config/pull_up_inv.ice index b89fae0e6..934b9a167 100644 --- a/app/resources/blocks/config/pull_up_inv.ice +++ b/app/resources/blocks/config/pull_up_inv.ice @@ -1,5 +1,5 @@ { - "version": "1.0", + "version": "1.1", "package": { "name": "Pull up inv", "version": "1.0.0", @@ -97,7 +97,6 @@ } ] }, - "deps": {}, "state": { "pan": { "x": 0, @@ -105,5 +104,6 @@ }, "zoom": 1 } - } -} + }, + "dependencies": {} +} \ No newline at end of file diff --git a/app/resources/blocks/config/tri_state.ice b/app/resources/blocks/config/tri_state.ice index 366f25b1d..59623608a 100644 --- a/app/resources/blocks/config/tri_state.ice +++ b/app/resources/blocks/config/tri_state.ice @@ -1,5 +1,5 @@ { - "version": "1.0", + "version": "1.1", "package": { "name": "Tri state", "version": "1.0.0", @@ -161,7 +161,6 @@ } ] }, - "deps": {}, "state": { "pan": { "x": 0, @@ -169,5 +168,6 @@ }, "zoom": 1 } - } -} + }, + "dependencies": {} +} \ No newline at end of file diff --git a/app/resources/blocks/logic/combinational/demux_1_2.ice b/app/resources/blocks/logic/combinational/demux_1_2.ice index 177e2eaf9..bf21af960 100644 --- a/app/resources/blocks/logic/combinational/demux_1_2.ice +++ b/app/resources/blocks/logic/combinational/demux_1_2.ice @@ -1,5 +1,5 @@ { - "version": "1.0", + "version": "1.1", "package": { "name": "Demux 1:2", "version": "1.0.0", @@ -161,7 +161,6 @@ } ] }, - "deps": {}, "state": { "pan": { "x": 0, @@ -169,5 +168,6 @@ }, "zoom": 1 } - } -} + }, + "dependencies": {} +} \ No newline at end of file diff --git a/app/resources/blocks/logic/combinational/demux_1_4.ice b/app/resources/blocks/logic/combinational/demux_1_4.ice index 48fd98053..48ced9775 100644 --- a/app/resources/blocks/logic/combinational/demux_1_4.ice +++ b/app/resources/blocks/logic/combinational/demux_1_4.ice @@ -1,5 +1,5 @@ { - "version": "1.0", + "version": "1.1", "package": { "name": "Demux 1:4", "version": "1.0.0", @@ -257,13 +257,13 @@ } ] }, - "deps": {}, "state": { "pan": { - "x": 11.176135344899718, - "y": 3.2150526334643024 + "x": 11.1761, + "y": 3.2151 }, - "zoom": 0.9234510996506167 + "zoom": 0.9235 } - } -} + }, + "dependencies": {} +} \ No newline at end of file diff --git a/app/resources/blocks/logic/combinational/demux_1_8.ice b/app/resources/blocks/logic/combinational/demux_1_8.ice index 7ccb9a900..f281e1dc6 100644 --- a/app/resources/blocks/logic/combinational/demux_1_8.ice +++ b/app/resources/blocks/logic/combinational/demux_1_8.ice @@ -1,5 +1,5 @@ { - "version": "1.0", + "version": "1.1", "package": { "name": "Demux 1:8", "version": "1.0.0", @@ -471,13 +471,13 @@ } ] }, - "deps": {}, "state": { "pan": { - "x": 143.76402059142058, - "y": 110.755583226028 + "x": 143.764, + "y": 110.7556 }, - "zoom": 0.7272029968400818 + "zoom": 0.7272 } - } -} + }, + "dependencies": {} +} \ No newline at end of file diff --git a/app/resources/blocks/logic/combinational/hex_7seg_ca.ice b/app/resources/blocks/logic/combinational/hex_7seg_ca.ice index 3c76dbe3f..7576429a8 100644 --- a/app/resources/blocks/logic/combinational/hex_7seg_ca.ice +++ b/app/resources/blocks/logic/combinational/hex_7seg_ca.ice @@ -1,5 +1,5 @@ { - "version": "1.0", + "version": "1.1", "package": { "name": "Hex 7seg CA", "version": "1.0.0", @@ -415,13 +415,13 @@ } ] }, - "deps": {}, "state": { "pan": { - "x": -152.07320110504, - "y": -209.21075900090992 + "x": -152.0732, + "y": -209.2108 }, - "zoom": 0.7373584811199316 + "zoom": 0.7374 } - } -} + }, + "dependencies": {} +} \ No newline at end of file diff --git a/app/resources/blocks/logic/combinational/hex_7seg_cc.ice b/app/resources/blocks/logic/combinational/hex_7seg_cc.ice index c86f12e85..fb9b3d09f 100644 --- a/app/resources/blocks/logic/combinational/hex_7seg_cc.ice +++ b/app/resources/blocks/logic/combinational/hex_7seg_cc.ice @@ -1,5 +1,5 @@ { - "version": "1.0", + "version": "1.1", "package": { "name": "Hex 7seg CC", "version": "1.0.0", @@ -409,13 +409,13 @@ } ] }, - "deps": {}, "state": { "pan": { - "x": -152.07320110504, - "y": -209.21075900090992 + "x": -152.0732, + "y": -209.2108 }, - "zoom": 0.7373584371699413 + "zoom": 0.7374 } - } -} + }, + "dependencies": {} +} \ No newline at end of file diff --git a/app/resources/blocks/logic/combinational/mux_2_1.ice b/app/resources/blocks/logic/combinational/mux_2_1.ice index f091a2f4b..aa5bc7ae2 100644 --- a/app/resources/blocks/logic/combinational/mux_2_1.ice +++ b/app/resources/blocks/logic/combinational/mux_2_1.ice @@ -1,5 +1,5 @@ { - "version": "1.0", + "version": "1.1", "package": { "name": "Mux 2:1", "version": "1.0.0", @@ -161,13 +161,13 @@ } ] }, - "deps": {}, "state": { "pan": { - "x": -21.03752160981206, - "y": 29.479234822175684 + "x": -21.0375, + "y": 29.4792 }, "zoom": 1 } - } -} + }, + "dependencies": {} +} \ No newline at end of file diff --git a/app/resources/blocks/logic/combinational/mux_4_1.ice b/app/resources/blocks/logic/combinational/mux_4_1.ice index 93d1bba3a..6b9b53ad6 100644 --- a/app/resources/blocks/logic/combinational/mux_4_1.ice +++ b/app/resources/blocks/logic/combinational/mux_4_1.ice @@ -1,5 +1,5 @@ { - "version": "1.0", + "version": "1.1", "package": { "name": "Mux 4:1", "version": "1.0.0", @@ -269,7 +269,6 @@ } ] }, - "deps": {}, "state": { "pan": { "x": 0, @@ -277,5 +276,6 @@ }, "zoom": 1 } - } -} + }, + "dependencies": {} +} \ No newline at end of file diff --git a/app/resources/blocks/logic/gate/and.ice b/app/resources/blocks/logic/gate/and.ice index e7c76f789..ebb235e4f 100644 --- a/app/resources/blocks/logic/gate/and.ice +++ b/app/resources/blocks/logic/gate/and.ice @@ -1,5 +1,5 @@ { - "version": "1.0", + "version": "1.1", "package": { "name": "AND", "version": "1.0.0", @@ -129,7 +129,6 @@ } ] }, - "deps": {}, "state": { "pan": { "x": 0, @@ -137,5 +136,6 @@ }, "zoom": 1 } - } -} + }, + "dependencies": {} +} \ No newline at end of file diff --git a/app/resources/blocks/logic/gate/nand.ice b/app/resources/blocks/logic/gate/nand.ice index 7cfc60c7a..3db99ebb5 100644 --- a/app/resources/blocks/logic/gate/nand.ice +++ b/app/resources/blocks/logic/gate/nand.ice @@ -1,5 +1,5 @@ { - "version": "1.0", + "version": "1.1", "package": { "name": "NAND", "version": "1.0.0", @@ -129,7 +129,6 @@ } ] }, - "deps": {}, "state": { "pan": { "x": 0, @@ -137,5 +136,6 @@ }, "zoom": 1 } - } -} + }, + "dependencies": {} +} \ No newline at end of file diff --git a/app/resources/blocks/logic/gate/nor.ice b/app/resources/blocks/logic/gate/nor.ice index d9d75bacf..93768b7ca 100644 --- a/app/resources/blocks/logic/gate/nor.ice +++ b/app/resources/blocks/logic/gate/nor.ice @@ -1,5 +1,5 @@ { - "version": "1.0", + "version": "1.1", "package": { "name": "NOR", "version": "1.0.0", @@ -129,7 +129,6 @@ } ] }, - "deps": {}, "state": { "pan": { "x": 0, @@ -137,5 +136,6 @@ }, "zoom": 1 } - } -} + }, + "dependencies": {} +} \ No newline at end of file diff --git a/app/resources/blocks/logic/gate/not.ice b/app/resources/blocks/logic/gate/not.ice index 712e579c3..e81bd15da 100644 --- a/app/resources/blocks/logic/gate/not.ice +++ b/app/resources/blocks/logic/gate/not.ice @@ -1,5 +1,5 @@ { - "version": "1.0", + "version": "1.1", "package": { "name": "NOT", "version": "1.0.0", @@ -97,7 +97,6 @@ } ] }, - "deps": {}, "state": { "pan": { "x": 0, @@ -105,5 +104,6 @@ }, "zoom": 1 } - } -} + }, + "dependencies": {} +} \ No newline at end of file diff --git a/app/resources/blocks/logic/gate/or.ice b/app/resources/blocks/logic/gate/or.ice index 90769baf6..2daface97 100644 --- a/app/resources/blocks/logic/gate/or.ice +++ b/app/resources/blocks/logic/gate/or.ice @@ -1,5 +1,5 @@ { - "version": "1.0", + "version": "1.1", "package": { "name": "OR", "version": "1.0.0", @@ -129,7 +129,6 @@ } ] }, - "deps": {}, "state": { "pan": { "x": 0, @@ -137,5 +136,6 @@ }, "zoom": 1 } - } -} + }, + "dependencies": {} +} \ No newline at end of file diff --git a/app/resources/blocks/logic/gate/xnor.ice b/app/resources/blocks/logic/gate/xnor.ice index 529f288e6..c1bf5bce5 100644 --- a/app/resources/blocks/logic/gate/xnor.ice +++ b/app/resources/blocks/logic/gate/xnor.ice @@ -1,5 +1,5 @@ { - "version": "1.0", + "version": "1.1", "package": { "name": "XNOR", "version": "1.0.0", @@ -129,7 +129,6 @@ } ] }, - "deps": {}, "state": { "pan": { "x": 0, @@ -137,5 +136,6 @@ }, "zoom": 1 } - } -} + }, + "dependencies": {} +} \ No newline at end of file diff --git a/app/resources/blocks/logic/gate/xor.ice b/app/resources/blocks/logic/gate/xor.ice index 463a088f1..30a46a1cd 100644 --- a/app/resources/blocks/logic/gate/xor.ice +++ b/app/resources/blocks/logic/gate/xor.ice @@ -1,5 +1,5 @@ { - "version": "1.0", + "version": "1.1", "package": { "name": "XOR", "version": "1.0.0", @@ -129,7 +129,6 @@ } ] }, - "deps": {}, "state": { "pan": { "x": 0, @@ -137,5 +136,6 @@ }, "zoom": 1 } - } -} + }, + "dependencies": {} +} \ No newline at end of file diff --git a/app/resources/blocks/logic/sequential/debouncer.ice b/app/resources/blocks/logic/sequential/debouncer.ice index c49e1de35..f9c78407d 100644 --- a/app/resources/blocks/logic/sequential/debouncer.ice +++ b/app/resources/blocks/logic/sequential/debouncer.ice @@ -1,5 +1,5 @@ { - "version": "1.0", + "version": "1.1", "package": { "name": "Debouncer", "version": "1.0.0", @@ -129,7 +129,6 @@ } ] }, - "deps": {}, "state": { "pan": { "x": 0, @@ -137,5 +136,6 @@ }, "zoom": 1 } - } -} + }, + "dependencies": {} +} \ No newline at end of file diff --git a/app/resources/blocks/logic/sequential/dff_ar.ice b/app/resources/blocks/logic/sequential/dff_ar.ice index 55c82d609..e623bf232 100644 --- a/app/resources/blocks/logic/sequential/dff_ar.ice +++ b/app/resources/blocks/logic/sequential/dff_ar.ice @@ -1,5 +1,5 @@ { - "version": "1.0", + "version": "1.1", "package": { "name": "DFF async", "version": "1.0.0", @@ -225,7 +225,6 @@ } ] }, - "deps": {}, "state": { "pan": { "x": -100, @@ -233,5 +232,6 @@ }, "zoom": 1 } - } -} + }, + "dependencies": {} +} \ No newline at end of file diff --git a/app/resources/blocks/logic/sequential/dff_sr.ice b/app/resources/blocks/logic/sequential/dff_sr.ice index 9779e1902..10d174586 100644 --- a/app/resources/blocks/logic/sequential/dff_sr.ice +++ b/app/resources/blocks/logic/sequential/dff_sr.ice @@ -1,5 +1,5 @@ { - "version": "1.0", + "version": "1.1", "package": { "name": "DFF", "version": "1.0.0", @@ -225,7 +225,6 @@ } ] }, - "deps": {}, "state": { "pan": { "x": -100, @@ -233,5 +232,6 @@ }, "zoom": 1 } - } -} + }, + "dependencies": {} +} \ No newline at end of file diff --git a/app/resources/blocks/logic/sequential/tff_ar.ice b/app/resources/blocks/logic/sequential/tff_ar.ice index b4cc0fbbb..4ddcd0ea2 100644 --- a/app/resources/blocks/logic/sequential/tff_ar.ice +++ b/app/resources/blocks/logic/sequential/tff_ar.ice @@ -1,5 +1,5 @@ { - "version": "1.0", + "version": "1.1", "package": { "name": "TFF async", "version": "1.0.0", @@ -225,7 +225,6 @@ } ] }, - "deps": {}, "state": { "pan": { "x": -100, @@ -233,5 +232,6 @@ }, "zoom": 1 } - } -} + }, + "dependencies": {} +} \ No newline at end of file diff --git a/app/resources/blocks/logic/sequential/tff_sr.ice b/app/resources/blocks/logic/sequential/tff_sr.ice index 884cbad2a..1d2786f39 100644 --- a/app/resources/blocks/logic/sequential/tff_sr.ice +++ b/app/resources/blocks/logic/sequential/tff_sr.ice @@ -1,5 +1,5 @@ { - "version": "1.0", + "version": "1.1", "package": { "name": "TFF", "version": "1.0.0", @@ -225,7 +225,6 @@ } ] }, - "deps": {}, "state": { "pan": { "x": -100, @@ -233,5 +232,6 @@ }, "zoom": 1 } - } -} + }, + "dependencies": {} +} \ No newline at end of file diff --git a/app/scripts/services/blocks.service.js b/app/scripts/services/blocks.service.js index ada7c9828..98d4da0c9 100644 --- a/app/scripts/services/blocks.service.js +++ b/app/scripts/services/blocks.service.js @@ -527,7 +527,7 @@ angular.module('icestudio') var height = 8 * gridsize; height = Math.max(4 * gridsize * numPortsHeight, height); - var blockLabel = block.package.name; + var blockLabel = block.package.name ? block.package.name : instance.type; var width = 12 * gridsize; width = Math.max(4 * gridsize * numPortsWidth, width); diff --git a/app/scripts/services/compiler.service.js b/app/scripts/services/compiler.service.js index 5214e4683..a6872a477 100644 --- a/app/scripts/services/compiler.service.js +++ b/app/scripts/services/compiler.service.js @@ -471,14 +471,14 @@ angular.module('icestudio') // Clock signal var hasClk = false; for (i in input) { - if (input[i].name.toLowerCase() === 'input_clk') { + if (input[i].name.toLowerCase() === 'clk') { hasClk = true; break; } } if (hasClk) { content += '\n// Clock signal\n'; - content += 'always #0.5 input_clk = ~input_clk;\n'; + content += 'always #0.5 clk = ~clk;\n'; } content += '\ninitial begin\n'; @@ -486,8 +486,8 @@ angular.module('icestudio') content += ' $dumpfile(`DUMPSTR(`VCD_OUTPUT));\n'; content += ' $dumpvars(0, main_tb);\n\n'; content += ' // TODO: initialize the registers here\n'; - content += ' // e.g. input_value = 1;\n'; - content += ' // e.g. #2 input_value = 0;\n'; + content += ' // e.g. value = 1;\n'; + content += ' // e.g. #2 value = 0;\n'; for (i in input) { content += ' ' + input[i].name + ' = 0;\n'; } @@ -535,14 +535,14 @@ angular.module('icestudio') if (block.data.name) { input.push({ id: digestId(block.id), - name: 'input_' + block.data.name.replace(/ /g, '_'), + name: block.data.name.replace(/ /g, '_'), range: block.data.range }); } else { input.push({ id: digestId(block.id), - name: 'input_' + inputUnnamed.toString(), + name: inputUnnamed.toString(), }); inputUnnamed += 1; } @@ -551,14 +551,14 @@ angular.module('icestudio') if (block.data.name) { output.push({ id: digestId(block.id), - name: 'output_' + block.data.name.replace(/ /g, '_'), + name: block.data.name.replace(/ /g, '_'), range: block.data.range }); } else { output.push({ id: digestId(block.id), - name: 'output_' + outputUnnamed.toString() + name: outputUnnamed.toString() }); outputUnnamed += 1; } diff --git a/app/scripts/services/project.service.js b/app/scripts/services/project.service.js index 7b1f37bc9..e07ee14b9 100644 --- a/app/scripts/services/project.service.js +++ b/app/scripts/services/project.service.js @@ -14,12 +14,14 @@ angular.module('icestudio') this.path = ''; // Used in Save / Save as this.changed = false; + const VERSION = '1.1'; + var project = _default(); var allDependencies = {}; function _default() { return { - version: '1.1', + version: VERSION, package: { name: '', version: '', @@ -56,6 +58,9 @@ angular.module('icestudio') if (key in project) { return project[key]; } + else { + return project; + } }; this.set = function(key, obj) { @@ -64,10 +69,6 @@ angular.module('icestudio') } }; - this.getProject = function() { - return project; - }; - this.getAllDependencies = function() { return allDependencies; }; @@ -96,7 +97,7 @@ angular.module('icestudio') }; this.load = function(name, data) { - if (!data.version) { + if (data.version !== VERSION) { alertify.notify(gettextCatalog.getString('Old project format'), 'warning', 5); } project = _safeLoad(data); @@ -119,11 +120,16 @@ angular.module('icestudio') function _safeLoad(data) { var project = {}; switch(data.version) { - case '1.1': + case VERSION: project = data; break; case '1.0': - project = data; + project = _default(); + project.package = data.package; + project.design.board = data.design.board; + project.design.graph = convertTypes10to11(data.design.graph); + project.design.state = data.design.state; + project.dependencies = findDependencies10to11(data.design.deps); break; default: for (var b in data.graph.blocks) { @@ -182,8 +188,8 @@ angular.module('icestudio') project = _default(); project.design.board = data.board; project.design.graph = data.graph; - project.design.deps = data.deps; project.design.state = data.state; + project.dependencies = data.deps; break; } // Safe load all dependencies recursively @@ -193,6 +199,14 @@ angular.module('icestudio') return project; } + function convertTypes10to11(graph) { + return graph; + } + + function findDependencies10to11(dependencies) { + return dependencies; + } + this.save = function(filepath) { var name = utils.basename(filepath); this.path = filepath; @@ -228,7 +242,7 @@ angular.module('icestudio') this.addAsBlock = function(filepath) { var self = this; utils.readFile(filepath, function(data) { - if (!data.version) { + if (data.version !== VERSION) { alertify.notify(gettextCatalog.getString('Old project format'), 'warning', 5); } var block = _safeLoad(data); diff --git a/app/scripts/services/tools.service.js b/app/scripts/services/tools.service.js index 82cf10f2e..7d6142520 100644 --- a/app/scripts/services/tools.service.js +++ b/app/scripts/services/tools.service.js @@ -132,8 +132,8 @@ angular.module('icestudio') nodeFs.mkdirSync(buildPath); } project.update(); - var verilog = compiler.generate('verilog', project.getProject()); - var pcf = compiler.generate('pcf', project.getProject()); + var verilog = compiler.generate('verilog', project.get()); + var pcf = compiler.generate('pcf', project.get()); nodeFs.writeFileSync(nodePath.join(buildPath, 'main.v'), verilog, 'utf8'); nodeFs.writeFileSync(nodePath.join(buildPath, 'main.pcf'), pcf, 'utf8'); return verilog; From 19cea50c9517305fee278d216283369e2878ca5b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jes=C3=BAs=20Arroyo=20Torrens?= Date: Wed, 18 Jan 2017 10:57:53 +0100 Subject: [PATCH 136/169] Add backwards compatibility 1.0 -> 1.1 --- app/scripts/services/blocks.service.js | 2 +- app/scripts/services/project.service.js | 108 ++++++++++++++++++------ 2 files changed, 82 insertions(+), 28 deletions(-) diff --git a/app/scripts/services/blocks.service.js b/app/scripts/services/blocks.service.js index 98d4da0c9..ada7c9828 100644 --- a/app/scripts/services/blocks.service.js +++ b/app/scripts/services/blocks.service.js @@ -527,7 +527,7 @@ angular.module('icestudio') var height = 8 * gridsize; height = Math.max(4 * gridsize * numPortsHeight, height); - var blockLabel = block.package.name ? block.package.name : instance.type; + var blockLabel = block.package.name; var width = 12 * gridsize; width = Math.max(4 * gridsize * numPortsWidth, width); diff --git a/app/scripts/services/project.service.js b/app/scripts/services/project.service.js index e07ee14b9..adba4cffc 100644 --- a/app/scripts/services/project.service.js +++ b/app/scripts/services/project.service.js @@ -98,7 +98,7 @@ angular.module('icestudio') this.load = function(name, data) { if (data.version !== VERSION) { - alertify.notify(gettextCatalog.getString('Old project format'), 'warning', 5); + alertify.notify(gettextCatalog.getString('Old project format {{version}}', { version: data.version }), 'warning', 5); } project = _safeLoad(data); allDependencies = project.dependencies; @@ -119,17 +119,25 @@ angular.module('icestudio') function _safeLoad(data) { var project = {}; + console.log(data.version); switch(data.version) { case VERSION: project = data; break; case '1.0': + var depsInfo = findSubDependencies10(data.design.deps); + console.log(depsInfo); project = _default(); project.package = data.package; project.design.board = data.design.board; - project.design.graph = convertTypes10to11(data.design.graph); project.design.state = data.design.state; - project.dependencies = findDependencies10to11(data.design.deps); + project.design.graph = data.design.graph; + replaceType10(project, depsInfo); + for (var d in depsInfo) { + var dep = depsInfo[d]; + replaceType10(dep.content, depsInfo); + project.dependencies[dep.id] = dep.content; + } break; default: for (var b in data.graph.blocks) { @@ -185,26 +193,67 @@ angular.module('icestudio') break; } } - project = _default(); - project.design.board = data.board; - project.design.graph = data.graph; - project.design.state = data.state; - project.dependencies = data.deps; + project = { + version: '1.0', + package: { + name: '', + version: '', + description: '', + author: '', + image: '' + }, + design: { + board: data.board, + graph: data.graph, + deps: {}, + state: data.state + }, + }; + // Safe load all dependencies recursively + for (var j in data.deps) { + project.design.deps[j] = _safeLoad(data.deps[j]); + } + console.log('PROJECT', project.version, project); + project = _safeLoad(project); break; } - // Safe load all dependencies recursively - /*for (var d in project.design.deps) { - project.design.deps[d] = _safeLoad(project.design.deps[d]); - }*/ + console.log('PROJECT', project.version, project); return project; } - function convertTypes10to11(graph) { - return graph; + function findSubDependencies10(deps) { + var depsInfo = {}; + for (var key in deps) { + var block = utils.clone(deps[key]); + // Go recursive + var subDepsInfo = findSubDependencies10(block.design.deps); + for (var name in subDepsInfo) { + if (!(name in depsInfo)) { + depsInfo[name] = subDepsInfo[name]; + } + } + // Add current dependency + block = pruneBlock(block); + delete block.design.deps; + block.package.name = block.package.name || key; + block.package.description = block.package.description || key; + if (!(key in depsInfo)) { + depsInfo[key] = { + id: utils.dependencyID(block), + content: block + }; + } + } + return depsInfo; } - function findDependencies10to11(dependencies) { - return dependencies; + function replaceType10(project, depsInfo) { + for (var i in project.design.graph.blocks) { + var type = project.design.graph.blocks[i].type; + if (type.indexOf('basic.') === -1) { + project.design.graph.blocks[i].type = depsInfo[type].id; + } + } } this.save = function(filepath) { @@ -243,7 +292,7 @@ angular.module('icestudio') var self = this; utils.readFile(filepath, function(data) { if (data.version !== VERSION) { - alertify.notify(gettextCatalog.getString('Old project format'), 'warning', 5); + alertify.notify(gettextCatalog.getString('Old project format {{version}}', { version: data.version }), 'warning', 5); } var block = _safeLoad(data); if (block) { @@ -405,16 +454,19 @@ angular.module('icestudio') function findSubDependencies(dependency) { var subDependencies = []; - var blocks = dependency.design.graph.blocks; - for (var i in blocks) { - var type = blocks[i].type; - if (type.indexOf('basic.') === -1) { - subDependencies.push(type); - var newSubDependencies = findSubDependencies(allDependencies[type]); - subDependencies = subDependencies.concat(newSubDependencies); + if (dependency) { + var blocks = dependency.design.graph.blocks; + for (var i in blocks) { + var type = blocks[i].type; + if (type.indexOf('basic.') === -1) { + subDependencies.push(type); + var newSubDependencies = findSubDependencies(allDependencies[type]); + subDependencies = subDependencies.concat(newSubDependencies); + } } + return _.unique(subDependencies); } - return _.unique(subDependencies); + return subDependencies; } this.updateTitle = function(name) { @@ -457,8 +509,10 @@ angular.module('icestudio') for (i in block.design.graph.blocks) { if (block.design.graph.blocks[i].type === 'basic.input' || block.design.graph.blocks[i].type === 'basic.output') { - pins = block.design.graph.blocks[i].data.pins; - block.design.graph.blocks[i].data.size = (pins && pins.length > 1) ? pins.length : undefined; + if (block.design.graph.blocks[i].data.size === undefined) { + pins = block.design.graph.blocks[i].data.pins; + block.design.graph.blocks[i].data.size = (pins && pins.length > 1) ? pins.length : undefined; + } delete block.design.graph.blocks[i].data.pins; delete block.design.graph.blocks[i].data.virtual; } From c5bd8d585f23b63b44425c28f274b5dbbebfe2bc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jes=C3=BAs=20Arroyo=20Torrens?= Date: Wed, 18 Jan 2017 10:59:11 +0100 Subject: [PATCH 137/169] Update examples and samples to 1.1 --- .../examples/icestick/1_basic/1_led_on.ice | 140 ++-- .../examples/icestick/1_basic/contadorAsc.ice | 140 ++-- .../examples/icestick/1_basic/contadorDes.ice | 140 ++-- .../examples/icezum/1_basic/1_led_on.ice | 140 ++-- .../examples/icezum/1_basic/2_switch_led.ice | 6 +- .../icezum/1_basic/3_switch_and_gate.ice | 230 ++++--- samples/assign.ice | 8 +- samples/block.ice | 14 +- samples/complex.ice | 640 +++++++++--------- samples/counter.ice | 138 ++-- samples/in-out.ice | 6 +- samples/mux.ice | 8 +- samples/not.ice | 8 +- 13 files changed, 800 insertions(+), 818 deletions(-) diff --git a/app/resources/examples/icestick/1_basic/1_led_on.ice b/app/resources/examples/icestick/1_basic/1_led_on.ice index 1dc568425..d7e220c22 100644 --- a/app/resources/examples/icestick/1_basic/1_led_on.ice +++ b/app/resources/examples/icestick/1_basic/1_led_on.ice @@ -1,5 +1,5 @@ { - "version": "1.0", + "version": "1.1", "package": { "name": "Led on", "version": "1.0.0", @@ -13,7 +13,7 @@ "blocks": [ { "id": "eaf792b5-de98-4e2f-b78a-4023eb9a7f2b", - "type": "bit.1", + "type": "3e6c249e205080168c1bf4ee8dbc33b50653d5f4", "position": { "x": 80, "y": 64 @@ -74,81 +74,79 @@ } ] }, - "deps": { - "bit.1": { - "version": "1.0", - "package": { - "name": "Bit 1", - "version": "1.0.0", - "description": "Assign 1 to the output wire", - "author": "Jesús Arroyo", - "image": "%3Csvg%20xmlns=%22http://www.w3.org/2000/svg%22%20width=%2247.303%22%20height=%2227.648%22%20viewBox=%220%200%2044.346456%2025.919999%22%3E%3Ctext%20style=%22line-height:125%25%22%20x=%22325.218%22%20y=%22315.455%22%20font-weight=%22400%22%20font-size=%2212.669%22%20font-family=%22sans-serif%22%20letter-spacing=%220%22%20word-spacing=%220%22%20transform=%22translate(-307.01%20-298.51)%22%3E%3Ctspan%20x=%22325.218%22%20y=%22315.455%22%20style=%22-inkscape-font-specification:'Courier%2010%20Pitch'%22%20font-family=%22Courier%2010%20Pitch%22%3E1%3C/tspan%3E%3C/text%3E%3C/svg%3E" - }, - "design": { - "graph": { - "blocks": [ - { - "id": "b959fb96-ac67-4aea-90b3-ed35a4c17bf5", - "type": "basic.code", - "data": { - "code": "// Bit 1\n\nassign v = 1'b1;", - "params": [], - "ports": { - "in": [], - "out": [ - { - "name": "v" - } - ] - } - }, - "position": { - "x": 96, - "y": 96 + "state": { + "pan": { + "x": 0, + "y": 0 + }, + "zoom": 1 + } + }, + "dependencies": { + "3e6c249e205080168c1bf4ee8dbc33b50653d5f4": { + "package": { + "name": "Bit 1", + "version": "1.0.0", + "description": "Assign 1 to the output wire", + "author": "Jesús Arroyo", + "image": "%3Csvg%20xmlns=%22http://www.w3.org/2000/svg%22%20width=%2247.303%22%20height=%2227.648%22%20viewBox=%220%200%2044.346456%2025.919999%22%3E%3Ctext%20style=%22line-height:125%25%22%20x=%22325.218%22%20y=%22315.455%22%20font-weight=%22400%22%20font-size=%2212.669%22%20font-family=%22sans-serif%22%20letter-spacing=%220%22%20word-spacing=%220%22%20transform=%22translate(-307.01%20-298.51)%22%3E%3Ctspan%20x=%22325.218%22%20y=%22315.455%22%20style=%22-inkscape-font-specification:'Courier%2010%20Pitch'%22%20font-family=%22Courier%2010%20Pitch%22%3E1%3C/tspan%3E%3C/text%3E%3C/svg%3E" + }, + "design": { + "graph": { + "blocks": [ + { + "id": "b959fb96-ac67-4aea-90b3-ed35a4c17bf5", + "type": "basic.code", + "data": { + "code": "// Bit 1\n\nassign v = 1'b1;", + "params": [], + "ports": { + "in": [], + "out": [ + { + "name": "v" + } + ] } }, - { - "id": "19c8f68d-5022-487f-9ab0-f0a3cd58bead", - "type": "basic.output", - "data": { - "name": "" - }, - "position": { - "x": 608, - "y": 192 - } + "position": { + "x": 96, + "y": 96 } - ], - "wires": [ - { - "source": { - "block": "b959fb96-ac67-4aea-90b3-ed35a4c17bf5", - "port": "v" - }, - "target": { - "block": "19c8f68d-5022-487f-9ab0-f0a3cd58bead", - "port": "in" - } + }, + { + "id": "19c8f68d-5022-487f-9ab0-f0a3cd58bead", + "type": "basic.output", + "data": { + "name": "" + }, + "position": { + "x": 608, + "y": 192 + } + } + ], + "wires": [ + { + "source": { + "block": "b959fb96-ac67-4aea-90b3-ed35a4c17bf5", + "port": "v" + }, + "target": { + "block": "19c8f68d-5022-487f-9ab0-f0a3cd58bead", + "port": "in" } - ] + } + ] + }, + "state": { + "pan": { + "x": 0, + "y": 0 }, - "deps": {}, - "state": { - "pan": { - "x": 0, - "y": 0 - }, - "zoom": 1 - } + "zoom": 1 } } - }, - "state": { - "pan": { - "x": 0, - "y": 0 - }, - "zoom": 1 } } -} +} \ No newline at end of file diff --git a/app/resources/examples/icestick/1_basic/contadorAsc.ice b/app/resources/examples/icestick/1_basic/contadorAsc.ice index b31deca9e..f3021c6f9 100644 --- a/app/resources/examples/icestick/1_basic/contadorAsc.ice +++ b/app/resources/examples/icestick/1_basic/contadorAsc.ice @@ -1,5 +1,5 @@ { - "version": "1.0", + "version": "1.1", "package": { "name": "contadorAsc", "version": "0.1", @@ -123,7 +123,7 @@ }, { "id": "aa65e0fd-fea6-4cde-bcea-5b09f97848ff", - "type": "bit.1", + "type": "3e6c249e205080168c1bf4ee8dbc33b50653d5f4", "position": { "x": 72, "y": 224 @@ -299,81 +299,79 @@ } ] }, - "deps": { - "bit.1": { - "version": "1.0", - "package": { - "name": "Bit 1", - "version": "1.0.0", - "description": "Assign 1 to the output wire", - "author": "Jesús Arroyo", - "image": "%3Csvg%20xmlns=%22http://www.w3.org/2000/svg%22%20width=%2247.303%22%20height=%2227.648%22%20viewBox=%220%200%2044.346456%2025.919999%22%3E%3Ctext%20style=%22line-height:125%25%22%20x=%22325.218%22%20y=%22315.455%22%20font-weight=%22400%22%20font-size=%2212.669%22%20font-family=%22sans-serif%22%20letter-spacing=%220%22%20word-spacing=%220%22%20transform=%22translate(-307.01%20-298.51)%22%3E%3Ctspan%20x=%22325.218%22%20y=%22315.455%22%20style=%22-inkscape-font-specification:'Courier%2010%20Pitch'%22%20font-family=%22Courier%2010%20Pitch%22%3E1%3C/tspan%3E%3C/text%3E%3C/svg%3E" - }, - "design": { - "graph": { - "blocks": [ - { - "id": "b959fb96-ac67-4aea-90b3-ed35a4c17bf5", - "type": "basic.code", - "data": { - "code": "// Bit 1\n\nassign v = 1'b1;", - "params": [], - "ports": { - "in": [], - "out": [ - { - "name": "v" - } - ] - } - }, - "position": { - "x": 96, - "y": 96 + "state": { + "pan": { + "x": 0, + "y": 0 + }, + "zoom": 1 + } + }, + "dependencies": { + "3e6c249e205080168c1bf4ee8dbc33b50653d5f4": { + "package": { + "name": "Bit 1", + "version": "1.0.0", + "description": "Assign 1 to the output wire", + "author": "Jesús Arroyo", + "image": "%3Csvg%20xmlns=%22http://www.w3.org/2000/svg%22%20width=%2247.303%22%20height=%2227.648%22%20viewBox=%220%200%2044.346456%2025.919999%22%3E%3Ctext%20style=%22line-height:125%25%22%20x=%22325.218%22%20y=%22315.455%22%20font-weight=%22400%22%20font-size=%2212.669%22%20font-family=%22sans-serif%22%20letter-spacing=%220%22%20word-spacing=%220%22%20transform=%22translate(-307.01%20-298.51)%22%3E%3Ctspan%20x=%22325.218%22%20y=%22315.455%22%20style=%22-inkscape-font-specification:'Courier%2010%20Pitch'%22%20font-family=%22Courier%2010%20Pitch%22%3E1%3C/tspan%3E%3C/text%3E%3C/svg%3E" + }, + "design": { + "graph": { + "blocks": [ + { + "id": "b959fb96-ac67-4aea-90b3-ed35a4c17bf5", + "type": "basic.code", + "data": { + "code": "// Bit 1\n\nassign v = 1'b1;", + "params": [], + "ports": { + "in": [], + "out": [ + { + "name": "v" + } + ] } }, - { - "id": "19c8f68d-5022-487f-9ab0-f0a3cd58bead", - "type": "basic.output", - "data": { - "name": "" - }, - "position": { - "x": 608, - "y": 192 - } + "position": { + "x": 96, + "y": 96 } - ], - "wires": [ - { - "source": { - "block": "b959fb96-ac67-4aea-90b3-ed35a4c17bf5", - "port": "v" - }, - "target": { - "block": "19c8f68d-5022-487f-9ab0-f0a3cd58bead", - "port": "in" - } + }, + { + "id": "19c8f68d-5022-487f-9ab0-f0a3cd58bead", + "type": "basic.output", + "data": { + "name": "" + }, + "position": { + "x": 608, + "y": 192 + } + } + ], + "wires": [ + { + "source": { + "block": "b959fb96-ac67-4aea-90b3-ed35a4c17bf5", + "port": "v" + }, + "target": { + "block": "19c8f68d-5022-487f-9ab0-f0a3cd58bead", + "port": "in" } - ] + } + ] + }, + "state": { + "pan": { + "x": 0, + "y": 0 }, - "deps": {}, - "state": { - "pan": { - "x": 0, - "y": 0 - }, - "zoom": 1 - } + "zoom": 1 } } - }, - "state": { - "pan": { - "x": 0, - "y": 0 - }, - "zoom": 1.000000029620754 } } -} +} \ No newline at end of file diff --git a/app/resources/examples/icestick/1_basic/contadorDes.ice b/app/resources/examples/icestick/1_basic/contadorDes.ice index e0371ab2d..6a81de53a 100644 --- a/app/resources/examples/icestick/1_basic/contadorDes.ice +++ b/app/resources/examples/icestick/1_basic/contadorDes.ice @@ -1,5 +1,5 @@ { - "version": "1.0", + "version": "1.1", "package": { "name": "contadorDes", "version": "0.1", @@ -123,7 +123,7 @@ }, { "id": "dc5dc1c3-0471-4669-9760-2b2ee9d7d467", - "type": "bit.1", + "type": "3e6c249e205080168c1bf4ee8dbc33b50653d5f4", "position": { "x": 56, "y": 224 @@ -299,81 +299,79 @@ } ] }, - "deps": { - "bit.1": { - "version": "1.0", - "package": { - "name": "Bit 1", - "version": "1.0.0", - "description": "Assign 1 to the output wire", - "author": "Jesús Arroyo", - "image": "%3Csvg%20xmlns=%22http://www.w3.org/2000/svg%22%20width=%2247.303%22%20height=%2227.648%22%20viewBox=%220%200%2044.346456%2025.919999%22%3E%3Ctext%20style=%22line-height:125%25%22%20x=%22325.218%22%20y=%22315.455%22%20font-weight=%22400%22%20font-size=%2212.669%22%20font-family=%22sans-serif%22%20letter-spacing=%220%22%20word-spacing=%220%22%20transform=%22translate(-307.01%20-298.51)%22%3E%3Ctspan%20x=%22325.218%22%20y=%22315.455%22%20style=%22-inkscape-font-specification:'Courier%2010%20Pitch'%22%20font-family=%22Courier%2010%20Pitch%22%3E1%3C/tspan%3E%3C/text%3E%3C/svg%3E" - }, - "design": { - "graph": { - "blocks": [ - { - "id": "b959fb96-ac67-4aea-90b3-ed35a4c17bf5", - "type": "basic.code", - "data": { - "code": "// Bit 1\n\nassign v = 1'b1;", - "params": [], - "ports": { - "in": [], - "out": [ - { - "name": "v" - } - ] - } - }, - "position": { - "x": 96, - "y": 96 + "state": { + "pan": { + "x": 0, + "y": 0 + }, + "zoom": 1 + } + }, + "dependencies": { + "3e6c249e205080168c1bf4ee8dbc33b50653d5f4": { + "package": { + "name": "Bit 1", + "version": "1.0.0", + "description": "Assign 1 to the output wire", + "author": "Jesús Arroyo", + "image": "%3Csvg%20xmlns=%22http://www.w3.org/2000/svg%22%20width=%2247.303%22%20height=%2227.648%22%20viewBox=%220%200%2044.346456%2025.919999%22%3E%3Ctext%20style=%22line-height:125%25%22%20x=%22325.218%22%20y=%22315.455%22%20font-weight=%22400%22%20font-size=%2212.669%22%20font-family=%22sans-serif%22%20letter-spacing=%220%22%20word-spacing=%220%22%20transform=%22translate(-307.01%20-298.51)%22%3E%3Ctspan%20x=%22325.218%22%20y=%22315.455%22%20style=%22-inkscape-font-specification:'Courier%2010%20Pitch'%22%20font-family=%22Courier%2010%20Pitch%22%3E1%3C/tspan%3E%3C/text%3E%3C/svg%3E" + }, + "design": { + "graph": { + "blocks": [ + { + "id": "b959fb96-ac67-4aea-90b3-ed35a4c17bf5", + "type": "basic.code", + "data": { + "code": "// Bit 1\n\nassign v = 1'b1;", + "params": [], + "ports": { + "in": [], + "out": [ + { + "name": "v" + } + ] } }, - { - "id": "19c8f68d-5022-487f-9ab0-f0a3cd58bead", - "type": "basic.output", - "data": { - "name": "" - }, - "position": { - "x": 608, - "y": 192 - } + "position": { + "x": 96, + "y": 96 } - ], - "wires": [ - { - "source": { - "block": "b959fb96-ac67-4aea-90b3-ed35a4c17bf5", - "port": "v" - }, - "target": { - "block": "19c8f68d-5022-487f-9ab0-f0a3cd58bead", - "port": "in" - } + }, + { + "id": "19c8f68d-5022-487f-9ab0-f0a3cd58bead", + "type": "basic.output", + "data": { + "name": "" + }, + "position": { + "x": 608, + "y": 192 } - ] + } + ], + "wires": [ + { + "source": { + "block": "b959fb96-ac67-4aea-90b3-ed35a4c17bf5", + "port": "v" + }, + "target": { + "block": "19c8f68d-5022-487f-9ab0-f0a3cd58bead", + "port": "in" + } + } + ] + }, + "state": { + "pan": { + "x": 0, + "y": 0 }, - "deps": {}, - "state": { - "pan": { - "x": 0, - "y": 0 - }, - "zoom": 1 - } + "zoom": 1 } } - }, - "state": { - "pan": { - "x": 0, - "y": 0 - }, - "zoom": 1 } } -} +} \ No newline at end of file diff --git a/app/resources/examples/icezum/1_basic/1_led_on.ice b/app/resources/examples/icezum/1_basic/1_led_on.ice index 230f59129..44c798809 100644 --- a/app/resources/examples/icezum/1_basic/1_led_on.ice +++ b/app/resources/examples/icezum/1_basic/1_led_on.ice @@ -1,5 +1,5 @@ { - "version": "1.0", + "version": "1.1", "package": { "name": "Led on", "version": "1.0.0", @@ -13,7 +13,7 @@ "blocks": [ { "id": "eaf792b5-de98-4e2f-b78a-4023eb9a7f2b", - "type": "bit.1", + "type": "3e6c249e205080168c1bf4ee8dbc33b50653d5f4", "position": { "x": 80, "y": 64 @@ -74,81 +74,79 @@ } ] }, - "deps": { - "bit.1": { - "version": "1.0", - "package": { - "name": "Bit 1", - "version": "1.0.0", - "description": "Assign 1 to the output wire", - "author": "Jesús Arroyo", - "image": "%3Csvg%20xmlns=%22http://www.w3.org/2000/svg%22%20width=%2247.303%22%20height=%2227.648%22%20viewBox=%220%200%2044.346456%2025.919999%22%3E%3Ctext%20style=%22line-height:125%25%22%20x=%22325.218%22%20y=%22315.455%22%20font-weight=%22400%22%20font-size=%2212.669%22%20font-family=%22sans-serif%22%20letter-spacing=%220%22%20word-spacing=%220%22%20transform=%22translate(-307.01%20-298.51)%22%3E%3Ctspan%20x=%22325.218%22%20y=%22315.455%22%20style=%22-inkscape-font-specification:'Courier%2010%20Pitch'%22%20font-family=%22Courier%2010%20Pitch%22%3E1%3C/tspan%3E%3C/text%3E%3C/svg%3E" - }, - "design": { - "graph": { - "blocks": [ - { - "id": "b959fb96-ac67-4aea-90b3-ed35a4c17bf5", - "type": "basic.code", - "data": { - "code": "// Bit 1\n\nassign v = 1'b1;", - "params": [], - "ports": { - "in": [], - "out": [ - { - "name": "v" - } - ] - } - }, - "position": { - "x": 96, - "y": 96 + "state": { + "pan": { + "x": 0, + "y": 0 + }, + "zoom": 1 + } + }, + "dependencies": { + "3e6c249e205080168c1bf4ee8dbc33b50653d5f4": { + "package": { + "name": "Bit 1", + "version": "1.0.0", + "description": "Assign 1 to the output wire", + "author": "Jesús Arroyo", + "image": "%3Csvg%20xmlns=%22http://www.w3.org/2000/svg%22%20width=%2247.303%22%20height=%2227.648%22%20viewBox=%220%200%2044.346456%2025.919999%22%3E%3Ctext%20style=%22line-height:125%25%22%20x=%22325.218%22%20y=%22315.455%22%20font-weight=%22400%22%20font-size=%2212.669%22%20font-family=%22sans-serif%22%20letter-spacing=%220%22%20word-spacing=%220%22%20transform=%22translate(-307.01%20-298.51)%22%3E%3Ctspan%20x=%22325.218%22%20y=%22315.455%22%20style=%22-inkscape-font-specification:'Courier%2010%20Pitch'%22%20font-family=%22Courier%2010%20Pitch%22%3E1%3C/tspan%3E%3C/text%3E%3C/svg%3E" + }, + "design": { + "graph": { + "blocks": [ + { + "id": "b959fb96-ac67-4aea-90b3-ed35a4c17bf5", + "type": "basic.code", + "data": { + "code": "// Bit 1\n\nassign v = 1'b1;", + "params": [], + "ports": { + "in": [], + "out": [ + { + "name": "v" + } + ] } }, - { - "id": "19c8f68d-5022-487f-9ab0-f0a3cd58bead", - "type": "basic.output", - "data": { - "name": "" - }, - "position": { - "x": 608, - "y": 192 - } + "position": { + "x": 96, + "y": 96 } - ], - "wires": [ - { - "source": { - "block": "b959fb96-ac67-4aea-90b3-ed35a4c17bf5", - "port": "v" - }, - "target": { - "block": "19c8f68d-5022-487f-9ab0-f0a3cd58bead", - "port": "in" - } + }, + { + "id": "19c8f68d-5022-487f-9ab0-f0a3cd58bead", + "type": "basic.output", + "data": { + "name": "" + }, + "position": { + "x": 608, + "y": 192 + } + } + ], + "wires": [ + { + "source": { + "block": "b959fb96-ac67-4aea-90b3-ed35a4c17bf5", + "port": "v" + }, + "target": { + "block": "19c8f68d-5022-487f-9ab0-f0a3cd58bead", + "port": "in" } - ] + } + ] + }, + "state": { + "pan": { + "x": 0, + "y": 0 }, - "deps": {}, - "state": { - "pan": { - "x": 0, - "y": 0 - }, - "zoom": 1 - } + "zoom": 1 } } - }, - "state": { - "pan": { - "x": 0, - "y": 0 - }, - "zoom": 1 } } -} +} \ No newline at end of file diff --git a/app/resources/examples/icezum/1_basic/2_switch_led.ice b/app/resources/examples/icezum/1_basic/2_switch_led.ice index d428f6e3e..b7fa32b04 100644 --- a/app/resources/examples/icezum/1_basic/2_switch_led.ice +++ b/app/resources/examples/icezum/1_basic/2_switch_led.ice @@ -1,5 +1,5 @@ { - "version": "1.0", + "version": "1.1", "package": { "name": "Switch led", "version": "1.0.0", @@ -96,7 +96,6 @@ } ] }, - "deps": {}, "state": { "pan": { "x": 0, @@ -104,5 +103,6 @@ }, "zoom": 1 } - } + }, + "dependencies": {} } \ No newline at end of file diff --git a/app/resources/examples/icezum/1_basic/3_switch_and_gate.ice b/app/resources/examples/icezum/1_basic/3_switch_and_gate.ice index 94a22055f..8a01e713e 100644 --- a/app/resources/examples/icezum/1_basic/3_switch_and_gate.ice +++ b/app/resources/examples/icezum/1_basic/3_switch_and_gate.ice @@ -1,5 +1,5 @@ { - "version": "1.0", + "version": "1.1", "package": { "name": "", "version": "", @@ -32,7 +32,7 @@ }, { "id": "840e71b2-bf5a-4e20-8413-d386500c87fa", - "type": "logic.gate.and", + "type": "11a6f454705778e2f00adba4e5b28dcd9411bc8f", "position": { "x": 256, "y": 80 @@ -132,130 +132,128 @@ } ] }, - "deps": { - "logic.gate.and": { - "version": "1.0", - "package": { - "name": "AND", - "version": "1.0.0", - "description": "AND logic gate", - "author": "Jesús Arroyo", - "image": "%3Csvg%20xmlns=%22http://www.w3.org/2000/svg%22%20viewBox=%22-252%20400.9%2090%2040%22%3E%3Cpath%20d=%22M-252%20409.9h26v2h-26zM-252%20429.9h27v2h-27z%22/%3E%3Cpath%20d=%22M-227%20400.9v39.9h20.4c11.3%200%2020-9%2020-20s-8.7-20-20-20H-227zm2.9%202.8h17.6c9.8%200%2016.7%207.6%2016.7%2017.1%200%209.5-7.4%2017.1-17.1%2017.1H-224c-.1.1-.1-34.2-.1-34.2z%22/%3E%3Cpath%20d=%22M-187.911%20419.9H-162v2h-25.911z%22/%3E%3C/svg%3E" - }, - "design": { - "graph": { - "blocks": [ - { - "id": "00925b04-5004-4307-a737-fa4e97c8b6ab", - "type": "basic.code", - "data": { - "code": "// AND logic gate\n\nassign c = a & b;", - "params": [], - "ports": { - "in": [ - { - "name": "a" - }, - { - "name": "b" - } - ], - "out": [ - { - "name": "c" - } - ] - } - }, - "position": { - "x": 256, - "y": 48 + "state": { + "pan": { + "x": 0, + "y": 0 + }, + "zoom": 1 + } + }, + "dependencies": { + "11a6f454705778e2f00adba4e5b28dcd9411bc8f": { + "package": { + "name": "AND", + "version": "1.0.0", + "description": "AND logic gate", + "author": "Jesús Arroyo", + "image": "%3Csvg%20xmlns=%22http://www.w3.org/2000/svg%22%20viewBox=%22-252%20400.9%2090%2040%22%3E%3Cpath%20d=%22M-252%20409.9h26v2h-26zM-252%20429.9h27v2h-27z%22/%3E%3Cpath%20d=%22M-227%20400.9v39.9h20.4c11.3%200%2020-9%2020-20s-8.7-20-20-20H-227zm2.9%202.8h17.6c9.8%200%2016.7%207.6%2016.7%2017.1%200%209.5-7.4%2017.1-17.1%2017.1H-224c-.1.1-.1-34.2-.1-34.2z%22/%3E%3Cpath%20d=%22M-187.911%20419.9H-162v2h-25.911z%22/%3E%3C/svg%3E" + }, + "design": { + "graph": { + "blocks": [ + { + "id": "00925b04-5004-4307-a737-fa4e97c8b6ab", + "type": "basic.code", + "data": { + "code": "// AND logic gate\n\nassign c = a & b;", + "params": [], + "ports": { + "in": [ + { + "name": "a" + }, + { + "name": "b" + } + ], + "out": [ + { + "name": "c" + } + ] } }, - { - "id": "18c2ebc7-5152-439c-9b3f-851c59bac834", - "type": "basic.input", - "data": { - "name": "" - }, - "position": { - "x": 64, - "y": 80 - } + "position": { + "x": 256, + "y": 48 + } + }, + { + "id": "18c2ebc7-5152-439c-9b3f-851c59bac834", + "type": "basic.input", + "data": { + "name": "" }, - { - "id": "664caf9e-5f40-4df4-800a-b626af702e62", - "type": "basic.output", - "data": { - "name": "" - }, - "position": { - "x": 752, - "y": 144 - } + "position": { + "x": 64, + "y": 80 + } + }, + { + "id": "664caf9e-5f40-4df4-800a-b626af702e62", + "type": "basic.output", + "data": { + "name": "" }, - { - "id": "97b51945-d716-4b6c-9db9-970d08541249", - "type": "basic.input", - "data": { - "name": "" - }, - "position": { - "x": 64, - "y": 208 - } + "position": { + "x": 752, + "y": 144 } - ], - "wires": [ - { - "source": { - "block": "18c2ebc7-5152-439c-9b3f-851c59bac834", - "port": "out" - }, - "target": { - "block": "00925b04-5004-4307-a737-fa4e97c8b6ab", - "port": "a" - } + }, + { + "id": "97b51945-d716-4b6c-9db9-970d08541249", + "type": "basic.input", + "data": { + "name": "" }, - { - "source": { - "block": "97b51945-d716-4b6c-9db9-970d08541249", - "port": "out" - }, - "target": { - "block": "00925b04-5004-4307-a737-fa4e97c8b6ab", - "port": "b" - } + "position": { + "x": 64, + "y": 208 + } + } + ], + "wires": [ + { + "source": { + "block": "18c2ebc7-5152-439c-9b3f-851c59bac834", + "port": "out" }, - { - "source": { - "block": "00925b04-5004-4307-a737-fa4e97c8b6ab", - "port": "c" - }, - "target": { - "block": "664caf9e-5f40-4df4-800a-b626af702e62", - "port": "in" - } + "target": { + "block": "00925b04-5004-4307-a737-fa4e97c8b6ab", + "port": "a" } - ] - }, - "deps": {}, - "state": { - "pan": { - "x": 0, - "y": 0 }, - "zoom": 1 - } + { + "source": { + "block": "97b51945-d716-4b6c-9db9-970d08541249", + "port": "out" + }, + "target": { + "block": "00925b04-5004-4307-a737-fa4e97c8b6ab", + "port": "b" + } + }, + { + "source": { + "block": "00925b04-5004-4307-a737-fa4e97c8b6ab", + "port": "c" + }, + "target": { + "block": "664caf9e-5f40-4df4-800a-b626af702e62", + "port": "in" + } + } + ] + }, + "state": { + "pan": { + "x": 0, + "y": 0 + }, + "zoom": 1 } } - }, - "state": { - "pan": { - "x": 0, - "y": 0 - }, - "zoom": 1 } } -} +} \ No newline at end of file diff --git a/samples/assign.ice b/samples/assign.ice index 9d2a76963..158ccfb6d 100644 --- a/samples/assign.ice +++ b/samples/assign.ice @@ -1,5 +1,5 @@ { - "version": "1.0", + "version": "1.1", "package": { "name": "", "version": "", @@ -136,7 +136,6 @@ } ] }, - "deps": {}, "state": { "pan": { "x": 0, @@ -144,5 +143,6 @@ }, "zoom": 1 } - } -} + }, + "dependencies": {} +} \ No newline at end of file diff --git a/samples/block.ice b/samples/block.ice index 3d3a09bf2..13c9df89b 100644 --- a/samples/block.ice +++ b/samples/block.ice @@ -1,5 +1,5 @@ { - "version": "1.0", + "version": "1.1", "package": { "name": "", "version": "", @@ -217,13 +217,13 @@ } ] }, - "deps": {}, "state": { "pan": { - "x": 24.988850906836912, - "y": 53.895818245976436 + "x": 24.9889, + "y": 53.8958 }, - "zoom": 0.8154432847623143 + "zoom": 0.8154 } - } -} + }, + "dependencies": {} +} \ No newline at end of file diff --git a/samples/complex.ice b/samples/complex.ice index edfb97b84..1a60ab330 100644 --- a/samples/complex.ice +++ b/samples/complex.ice @@ -1,5 +1,5 @@ { - "version": "1.0", + "version": "1.1", "package": { "name": "", "version": "", @@ -26,7 +26,7 @@ }, { "id": "6f0cbf26-fd2e-4fa2-b55a-5f93e7af02c7", - "type": "assign", + "type": "8be60c981ee16ae78ea91d5b17181c7a72c5e6fe", "position": { "x": 120, "y": 184 @@ -34,7 +34,7 @@ }, { "id": "85073adf-db9b-4850-83de-8f9af24478ee", - "type": "mux", + "type": "739ddadeeb546b401f15a37331dac9d9165a15f9", "position": { "x": 336, "y": 200 @@ -42,7 +42,7 @@ }, { "id": "28a13e1c-47e8-4b22-b3f1-271bd5762ed7", - "type": "not", + "type": "a18ef3d9a87624c0875cb79ca115f0e625bf67d8", "position": { "x": 528, "y": 200 @@ -184,357 +184,351 @@ } ] }, - "deps": { - "not": { - "version": "1.0", - "package": { - "name": "", - "version": "", - "description": "", - "author": "", - "image": "" - }, - "design": { - "graph": { - "blocks": [ - { - "id": "364b95cc-e8ff-4c65-b332-d6125c5968ee", - "type": "basic.code", - "data": { - "code": "// NOT logic gate\nassign b = ~a;", - "params": [], - "ports": { - "in": [ - { - "name": "a" - } - ], - "out": [ - { - "name": "b" - } - ] + "state": { + "pan": { + "x": 0, + "y": 0 + }, + "zoom": 1 + } + }, + "dependencies": { + "8be60c981ee16ae78ea91d5b17181c7a72c5e6fe": { + "package": { + "name": "", + "version": "", + "description": "", + "author": "", + "image": "" + }, + "design": { + "graph": { + "blocks": [ + { + "id": "909655b9-5ef0-4c45-9494-c0238d2e4732", + "type": "basic.constant", + "data": { + "name": "Value", + "value": "4'b1110", + "local": false + }, + "position": { + "x": 192, + "y": 56 + } + }, + { + "id": "7e351e09-634d-407c-ab7e-452519468292", + "type": "basic.constant", + "data": { + "name": "offset", + "value": "0", + "local": true + }, + "position": { + "x": 384, + "y": 56 + } + }, + { + "id": "b6bc7556-6362-45ca-80e5-6db7a3100c7d", + "type": "basic.code", + "data": { + "code": "assign out = C + D;", + "params": [ + { + "name": "C" + }, + { + "name": "D" } - }, - "position": { - "x": 248, - "y": 88 + ], + "ports": { + "in": [], + "out": [ + { + "name": "out", + "range": "[3:0]", + "size": 4 + } + ] } }, - { - "id": "a4058fa5-b66e-4e5e-b542-28d7c3e9d3cd", - "type": "basic.input", - "data": { - "name": "" - }, - "position": { - "x": 72, - "y": 184 - } + "position": { + "x": 144, + "y": 200 + } + }, + { + "id": "ef743d41-5941-4831-becd-0d930c4eed54", + "type": "basic.output", + "data": { + "name": "out", + "range": "[3:0]", + "size": 4 }, - { - "id": "07895985-9d14-4a6f-8f2d-b2a6ddf61852", - "type": "basic.output", - "data": { - "name": "" - }, - "position": { - "x": 728, - "y": 184 - } + "position": { + "x": 680, + "y": 296 } - ], - "wires": [ - { - "source": { - "block": "a4058fa5-b66e-4e5e-b542-28d7c3e9d3cd", - "port": "out" - }, - "target": { - "block": "364b95cc-e8ff-4c65-b332-d6125c5968ee", - "port": "a" - } + } + ], + "wires": [ + { + "source": { + "block": "909655b9-5ef0-4c45-9494-c0238d2e4732", + "port": "constant-out" }, - { - "source": { - "block": "364b95cc-e8ff-4c65-b332-d6125c5968ee", - "port": "b" - }, - "target": { - "block": "07895985-9d14-4a6f-8f2d-b2a6ddf61852", - "port": "in" - } + "target": { + "block": "b6bc7556-6362-45ca-80e5-6db7a3100c7d", + "port": "C" } - ] - }, - "deps": {}, - "state": { - "pan": { - "x": 0, - "y": 0 }, - "zoom": 1 - } - } - }, - "mux": { - "version": "1.0", - "package": { - "name": "", - "version": "", - "description": "", - "author": "", - "image": "" - }, - "design": { - "graph": { - "blocks": [ - { - "id": "5e1563d7-86de-4618-a9b0-2a08075af9ec", - "type": "basic.code", - "data": { - "code": "// Multiplexer 4 to 1 \nassign out = data[sel];", - "params": [], - "ports": { - "in": [ - { - "name": "data", - "range": "[3:0]", - "size": 4 - }, - { - "name": "sel", - "range": "[1:0]", - "size": 2 - } - ], - "out": [ - { - "name": "out" - } - ] - } - }, - "position": { - "x": 288, - "y": 112 - } + { + "source": { + "block": "7e351e09-634d-407c-ab7e-452519468292", + "port": "constant-out" }, - { - "id": "95f8c313-6e18-4ee3-b9cf-7266dec53c93", - "type": "basic.input", - "data": { - "name": "d", - "range": "[3:0]", - "size": 4 - }, - "position": { - "x": 48, - "y": 144 - } + "target": { + "block": "b6bc7556-6362-45ca-80e5-6db7a3100c7d", + "port": "D" + } + }, + { + "source": { + "block": "b6bc7556-6362-45ca-80e5-6db7a3100c7d", + "port": "out" }, - { - "id": "60d40fc8-3388-4066-8f0a-af17e179a9bd", - "type": "basic.output", - "data": { - "name": "out" - }, - "position": { - "x": 760, - "y": 208 - } + "target": { + "block": "ef743d41-5941-4831-becd-0d930c4eed54", + "port": "in" }, - { - "id": "f6528039-852b-41f9-aa41-268994b3f631", - "type": "basic.input", - "data": { - "name": "s", - "range": "[1:0]", - "size": 2 - }, - "position": { - "x": 48, - "y": 272 + "size": 4 + } + ] + }, + "state": { + "pan": { + "x": 0, + "y": 0 + }, + "zoom": 1 + } + } + }, + "739ddadeeb546b401f15a37331dac9d9165a15f9": { + "package": { + "name": "", + "version": "", + "description": "", + "author": "", + "image": "" + }, + "design": { + "graph": { + "blocks": [ + { + "id": "5e1563d7-86de-4618-a9b0-2a08075af9ec", + "type": "basic.code", + "data": { + "code": "// Multiplexer 4 to 1 \nassign out = data[sel];", + "params": [], + "ports": { + "in": [ + { + "name": "data", + "range": "[3:0]", + "size": 4 + }, + { + "name": "sel", + "range": "[1:0]", + "size": 2 + } + ], + "out": [ + { + "name": "out" + } + ] } + }, + "position": { + "x": 288, + "y": 112 } - ], - "wires": [ - { - "source": { - "block": "95f8c313-6e18-4ee3-b9cf-7266dec53c93", - "port": "out" - }, - "target": { - "block": "5e1563d7-86de-4618-a9b0-2a08075af9ec", - "port": "data" - }, + }, + { + "id": "95f8c313-6e18-4ee3-b9cf-7266dec53c93", + "type": "basic.input", + "data": { + "name": "d", + "range": "[3:0]", "size": 4 }, - { - "source": { - "block": "f6528039-852b-41f9-aa41-268994b3f631", - "port": "out" - }, - "target": { - "block": "5e1563d7-86de-4618-a9b0-2a08075af9ec", - "port": "sel" - }, + "position": { + "x": 48, + "y": 144 + } + }, + { + "id": "60d40fc8-3388-4066-8f0a-af17e179a9bd", + "type": "basic.output", + "data": { + "name": "out" + }, + "position": { + "x": 760, + "y": 208 + } + }, + { + "id": "f6528039-852b-41f9-aa41-268994b3f631", + "type": "basic.input", + "data": { + "name": "s", + "range": "[1:0]", "size": 2 }, - { - "source": { - "block": "5e1563d7-86de-4618-a9b0-2a08075af9ec", - "port": "out" - }, - "target": { - "block": "60d40fc8-3388-4066-8f0a-af17e179a9bd", - "port": "in" - } + "position": { + "x": 48, + "y": 272 } - ] - }, - "deps": {}, - "state": { - "pan": { - "x": 0, - "y": 0 + } + ], + "wires": [ + { + "source": { + "block": "95f8c313-6e18-4ee3-b9cf-7266dec53c93", + "port": "out" + }, + "target": { + "block": "5e1563d7-86de-4618-a9b0-2a08075af9ec", + "port": "data" + }, + "size": 4 }, - "zoom": 1 - } - } - }, - "assign": { - "version": "1.0", - "package": { - "name": "", - "version": "", - "description": "", - "author": "", - "image": "" - }, - "design": { - "graph": { - "blocks": [ - { - "id": "909655b9-5ef0-4c45-9494-c0238d2e4732", - "type": "basic.constant", - "data": { - "name": "Value", - "value": "4'b1110", - "local": false - }, - "position": { - "x": 192, - "y": 56 - } + { + "source": { + "block": "f6528039-852b-41f9-aa41-268994b3f631", + "port": "out" }, - { - "id": "7e351e09-634d-407c-ab7e-452519468292", - "type": "basic.constant", - "data": { - "name": "offset", - "value": "0", - "local": true - }, - "position": { - "x": 384, - "y": 56 - } + "target": { + "block": "5e1563d7-86de-4618-a9b0-2a08075af9ec", + "port": "sel" }, - { - "id": "b6bc7556-6362-45ca-80e5-6db7a3100c7d", - "type": "basic.code", - "data": { - "code": "assign out = C + D;", - "params": [ - { - "name": "C" - }, + "size": 2 + }, + { + "source": { + "block": "5e1563d7-86de-4618-a9b0-2a08075af9ec", + "port": "out" + }, + "target": { + "block": "60d40fc8-3388-4066-8f0a-af17e179a9bd", + "port": "in" + } + } + ] + }, + "state": { + "pan": { + "x": 0, + "y": 0 + }, + "zoom": 1 + } + } + }, + "a18ef3d9a87624c0875cb79ca115f0e625bf67d8": { + "package": { + "name": "", + "version": "", + "description": "", + "author": "", + "image": "" + }, + "design": { + "graph": { + "blocks": [ + { + "id": "364b95cc-e8ff-4c65-b332-d6125c5968ee", + "type": "basic.code", + "data": { + "code": "// NOT logic gate\nassign b = ~a;", + "params": [], + "ports": { + "in": [ { - "name": "D" + "name": "a" } ], - "ports": { - "in": [], - "out": [ - { - "name": "out", - "range": "[3:0]", - "size": 4 - } - ] - } - }, - "position": { - "x": 144, - "y": 200 + "out": [ + { + "name": "b" + } + ] } }, - { - "id": "ef743d41-5941-4831-becd-0d930c4eed54", - "type": "basic.output", - "data": { - "name": "out", - "range": "[3:0]", - "size": 4 - }, - "position": { - "x": 680, - "y": 296 - } + "position": { + "x": 248, + "y": 88 } - ], - "wires": [ - { - "source": { - "block": "909655b9-5ef0-4c45-9494-c0238d2e4732", - "port": "constant-out" - }, - "target": { - "block": "b6bc7556-6362-45ca-80e5-6db7a3100c7d", - "port": "C" - } + }, + { + "id": "a4058fa5-b66e-4e5e-b542-28d7c3e9d3cd", + "type": "basic.input", + "data": { + "name": "" }, - { - "source": { - "block": "7e351e09-634d-407c-ab7e-452519468292", - "port": "constant-out" - }, - "target": { - "block": "b6bc7556-6362-45ca-80e5-6db7a3100c7d", - "port": "D" - } + "position": { + "x": 72, + "y": 184 + } + }, + { + "id": "07895985-9d14-4a6f-8f2d-b2a6ddf61852", + "type": "basic.output", + "data": { + "name": "" }, - { - "source": { - "block": "b6bc7556-6362-45ca-80e5-6db7a3100c7d", - "port": "out" - }, - "target": { - "block": "ef743d41-5941-4831-becd-0d930c4eed54", - "port": "in" - }, - "size": 4 + "position": { + "x": 728, + "y": 184 + } + } + ], + "wires": [ + { + "source": { + "block": "a4058fa5-b66e-4e5e-b542-28d7c3e9d3cd", + "port": "out" + }, + "target": { + "block": "364b95cc-e8ff-4c65-b332-d6125c5968ee", + "port": "a" } - ] - }, - "deps": {}, - "state": { - "pan": { - "x": 0, - "y": 0 }, - "zoom": 1 - } + { + "source": { + "block": "364b95cc-e8ff-4c65-b332-d6125c5968ee", + "port": "b" + }, + "target": { + "block": "07895985-9d14-4a6f-8f2d-b2a6ddf61852", + "port": "in" + } + } + ] + }, + "state": { + "pan": { + "x": 0, + "y": 0 + }, + "zoom": 1 } } - }, - "state": { - "pan": { - "x": 0, - "y": 0 - }, - "zoom": 1 } } -} +} \ No newline at end of file diff --git a/samples/counter.ice b/samples/counter.ice index 17931b94c..e66dc4f56 100644 --- a/samples/counter.ice +++ b/samples/counter.ice @@ -1,5 +1,5 @@ { - "version": "1.0", + "version": "1.1", "package": { "name": "", "version": "", @@ -26,7 +26,7 @@ }, { "id": "51e4e6a6-ef05-48e6-8f22-a355e6eda3ae", - "type": "bit.0", + "type": "862d2a36c72ddee13ea44bf906fe1b60efa90941", "position": { "x": 568, "y": 64 @@ -273,81 +273,79 @@ } ] }, - "deps": { - "bit.0": { - "version": "1.0", - "package": { - "name": "Bit 0", - "version": "1.0.0", - "description": "Assign 0 to the output wire", - "author": "Jesús Arroyo", - "image": "%3Csvg%20xmlns=%22http://www.w3.org/2000/svg%22%20width=%2247.303%22%20height=%2227.648%22%20viewBox=%220%200%2044.346456%2025.919999%22%3E%3Ctext%20style=%22line-height:125%25%22%20x=%22325.37%22%20y=%22315.373%22%20font-weight=%22400%22%20font-size=%2212.669%22%20font-family=%22sans-serif%22%20letter-spacing=%220%22%20word-spacing=%220%22%20transform=%22translate(-307.01%20-298.51)%22%3E%3Ctspan%20x=%22325.37%22%20y=%22315.373%22%20style=%22-inkscape-font-specification:'Courier%2010%20Pitch'%22%20font-family=%22Courier%2010%20Pitch%22%3E0%3C/tspan%3E%3C/text%3E%3C/svg%3E" - }, - "design": { - "graph": { - "blocks": [ - { - "id": "b959fb96-ac67-4aea-90b3-ed35a4c17bf5", - "type": "basic.code", - "data": { - "code": "// Bit 0\n\nassign v = 1'b0;", - "params": [], - "ports": { - "in": [], - "out": [ - { - "name": "v" - } - ] - } - }, - "position": { - "x": 96, - "y": 96 + "state": { + "pan": { + "x": 0, + "y": 0 + }, + "zoom": 1 + } + }, + "dependencies": { + "862d2a36c72ddee13ea44bf906fe1b60efa90941": { + "package": { + "name": "Bit 0", + "version": "1.0.0", + "description": "Assign 0 to the output wire", + "author": "Jesús Arroyo", + "image": "%3Csvg%20xmlns=%22http://www.w3.org/2000/svg%22%20width=%2247.303%22%20height=%2227.648%22%20viewBox=%220%200%2044.346456%2025.919999%22%3E%3Ctext%20style=%22line-height:125%25%22%20x=%22325.37%22%20y=%22315.373%22%20font-weight=%22400%22%20font-size=%2212.669%22%20font-family=%22sans-serif%22%20letter-spacing=%220%22%20word-spacing=%220%22%20transform=%22translate(-307.01%20-298.51)%22%3E%3Ctspan%20x=%22325.37%22%20y=%22315.373%22%20style=%22-inkscape-font-specification:'Courier%2010%20Pitch'%22%20font-family=%22Courier%2010%20Pitch%22%3E0%3C/tspan%3E%3C/text%3E%3C/svg%3E" + }, + "design": { + "graph": { + "blocks": [ + { + "id": "b959fb96-ac67-4aea-90b3-ed35a4c17bf5", + "type": "basic.code", + "data": { + "code": "// Bit 0\n\nassign v = 1'b0;", + "params": [], + "ports": { + "in": [], + "out": [ + { + "name": "v" + } + ] } }, - { - "id": "19c8f68d-5022-487f-9ab0-f0a3cd58bead", - "type": "basic.output", - "data": { - "name": "" - }, - "position": { - "x": 608, - "y": 192 - } + "position": { + "x": 96, + "y": 96 } - ], - "wires": [ - { - "source": { - "block": "b959fb96-ac67-4aea-90b3-ed35a4c17bf5", - "port": "v" - }, - "target": { - "block": "19c8f68d-5022-487f-9ab0-f0a3cd58bead", - "port": "in" - } + }, + { + "id": "19c8f68d-5022-487f-9ab0-f0a3cd58bead", + "type": "basic.output", + "data": { + "name": "" + }, + "position": { + "x": 608, + "y": 192 } - ] + } + ], + "wires": [ + { + "source": { + "block": "b959fb96-ac67-4aea-90b3-ed35a4c17bf5", + "port": "v" + }, + "target": { + "block": "19c8f68d-5022-487f-9ab0-f0a3cd58bead", + "port": "in" + } + } + ] + }, + "state": { + "pan": { + "x": 0, + "y": 0 }, - "deps": {}, - "state": { - "pan": { - "x": 0, - "y": 0 - }, - "zoom": 1 - } + "zoom": 1 } } - }, - "state": { - "pan": { - "x": 0, - "y": 0 - }, - "zoom": 1 } } } \ No newline at end of file diff --git a/samples/in-out.ice b/samples/in-out.ice index 6989126d9..db144cf58 100644 --- a/samples/in-out.ice +++ b/samples/in-out.ice @@ -1,5 +1,5 @@ { - "version": "1.0", + "version": "1.1", "package": { "name": "", "version": "", @@ -92,7 +92,6 @@ } ] }, - "deps": {}, "state": { "pan": { "x": 0, @@ -100,5 +99,6 @@ }, "zoom": 1 } - } + }, + "dependencies": {} } \ No newline at end of file diff --git a/samples/mux.ice b/samples/mux.ice index 094892628..ecbc42feb 100644 --- a/samples/mux.ice +++ b/samples/mux.ice @@ -1,5 +1,5 @@ { - "version": "1.0", + "version": "1.1", "package": { "name": "", "version": "", @@ -157,7 +157,6 @@ } ] }, - "deps": {}, "state": { "pan": { "x": 0, @@ -165,5 +164,6 @@ }, "zoom": 1 } - } -} + }, + "dependencies": {} +} \ No newline at end of file diff --git a/samples/not.ice b/samples/not.ice index ec261d053..10df4e011 100644 --- a/samples/not.ice +++ b/samples/not.ice @@ -1,5 +1,5 @@ { - "version": "1.0", + "version": "1.1", "package": { "name": "", "version": "", @@ -97,7 +97,6 @@ } ] }, - "deps": {}, "state": { "pan": { "x": 0, @@ -105,5 +104,6 @@ }, "zoom": 1 } - } -} + }, + "dependencies": {} +} \ No newline at end of file From 856b9ee867335e30968a82fb7709bb4508d8c494 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jes=C3=BAs=20Arroyo=20Torrens?= Date: Wed, 18 Jan 2017 11:20:21 +0100 Subject: [PATCH 138/169] Improve backwards compatibility 0 -> 1.1 --- app/scripts/services/project.service.js | 193 +++++++++++++----------- 1 file changed, 103 insertions(+), 90 deletions(-) diff --git a/app/scripts/services/project.service.js b/app/scripts/services/project.service.js index adba4cffc..594a35658 100644 --- a/app/scripts/services/project.service.js +++ b/app/scripts/services/project.service.js @@ -118,106 +118,38 @@ angular.module('icestudio') }; function _safeLoad(data) { + // Backwards compatibility var project = {}; - console.log(data.version); switch(data.version) { case VERSION: project = data; break; case '1.0': - var depsInfo = findSubDependencies10(data.design.deps); - console.log(depsInfo); - project = _default(); - project.package = data.package; - project.design.board = data.design.board; - project.design.state = data.design.state; - project.design.graph = data.design.graph; - replaceType10(project, depsInfo); - for (var d in depsInfo) { - var dep = depsInfo[d]; - replaceType10(dep.content, depsInfo); - project.dependencies[dep.id] = dep.content; - } + project = convert10To11(data); break; default: - for (var b in data.graph.blocks) { - var block = data.graph.blocks[b]; - switch(block.type) { - case 'basic.input': - case 'basic.output': - block.data = { - name: block.data.label, - pins: [{ - index: '0', - name: block.data.pin ? block.data.pin.name : '', - value: block.data.pin? block.data.pin.value : '0' - }], - virtual: false - }; - break; - case 'basic.constant': - block.data = { - name: block.data.label, - value: block.data.value, - local: false - }; - break; - case 'basic.code': - var params = []; - for (var p in block.data.params) { - params.push({ - name: block.data.params[p] - }); - } - var inPorts = []; - for (var i in block.data.ports.in) { - inPorts.push({ - name: block.data.ports.in[i] - }); - } - - var outPorts = []; - for (var o in block.data.ports.out) { - outPorts.push({ - name: block.data.ports.out[o] - }); - } - block.data = { - code: block.data.code, - params: params, - ports: { - in: inPorts, - out: outPorts - } - }; - break; - } - } - project = { - version: '1.0', - package: { - name: '', - version: '', - description: '', - author: '', - image: '' - }, - design: { - board: data.board, - graph: data.graph, - deps: {}, - state: data.state - }, - }; - // Safe load all dependencies recursively - for (var j in data.deps) { - project.design.deps[j] = _safeLoad(data.deps[j]); - } - console.log('PROJECT', project.version, project); - project = _safeLoad(project); + project = convertTo10(data); + project = convert10To11(project); break; } - console.log('PROJECT', project.version, project); + return project; + } + + function convert10To11(data) { + var project = _default(); + project.package = data.package; + project.design.board = data.design.board; + project.design.state = data.design.state; + project.design.graph = data.design.graph; + + var depsInfo = findSubDependencies10(data.design.deps); + replaceType10(project, depsInfo); + for (var d in depsInfo) { + var dep = depsInfo[d]; + replaceType10(dep.content, depsInfo); + project.dependencies[dep.id] = dep.content; + } + return project; } @@ -256,6 +188,87 @@ angular.module('icestudio') } } + function convertTo10(data) { + var project = { + version: '1.0', + package: { + name: '', + version: '', + description: '', + author: '', + image: '' + }, + design: { + board: '', + graph: {}, + deps: {}, + state: {} + }, + }; + for (var b in data.graph.blocks) { + var block = data.graph.blocks[b]; + switch(block.type) { + case 'basic.input': + case 'basic.output': + block.data = { + name: block.data.label, + pins: [{ + index: '0', + name: block.data.pin ? block.data.pin.name : '', + value: block.data.pin? block.data.pin.value : '0' + }], + virtual: false + }; + break; + case 'basic.constant': + block.data = { + name: block.data.label, + value: block.data.value, + local: false + }; + break; + case 'basic.code': + var params = []; + for (var p in block.data.params) { + params.push({ + name: block.data.params[p] + }); + } + var inPorts = []; + for (var i in block.data.ports.in) { + inPorts.push({ + name: block.data.ports.in[i] + }); + } + + var outPorts = []; + for (var o in block.data.ports.out) { + outPorts.push({ + name: block.data.ports.out[o] + }); + } + block.data = { + code: block.data.code, + params: params, + ports: { + in: inPorts, + out: outPorts + } + }; + break; + } + } + project.design.board = data.board; + project.design.graph = data.graph; + project.design.state = data.state; + // Safe load all dependencies recursively + for (var j in data.deps) { + project.design.deps[j] = convertTo10(data.deps[j]); + } + + return project; + } + this.save = function(filepath) { var name = utils.basename(filepath); this.path = filepath; From 648f5dcd2b85846b1a84a2c5506330f7eb92d8cf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jes=C3=BAs=20Arroyo=20Torrens?= Date: Wed, 18 Jan 2017 11:33:46 +0100 Subject: [PATCH 139/169] Apply Back key to BreadcrumbsBack --- app/scripts/controllers/design.js | 8 +++- app/scripts/controllers/menu.js | 68 +++++++++++++++++-------------- 2 files changed, 44 insertions(+), 32 deletions(-) diff --git a/app/scripts/controllers/design.js b/app/scripts/controllers/design.js index 746e1d339..2d4db5053 100644 --- a/app/scripts/controllers/design.js +++ b/app/scripts/controllers/design.js @@ -5,7 +5,8 @@ angular.module('icestudio') $scope, project, boards, - graph) { + graph, + utils) { $scope.boards = boards; $scope.graph = graph; @@ -48,4 +49,9 @@ angular.module('icestudio') project.update(callback, false); }); + $rootScope.$on('breadcrumbsBack', function(/*event*/) { + $scope.breadcrumbsBack(); + utils.rootScopeSafeApply(); + }); + }); diff --git a/app/scripts/controllers/menu.js b/app/scripts/controllers/menu.js index c22a28e4e..21da4f5a6 100644 --- a/app/scripts/controllers/menu.js +++ b/app/scripts/controllers/menu.js @@ -506,16 +506,17 @@ angular.module('icestudio') }); $(document).on('keydown', function(event) { - if (graph.isEnabled() && !promptShown) { - if (event.ctrlKey) { - switch (event.keyCode) { - case 78: // Ctrl+N + if (!promptShown) { + if (graph.isEnabled()) { + if (event.ctrlKey) { + switch (event.keyCode) { + case 78: // Ctrl+N $scope.newProject(); break; - case 79: // Ctrl+O + case 79: // Ctrl+O $scope.openProject(); break; - case 83: + case 83: if (event.shiftKey) { // Ctrl+Shift+S $scope.saveProjectAs(); } @@ -523,10 +524,10 @@ angular.module('icestudio') $scope.saveProject(); } break; - case 81: // Ctrl+Q + case 81: // Ctrl+Q $scope.quit(); break; - case 90: + case 90: if (event.shiftKey) { // Ctrl+Shift+Z $scope.redoGraph(); event.preventDefault(); @@ -536,72 +537,77 @@ angular.module('icestudio') event.preventDefault(); } break; - case 89: // Ctrl+Y + case 89: // Ctrl+Y $scope.redoGraph(); event.preventDefault(); break; - case 88: // Ctrl+X + case 88: // Ctrl+X $scope.cutSelected(); break; - case 67: // Ctrl+C + case 67: // Ctrl+C $scope.copySelected(); break; - case 86: // Ctrl+V + case 86: // Ctrl+V $scope.pasteSelected(); break; - case 65: // Ctrl+A + case 65: // Ctrl+A $scope.selectAll(); break; - case 48: // Ctrl+0 + case 48: // Ctrl+0 $scope.resetView(); break; - case 70: // Ctrl+F + case 70: // Ctrl+F $scope.fitContent(); break; - case 82: // Ctrl+R + case 82: // Ctrl+R $scope.verifyCode(); break; - case 66: // Ctrl+B + case 66: // Ctrl+B $scope.buildCode(); break; - case 85: // Ctrl+U + case 85: // Ctrl+U $scope.uploadCode(); break; + } } - } - switch (event.keyCode) { - case 37: // Arrow Left + switch (event.keyCode) { + case 37: // Arrow Left if (graph.hasSelection()) { graph.stepLeft(); } break; - case 38: // Arrow Up + case 38: // Arrow Up if (graph.hasSelection()) { graph.stepUp(); } break; - case 39: // Arrow Right + case 39: // Arrow Right if (graph.hasSelection()) { graph.stepRight(); } break; - case 40: // Arrow Down + case 40: // Arrow Down if (graph.hasSelection()) { graph.stepDown(); } break; - } - - if (event.keyCode === 46) { // Supr - removeSelected(); - } + } - if (process.platform === 'darwin') { - if (event.keyCode === 8) { // Back + if (event.keyCode === 46) { // Supr removeSelected(); } } + if (event.keyCode === 8) { // Back + if (!graph.isEnabled()) { + $rootScope.$broadcast('breadcrumbsBack'); + } + else { + if (process.platform === 'darwin') { + removeSelected(); + } + } + } } if (event.ctrlKey && event.keyCode === 80) { // Ctrl+P // Print and save a window snapshot From 4358d14a792ae7905b24893dae7738b39df0c923 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jes=C3=BAs=20Arroyo=20Torrens?= Date: Wed, 18 Jan 2017 12:24:25 +0100 Subject: [PATCH 140/169] Launch new window using exec --- app/scripts/controllers/menu.js | 25 ++----------------------- app/scripts/services/utils.service.js | 12 ++++++++++++ 2 files changed, 14 insertions(+), 23 deletions(-) diff --git a/app/scripts/controllers/menu.js b/app/scripts/controllers/menu.js index 21da4f5a6..daf7c583e 100644 --- a/app/scripts/controllers/menu.js +++ b/app/scripts/controllers/menu.js @@ -86,31 +86,10 @@ angular.module('icestudio') }, 700); }; - //-- File - function newWindow() { - // TODO: issue if the first window is removed new windows - // are not well created. Fix: reload the new window - /* jshint -W106 */ - var _win = gui.Window.open('index.html', { - focus: true, - width: 900, - height: 620, - min_width: 800, - min_height: 200, - toolbar: true, - resizable: true, - x: (win ? win.x : 0) + 50, - y: (win ? win.y : 0) + 50, - icon: 'resources/images/icestudio-logo.png' - }); - /* jshint +W106 */ - return _win; - } - $scope.newProject = function() { - newWindow(); + utils.newWindow(); }; $scope.openProject = function() { @@ -126,7 +105,7 @@ angular.module('icestudio') // If this is not the first action, and // the file path is different, open // the project in a new window - var _win = newWindow(); + var _win = utils.newWindow(); _win.on('loaded', function() { setTimeout(function() { _win.emit('openProject', { filepath: filepath }); diff --git a/app/scripts/services/utils.service.js b/app/scripts/services/utils.service.js index 2045de7e6..4ccf9580b 100644 --- a/app/scripts/services/utils.service.js +++ b/app/scripts/services/utils.service.js @@ -911,4 +911,16 @@ angular.module('icestudio') } }; + this.newWindow = function() { + var command = [ + process.execPath, + nodePath.dirname(process.mainModule.filename) + ]; + nodeChildProcess.exec(command.join(' '), [], function(error/*, stdout/*, stderr*/) { + if (error) { + throw error; + } + }); + }; + }); From a0282798304ae78cefa02b2f986a1ead3c86a9a7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jes=C3=BAs=20Arroyo=20Torrens?= Date: Wed, 18 Jan 2017 13:01:34 +0100 Subject: [PATCH 141/169] Pass filepath arg to the App. Open examples on runtime --- app/scripts/controllers/menu.js | 77 +++++++++-------------- app/scripts/services/resources.service.js | 2 +- app/scripts/services/utils.service.js | 11 ++-- app/views/menu.html | 2 +- 4 files changed, 37 insertions(+), 55 deletions(-) diff --git a/app/scripts/controllers/menu.js b/app/scripts/controllers/menu.js index daf7c583e..d23a670ff 100644 --- a/app/scripts/controllers/menu.js +++ b/app/scripts/controllers/menu.js @@ -42,25 +42,6 @@ angular.module('icestudio') exit(); }); - var openProject = false; - win.on('openProject', function(args) { - if (!openProject) { - updateWorkingdir(args.filepath); - project.open(args.filepath); - openProject = true; - zeroProject = false; - } - }); - - var loadProject = false; - win.on('loadProject', function(args) { - if (!loadProject) { - project.load(args.name, args.data); - loadProject = true; - zeroProject = false; - } - }); - // Darwin fix for shortcuts if (process.platform === 'darwin') { var mb = new gui.Menu({type: 'menubar'}); @@ -86,14 +67,39 @@ angular.module('icestudio') }, 700); }; + // Load app arguments + console.log('ARGV', gui.App.argv); + setTimeout(function() { + if (gui.App.argv.length > 0) { + var filepath = gui.App.argv[0]; + if (nodeFs.existsSync(filepath)) { + updateWorkingdir(filepath); + project.open(filepath); + zeroProject = false; + } + else { + alertify.notify(gettextCatalog.getString('Invalid argument {{arg}}', { arg: filepath }), 'warning', 5); + } + } + }, 0); + + //-- File $scope.newProject = function() { utils.newWindow(); }; - $scope.openProject = function() { - utils.openDialog('#input-open-project', '.ice', function(filepath) { + $scope.openProject = function(filepath) { + if (filepath) { + _open(filepath); + } + else { + utils.openDialog('#input-open-project', '.ice', function(filepath) { + _open(filepath); + }); + } + function _open(filepath) { if (zeroProject) { // If this is the first action, open // the projec in the same window @@ -105,34 +111,7 @@ angular.module('icestudio') // If this is not the first action, and // the file path is different, open // the project in a new window - var _win = utils.newWindow(); - _win.on('loaded', function() { - setTimeout(function() { - _win.emit('openProject', { filepath: filepath }); - }, 200); - }); - } - }); - }; - - $scope.loadProject = function(name, data) { - if (data) { - if (zeroProject) { - // If this is the first action, load - // the projec in the same window - project.load(name, data); - zeroProject = false; - } - else if (project.changed || (project.name !== name)) { - // If this is not the first action, and - // the project name is different, load - // the project in a new window - var _win = newWindow(); - _win.on('loaded', function() { - setTimeout(function() { - _win.emit('loadProject', { name: name, data: data }); - }, 200); - }); + utils.newWindow(filepath); } } }; diff --git a/app/scripts/services/resources.service.js b/app/scripts/services/resources.service.js index f0724c6ce..82f6b0b8a 100644 --- a/app/scripts/services/resources.service.js +++ b/app/scripts/services/resources.service.js @@ -5,7 +5,7 @@ angular.module('icestudio') nodePath) { this.getExamples = function() { - return utils.getFilesRecursive(nodePath.join('resources', 'examples'), '.ice'); + return utils.getFilesRecursive(nodePath.join('resources', 'examples'), '.ice', true); // onlyFilepath }; this.getMenuBlocks = function() { diff --git a/app/scripts/services/utils.service.js b/app/scripts/services/utils.service.js index 4ccf9580b..d64bb2394 100644 --- a/app/scripts/services/utils.service.js +++ b/app/scripts/services/utils.service.js @@ -357,7 +357,7 @@ angular.module('icestudio') this.getFilesRecursive = getFilesRecursive; - function getFilesRecursive(folder, extension) { + function getFilesRecursive(folder, extension, onlyFilepath) { var fileContents = nodeFs.readdirSync(folder), fileTree = [], stats; @@ -369,11 +369,11 @@ angular.module('icestudio') if (stats.isDirectory()) { fileTree.push({ name: fileName, - children: getFilesRecursive(filePath, extension) + children: getFilesRecursive(filePath, extension, onlyFilepath) }); } else { if (fileName.endsWith(extension)) { - var content = JSON.parse(nodeFs.readFileSync(filePath).toString()); + var content = onlyFilepath ? filePath : JSON.parse(nodeFs.readFileSync(filePath).toString()); fileTree.push({ name: basename(fileName), content: content @@ -911,11 +911,14 @@ angular.module('icestudio') } }; - this.newWindow = function() { + this.newWindow = function(filepath) { var command = [ process.execPath, nodePath.dirname(process.mainModule.filename) ]; + if (filepath) { + command.push(filepath); + } nodeChildProcess.exec(command.join(' '), [], function(error/*, stdout/*, stderr*/) { if (error) { throw error; diff --git a/app/views/menu.html b/app/views/menu.html index 4101b1308..91de271c5 100644 --- a/app/views/menu.html +++ b/app/views/menu.html @@ -41,7 +41,7 @@ {{ example.name | translate }}
                        • - + {{ child.name | translate }}
                          • From 995d901166cc0a86445efa656c3a52218d42c237 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jes=C3=BAs=20Arroyo=20Torrens?= Date: Wed, 18 Jan 2017 13:58:21 +0100 Subject: [PATCH 142/169] Allow newWindow in a release --- app/index.html | 2 +- app/scripts/services/utils.service.js | 9 +++++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/app/index.html b/app/index.html index ebada72b0..1587487d7 100644 --- a/app/index.html +++ b/app/index.html @@ -41,7 +41,7 @@ - + diff --git a/app/scripts/services/utils.service.js b/app/scripts/services/utils.service.js index d64bb2394..95afcebb0 100644 --- a/app/scripts/services/utils.service.js +++ b/app/scripts/services/utils.service.js @@ -912,10 +912,11 @@ angular.module('icestudio') }; this.newWindow = function(filepath) { - var command = [ - process.execPath, - nodePath.dirname(process.mainModule.filename) - ]; + var execPath = process.execPath; + var command = [ execPath ]; + if (execPath.endsWith('nw')) { + command.push(nodePath.dirname(process.mainModule.filename)); + } if (filepath) { command.push(filepath); } From 5e0e10cb86fa5a148ff06108df5a4c499533cce8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jes=C3=BAs=20Arroyo=20Torrens?= Date: Wed, 18 Jan 2017 14:34:12 +0100 Subject: [PATCH 143/169] Parse argument XxY --- app/scripts/controllers/menu.js | 32 ++++++++++++++++++--------- app/scripts/services/utils.service.js | 6 +++++ 2 files changed, 27 insertions(+), 11 deletions(-) diff --git a/app/scripts/controllers/menu.js b/app/scripts/controllers/menu.js index d23a670ff..0d681b854 100644 --- a/app/scripts/controllers/menu.js +++ b/app/scripts/controllers/menu.js @@ -68,21 +68,31 @@ angular.module('icestudio') }; // Load app arguments - console.log('ARGV', gui.App.argv); setTimeout(function() { - if (gui.App.argv.length > 0) { - var filepath = gui.App.argv[0]; - if (nodeFs.existsSync(filepath)) { - updateWorkingdir(filepath); - project.open(filepath); - zeroProject = false; - } - else { - alertify.notify(gettextCatalog.getString('Invalid argument {{arg}}', { arg: filepath }), 'warning', 5); - } + for (var i in gui.App.argv) { + processArg(gui.App.argv[i]); } }, 0); + function processArg(arg) { + if (nodeFs.existsSync(arg)) { + // Open filepath + var filepath = arg; + updateWorkingdir(filepath); + project.open(filepath); + zeroProject = false; + } + else { + // Move window + var data = arg.split('x'); + var offset = { + x: parseInt(data[0]), + y: parseInt(data[1]) + }; + win.moveTo(offset.x, offset.y); + } + } + //-- File diff --git a/app/scripts/services/utils.service.js b/app/scripts/services/utils.service.js index 95afcebb0..485de836e 100644 --- a/app/scripts/services/utils.service.js +++ b/app/scripts/services/utils.service.js @@ -920,6 +920,12 @@ angular.module('icestudio') if (filepath) { command.push(filepath); } + /*var win = window.get(); + var position = { + x: win.x + 30, + y: win.y + 30 + }; + command.push(position.x + 'x' + position.y);*/ nodeChildProcess.exec(command.join(' '), [], function(error/*, stdout/*, stderr*/) { if (error) { throw error; From 0d24e8af65e00e1ecbc1c861856c1f70e7bce6a1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jes=C3=BAs=20Arroyo=20Torrens?= Date: Wed, 18 Jan 2017 14:41:02 +0100 Subject: [PATCH 144/169] Apply Ctrl+0 & Ctrl+F to sub-blocks --- app/scripts/controllers/menu.js | 126 ++++++++++++++++---------------- 1 file changed, 62 insertions(+), 64 deletions(-) diff --git a/app/scripts/controllers/menu.js b/app/scripts/controllers/menu.js index 0d681b854..6f67028bd 100644 --- a/app/scripts/controllers/menu.js +++ b/app/scripts/controllers/menu.js @@ -479,93 +479,91 @@ angular.module('icestudio') if (event.ctrlKey) { switch (event.keyCode) { case 78: // Ctrl+N - $scope.newProject(); - break; + $scope.newProject(); + break; case 79: // Ctrl+O - $scope.openProject(); - break; + $scope.openProject(); + break; case 83: - if (event.shiftKey) { // Ctrl+Shift+S - $scope.saveProjectAs(); - } - else { // Ctrl+S - $scope.saveProject(); - } - break; + if (event.shiftKey) { // Ctrl+Shift+S + $scope.saveProjectAs(); + } + else { // Ctrl+S + $scope.saveProject(); + } + break; case 81: // Ctrl+Q - $scope.quit(); - break; + $scope.quit(); + break; case 90: - if (event.shiftKey) { // Ctrl+Shift+Z + if (event.shiftKey) { // Ctrl+Shift+Z + $scope.redoGraph(); + event.preventDefault(); + } + else { // Ctrl+Z + $scope.undoGraph(); + event.preventDefault(); + } + break; + case 89: // Ctrl+Y $scope.redoGraph(); event.preventDefault(); - } - else { // Ctrl+Z - $scope.undoGraph(); - event.preventDefault(); - } - break; - case 89: // Ctrl+Y - $scope.redoGraph(); - event.preventDefault(); - break; + break; case 88: // Ctrl+X - $scope.cutSelected(); - break; + $scope.cutSelected(); + break; case 67: // Ctrl+C - $scope.copySelected(); - break; + $scope.copySelected(); + break; case 86: // Ctrl+V - $scope.pasteSelected(); - break; + $scope.pasteSelected(); + break; case 65: // Ctrl+A - $scope.selectAll(); - break; - case 48: // Ctrl+0 - $scope.resetView(); - break; - case 70: // Ctrl+F - $scope.fitContent(); - break; + $scope.selectAll(); + break; case 82: // Ctrl+R - $scope.verifyCode(); - break; + $scope.verifyCode(); + break; case 66: // Ctrl+B - $scope.buildCode(); - break; + $scope.buildCode(); + break; case 85: // Ctrl+U - $scope.uploadCode(); - break; + $scope.uploadCode(); + break; } } - switch (event.keyCode) { - case 37: // Arrow Left - if (graph.hasSelection()) { - graph.stepLeft(); - } - break; - case 38: // Arrow Up - if (graph.hasSelection()) { - graph.stepUp(); - } - break; - case 39: // Arrow Right - if (graph.hasSelection()) { - graph.stepRight(); - } - break; - case 40: // Arrow Down - if (graph.hasSelection()) { - graph.stepDown(); + if (graph.hasSelection()) { + switch (event.keyCode) { + case 37: // Arrow Left + graph.stepLeft(); + break; + case 38: // Arrow Up + graph.stepUp(); + break; + case 39: // Arrow Right + graph.stepRight(); + break; + case 40: // Arrow Down + graph.stepDown(); + break; } - break; } if (event.keyCode === 46) { // Supr removeSelected(); } } + if (event.ctrlKey) { + switch (event.keyCode) { + case 48: // Ctrl+0 + $scope.resetView(); + break; + case 70: // Ctrl+F + $scope.fitContent(); + break; + } + } if (event.keyCode === 8) { // Back if (!graph.isEnabled()) { $rootScope.$broadcast('breadcrumbsBack'); From a85e5a50c4292778201795bea1dfe521d4450366 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jes=C3=BAs=20Arroyo=20Torrens?= Date: Wed, 18 Jan 2017 14:46:33 +0100 Subject: [PATCH 145/169] Initialize I/O block label --- app/scripts/plugins/shapes/joint.shapes.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/scripts/plugins/shapes/joint.shapes.js b/app/scripts/plugins/shapes/joint.shapes.js index 54d9f772e..38dd94c3b 100644 --- a/app/scripts/plugins/shapes/joint.shapes.js +++ b/app/scripts/plugins/shapes/joint.shapes.js @@ -406,6 +406,7 @@ joint.shapes.ice.IOView = joint.shapes.ice.ModelView.extend({ var selectCode = ''; var selectScript = ''; var data = this.model.get('data'); + var name = data.name + (data.range || ''); if (data.pins) { for (var i in data.pins) { @@ -422,7 +423,7 @@ joint.shapes.ice.IOView = joint.shapes.ice.ModelView.extend({ this.$box = $(joint.util.template( '\
                          \ - \ + \
                          \
                          \ \ From 850d46701d4efaa29e3c50738080f382e016a63b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jes=C3=BAs=20Arroyo=20Torrens?= Date: Wed, 18 Jan 2017 15:14:24 +0100 Subject: [PATCH 146/169] Update samples --- app/styles/design.css | 2 +- samples/assign.ice | 14 ++--- samples/block.ice | 14 ++--- samples/complex.ice | 128 +++++++++++++++++++++--------------------- samples/counter.ice | 22 ++++---- samples/in-out.ice | 8 +-- samples/mux.ice | 16 +++--- samples/not.ice | 16 +++--- 8 files changed, 110 insertions(+), 110 deletions(-) diff --git a/app/styles/design.css b/app/styles/design.css index 2c894622f..0751fe757 100644 --- a/app/styles/design.css +++ b/app/styles/design.css @@ -93,7 +93,7 @@ padding: 5px 5px; position: absolute; bottom: 100%; - margin-bottom: 16px; + margin-bottom: 20px; left: 50%; margin-left: -60px; } diff --git a/samples/assign.ice b/samples/assign.ice index 158ccfb6d..a2f884a55 100644 --- a/samples/assign.ice +++ b/samples/assign.ice @@ -1,10 +1,10 @@ { "version": "1.1", "package": { - "name": "", - "version": "", - "description": "", - "author": "", + "name": "Assign", + "version": "1.0", + "description": "Assign the value plus an offset to the 4bit output", + "author": "Jesús Arroyo", "image": "" }, "design": { @@ -138,10 +138,10 @@ }, "state": { "pan": { - "x": 0, - "y": 0 + "x": -64.05, + "y": -22.58 }, - "zoom": 1 + "zoom": 1.1175 } }, "dependencies": {} diff --git a/samples/block.ice b/samples/block.ice index 13c9df89b..8d1d2679b 100644 --- a/samples/block.ice +++ b/samples/block.ice @@ -1,10 +1,10 @@ { "version": "1.1", "package": { - "name": "", - "version": "", - "description": "", - "author": "", + "name": "Block", + "version": "1.0", + "description": "out = in ? C : D; p = q;", + "author": "Jesús Arroyo", "image": "" }, "design": { @@ -219,10 +219,10 @@ }, "state": { "pan": { - "x": 24.9889, - "y": 53.8958 + "x": -1.6949, + "y": 61.9746 }, - "zoom": 0.8154 + "zoom": 0.8686 } }, "dependencies": {} diff --git a/samples/complex.ice b/samples/complex.ice index 1a60ab330..614039ab1 100644 --- a/samples/complex.ice +++ b/samples/complex.ice @@ -1,10 +1,10 @@ { "version": "1.1", "package": { - "name": "", - "version": "", - "description": "", - "author": "", + "name": "Complex", + "version": "1.0", + "description": "Example including projects as blocks", + "author": "Jesús Arroyo", "image": "" }, "design": { @@ -20,29 +20,29 @@ "local": false }, "position": { - "x": 128, - "y": 40 + "x": 120, + "y": 56 } }, { - "id": "6f0cbf26-fd2e-4fa2-b55a-5f93e7af02c7", - "type": "8be60c981ee16ae78ea91d5b17181c7a72c5e6fe", + "id": "ceadef15-e833-414a-93e7-aea6f85a882b", + "type": "894ab7f455e1e77e336f2e96457b1da7381a61bd", "position": { "x": 120, "y": 184 } }, { - "id": "85073adf-db9b-4850-83de-8f9af24478ee", - "type": "739ddadeeb546b401f15a37331dac9d9165a15f9", + "id": "00824624-3f88-4f18-9983-3e45d52b19c7", + "type": "88119a9ec745ebab0cf9098d339d2bbdd803db40", "position": { - "x": 336, + "x": 344, "y": 200 } }, { - "id": "28a13e1c-47e8-4b22-b3f1-271bd5762ed7", - "type": "a18ef3d9a87624c0875cb79ca115f0e625bf67d8", + "id": "bf4b5914-c791-42d3-b876-df0e03d5a9a4", + "type": "dd6af852895fb14362cdc5cb5f47c76353d7c7ad", "position": { "x": 528, "y": 200 @@ -132,28 +132,17 @@ }, { "source": { - "block": "21e9e7f9-9b8a-4fca-904d-e266f1496454", - "port": "out" - }, - "target": { - "block": "85073adf-db9b-4850-83de-8f9af24478ee", - "port": "f6528039-852b-41f9-aa41-268994b3f631" - }, - "size": 2 - }, - { - "source": { - "block": "85073adf-db9b-4850-83de-8f9af24478ee", - "port": "60d40fc8-3388-4066-8f0a-af17e179a9bd" + "block": "bfebb831-8b03-43e1-9b87-013f1b5a9cdf", + "port": "constant-out" }, "target": { - "block": "28a13e1c-47e8-4b22-b3f1-271bd5762ed7", - "port": "a4058fa5-b66e-4e5e-b542-28d7c3e9d3cd" + "block": "ceadef15-e833-414a-93e7-aea6f85a882b", + "port": "909655b9-5ef0-4c45-9494-c0238d2e4732" } }, { "source": { - "block": "28a13e1c-47e8-4b22-b3f1-271bd5762ed7", + "block": "bf4b5914-c791-42d3-b876-df0e03d5a9a4", "port": "07895985-9d14-4a6f-8f2d-b2a6ddf61852" }, "target": { @@ -163,42 +152,53 @@ }, { "source": { - "block": "6f0cbf26-fd2e-4fa2-b55a-5f93e7af02c7", + "block": "ceadef15-e833-414a-93e7-aea6f85a882b", "port": "ef743d41-5941-4831-becd-0d930c4eed54" }, "target": { - "block": "85073adf-db9b-4850-83de-8f9af24478ee", + "block": "00824624-3f88-4f18-9983-3e45d52b19c7", "port": "95f8c313-6e18-4ee3-b9cf-7266dec53c93" }, "size": 4 }, { "source": { - "block": "bfebb831-8b03-43e1-9b87-013f1b5a9cdf", - "port": "constant-out" + "block": "21e9e7f9-9b8a-4fca-904d-e266f1496454", + "port": "out" }, "target": { - "block": "6f0cbf26-fd2e-4fa2-b55a-5f93e7af02c7", - "port": "909655b9-5ef0-4c45-9494-c0238d2e4732" + "block": "00824624-3f88-4f18-9983-3e45d52b19c7", + "port": "f6528039-852b-41f9-aa41-268994b3f631" + }, + "size": 2 + }, + { + "source": { + "block": "00824624-3f88-4f18-9983-3e45d52b19c7", + "port": "60d40fc8-3388-4066-8f0a-af17e179a9bd" + }, + "target": { + "block": "bf4b5914-c791-42d3-b876-df0e03d5a9a4", + "port": "a4058fa5-b66e-4e5e-b542-28d7c3e9d3cd" } } ] }, "state": { "pan": { - "x": 0, - "y": 0 + "x": -24.6892, + "y": 38.6221 }, - "zoom": 1 + "zoom": 1.0164 } }, "dependencies": { - "8be60c981ee16ae78ea91d5b17181c7a72c5e6fe": { + "894ab7f455e1e77e336f2e96457b1da7381a61bd": { "package": { - "name": "", - "version": "", - "description": "", - "author": "", + "name": "Assign", + "version": "1.0", + "description": "Assign the value plus an offset to the 4bit output", + "author": "Jesús Arroyo", "image": "" }, "design": { @@ -309,20 +309,20 @@ }, "state": { "pan": { - "x": 0, - "y": 0 + "x": -64.05, + "y": -22.58 }, - "zoom": 1 + "zoom": 1.1175 } } }, - "739ddadeeb546b401f15a37331dac9d9165a15f9": { + "88119a9ec745ebab0cf9098d339d2bbdd803db40": { "package": { - "name": "", - "version": "", - "description": "", - "author": "", - "image": "" + "name": "Mux4:1", + "version": "1.0", + "description": "Multiplexer 4 to 1", + "author": "Jesús Arroyo", + "image": "%3Csvg%20xmlns=%22http://www.w3.org/2000/svg%22%20viewBox=%22-252%20400.9%2081%2040%22%20width=%2281%22%20height=%2240%22%3E%3Cpath%20d=%22M-191%20419.9v-7.2l-41-11.8v40l41-11.7v-7.4zm-39%2018.5v-35l37%2010.8v13.5z%22/%3E%3C/svg%3E" }, "design": { "graph": { @@ -433,20 +433,20 @@ }, "state": { "pan": { - "x": 0, - "y": 0 + "x": -8.7129, + "y": 19.9356 }, - "zoom": 1 + "zoom": 1.0149 } } }, - "a18ef3d9a87624c0875cb79ca115f0e625bf67d8": { + "dd6af852895fb14362cdc5cb5f47c76353d7c7ad": { "package": { - "name": "", - "version": "", - "description": "", - "author": "", - "image": "" + "name": "Not", + "version": "1.0", + "description": "NOT logic gate", + "author": "Jesús Arroyo", + "image": "%3Csvg%20xmlns=%22http://www.w3.org/2000/svg%22%20width=%2291.33%22%20height=%2245.752%22%20version=%221%22%3E%3Cpath%20d=%22M0%2020.446h27v2H0zm70.322.001h15.3v2h-15.3z%22/%3E%3Cpath%20d=%22M66.05%2026.746c-2.9%200-5.3-2.4-5.3-5.3s2.4-5.3%205.3-5.3%205.3%202.4%205.3%205.3-2.4%205.3-5.3%205.3zm0-8.6c-1.8%200-3.3%201.5-3.3%203.3%200%201.8%201.5%203.3%203.3%203.3%201.8%200%203.3-1.5%203.3-3.3%200-1.8-1.5-3.3-3.3-3.3z%22/%3E%3Cpath%20d=%22M25.962%202.563l33.624%2018.883L25.962%2040.33V2.563z%22%20fill=%22none%22%20stroke=%22#000%22%20stroke-width=%223%22/%3E%3C/svg%3E" }, "design": { "graph": { @@ -523,10 +523,10 @@ }, "state": { "pan": { - "x": 0, - "y": 0 + "x": -38.5106, + "y": 27.9681 }, - "zoom": 1 + "zoom": 1.0904 } } } diff --git a/samples/counter.ice b/samples/counter.ice index e66dc4f56..20cbbd76d 100644 --- a/samples/counter.ice +++ b/samples/counter.ice @@ -1,10 +1,10 @@ { "version": "1.1", "package": { - "name": "", - "version": "", - "description": "", - "author": "", + "name": "counter", + "version": "1.0", + "description": "4-bit counter. N is the number of bits to count.", + "author": "Jesús Arroyo", "image": "" }, "design": { @@ -36,7 +36,7 @@ "id": "1a49c635-92d6-4641-bd3b-dbd7604a76bf", "type": "basic.output", "data": { - "name": "LED 5", + "name": "LED5", "pins": [ { "index": "0", @@ -55,7 +55,7 @@ "id": "1f3764d6-7db2-4e5a-912d-a25aad6459e2", "type": "basic.output", "data": { - "name": "LED 4", + "name": "LED4", "pins": [ { "index": "0", @@ -164,7 +164,7 @@ "id": "9803de82-f844-48f0-9f6a-b428395073b4", "type": "basic.input", "data": { - "name": "Button 1", + "name": "Enable", "pins": [ { "index": "0", @@ -183,7 +183,7 @@ "id": "4caf869e-5202-4aa0-acbf-14fac565eaf1", "type": "basic.input", "data": { - "name": "Button 2", + "name": "Reset", "pins": [ { "index": "0", @@ -275,10 +275,10 @@ }, "state": { "pan": { - "x": 0, - "y": 0 + "x": -0.5941, + "y": -4.4208 }, - "zoom": 1 + "zoom": 1.0149 } }, "dependencies": { diff --git a/samples/in-out.ice b/samples/in-out.ice index db144cf58..0832bcc63 100644 --- a/samples/in-out.ice +++ b/samples/in-out.ice @@ -1,10 +1,10 @@ { "version": "1.1", "package": { - "name": "", - "version": "", - "description": "", - "author": "", + "name": "in-out", + "version": "1.0", + "description": "Assign the input to both outputs", + "author": "Jesús Arroyo", "image": "" }, "design": { diff --git a/samples/mux.ice b/samples/mux.ice index ecbc42feb..3501560e0 100644 --- a/samples/mux.ice +++ b/samples/mux.ice @@ -1,11 +1,11 @@ { "version": "1.1", "package": { - "name": "", - "version": "", - "description": "", - "author": "", - "image": "" + "name": "Mux4:1", + "version": "1.0", + "description": "Multiplexer 4 to 1", + "author": "Jesús Arroyo", + "image": "%3Csvg%20xmlns=%22http://www.w3.org/2000/svg%22%20viewBox=%22-252%20400.9%2081%2040%22%20width=%2281%22%20height=%2240%22%3E%3Cpath%20d=%22M-191%20419.9v-7.2l-41-11.8v40l41-11.7v-7.4zm-39%2018.5v-35l37%2010.8v13.5z%22/%3E%3C/svg%3E" }, "design": { "board": "icezum", @@ -159,10 +159,10 @@ }, "state": { "pan": { - "x": 0, - "y": 0 + "x": -8.7129, + "y": 19.9356 }, - "zoom": 1 + "zoom": 1.0149 } }, "dependencies": {} diff --git a/samples/not.ice b/samples/not.ice index 10df4e011..e30708735 100644 --- a/samples/not.ice +++ b/samples/not.ice @@ -1,11 +1,11 @@ { "version": "1.1", "package": { - "name": "", - "version": "", - "description": "", - "author": "", - "image": "" + "name": "Not", + "version": "1.0", + "description": "NOT logic gate", + "author": "Jesús Arroyo", + "image": "%3Csvg%20xmlns=%22http://www.w3.org/2000/svg%22%20width=%2291.33%22%20height=%2245.752%22%20version=%221%22%3E%3Cpath%20d=%22M0%2020.446h27v2H0zm70.322.001h15.3v2h-15.3z%22/%3E%3Cpath%20d=%22M66.05%2026.746c-2.9%200-5.3-2.4-5.3-5.3s2.4-5.3%205.3-5.3%205.3%202.4%205.3%205.3-2.4%205.3-5.3%205.3zm0-8.6c-1.8%200-3.3%201.5-3.3%203.3%200%201.8%201.5%203.3%203.3%203.3%201.8%200%203.3-1.5%203.3-3.3%200-1.8-1.5-3.3-3.3-3.3z%22/%3E%3Cpath%20d=%22M25.962%202.563l33.624%2018.883L25.962%2040.33V2.563z%22%20fill=%22none%22%20stroke=%22#000%22%20stroke-width=%223%22/%3E%3C/svg%3E" }, "design": { "board": "icezum", @@ -99,10 +99,10 @@ }, "state": { "pan": { - "x": 0, - "y": 0 + "x": -38.5106, + "y": 27.9681 }, - "zoom": 1 + "zoom": 1.0904 } }, "dependencies": {} From 7297f13d92a8cb253159052ae6530ff57e8de74a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jes=C3=BAs=20Arroyo=20Torrens?= Date: Wed, 18 Jan 2017 16:03:50 +0100 Subject: [PATCH 147/169] Allow to Add multiple projects as blocks --- app/scripts/controllers/menu.js | 7 +++++-- app/views/menu.html | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/app/scripts/controllers/menu.js b/app/scripts/controllers/menu.js index 6f67028bd..c7cfa71bb 100644 --- a/app/scripts/controllers/menu.js +++ b/app/scripts/controllers/menu.js @@ -153,8 +153,11 @@ angular.module('icestudio') }); $scope.addAsBlock = function() { - utils.openDialog('#input-add-as-block', '.ice', function(filepath) { - project.addAsBlock(filepath); + utils.openDialog('#input-add-as-block', '.ice', function(filepaths) { + filepaths = filepaths.split(';'); + for (var i in filepaths) { + project.addAsBlock(filepaths[i]); + } }); }; diff --git a/app/views/menu.html b/app/views/menu.html index 91de271c5..bd46ff6c1 100644 --- a/app/views/menu.html +++ b/app/views/menu.html @@ -7,7 +7,7 @@ - + From 64301e9383fabc8fbd3be3ab2d560ec3af8d0c7f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jes=C3=BAs=20Arroyo=20Torrens?= Date: Wed, 18 Jan 2017 16:15:35 +0100 Subject: [PATCH 148/169] Manage config and pull up blocks --- app/resources/blocks/config/pull_up.ice | 4 +++- app/resources/blocks/config/pull_up_inv.ice | 4 +++- app/resources/blocks/config/tri_state.ice | 3 ++- app/scripts/plugins/shapes/joint.shapes.js | 2 +- app/scripts/services/blocks.service.js | 2 ++ app/scripts/services/graph.service.js | 9 +++------ 6 files changed, 14 insertions(+), 10 deletions(-) diff --git a/app/resources/blocks/config/pull_up.ice b/app/resources/blocks/config/pull_up.ice index 49b945609..9a9ce030f 100644 --- a/app/resources/blocks/config/pull_up.ice +++ b/app/resources/blocks/config/pull_up.ice @@ -9,6 +9,8 @@ }, "design": { "board": "icezum", + "config": "true", + "pullup": "true", "graph": { "blocks": [ { @@ -106,4 +108,4 @@ } }, "dependencies": {} -} \ No newline at end of file +} diff --git a/app/resources/blocks/config/pull_up_inv.ice b/app/resources/blocks/config/pull_up_inv.ice index 934b9a167..1871d6862 100644 --- a/app/resources/blocks/config/pull_up_inv.ice +++ b/app/resources/blocks/config/pull_up_inv.ice @@ -9,6 +9,8 @@ }, "design": { "board": "icezum", + "config": "true", + "pullup": "true", "graph": { "blocks": [ { @@ -106,4 +108,4 @@ } }, "dependencies": {} -} \ No newline at end of file +} diff --git a/app/resources/blocks/config/tri_state.ice b/app/resources/blocks/config/tri_state.ice index 59623608a..337e9381e 100644 --- a/app/resources/blocks/config/tri_state.ice +++ b/app/resources/blocks/config/tri_state.ice @@ -9,6 +9,7 @@ }, "design": { "board": "icezum", + "config": "true", "graph": { "blocks": [ { @@ -170,4 +171,4 @@ } }, "dependencies": {} -} \ No newline at end of file +} diff --git a/app/scripts/plugins/shapes/joint.shapes.js b/app/scripts/plugins/shapes/joint.shapes.js index 38dd94c3b..2fb7a5683 100644 --- a/app/scripts/plugins/shapes/joint.shapes.js +++ b/app/scripts/plugins/shapes/joint.shapes.js @@ -363,7 +363,7 @@ joint.shapes.ice.GenericView = joint.shapes.ice.ModelView.extend({ this.$box.find('img').addClass('hidden'); this.$box.find('label').removeClass('hidden'); } - if (this.model.get('blockType').indexOf('config.') !== -1) { + if (this.model.get('config')) { this.$box.addClass('config-block'); } } diff --git a/app/scripts/services/blocks.service.js b/app/scripts/services/blocks.service.js index ada7c9828..27940ba17 100644 --- a/app/scripts/services/blocks.service.js +++ b/app/scripts/services/blocks.service.js @@ -562,6 +562,8 @@ angular.module('icestudio') var cell = new joint.shapes.ice.Generic({ id: instance.id, blockType: instance.type, + config: block.design.config, + pullup: block.design.pullup, image: blockImage, label: blockLabel, tooltip: block.package.description, diff --git a/app/scripts/services/graph.service.js b/app/scripts/services/graph.service.js index 50f805140..415747842 100644 --- a/app/scripts/services/graph.service.js +++ b/app/scripts/services/graph.service.js @@ -181,23 +181,20 @@ angular.module('icestudio') return false; } // Prevent to connect a pull-up if other blocks are connected - if ((cellViewT.model.attributes.blockType === 'config.pull_up' || - cellViewT.model.attributes.blockType === 'config.pull_up_inv') && + if ((cellViewT.model.attributes.pullup) && (cellViewS.model.id === links[i].get('source').id)) { warning(gettextCatalog.getString('Invalid Pull up connection:
                          block already connected')); return false; } // Prevent to connect other blocks if a pull-up is connected - if ((linkIView.targetView.model.attributes.blockType === 'config.pull_up' || - linkIView.targetView.model.attributes.blockType === 'config.pull_up_inv') && + if ((linkIView.targetView.model.attributes.pullup) && (cellViewS.model.id === links[i].get('source').id)) { warning(gettextCatalog.getString('Invalid block connection:
                          Pull up already connected')); return false; } } // Ensure input -> pull-up connections - if (cellViewT.model.attributes.blockType === 'config.pull_up' || - cellViewT.model.attributes.blockType === 'config.pull_up_inv') { + if (cellViewT.model.attributes.pullup) { var ret = (cellViewS.model.attributes.blockType === 'basic.input'); if (!ret) { warning(gettextCatalog.getString('Invalid Pull up connection:
                          only Input blocks allowed')); From b452f85918f5bf5586b70d47435d3fbe18c46bea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jes=C3=BAs=20Arroyo=20Torrens?= Date: Wed, 18 Jan 2017 17:57:35 +0100 Subject: [PATCH 149/169] Load View > Collections --- app/scripts/controllers/menu.js | 9 +++++++ app/scripts/services/profile.service.js | 8 +++--- app/scripts/services/resources.service.js | 31 +++++++++++++++++++++++ app/scripts/services/utils.service.js | 1 + app/views/menu.html | 12 +++++++++ 5 files changed, 56 insertions(+), 5 deletions(-) diff --git a/app/scripts/controllers/menu.js b/app/scripts/controllers/menu.js index c7cfa71bb..1bfc06dfb 100644 --- a/app/scripts/controllers/menu.js +++ b/app/scripts/controllers/menu.js @@ -23,10 +23,12 @@ angular.module('icestudio') $scope.profile = profile; $scope.project = project; $scope.tools = tools; + $scope.resources = resources; $scope.examples = resources.getExamples(); $scope.currentBoards = boards.getBoards(); $scope.menuBlocks = resources.getMenuBlocks(); + $scope.collections = resources.getCollections(); $scope.version = _package.version; $scope.toolchain = tools.toolchain; @@ -364,6 +366,13 @@ angular.module('icestudio') } }; + $scope.selectCollection = function(collection) { + if (resources.selectedCollection.name !== collection.name) { + resources.selectCollection(collection.name); + alertify.success(gettextCatalog.getString('Collection {{name}} selected', { name: utils.bold(collection.name) })); + } + }; + //-- Boards diff --git a/app/scripts/services/profile.service.js b/app/scripts/services/profile.service.js index c069425e6..eff951759 100644 --- a/app/scripts/services/profile.service.js +++ b/app/scripts/services/profile.service.js @@ -5,9 +5,7 @@ angular.module('icestudio') nodeFs, nodePath) { - const BASE_DIR = process.env.HOME || process.env.USERPROFILE; - const ICESTUDIO_DIR = nodePath.join(BASE_DIR, '.icestudio'); - const PROFILE_PATH = nodePath.join(ICESTUDIO_DIR, 'profile.json'); + const PROFILE_PATH = nodePath.join(utils.ICESTUDIO_DIR, 'profile.json'); this.data = { 'language': '', @@ -28,8 +26,8 @@ angular.module('icestudio') }; this.save = function() { - if (!nodeFs.existsSync(ICESTUDIO_DIR)) { - nodeFs.mkdirSync(ICESTUDIO_DIR); + if (!nodeFs.existsSync(utils.ICESTUDIO_DIR)) { + nodeFs.mkdirSync(utils.ICESTUDIO_DIR); } utils.saveFile(PROFILE_PATH, this.data, function() { console.log('Profile saved'); diff --git a/app/scripts/services/resources.service.js b/app/scripts/services/resources.service.js index 82f6b0b8a..cbfd96eb9 100644 --- a/app/scripts/services/resources.service.js +++ b/app/scripts/services/resources.service.js @@ -4,6 +4,21 @@ angular.module('icestudio') .service('resources', function(utils, nodePath) { + const DEFAULT = 'Default'; + const COLLECTIONS_DIR = nodePath.join(utils.ICESTUDIO_DIR, 'collections'); + + this.selectedCollection = null; + this.currentCollections = loadCollections(); + + function loadCollections() { + var collections = [{ + 'name': DEFAULT, + 'children': utils.getFilesRecursive(nodePath.join('resources', 'blocks'), '.ice') + }]; + collections = collections.concat(utils.getFilesRecursive(COLLECTIONS_DIR, '.ice')); + return collections; + } + this.getExamples = function() { return utils.getFilesRecursive(nodePath.join('resources', 'examples'), '.ice', true); // onlyFilepath }; @@ -12,4 +27,20 @@ angular.module('icestudio') return utils.getFilesRecursive(nodePath.join('resources', 'blocks'), '.ice'); }; + this.selectCollection = function(name) { + for (var i in this.currentCollections) { + if (name === this.currentCollections[i].name) { + this.selectedCollection = this.currentCollections[i]; + break; + } + } + }; + + // Select default collection + this.selectCollection(DEFAULT); + + this.getCollections = function() { + return this.currentCollections; + }; + }); diff --git a/app/scripts/services/utils.service.js b/app/scripts/services/utils.service.js index 485de836e..f077adce9 100644 --- a/app/scripts/services/utils.service.js +++ b/app/scripts/services/utils.service.js @@ -46,6 +46,7 @@ angular.module('icestudio') const BASE_DIR = process.env.HOME || process.env.USERPROFILE; const ICESTUDIO_DIR = nodePath.join(BASE_DIR, '.icestudio'); + this.ICESTUDIO_DIR = ICESTUDIO_DIR; const APIO_HOME_DIR = nodePath.join(ICESTUDIO_DIR, 'apio'); const ENV_DIR = _getEnvDir(nodePath.join(ICESTUDIO_DIR, 'venv')); diff --git a/app/views/menu.html b/app/views/menu.html index bd46ff6c1..f8860f0ab 100644 --- a/app/views/menu.html +++ b/app/views/menu.html @@ -177,6 +177,18 @@
                        • {{ 'Datasheet' | translate }}
                          • +
                        • +
                        • + {{ 'Collections' | translate }} + +
                        From 551745db8c7f5c12208a54ae1738a9d5e3140fdf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jes=C3=BAs=20Arroyo=20Torrens?= Date: Wed, 18 Jan 2017 19:10:45 +0100 Subject: [PATCH 150/169] Store selected collection --- app/scripts/controllers/menu.js | 5 ++++- app/scripts/services/profile.service.js | 3 ++- app/scripts/services/project.service.js | 2 +- app/scripts/services/resources.service.js | 4 +--- app/views/menu.html | 2 +- 5 files changed, 9 insertions(+), 7 deletions(-) diff --git a/app/scripts/controllers/menu.js b/app/scripts/controllers/menu.js index 1bfc06dfb..065df88fc 100644 --- a/app/scripts/controllers/menu.js +++ b/app/scripts/controllers/menu.js @@ -27,7 +27,6 @@ angular.module('icestudio') $scope.examples = resources.getExamples(); $scope.currentBoards = boards.getBoards(); - $scope.menuBlocks = resources.getMenuBlocks(); $scope.collections = resources.getCollections(); $scope.version = _package.version; @@ -38,6 +37,9 @@ angular.module('icestudio') var zeroProject = true; // New project without changes + // Select collection + resources.selectCollection(profile.data.collection); + // Window events var win = gui.Window.get(); win.on('close', function() { @@ -369,6 +371,7 @@ angular.module('icestudio') $scope.selectCollection = function(collection) { if (resources.selectedCollection.name !== collection.name) { resources.selectCollection(collection.name); + profile.data.collection = collection.name; alertify.success(gettextCatalog.getString('Collection {{name}} selected', { name: utils.bold(collection.name) })); } }; diff --git a/app/scripts/services/profile.service.js b/app/scripts/services/profile.service.js index eff951759..7fcf63321 100644 --- a/app/scripts/services/profile.service.js +++ b/app/scripts/services/profile.service.js @@ -9,7 +9,8 @@ angular.module('icestudio') this.data = { 'language': '', - 'remoterHostname': '' + 'remoterHostname': '', + 'collection': '' }; this.load = function(callback) { diff --git a/app/scripts/services/project.service.js b/app/scripts/services/project.service.js index 594a35658..bfab50748 100644 --- a/app/scripts/services/project.service.js +++ b/app/scripts/services/project.service.js @@ -504,7 +504,7 @@ angular.module('icestudio') graph.createBasicBlock(arg); } else if (arg) { - var block = _safeLoad(arg); + var block = utils.clone(_safeLoad(arg)); block = pruneBlock(block); var type = utils.dependencyID(block); mergeDependencies(type, block); diff --git a/app/scripts/services/resources.service.js b/app/scripts/services/resources.service.js index cbfd96eb9..ba511ba33 100644 --- a/app/scripts/services/resources.service.js +++ b/app/scripts/services/resources.service.js @@ -28,6 +28,7 @@ angular.module('icestudio') }; this.selectCollection = function(name) { + name = name || DEFAULT; for (var i in this.currentCollections) { if (name === this.currentCollections[i].name) { this.selectedCollection = this.currentCollections[i]; @@ -36,9 +37,6 @@ angular.module('icestudio') } }; - // Select default collection - this.selectCollection(DEFAULT); - this.getCollections = function() { return this.currentCollections; }; diff --git a/app/views/menu.html b/app/views/menu.html index f8860f0ab..9e8600f35 100644 --- a/app/views/menu.html +++ b/app/views/menu.html @@ -304,7 +304,7 @@
                      • -
                    • +
                    • {{ blocks.name | translate }}
                      • From fb15883b9589209dc654f5b4c33d166d2c102bbe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jes=C3=BAs=20Arroyo=20Torrens?= Date: Wed, 18 Jan 2017 19:27:17 +0100 Subject: [PATCH 151/169] Change FPGA pin = !(Virtual port) --- app/scripts/services/blocks.service.js | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/app/scripts/services/blocks.service.js b/app/scripts/services/blocks.service.js index 27940ba17..f24fb33a0 100644 --- a/app/scripts/services/blocks.service.js +++ b/app/scripts/services/blocks.service.js @@ -55,14 +55,14 @@ angular.module('icestudio') }; utils.inputcheckboxprompt([ gettextCatalog.getString('Enter the ports'), - gettextCatalog.getString('Virtual port') + gettextCatalog.getString('FPGA pin') ], [ config._default, - true + false ], function(evt, values) { var labels = values[0].replace(/ /g, '').split(','); - var virtual = values[1]; + var virtual = !values[1]; // Validate values var portInfo, portInfos = []; for (var l in labels) { @@ -637,15 +637,15 @@ angular.module('icestudio') var block = cellView.model.attributes; utils.inputcheckboxprompt([ gettextCatalog.getString('Update the port'), - gettextCatalog.getString('Virtual port') + gettextCatalog.getString('FPGA pin') ], [ block.data.name + (block.data.range || ''), - block.data.virtual + !block.data.virtual ], function(evt, values) { var oldSize, newSize, offset = 0; var label = values[0].replace(/ /g, ''); - var virtual = values[1]; + var virtual = !values[1]; // Validate values var portInfo = utils.parsePortLabel(label); if (portInfo) { From 469b0fe06032a47d717471e69e2abdfbb172a754 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jes=C3=BAs=20Arroyo=20Torrens?= Date: Thu, 19 Jan 2017 09:51:53 +0100 Subject: [PATCH 152/169] Manage empty or nonexistent collections --- app/scripts/controllers/menu.js | 8 ++--- app/scripts/services/resources.service.js | 13 +++++-- app/scripts/services/utils.service.js | 43 ++++++++++++----------- 3 files changed, 37 insertions(+), 27 deletions(-) diff --git a/app/scripts/controllers/menu.js b/app/scripts/controllers/menu.js index 065df88fc..96d5172ca 100644 --- a/app/scripts/controllers/menu.js +++ b/app/scripts/controllers/menu.js @@ -38,7 +38,7 @@ angular.module('icestudio') var zeroProject = true; // New project without changes // Select collection - resources.selectCollection(profile.data.collection); + profile.data.collection = resources.selectCollection(profile.data.collection); // Window events var win = gui.Window.get(); @@ -370,9 +370,9 @@ angular.module('icestudio') $scope.selectCollection = function(collection) { if (resources.selectedCollection.name !== collection.name) { - resources.selectCollection(collection.name); - profile.data.collection = collection.name; - alertify.success(gettextCatalog.getString('Collection {{name}} selected', { name: utils.bold(collection.name) })); + var name = resources.selectCollection(collection.name); + profile.data.collection = name; + alertify.success(gettextCatalog.getString('Collection {{name}} selected', { name: utils.bold(name) })); } }; diff --git a/app/scripts/services/resources.service.js b/app/scripts/services/resources.service.js index ba511ba33..124c61305 100644 --- a/app/scripts/services/resources.service.js +++ b/app/scripts/services/resources.service.js @@ -4,9 +4,11 @@ angular.module('icestudio') .service('resources', function(utils, nodePath) { - const DEFAULT = 'Default'; + const DEFAULT = ''; const COLLECTIONS_DIR = nodePath.join(utils.ICESTUDIO_DIR, 'collections'); + console.log(utils.getFilesRecursive(COLLECTIONS_DIR, '.ice')); + this.selectedCollection = null; this.currentCollections = loadCollections(); @@ -29,12 +31,19 @@ angular.module('icestudio') this.selectCollection = function(name) { name = name || DEFAULT; + var selectedCollection = null; for (var i in this.currentCollections) { if (name === this.currentCollections[i].name) { - this.selectedCollection = this.currentCollections[i]; + selectedCollection = this.currentCollections[i]; break; } } + if (selectedCollection === null) { + // Collection not found: select default collection + selectedCollection = this.currentCollections[0]; + } + this.selectedCollection = selectedCollection; + return selectedCollection.name; }; this.getCollections = function() { diff --git a/app/scripts/services/utils.service.js b/app/scripts/services/utils.service.js index f077adce9..49602ab57 100644 --- a/app/scripts/services/utils.service.js +++ b/app/scripts/services/utils.service.js @@ -359,30 +359,31 @@ angular.module('icestudio') this.getFilesRecursive = getFilesRecursive; function getFilesRecursive(folder, extension, onlyFilepath) { - var fileContents = nodeFs.readdirSync(folder), - fileTree = [], - stats; - - fileContents.forEach(function (fileName) { - var filePath = nodePath.join(folder, fileName); - stats = nodeFs.lstatSync(filePath); - - if (stats.isDirectory()) { - fileTree.push({ - name: fileName, - children: getFilesRecursive(filePath, extension, onlyFilepath) - }); - } else { - if (fileName.endsWith(extension)) { - var content = onlyFilepath ? filePath : JSON.parse(nodeFs.readFileSync(filePath).toString()); + var fileTree = []; + if (nodeFs.existsSync(folder)) { + var fileContents = nodeFs.readdirSync(folder); + var stats; + + fileContents.forEach(function (fileName) { + var filePath = nodePath.join(folder, fileName); + stats = nodeFs.lstatSync(filePath); + + if (stats.isDirectory()) { fileTree.push({ - name: basename(fileName), - content: content + name: fileName, + children: getFilesRecursive(filePath, extension, onlyFilepath) }); + } else { + if (fileName.endsWith(extension)) { + var content = onlyFilepath ? filePath : JSON.parse(nodeFs.readFileSync(filePath).toString()); + fileTree.push({ + name: basename(fileName), + content: content + }); + } } - } - }); - + }); + } return fileTree; } From f5543cefe271138daf3d78fc6c320d067bf93fb4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jes=C3=BAs=20Arroyo=20Torrens?= Date: Thu, 19 Jan 2017 10:06:31 +0100 Subject: [PATCH 153/169] Add Tools > Collections section. Hide empty dropdown menus --- app/views/menu.html | 38 ++++++++++++++++++++++++++++++++++---- 1 file changed, 34 insertions(+), 4 deletions(-) diff --git a/app/views/menu.html b/app/views/menu.html index 9e8600f35..853fb75d6 100644 --- a/app/views/menu.html +++ b/app/views/menu.html @@ -36,6 +36,7 @@ {{ 'Examples' | translate }}
                        • @@ -306,7 +336,7 @@
                      • {{ blocks.name | translate }} -
                          +
                          • {{ block.name | translate }} @@ -314,7 +344,7 @@ {{ block.name | translate }} -
                              +
                              • {{ sblock.name | translate }} From 4aa02e62a5ede2de3e685691686394944d01d503 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jes=C3=BAs=20Arroyo=20Torrens?= Date: Thu, 19 Jan 2017 11:03:18 +0100 Subject: [PATCH 154/169] Implement "Add collection" --- app/scripts/controllers/menu.js | 18 +++++++++++++++++- app/scripts/factories/node.factory.js | 3 +++ app/scripts/services/profile.service.js | 9 +++------ app/scripts/services/resources.service.js | 18 ++++++------------ app/scripts/services/tools.service.js | 17 ++++++++++++++++- app/scripts/services/utils.service.js | 4 ++++ app/views/menu.html | 22 ++++++++++++++-------- 7 files changed, 63 insertions(+), 28 deletions(-) diff --git a/app/scripts/controllers/menu.js b/app/scripts/controllers/menu.js index 96d5172ca..4ce08a6f7 100644 --- a/app/scripts/controllers/menu.js +++ b/app/scripts/controllers/menu.js @@ -27,7 +27,6 @@ angular.module('icestudio') $scope.examples = resources.getExamples(); $scope.currentBoards = boards.getBoards(); - $scope.collections = resources.getCollections(); $scope.version = _package.version; $scope.toolchain = tools.toolchain; @@ -429,6 +428,23 @@ angular.module('icestudio') } } + $scope.addCollection = function() { + utils.openDialog('#input-add-collection', '.zip', function(filepaths) { + filepaths = filepaths.split(';'); + for (var i in filepaths) { + tools.addCollection(filepaths[i]); + } + }); + }; + + $scope.removeCollection = function(name) { + + }; + + $scope.removeAllCollections = function() { + + }; + //-- Help diff --git a/app/scripts/factories/node.factory.js b/app/scripts/factories/node.factory.js index f03f8538d..7f0facf3d 100644 --- a/app/scripts/factories/node.factory.js +++ b/app/scripts/factories/node.factory.js @@ -49,6 +49,9 @@ angular.module('icestudio') .factory('nodeLangInfo', function() { return require('node-lang-info'); }) + .factory('nodeUnzip', function() { + return require('unzip'); + }) .factory('SVGO', function() { return require('svgo'); }); diff --git a/app/scripts/services/profile.service.js b/app/scripts/services/profile.service.js index 7fcf63321..bd04bf74a 100644 --- a/app/scripts/services/profile.service.js +++ b/app/scripts/services/profile.service.js @@ -2,10 +2,7 @@ angular.module('icestudio') .service('profile', function(utils, - nodeFs, - nodePath) { - - const PROFILE_PATH = nodePath.join(utils.ICESTUDIO_DIR, 'profile.json'); + nodeFs) { this.data = { 'language': '', @@ -15,7 +12,7 @@ angular.module('icestudio') this.load = function(callback) { var self = this; - utils.readFile(PROFILE_PATH, function(data) { + utils.readFile(utils.PROFILE_PATH, function(data) { if (data) { self.data = data; } @@ -30,7 +27,7 @@ angular.module('icestudio') if (!nodeFs.existsSync(utils.ICESTUDIO_DIR)) { nodeFs.mkdirSync(utils.ICESTUDIO_DIR); } - utils.saveFile(PROFILE_PATH, this.data, function() { + utils.saveFile(utils.PROFILE_PATH, this.data, function() { console.log('Profile saved'); }, true); }; diff --git a/app/scripts/services/resources.service.js b/app/scripts/services/resources.service.js index 124c61305..16ceca33c 100644 --- a/app/scripts/services/resources.service.js +++ b/app/scripts/services/resources.service.js @@ -5,21 +5,19 @@ angular.module('icestudio') nodePath) { const DEFAULT = ''; - const COLLECTIONS_DIR = nodePath.join(utils.ICESTUDIO_DIR, 'collections'); - - console.log(utils.getFilesRecursive(COLLECTIONS_DIR, '.ice')); this.selectedCollection = null; - this.currentCollections = loadCollections(); + this.currentCollections = []; - function loadCollections() { + this.loadCollections = function() { var collections = [{ 'name': DEFAULT, 'children': utils.getFilesRecursive(nodePath.join('resources', 'blocks'), '.ice') }]; - collections = collections.concat(utils.getFilesRecursive(COLLECTIONS_DIR, '.ice')); - return collections; - } + this.currentCollections = collections.concat(utils.getFilesRecursive(utils.COLLECTIONS_DIR, '.ice')); + }; + + this.loadCollections(); this.getExamples = function() { return utils.getFilesRecursive(nodePath.join('resources', 'examples'), '.ice', true); // onlyFilepath @@ -46,8 +44,4 @@ angular.module('icestudio') return selectedCollection.name; }; - this.getCollections = function() { - return this.currentCollections; - }; - }); diff --git a/app/scripts/services/tools.service.js b/app/scripts/services/tools.service.js index 7d6142520..333dfdce6 100644 --- a/app/scripts/services/tools.service.js +++ b/app/scripts/services/tools.service.js @@ -5,6 +5,7 @@ angular.module('icestudio') boards, compiler, profile, + resources, utils, gettextCatalog, gettext, @@ -15,7 +16,8 @@ angular.module('icestudio') nodeProcess, nodeChildProcess, nodeSSHexec, - nodeRSync) { + nodeRSync, + nodeUnzip) { var currentAlert = null; var taskRunning = false; @@ -564,4 +566,17 @@ angular.module('icestudio') .css('width', '100%'); } + // Collections management + + this.addCollection = function(filepath) { + var name = utils.basename(filepath); + nodeFs.createReadStream(filepath) + .pipe(nodeUnzip.Extract({ path: utils.COLLECTIONS_DIR })) + .on('close', function() { + resources.loadCollections(); + alertify.success(gettextCatalog.getString('Collection file {{name}} added', { name: utils.bold(name) })); + }); + }; + + }); diff --git a/app/scripts/services/utils.service.js b/app/scripts/services/utils.service.js index 49602ab57..bf3f7869a 100644 --- a/app/scripts/services/utils.service.js +++ b/app/scripts/services/utils.service.js @@ -47,7 +47,11 @@ angular.module('icestudio') const BASE_DIR = process.env.HOME || process.env.USERPROFILE; const ICESTUDIO_DIR = nodePath.join(BASE_DIR, '.icestudio'); this.ICESTUDIO_DIR = ICESTUDIO_DIR; + const COLLECTIONS_DIR = nodePath.join(ICESTUDIO_DIR, 'collections'); + this.COLLECTIONS_DIR = COLLECTIONS_DIR; const APIO_HOME_DIR = nodePath.join(ICESTUDIO_DIR, 'apio'); + const PROFILE_PATH = nodePath.join(ICESTUDIO_DIR, 'profile.json'); + this.PROFILE_PATH = PROFILE_PATH; const ENV_DIR = _getEnvDir(nodePath.join(ICESTUDIO_DIR, 'venv')); const ENV_BIN_DIR = nodePath.join(ENV_DIR, WIN32 ? 'Scripts' : 'bin'); diff --git a/app/views/menu.html b/app/views/menu.html index 853fb75d6..c02c56fac 100644 --- a/app/views/menu.html +++ b/app/views/menu.html @@ -14,6 +14,8 @@ + +