diff --git a/Frontend Angular 4/package-lock.json b/Frontend Angular 4/package-lock.json
index 1d47d97260bc9fecaca8b87af18360da76551685..15f5568f851a2bd40f1f0d550342426d1aab288a 100644
--- a/Frontend Angular 4/package-lock.json
+++ b/Frontend Angular 4/package-lock.json
@@ -3628,8 +3628,7 @@
"version": "2.1.1",
"resolved": false,
"integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
- "dev": true,
- "optional": true
+ "dev": true
},
"aproba": {
"version": "1.2.0",
@@ -3653,15 +3652,13 @@
"version": "1.0.0",
"resolved": false,
"integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=",
- "dev": true,
- "optional": true
+ "dev": true
},
"brace-expansion": {
"version": "1.1.11",
"resolved": false,
"integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
"dev": true,
- "optional": true,
"requires": {
"balanced-match": "^1.0.0",
"concat-map": "0.0.1"
@@ -3678,22 +3675,19 @@
"version": "1.1.0",
"resolved": false,
"integrity": "sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c=",
- "dev": true,
- "optional": true
+ "dev": true
},
"concat-map": {
"version": "0.0.1",
"resolved": false,
"integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=",
- "dev": true,
- "optional": true
+ "dev": true
},
"console-control-strings": {
"version": "1.1.0",
"resolved": false,
"integrity": "sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4=",
- "dev": true,
- "optional": true
+ "dev": true
},
"core-util-is": {
"version": "1.0.2",
@@ -3824,8 +3818,7 @@
"version": "2.0.3",
"resolved": false,
"integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=",
- "dev": true,
- "optional": true
+ "dev": true
},
"ini": {
"version": "1.3.5",
@@ -3839,7 +3832,6 @@
"resolved": false,
"integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=",
"dev": true,
- "optional": true,
"requires": {
"number-is-nan": "^1.0.0"
}
@@ -3856,7 +3848,6 @@
"resolved": false,
"integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
"dev": true,
- "optional": true,
"requires": {
"brace-expansion": "^1.1.7"
}
@@ -3865,15 +3856,13 @@
"version": "0.0.8",
"resolved": false,
"integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=",
- "dev": true,
- "optional": true
+ "dev": true
},
"minipass": {
"version": "2.2.4",
"resolved": false,
"integrity": "sha512-hzXIWWet/BzWhYs2b+u7dRHlruXhwdgvlTMDKC6Cb1U7ps6Ac6yQlR39xsbjWJE377YTCtKwIXIpJ5oP+j5y8g==",
"dev": true,
- "optional": true,
"requires": {
"safe-buffer": "^5.1.1",
"yallist": "^3.0.0"
@@ -3894,7 +3883,6 @@
"resolved": false,
"integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=",
"dev": true,
- "optional": true,
"requires": {
"minimist": "0.0.8"
}
@@ -3983,8 +3971,7 @@
"version": "1.0.1",
"resolved": false,
"integrity": "sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0=",
- "dev": true,
- "optional": true
+ "dev": true
},
"object-assign": {
"version": "4.1.1",
@@ -3998,7 +3985,6 @@
"resolved": false,
"integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=",
"dev": true,
- "optional": true,
"requires": {
"wrappy": "1"
}
@@ -4094,8 +4080,7 @@
"version": "5.1.1",
"resolved": false,
"integrity": "sha512-kKvNJn6Mm93gAczWVJg7wH+wGYWNrDHdWvpUmHyEsgCtIwwo3bqPtV4tR5tuPaUhTOo/kvhVwd8XwwOllGYkbg==",
- "dev": true,
- "optional": true
+ "dev": true
},
"safer-buffer": {
"version": "2.1.2",
@@ -4137,7 +4122,6 @@
"resolved": false,
"integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=",
"dev": true,
- "optional": true,
"requires": {
"code-point-at": "^1.0.0",
"is-fullwidth-code-point": "^1.0.0",
@@ -4159,7 +4143,6 @@
"resolved": false,
"integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
"dev": true,
- "optional": true,
"requires": {
"ansi-regex": "^2.0.0"
}
@@ -4208,15 +4191,13 @@
"version": "1.0.2",
"resolved": false,
"integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=",
- "dev": true,
- "optional": true
+ "dev": true
},
"yallist": {
"version": "3.0.2",
"resolved": false,
"integrity": "sha1-hFK0u36Dx8GI2AQcGoN8dz1ti7k=",
- "dev": true,
- "optional": true
+ "dev": true
}
}
},
@@ -4239,8 +4220,8 @@
"dev": true
},
"function-plot": {
- "version": "git://github.com/diego-rey/function-plot.git#2594f0109b8a55a6b1f7a997824c9a174e0ec367",
- "from": "git://github.com/diego-rey/function-plot.git#feature/integration-multigraf-shape",
+ "version": "git://github.com/diego-rey/function-plot.git#ce21b9b486d26447e4bbe769e8c83a86c870cfa9",
+ "from": "git://github.com/diego-rey/function-plot.git#feature/discontinuidades",
"requires": {
"array-range": "^1.0.1",
"built-in-math-eval": "^0.3.0",
@@ -5582,7 +5563,7 @@
},
"is-safe-integer": {
"version": "1.0.2",
- "resolved": "http://registry.npmjs.org/is-safe-integer/-/is-safe-integer-1.0.2.tgz",
+ "resolved": "https://registry.npmjs.org/is-safe-integer/-/is-safe-integer-1.0.2.tgz",
"integrity": "sha1-yi3gJR9WRAj512MMKOLgLOGOoKo=",
"requires": {
"max-safe-integer": "^1.0.0"
@@ -6642,7 +6623,7 @@
},
"max-safe-integer": {
"version": "1.0.1",
- "resolved": "http://registry.npmjs.org/max-safe-integer/-/max-safe-integer-1.0.1.tgz",
+ "resolved": "https://registry.npmjs.org/max-safe-integer/-/max-safe-integer-1.0.1.tgz",
"integrity": "sha1-84BgvixWPYwC5tSK85Ei/YO29BA="
},
"md5.js": {
@@ -11152,6 +11133,11 @@
"minimalistic-assert": "^1.0.0"
}
},
+ "web-animations-js": {
+ "version": "2.3.2",
+ "resolved": "https://registry.npmjs.org/web-animations-js/-/web-animations-js-2.3.2.tgz",
+ "integrity": "sha512-TOMFWtQdxzjWp8qx4DAraTWTsdhxVSiWa6NkPFSaPtZ1diKUxTn4yTix73A1euG1WbSOMMPcY51cnjTIHrGtDA=="
+ },
"webdriver-js-extender": {
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/webdriver-js-extender/-/webdriver-js-extender-1.0.0.tgz",
diff --git a/Frontend Angular 4/src/app/layout/plotter/graph2D/graph2D.component.ts b/Frontend Angular 4/src/app/layout/plotter/graph2D/graph2D.component.ts
index 4eb43aff504e9d0cca2678e2091f3c2162541998..55ea59cd0a2c45adeaeeb469f46bf8813ae8f844 100755
--- a/Frontend Angular 4/src/app/layout/plotter/graph2D/graph2D.component.ts
+++ b/Frontend Angular 4/src/app/layout/plotter/graph2D/graph2D.component.ts
@@ -79,7 +79,9 @@ export class Graph2DComponent {
switch(canvas.tipo) {
case 'graph': {
console.log(canvas.resultado)
- var jsonCanvas = JSON.parse(canvas.resultado);
+ // var jsonCanvas = JSON.parse(JSONRepair(canvas.resultado));
+
+ var jsonCanvas = JSON.parse(canvas.resultado);
var conjs = this.obtenerConjunto(jsonCanvas.funs[0]);
var d = conjs + "}"; //Leo
@@ -154,6 +156,16 @@ export class Graph2DComponent {
}
+ if (obj.conj.baseDom == 'R'){
+ obj.conj.baseCod = 'R';
+ if (obj.conj.cod != 'Func'){
+ obj.conj.cod = 'R';
+ obj.conj.fcod = 'R';
+ }
+
+
+ }
+
let fun = eval(funcionGenerada);
@@ -168,7 +180,7 @@ export class Graph2DComponent {
}else{
tipoGraf = 'polyline';
}
-
+ console.log(obj.conj);
if(this.animation.boton && obj.conj.cod != 'Numer' && obj.conj.dom != 'Numer'){
if(this.conjunto.length == 1 && (this.conjunto[0].cod == 'Numer' || this.conjunto[0].dom == 'Numer')){
this.conjunto = [];
diff --git a/Frontend Angular 4/src/app/layout/plotter/graph2D/graph2D.helper.ts b/Frontend Angular 4/src/app/layout/plotter/graph2D/graph2D.helper.ts
index e4e8ca3419afcbe02ce481dc86395351080ddda2..480e9dfb2db0a8a430a1fd67aa7d3c78d2e7845c 100644
--- a/Frontend Angular 4/src/app/layout/plotter/graph2D/graph2D.helper.ts
+++ b/Frontend Angular 4/src/app/layout/plotter/graph2D/graph2D.helper.ts
@@ -26,6 +26,15 @@ export function toJSON(data: string) : string {
console.log('dataJSON', dataJSON);
return dataJSON;
}
+/**************para borrar***************** */
+// export function JSONRepair(data: string): string {
+// const regex = /\"sets\"\ : \[(\"+.*)\]\, \"bdy\"/g;
+
+// return data.replace(regex, (match, content) => {
+// return `"sets": [{ ${content} }], "bdy"`
+// })
+// }
+ /**************fin para borrar***************** */
export function triggerDownload(imgURI: string) {
var evt = new MouseEvent('click', {
diff --git a/Frontend Angular 4/src/app/shared/config.ts b/Frontend Angular 4/src/app/shared/config.ts
index a174ee9a63ec1992d2c8da76be66aa0165f2ea6f..1d2f9dca7d29b66ca41c304766f92cdd627f0c8e 100755
--- a/Frontend Angular 4/src/app/shared/config.ts
+++ b/Frontend Angular 4/src/app/shared/config.ts
@@ -21,8 +21,8 @@
// export const GHCI_URL = 'ws://35.199.110.129:9090/endpoint';
// Google cloud platform v2
-// export const SERVER = 'http://35.198.52.82:9090';
-// export const GHCI_URL = 'ws://35.198.52.82:9090/endpoint';
+// export const SERVER = 'http://35.198.60.74:9090';
+// export const GHCI_URL = 'ws://35.198.60.74:9090/endpoint';
// psico
export const SERVER = 'https://matefun.math.psico.edu.uy';