Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
matefun
Frontend
Commits
c424d7cb
Commit
c424d7cb
authored
Sep 29, 2018
by
Diego Rey
Browse files
Fixed bounding on 2d plots
parent
4dc37e1e
Changes
3
Hide whitespace changes
Inline
Side-by-side
Frontend Angular 4/src/app/layout/matefun/matefun.component.ts
View file @
c424d7cb
...
...
@@ -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 {
});
}
}
Frontend Angular 4/src/app/layout/plotter/graph2D/graph2D.component.ts
View file @
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
}
}
...
...
Frontend Angular 4/src/app/shared/services/ghci.service.ts
View file @
c424d7cb
...
...
@@ -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
);
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment