diff --git a/Frontend Angular 4/package-lock.json b/Frontend Angular 4/package-lock.json index 7d1db213c7168a154cef18dfcd8260e4696210b6..a868de0c26f56f5a3460ca6cde2c85db7aadae63 100644 --- a/Frontend Angular 4/package-lock.json +++ b/Frontend Angular 4/package-lock.json @@ -4139,8 +4139,8 @@ "dev": true }, "function-plot": { - "version": "git+https://github.com/diego-rey/function-plot.git#8e0045a0abcfc93662df118da951a056812141dc", - "from": "git+https://github.com/diego-rey/function-plot.git#feature/shape-type", + "version": "git+https://github.com/diego-rey/function-plot.git#9aeb9257649497939ba3c89cf69f1c338e91d436", + "from": "git+https://github.com/diego-rey/function-plot.git#feature/integration-domain-shape", "requires": { "array-range": "^1.0.1", "built-in-math-eval": "^0.3.0", diff --git a/Frontend Angular 4/package.json b/Frontend Angular 4/package.json index 8da84009857ea18ee6c5c4c6fa0ca0fb4d147df5..e9814d97a29a9be0a3a5ce9f7785cb519af3f3a0 100755 --- a/Frontend Angular 4/package.json +++ b/Frontend Angular 4/package.json @@ -24,7 +24,7 @@ "core-js": "^2.4.1", "d3": "^4.12.2", "font-awesome": "^4.7.0", - "function-plot": "git+https://github.com/diego-rey/function-plot.git#feature/shape-type", + "function-plot": "git+https://github.com/diego-rey/function-plot.git#feature/integration-domain-shape", "ionicons": "^3.0.0", "jq-console": "^2.13.2", "jquery": "^3.2.1", 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 9c7bdf94152cb22fb5390b91937ba375cd9f2965..291024bb2665d65e3816c421cc84d225b0cb7d38 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 @@ -20,29 +20,41 @@ export class Graph2DComponent { functionPlot({ - target: '#graph2D-container', - width: 770, - height: 720, - tip: { - color: 'green' - }, + target: '#implicit-complex', xAxis: { label: 'x - axis', scale: 'linear', domain: { initial: [-4, 4], type: 'discrete' + }, + yAxis: { + domain: [-4, 4] + }, + + + }, + conj: { + radio: 2, + baseDom: 'Z', + baseCod: 'Z', + cod: 'Numer', + dom: 'Func', + sets: { + fcod:['Lun','Mart','Mier','Juev','Vier','Saba','Dom','Lunes'], + fdom: function (x) { + // scope.x = Number + return (0 <= x); + } } }, data: [{ graphType: 'scatter', fn: function (scope) { - // scope.x = Number return fun(scope.x) } }] }) - // functionPlot({ // target: '#graph2D-container', // width: 620,