From b16198df5fff178cdf6602abe4db6645d8c9f74a Mon Sep 17 00:00:00 2001
From: Marcos Viera <mviera@fing.edu.uy>
Date: Fri, 13 Aug 2021 19:11:51 -0300
Subject: [PATCH] fix bug graficas con dominio definido por el usuario
---
.../src/app/layout/plotter/graph2D/graph2D.component.ts | 4 ++--
Servidor JEE/WebContent/index.html | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
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 3743a4ba..f37335e6 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
@@ -94,7 +94,6 @@ export class Graph2DComponent {
if (obj.conj.sets.fdom == "function(x)") {
var nom = jsonCanvas.funs[0].dom;
var elemento1 = this.recursionfuncion(jsonCanvas.funs[0].sets, nom);
-
var funcionString = '';
funcionString ="var "+nom+" = function(x){\nreturn "+elemento1+"}\n"
@@ -105,6 +104,7 @@ export class Graph2DComponent {
funcionString = 'var ' + funs.fun + ' = function('+funs.args+'){\n return ' + this.generarExpresion(funs.bdy) + '}\n' + funcionString;
}
funcionString = '(x)=>{\n' + funcionString + '}';
+ console.log(funcionString);
obj.conj.sets.fdom = eval(funcionString);
@@ -1670,7 +1670,7 @@ createListExp = function (exp) {
recursionfuncion = function (func, nombre) {
var fun = func[0][nombre].set;
- var resul = "var z = 2;"; // PRUEBA
+ var resul = ""; // "var z = 2;"; // PRUEBA
if (fun == 'R' || fun == 'Z' || fun == 'N') {
resul += this.generarF(func[0][nombre].cond);
diff --git a/Servidor JEE/WebContent/index.html b/Servidor JEE/WebContent/index.html
index d226dd05..cd1d5085 100644
--- a/Servidor JEE/WebContent/index.html
+++ b/Servidor JEE/WebContent/index.html
@@ -1,4 +1,4 @@
<!doctype html><html><head><meta charset="utf-8"><title>Proyecto MateFun</title><base href="/proyectos/matefun/"><meta name="viewport" content="width=device-width,initial-scale=1"><link rel="icon" type="image/x-icon" href="favicon.ico"><!-- despues lo saco de aca --><!-- <link rel="stylesheet" type="text/css" href="node_modules/codemirror/addon/hint/show-hint.css"> --><script src="https://code.jquery.com/jquery-3.1.1.slim.min.js" integrity="sha384-A7FZj7v+d/sdmMqp/nOQwliLvUsJfDHW+k9Omg/a/EheAdgtzNs3hpfag6Ed950n" crossorigin="anonymous"></script><script src="https://cdnjs.cloudflare.com/ajax/libs/tether/1.4.0/js/tether.min.js" integrity="sha384-DztdAPBWPRXSA/3eYEEUWrWCy7G5KFbe8fFjk5JAIxUYHKkDx6Qin1DkWx51bBrb" crossorigin="anonymous"></script><script src="https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0-alpha.6/js/bootstrap.min.js" integrity="sha384-vBWWzlZJ8ea9aCX4pEW3rVHjgjt7zpkNpZk+02D9phzyeVkE+jo0ieGizqPLForn" crossorigin="anonymous"></script><script src="https://cdnjs.cloudflare.com/ajax/libs/d3/3.5.5/d3.min.js" crossorigin="anonymous"></script><!--
<script src="https://wzrd.in/standalone/function-plot@1.18.1" crossorigin="anonymous"></script>
- --><link href="styles.1111de0348a2a1de8dc6.bundle.css" rel="stylesheet"/></head><body><app-root><div class="loading"><div class="loading-bar"></div><div class="loading-bar"></div><div class="loading-bar"></div><div class="loading-bar"></div><div class="loading-bar"></div></div></app-root><script type="text/javascript" src="inline.fad0dd87d0e3ef8da6ca.bundle.js"></script><script type="text/javascript" src="polyfills.d50ac7c762e2eb4097d9.bundle.js"></script><script type="text/javascript" src="scripts.d01654a9119059a68b2b.bundle.js"></script><script type="text/javascript" src="vendor.d3c1758890cc7548bc7b.bundle.js"></script><script type="text/javascript" src="main.d2d3c2c4a57b623a2761.bundle.js"></script></body></html>
\ No newline at end of file
+ --><link href="styles.1111de0348a2a1de8dc6.bundle.css" rel="stylesheet"/></head><body><app-root><div class="loading"><div class="loading-bar"></div><div class="loading-bar"></div><div class="loading-bar"></div><div class="loading-bar"></div><div class="loading-bar"></div></div></app-root><script type="text/javascript" src="inline.ea7f74e4bba6c6d92d4e.bundle.js"></script><script type="text/javascript" src="polyfills.d50ac7c762e2eb4097d9.bundle.js"></script><script type="text/javascript" src="scripts.d01654a9119059a68b2b.bundle.js"></script><script type="text/javascript" src="vendor.d3c1758890cc7548bc7b.bundle.js"></script><script type="text/javascript" src="main.d2d3c2c4a57b623a2761.bundle.js"></script></body></html>
\ No newline at end of file
--
GitLab