Agrega la funcionalidad de Enmuerados

Frontend Angular 4/src/app/layout/plotter/graph2D/graph2D.component.ts

@@ -53,7 +53,7 @@ export class Graph2DComponent {
 
 
     public setZoom = () => {
-        this.animation.zoo = this.animation.zoo ;
+        this.animation.zoo = this.animation.zoo ;  
     }
     public multiGraf = () => { 
         this.animation.boton = !this.animation.boton;
@@ -68,7 +68,6 @@ export class Graph2DComponent {
                 switch(canvas.tipo) { 
                     case 'graph': {
                         var jsonCanvas = JSON.parse(canvas.resultado);
-                        let fun = eval(this.generarFuncion(jsonCanvas));
                         var conjs = this.obtenerConjunto(jsonCanvas.funs[0]);
     
                         var d = conjs + "}"; //Leo
@@ -85,26 +84,31 @@ export class Graph2DComponent {
                             var elemento2 = this.recursionfuncion(jsonCanvas.funs[0].sets, nom);
                             obj.conj.sets.fcod = function (x) { return (eval(elemento2)) }
                         }
+
+                        var funcionGenerada = this.generarFuncion(jsonCanvas);
+                        console.log(obj)
+
                         //para Enumerados
                         if (obj.conj.dom == 'Numer') {
-                            var cantElementos = obj.conj.sets.fdom.length;
                             var j = 0;
-                            for (var fun of obj.conj.sets.fdom) {
-                                //var newstr = nuevo2.replace(fun, j); 
-                                j = j + 1;
+                            for (var f of obj.conj.sets.fdom) {
+                                var expresionDom = new RegExp('( '+f+' )', 'g'); 
+                                funcionGenerada = funcionGenerada.replace(expresionDom, j.toString()); 
+                                j += 1;
                             }
-    
                         }
                         if (obj.conj.cod == 'Numer') {
-                            var cantElementos = obj.conj.sets.fcod.length;
-                            var j = 0;
-                            for (var fun of obj.conj.sets.fcod) {
-                                //var newstr = nuevo2.replace(fun, j); 
-                                j = j + 1;
+                            var j2 = 0;
+                            for (var f2 of obj.conj.sets.fcod) {
+                                var expresionCod = new RegExp(f2, 'g'); 
+                                funcionGenerada = funcionGenerada.replace(expresionCod, j2.toString()); 
+                                j2 += 1;
                             }
-    
+
                         }
-    
+
+                        let fun = eval(funcionGenerada);
+
                         var colores = ['pink', 'red', 'blue', 'orange', 'green']
                         var num = this.getRandomArbitrary(0, 4);
                         var color = colores[num];