From b3be2e892595cbede52dc7b4a0a035de02e4e58a Mon Sep 17 00:00:00 2001
From: ifagian <nachofagian@gmail.com>
Date: Sun, 25 Aug 2019 17:13:51 -0300
Subject: [PATCH] Arreglo controles grilla y axes
---
Frontend Angular 4/package-lock.json | 2 +-
.../app/layout/plotter/graph2D/graph2D.component.html | 4 ++--
.../app/layout/plotter/graph2D/graph2D.component.ts | 10 ++++++++--
3 files changed, 11 insertions(+), 5 deletions(-)
diff --git a/Frontend Angular 4/package-lock.json b/Frontend Angular 4/package-lock.json
index 86e56592..f75adca8 100644
--- a/Frontend Angular 4/package-lock.json
+++ b/Frontend Angular 4/package-lock.json
@@ -4519,7 +4519,7 @@
"dev": true
},
"graph3D": {
- "version": "git://github.com/ifagian/graph3D.git#7ccf98694a6c2afc03f39d5f8bbe548f28c3538d",
+ "version": "git://github.com/ifagian/graph3D.git#c0b284a2503343898fbba1fba17040e6fc97f717",
"from": "git://github.com/ifagian/graph3D.git#master",
"requires": {
"gif.js": "^0.2.0",
diff --git a/Frontend Angular 4/src/app/layout/plotter/graph2D/graph2D.component.html b/Frontend Angular 4/src/app/layout/plotter/graph2D/graph2D.component.html
index dcab32fe..40f0e6b1 100755
--- a/Frontend Angular 4/src/app/layout/plotter/graph2D/graph2D.component.html
+++ b/Frontend Angular 4/src/app/layout/plotter/graph2D/graph2D.component.html
@@ -76,7 +76,7 @@
(click)="toggleAxis()">
{{ "i18n.object.axes" | translate | titleCase }}
</label>
- <label>
+ <!-- <label>
<input
type="checkbox"
name="tip"
@@ -84,7 +84,7 @@
[checked]= settings.tip
(click)="toggleTip()">
{{ "i18n.object.tip" | translate | titleCase }}
- </label>
+ </label> -->
<label [class.disabled]="funciones.length === 0">
<input
type="checkbox"
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 b8b16768..632a7ed2 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
@@ -434,6 +434,8 @@ export class Graph2DComponent {
let bounding = this.getBounding();
this.instance = functionPlot({
target: '#graph2D-container',
+ grid: this.settings.grid,
+ axis: this.settings.axis,
width: bounding.width,
height: bounding.height,
tip: {
@@ -463,7 +465,8 @@ export class Graph2DComponent {
target: '#graph2D-container',
width: bounding.width,
height: bounding.height,
- grid: true,
+ grid: this.settings.grid,
+ axis: this.settings.axis,
xAxis: {
scale: 'linear',
domain: {
@@ -506,7 +509,8 @@ export class Graph2DComponent {
target: '#graph2D-container',
width: bounding.width,
height: bounding.height,
- grid: true,
+ grid: this.settings.grid,
+ axis: this.settings.axis,
xAxis: {
scale: 'linear',
domain: {
@@ -569,6 +573,8 @@ export class Graph2DComponent {
let bounding = $this.getBounding();
$this.instance = functionPlot({
target: '#graph2D-container',
+ grid: this.settings.grid,
+ axis: this.settings.axis,
width: bounding.width,
height: bounding.height,
xAxis: {
--
GitLab