Skip to content
Snippets Groups Projects
Commit ef8ef4f1 authored by Ignacio Fagian's avatar Ignacio Fagian
Browse files

Merge branch 'master' of https://gitlab.fing.edu.uy/matefun/Frontend

parents e198300f ccab01a5
No related branches found
No related tags found
No related merge requests found
Show whitespace changes
Inline Side-by-side
Frontend Angular 4/src/app/layout/plotter/graph2D/graph2D.component.ts
+ 9
− 9
View file @ ef8ef4f1
...@@ -715,7 +715,7 @@ export class Graph2DComponent { ...@@ -715,7 +715,7 @@ export class Graph2DComponent {
if (exp.op == '==') { if (exp.op == '==') {
expresion = ' Math.abs((' + this.generarExpresion(exp.exp1) + ') - (' + this.generarExpresion(exp.exp2) + ')) == 0 '; expresion = ' Math.abs((' + this.generarExpresion(exp.exp1) + ') - (' + this.generarExpresion(exp.exp2) + ')) == 0 ';
} else if (exp.op == '/=') { } else if (exp.op == '/=') {
expresion = ' Math.abs((' + this.generarExpresion(exp.exp1) + ') - (' + this.generarExpresion(exp.exp2) + ')) == 0 || Math.abs((' + this.generarExpresion(exp.exp1) + ') - (' + this.generarExpresion(exp.exp2) + ')) == 0 '; expresion = ' Math.abs((' + this.generarExpresion(exp.exp1) + ') - (' + this.generarExpresion(exp.exp2) + ')) != 0';
} else if (exp.op == '^') { } else if (exp.op == '^') {
expresion = ' Math.pow(' + this.generarExpresion(exp.exp1) + ',' + this.generarExpresion(exp.exp2) + ') '; expresion = ' Math.pow(' + this.generarExpresion(exp.exp1) + ',' + this.generarExpresion(exp.exp2) + ') ';
} else { } else {
...@@ -786,9 +786,9 @@ export class Graph2DComponent { ...@@ -786,9 +786,9 @@ export class Graph2DComponent {
} else if (grf.cod == 'Z') { } else if (grf.cod == 'Z') {
dominio += "\"baseCod\": \"Z\", \"cod\": \"Z\" ,"; dominio += "\"baseCod\": \"Z\", \"cod\": \"Z\" ,";
setf += "\"fcod\": \"Z\""; setf += "\"fcod\": \"Z\"";
} else if (grf.cod == 'N') { // } else if (grf.cod == 'N') {
dominio += "\"baseCod\": \"N\", \"cod\": \"N\" ,"; // dominio += "\"baseCod\": \"N\", \"cod\": \"N\" ,";
setf += "\"fcod\": \"N\""; // setf += "\"fcod\": \"N\"";
} else { } else {
var nom = grf.cod; var nom = grf.cod;
if (Array.isArray(grf.sets[0][nom])) { if (Array.isArray(grf.sets[0][nom])) {
...@@ -825,8 +825,8 @@ export class Graph2DComponent { ...@@ -825,8 +825,8 @@ export class Graph2DComponent {
domin += "\"radio\": 0.3, \"baseDom\": \"R\", \"dom\": \"Func\""; domin += "\"radio\": 0.3, \"baseDom\": \"R\", \"dom\": \"Func\"";
} else if (sets[0][nom].set == 'Z') { } else if (sets[0][nom].set == 'Z') {
domin += "\"radio\": 2, \"baseDom\": \"Z\", \"dom\": \"Func\""; domin += "\"radio\": 2, \"baseDom\": \"Z\", \"dom\": \"Func\"";
} else if (sets[0][nom].set == 'N') { // } else if (sets[0][nom].set == 'N') {
domin += "\"radio\": 2, \"baseDom\": \"N\", \"dom\": \"Func\""; // domin += "\"radio\": 2, \"baseDom\": \"N\", \"dom\": \"Func\"";
} else { } else {
var nombre = sets[0][nom].set; var nombre = sets[0][nom].set;
domin = this.recursivoDom(sets, nombre); domin = this.recursivoDom(sets, nombre);
...@@ -841,8 +841,8 @@ export class Graph2DComponent { ...@@ -841,8 +841,8 @@ export class Graph2DComponent {
coodo += "\"baseCod\": \"R\", \"cod\": \"Func\","; coodo += "\"baseCod\": \"R\", \"cod\": \"Func\",";
} else if (sets[0][nom].set == 'Z') { } else if (sets[0][nom].set == 'Z') {
coodo += "\"baseCod\": \"Z\", \"cod\": \"Func\","; coodo += "\"baseCod\": \"Z\", \"cod\": \"Func\",";
} else if (sets[0][nom].set == 'N') { // } else if (sets[0][nom].set == 'N') {
coodo += "\"baseCod\": \"N\", \"cod\": \"Func\","; // coodo += "\"baseCod\": \"N\", \"cod\": \"Func\",";
} else { } else {
var nombre = sets[0][nom].set; var nombre = sets[0][nom].set;
coodo += this.recursivoDom(sets, nombre); coodo += this.recursivoDom(sets, nombre);
...@@ -858,7 +858,7 @@ export class Graph2DComponent { ...@@ -858,7 +858,7 @@ export class Graph2DComponent {
if (exp.op == '==') { if (exp.op == '==') {
expresion = ' Math.abs((' + this.generarF(exp.exp1) + ') - (' + this.generarF(exp.exp2) + ')) == 0 '; expresion = ' Math.abs((' + this.generarF(exp.exp1) + ') - (' + this.generarF(exp.exp2) + ')) == 0 ';
} else if (exp.op == '/=') { } else if (exp.op == '/=') {
expresion = ' Math.abs((' + this.generarF(exp.exp1) + ') - (' + this.generarF(exp.exp2) + ')) == 0 || Math.abs((' + this.generarF(exp.exp1) + ') - (' + this.generarF(exp.exp2) + ')) == 0 '; expresion = ' Math.abs((' + this.generarF(exp.exp1) + ') - (' + this.generarF(exp.exp2) + ')) != 0';
} else if (exp.op == '^') { } else if (exp.op == '^') {
expresion = ' Math.pow(' + this.generarF(exp.exp1) + ',' + this.generarF(exp.exp2) + ') '; expresion = ' Math.pow(' + this.generarF(exp.exp1) + ',' + this.generarF(exp.exp2) + ') ';
} else { } else {
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment