Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
C
c3-closed
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
charts
c3-closed
Commits
8cd56366
Commit
8cd56366
authored
Jul 08, 2016
by
Evgeny
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Use Excel-like axis calc for stacked with negative values
parent
5affb553
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
14 additions
and
28 deletions
+14
-28
c3.js
c3.js
+7
-14
c3.min.js
c3.min.js
+0
-0
axis.js
src/axis.js
+6
-13
core.js
src/core.js
+1
-1
No files found.
c3.js
View file @
8cd56366
...
@@ -12,7 +12,7 @@
...
@@ -12,7 +12,7 @@
return
c3
;
return
c3
;
}
}
var
injectedMethods
=
[
'getAxisData'
,
'getAbscissa'
];
var
injectedMethods
=
[
'getAxisData'
,
'getAbscissa'
,
'getAxisStackedData'
];
function
Chart
(
config
)
{
function
Chart
(
config
)
{
var
$$
=
this
.
internal
=
new
ChartInternal
(
this
);
var
$$
=
this
.
internal
=
new
ChartInternal
(
this
);
...
@@ -5013,7 +5013,12 @@
...
@@ -5013,7 +5013,12 @@
if
(
$$
.
config
.
is_xy
){
if
(
$$
.
config
.
is_xy
){
sizesX
=
$$
.
getAbscissa
(
$$
.
config
.
ed3Type
,
minmax
.
minX
,
minmax
.
maxX
);
sizesX
=
$$
.
getAbscissa
(
$$
.
config
.
ed3Type
,
minmax
.
minX
,
minmax
.
maxX
);
}
}
sizesY
=
$$
.
getAxisData
(
minmax
.
minY
,
minmax
.
maxY
);
if
(
$$
.
config
.
normalized
){
sizesY
=
$$
.
getAxisStackedData
(
minmax
.
minY
,
minmax
.
maxY
);
}
else
{
sizesY
=
$$
.
getAxisData
(
minmax
.
minY
,
minmax
.
maxY
);
}
}
else
{
}
else
{
sizesY
=
{
sizesY
=
{
min
:
minmax
.
minY
,
min
:
minmax
.
minY
,
...
@@ -5028,18 +5033,6 @@
...
@@ -5028,18 +5033,6 @@
sizesY
.
min
=
Math
.
max
(
sizesY
.
min
,
-
1
);
sizesY
.
min
=
Math
.
max
(
sizesY
.
min
,
-
1
);
}
}
if
(
$$
.
config
.
normalized
){
if
(
sizesY
.
min
<
0
&&
minmax
.
minY
<
0
){
while
(
sizesY
.
min
<
minmax
.
minY
){
sizesY
.
min
+=
sizesY
.
step
;
}
if
(
sizesY
.
min
>=
minmax
.
minY
){
sizesY
.
min
-=
sizesY
.
step
;
}
}
}
$$
.
api
.
axis
.
range
({
$$
.
api
.
axis
.
range
({
min
:
{
min
:
{
x
:
sizesX
?
sizesX
.
min
:
undefined
,
x
:
sizesX
?
sizesX
.
min
:
undefined
,
...
...
c3.min.js
View file @
8cd56366
This source diff could not be displayed because it is too large. You can
view the blob
instead.
src/axis.js
View file @
8cd56366
...
@@ -401,7 +401,12 @@ c3_chart_internal_fn.tuneAxis = function(sync, callback){
...
@@ -401,7 +401,12 @@ c3_chart_internal_fn.tuneAxis = function(sync, callback){
if
(
$$
.
config
.
is_xy
){
if
(
$$
.
config
.
is_xy
){
sizesX
=
$$
.
getAbscissa
(
$$
.
config
.
ed3Type
,
minmax
.
minX
,
minmax
.
maxX
);
sizesX
=
$$
.
getAbscissa
(
$$
.
config
.
ed3Type
,
minmax
.
minX
,
minmax
.
maxX
);
}
}
sizesY
=
$$
.
getAxisData
(
minmax
.
minY
,
minmax
.
maxY
);
if
(
$$
.
config
.
normalized
){
sizesY
=
$$
.
getAxisStackedData
(
minmax
.
minY
,
minmax
.
maxY
);
}
else
{
sizesY
=
$$
.
getAxisData
(
minmax
.
minY
,
minmax
.
maxY
);
}
}
else
{
}
else
{
sizesY
=
{
sizesY
=
{
min
:
minmax
.
minY
,
min
:
minmax
.
minY
,
...
@@ -416,18 +421,6 @@ c3_chart_internal_fn.tuneAxis = function(sync, callback){
...
@@ -416,18 +421,6 @@ c3_chart_internal_fn.tuneAxis = function(sync, callback){
sizesY
.
min
=
Math
.
max
(
sizesY
.
min
,
-
1
);
sizesY
.
min
=
Math
.
max
(
sizesY
.
min
,
-
1
);
}
}
if
(
$$
.
config
.
normalized
){
if
(
sizesY
.
min
<
0
&&
minmax
.
minY
<
0
){
while
(
sizesY
.
min
<
minmax
.
minY
){
sizesY
.
min
+=
sizesY
.
step
;
}
if
(
sizesY
.
min
>=
minmax
.
minY
){
sizesY
.
min
-=
sizesY
.
step
;
}
}
}
$$
.
api
.
axis
.
range
({
$$
.
api
.
axis
.
range
({
min
:
{
min
:
{
x
:
sizesX
?
sizesX
.
min
:
undefined
,
x
:
sizesX
?
sizesX
.
min
:
undefined
,
...
...
src/core.js
View file @
8cd56366
...
@@ -7,7 +7,7 @@ var c3init = function(module){
...
@@ -7,7 +7,7 @@ var c3init = function(module){
return
c3
;
return
c3
;
}
}
var
injectedMethods
=
[
'getAxisData'
,
'getAbscissa'
];
var
injectedMethods
=
[
'getAxisData'
,
'getAbscissa'
,
'getAxisStackedData'
];
function
Chart
(
config
)
{
function
Chart
(
config
)
{
var
$$
=
this
.
internal
=
new
ChartInternal
(
this
);
var
$$
=
this
.
internal
=
new
ChartInternal
(
this
);
...
...
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