Commit 7f128f3f authored by jose.ignacio.fagian's avatar jose.ignacio.fagian
Browse files

Merge branch 'feature/integration-graph-2d-3d' of...

Merge branch 'feature/integration-graph-2d-3d' of https://gitlab.fing.edu.uy/matefun/Frontend into feature/integration-graph-2d-3d

# Conflicts:
#	Frontend Angular 4/src/app/layout/matefun/matefun.component.ts
parents ff290175 c424d7cb
......@@ -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}
}
......
......@@ -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);
}
......
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