Commit 4d7f6d66 authored by Diego Rey's avatar Diego Rey
Browse files

Added referencia a git branch personalizado de function-plot

parent 4092c7c2
......@@ -24,7 +24,7 @@
"core-js": "^2.4.1",
"d3": "^4.12.2",
"font-awesome": "^4.7.0",
"function-plot": "^1.18.1",
"function-plot": "git+https://github.com/diego-rey/function-plot.git#feature/shape-type",
"ionicons": "^3.0.0",
"jq-console": "^2.13.2",
"jquery": "^3.2.1",
......
......@@ -18,18 +18,43 @@ export class PlotterComponent {
var jsonCanvas = JSON.parse(canvas.resultado);
let fun = eval(this.generarFuncion(jsonCanvas));
functionPlot({
target: '#plotter-container',
width: 620,
height: 450,
width: 770,
height: 720,
tip: {
color: 'green'
},
xAxis: {
label: 'x - axis',
scale: 'linear',
domain: {
initial: [-4, 4],
type: 'discrete'
}
},
data: [{
sampler: 'builtIn',
fn: function(scope) {
return fun(scope.x)
},
graphType: 'polyline'
graphType: 'scatter',
fn: function (scope) {
// scope.x = Number
return fun(scope.x)
}
}]
})
// functionPlot({
// target: '#plotter-container',
// width: 620,
// height: 450,
// data: [{
// sampler: 'builtIn',
// fn: function(scope) {
// return fun(scope.x)
// },
// graphType: 'polyline'
// }]
// })
}
},
error=>{
......
......@@ -4,9 +4,12 @@
//export const SERVER = 'http://localhost:9090';
//export const GHCI_URL = 'ws://localhost:9090/endpoint';
export const SERVER = 'http://localhost:8080';
export const GHCI_URL = 'ws://localhost:8080/endpoint';
//Configuracion dinamica pensando en servidor con ip dinamica
//export const SERVER = window.location.protocol + '//' + window.location.host;//'http://localhost:9090';
//export const GHCI_URL = window.location.protocol == 'http:'? 'ws://'+window.location.host+'/endpoint': 'wss://'+window.location.host+'/endpoint';
export const SERVER = 'http://ec2-52-15-74-22.us-east-2.compute.amazonaws.com:9090';
export const GHCI_URL = 'ws://ec2-52-15-74-22.us-east-2.compute.amazonaws.com:9090/endpoint';
\ No newline at end of file
//export const SERVER = 'http://ec2-52-15-74-22.us-east-2.compute.amazonaws.com:9090';
//export const GHCI_URL = 'ws://ec2-52-15-74-22.us-east-2.compute.amazonaws.com:9090/endpoint';
\ No newline at end of file
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment