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
vidjil
vidjil
Commits
9f3d5624
Commit
9f3d5624
authored
Apr 08, 2015
by
Marc Duez
Browse files
axis.js : accept anonymous function as default min/max
-remove special case for 0 -improve range for reverse mode -debug min
parent
c15efbd6
Changes
1
Show whitespace changes
Inline
Side-by-side
browser/js/axis.js
View file @
9f3d5624
...
...
@@ -153,14 +153,16 @@ Axis.prototype = {
use_log
=
typeof
percent
!==
'
undefined
'
?
use_log
:
false
;
var
self
=
this
;
this
.
fct
=
fct
;
var
min
=
default_min
;
var
max
=
default_max
;
if
(
typeof
min
===
'
function
'
)
min
=
min
();
if
(
typeof
min
===
'
function
'
)
max
=
max
();
for
(
var
i
in
this
.
m
.
clones
){
var
tmp
;
try
{
tmp
=
fct
(
i
);
if
(
tmp
==
0
)
tmp
=
undefined
;
}
catch
(
e
){}
if
(
typeof
tmp
!=
"
undefined
"
){
...
...
@@ -174,14 +176,16 @@ Axis.prototype = {
max
=
1
;
}
var
range
=
[
0
,
1
]
if
(
self
.
reverse
)
range
=
[
1
,
0
]
if
(
use_log
){
this
.
sizeScale
=
d3
.
scale
.
log
()
.
domain
([
min
,
max
])
.
range
(
[
0
,
1
]
);
.
range
(
range
);
}
else
{
this
.
sizeScale
=
d3
.
scale
.
linear
()
.
domain
([
min
,
max
])
.
range
(
[
0
,
1
]
);
.
range
(
range
);
}
this
.
min
=
min
;
...
...
@@ -196,10 +200,9 @@ Axis.prototype = {
if
(
typeof
value
!=
"
undefined
"
){
pos
=
self
.
sizeScale
(
value
);
}
else
{
pos
=
self
.
min
;
pos
=
self
.
sizeScale
(
self
.
min
)
;
}
if
(
self
.
reverse
)
pos
=
1
-
pos
;
return
pos
;
}
...
...
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