From c424d7cb602f9796c7adefa694a8638899eb2cc2 Mon Sep 17 00:00:00 2001
From: Diego Rey <diego.despaux@izundo.com>
Date: Sat, 29 Sep 2018 14:07:53 -0300
Subject: [PATCH] Fixed bounding on 2d plots
---
.../src/app/layout/matefun/matefun.component.ts | 5 -----
.../layout/plotter/graph2D/graph2D.component.ts | 14 +++++++++-----
.../src/app/shared/services/ghci.service.ts | 2 +-
3 files changed, 10 insertions(+), 11 deletions(-)
diff --git a/Frontend Angular 4/src/app/layout/matefun/matefun.component.ts b/Frontend Angular 4/src/app/layout/matefun/matefun.component.ts
index ec37f5c2..4503318c 100755
--- a/Frontend Angular 4/src/app/layout/matefun/matefun.component.ts
+++ b/Frontend Angular 4/src/app/layout/matefun/matefun.component.ts
@@ -33,7 +33,6 @@ import 'codemirror/mode/markdown/markdown';
import 'codemirror/lib/codemirror';
import 'codemirror/addon/search/search';
-
import 'codemirror/addon/dialog/dialog';
import 'codemirror/addon/search/search';
import 'codemirror/addon/search/matchesonscrollbar';
@@ -561,7 +560,6 @@ export class MateFunComponent {
});
}
-
buildTreeFromList (archivos){
@@ -585,7 +583,6 @@ export class MateFunComponent {
this.sessionService.setArchivosTree(tree);
}
-
buildTree(archivos, root){
root.archivos = this.getArchivos(root.id,archivos);
for(var a in root.archivos){
@@ -605,6 +602,4 @@ export class MateFunComponent {
});
}
-
-
}
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 1ad5b78e..f969c459 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
@@ -171,8 +171,10 @@ export class Graph2DComponent {
target: '#graph2D-container',
width: bounding.width,
height: bounding.height,
- tip: { color: 'green' },
- xAxis: { label: 'x - axis',
+ tip: {
+ color: 'green'
+ },
+ xAxis: {
scale: 'linear',
domain: { initial: [-4, 4],
type: 'discrete' },
@@ -198,7 +200,6 @@ export class Graph2DComponent {
height: bounding.height,
grid: true,
xAxis: {
- label: 'x - axis',
scale: 'linear',
domain: {
initial: [-10, 10],
@@ -242,7 +243,6 @@ export class Graph2DComponent {
height: bounding.height,
grid: true,
xAxis: {
- label: 'x - axis',
scale: 'linear',
domain: {
initial: [-10, 10],
@@ -282,7 +282,11 @@ export class Graph2DComponent {
* @desc get the measures of the container of the graph
*/
private getBounding = function() {
- const {width, height} = this.graph2DRef.nativeElement.getBoundingClientRect();
+ var {width, height} = this.graph2DRef.nativeElement.getBoundingClientRect();
+ if (width === 0) {
+ width = document.getElementById('graph2D-container').querySelector('svg').width.baseVal.value;
+ height = document.getElementById('graph2D-container').querySelector('svg').height.baseVal.value;
+ }
return {width, height}
}
diff --git a/Frontend Angular 4/src/app/shared/services/ghci.service.ts b/Frontend Angular 4/src/app/shared/services/ghci.service.ts
index af62279c..31d1dc26 100755
--- a/Frontend Angular 4/src/app/shared/services/ghci.service.ts
+++ b/Frontend Angular 4/src/app/shared/services/ghci.service.ts
@@ -302,7 +302,7 @@ export class GHCIService {
this.messages.next(json_server_message);
} else if (json_server_message.tipo == 'canvas3D' ||
json_server_message.tipo == 'animacion3D') {
- document.getElementById("FigurasBtn3D").click()
+ document.getElementById("FigurasBtn3D").click()
this.focusConsole();
this.messages.next(json_server_message);
}
--
GitLab