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
0cb6281d
Commit
0cb6281d
authored
Aug 04, 2018
by
jose.ignacio.fagian
Browse files
Cambios de nomenclatura sen por sin y round. Arreglo de grafica de reales.
parent
b496eed1
Changes
2
Hide whitespace changes
Inline
Side-by-side
Frontend Angular 4/src/app/layout/plotter/graph2D/graph2D.component.ts
View file @
0cb6281d
...
...
@@ -60,6 +60,12 @@ export class Graph2DComponent {
var
num
=
this
.
getRandomArbitrary
(
0
,
4
);
var
color
=
colores
[
num
];
var
tipoGraf
;
if
(
obj
.
conj
.
baseDom
!=
'
R
'
){
tipoGraf
=
'
scatter
'
;
}
else
{
tipoGraf
=
'
polyline
'
;
}
functionPlot
({
target
:
'
#graph2D-container
'
,
width
:
620
,
...
...
@@ -70,7 +76,7 @@ export class Graph2DComponent {
fn
:
function
(
scope
)
{
return
fun
(
scope
.
x
)
},
graphType
:
'
scatter
'
,
graphType
:
tipoGraf
,
color
:
color
}]
})
...
...
@@ -120,9 +126,9 @@ export class Graph2DComponent {
}
else
if
(
exp
.
kind
==
'
app
'
)
{
if
(
exp
.
fun
==
'
cos
'
)
{
exp
.
fun
=
'
Math.cos
'
}
else
if
(
exp
.
fun
==
'
s
e
n
'
)
{
}
else
if
(
exp
.
fun
==
'
s
i
n
'
)
{
exp
.
fun
=
'
Math.sin
'
}
else
if
(
exp
.
fun
==
'
r
e
d
'
)
{
}
else
if
(
exp
.
fun
==
'
r
oun
d
'
)
{
exp
.
fun
=
'
Math.round
'
}
expresion
=
'
'
+
exp
.
fun
+
'
(
'
+
exp
.
args
.
map
(
e
=>
this
.
generarExpresion
(
e
)).
join
()
+
'
)
'
;
...
...
@@ -261,7 +267,7 @@ export class Graph2DComponent {
}
else
if
(
exp
.
kind
==
'
app
'
)
{
if
(
exp
.
fun
==
'
cos
'
)
{
exp
.
fun
=
'
Math.cos
'
}
else
if
(
exp
.
fun
==
'
s
e
n
'
)
{
}
else
if
(
exp
.
fun
==
'
s
i
n
'
)
{
exp
.
fun
=
'
Math.sin
'
}
else
if
(
exp
.
fun
==
'
round
'
)
{
exp
.
fun
=
'
Math.round
'
...
...
Frontend Angular 4/src/app/layout/plotter/graph3D/graph3D.component.ts
View file @
0cb6281d
...
...
@@ -27,7 +27,6 @@ export class Graph3DComponent {
speed
:
1000
};
constructor
(
ghciService
:
GHCIService
,
private
zone
:
NgZone
)
{
this
.
ghciServiceSub
=
ghciService
.
messages
.
subscribe
(
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