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
Evgeny
c3-closed
Commits
7a0a8c4e
Commit
7a0a8c4e
authored
Sep 30, 2014
by
michalkop93
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
added configurable domain trimming
parent
6bd56b2b
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
91 additions
and
15 deletions
+91
-15
Gruntfile.coffee
Gruntfile.coffee
+1
-0
c3.js
c3.js
+44
-7
c3.min.js
c3.min.js
+0
-0
api.domain.js
src/api.domain.js
+34
-0
config.js
src/config.js
+2
-0
domain.js
src/domain.js
+10
-8
No files found.
Gruntfile.coffee
View file @
7a0a8c4e
...
@@ -65,6 +65,7 @@ module.exports = (grunt) ->
...
@@ -65,6 +65,7 @@ module.exports = (grunt) ->
'src/api.color.js'
,
'src/api.color.js'
,
'src/api.x.js'
,
'src/api.x.js'
,
'src/api.axis.js'
,
'src/api.axis.js'
,
'src/api.domain.js'
,
'src/api.legend.js'
,
'src/api.legend.js'
,
'src/api.chart.js'
,
'src/api.chart.js'
,
'src/api.tooltip.js'
,
'src/api.tooltip.js'
,
...
...
c3.js
View file @
7a0a8c4e
...
@@ -965,6 +965,8 @@
...
@@ -965,6 +965,8 @@
axis_x_height
:
undefined
,
axis_x_height
:
undefined
,
axis_x_extent
:
undefined
,
axis_x_extent
:
undefined
,
axis_x_label
:
{},
axis_x_label
:
{},
axis_x_domain_min
:
undefined
,
axis_x_domain_max
:
undefined
,
axis_y_show
:
true
,
axis_y_show
:
true
,
axis_y_max
:
undefined
,
axis_y_max
:
undefined
,
axis_y_min
:
undefined
,
axis_y_min
:
undefined
,
...
@@ -1382,14 +1384,16 @@
...
@@ -1382,14 +1384,16 @@
return
$$
.
x
.
domain
();
return
$$
.
x
.
domain
();
};
};
c3_chart_internal_fn
.
trimXDomain
=
function
(
domain
)
{
c3_chart_internal_fn
.
trimXDomain
=
function
(
domain
)
{
var
$$
=
this
;
var
$$
=
this
,
config
=
$$
.
config
,
d3
=
$$
.
d3
;
if
(
domain
[
0
]
<=
$$
.
orgXDomain
[
0
])
{
var
min
=
d3
.
min
([
$$
.
orgXDomain
[
0
],
config
.
axis_x_domain_min
]);
domain
[
1
]
=
+
domain
[
1
]
+
(
$$
.
orgXDomain
[
0
]
-
domain
[
0
]);
var
max
=
d3
.
max
([
$$
.
orgXDomain
[
1
],
config
.
axis_x_domain_max
]);
domain
[
0
]
=
$$
.
orgXDomain
[
0
];
if
(
domain
[
0
]
<=
min
)
{
domain
[
1
]
=
+
domain
[
1
]
+
(
min
-
domain
[
0
]);
domain
[
0
]
=
min
;
}
}
if
(
$$
.
orgXDomain
[
1
]
<=
domain
[
1
])
{
if
(
max
<=
domain
[
1
])
{
domain
[
0
]
=
+
domain
[
0
]
-
(
domain
[
1
]
-
$$
.
orgXDomain
[
1
]
);
domain
[
0
]
=
+
domain
[
0
]
-
(
domain
[
1
]
-
max
);
domain
[
1
]
=
$$
.
orgXDomain
[
1
]
;
domain
[
1
]
=
max
;
}
}
return
domain
;
return
domain
;
};
};
...
@@ -6095,6 +6099,39 @@
...
@@ -6095,6 +6099,39 @@
}
}
};
};
c3_chart_fn
.
domain
=
function
()
{};
c3_chart_fn
.
domain
.
max
=
function
(
max
)
{
var
$$
=
this
.
internal
,
config
=
$$
.
config
,
d3
=
$$
.
d3
;
if
(
max
===
0
||
max
)
{
config
.
axis_x_domain_max
=
d3
.
max
([
$$
.
orgXDomain
[
1
],
max
]);
}
else
{
return
config
.
axis_x_domain_max
;
}
};
c3_chart_fn
.
domain
.
min
=
function
(
min
)
{
var
$$
=
this
.
internal
,
config
=
$$
.
config
,
d3
=
$$
.
d3
;
if
(
min
===
0
||
min
)
{
config
.
axis_x_domain_min
=
d3
.
min
([
$$
.
orgXDomain
[
0
],
min
]);
}
else
{
return
config
.
axis_x_domain_min
;
}
};
c3_chart_fn
.
domain
.
range
=
function
(
range
)
{
if
(
arguments
.
length
)
{
if
(
isDefined
(
range
.
max
))
{
this
.
domain
.
max
(
range
.
max
);
}
if
(
isDefined
(
range
.
min
))
{
this
.
domain
.
min
(
range
.
min
);
}
}
else
{
return
{
max
:
this
.
domain
.
max
(),
min
:
this
.
domain
.
min
()
};
}
};
c3_chart_fn
.
legend
=
function
()
{};
c3_chart_fn
.
legend
=
function
()
{};
c3_chart_fn
.
legend
.
show
=
function
(
targetIds
)
{
c3_chart_fn
.
legend
.
show
=
function
(
targetIds
)
{
var
$$
=
this
.
internal
;
var
$$
=
this
.
internal
;
...
...
c3.min.js
View file @
7a0a8c4e
This source diff could not be displayed because it is too large. You can
view the blob
instead.
src/api.domain.js
0 → 100644
View file @
7a0a8c4e
c3_chart_fn
.
domain
=
function
()
{};
c3_chart_fn
.
domain
.
max
=
function
(
max
)
{
var
$$
=
this
.
internal
,
config
=
$$
.
config
,
d3
=
$$
.
d3
;
if
(
max
===
0
||
max
)
{
config
.
axis_x_domain_max
=
d3
.
max
([
$$
.
orgXDomain
[
1
],
max
]);
}
else
{
return
config
.
axis_x_domain_max
;
}
};
c3_chart_fn
.
domain
.
min
=
function
(
min
)
{
var
$$
=
this
.
internal
,
config
=
$$
.
config
,
d3
=
$$
.
d3
;
if
(
min
===
0
||
min
)
{
config
.
axis_x_domain_min
=
d3
.
min
([
$$
.
orgXDomain
[
0
],
min
]);
}
else
{
return
config
.
axis_x_domain_min
;
}
};
c3_chart_fn
.
domain
.
range
=
function
(
range
)
{
if
(
arguments
.
length
)
{
if
(
isDefined
(
range
.
max
))
{
this
.
domain
.
max
(
range
.
max
);
}
if
(
isDefined
(
range
.
min
))
{
this
.
domain
.
min
(
range
.
min
);
}
}
else
{
return
{
max
:
this
.
domain
.
max
(),
min
:
this
.
domain
.
min
()
};
}
};
\ No newline at end of file
src/config.js
View file @
7a0a8c4e
...
@@ -95,6 +95,8 @@ c3_chart_internal_fn.getDefaultConfig = function () {
...
@@ -95,6 +95,8 @@ c3_chart_internal_fn.getDefaultConfig = function () {
axis_x_height
:
undefined
,
axis_x_height
:
undefined
,
axis_x_extent
:
undefined
,
axis_x_extent
:
undefined
,
axis_x_label
:
{},
axis_x_label
:
{},
axis_x_domain_min
:
undefined
,
axis_x_domain_max
:
undefined
,
axis_y_show
:
true
,
axis_y_show
:
true
,
axis_y_max
:
undefined
,
axis_y_max
:
undefined
,
axis_y_min
:
undefined
,
axis_y_min
:
undefined
,
...
...
src/domain.js
View file @
7a0a8c4e
...
@@ -213,14 +213,16 @@ c3_chart_internal_fn.updateXDomain = function (targets, withUpdateXDomain, withU
...
@@ -213,14 +213,16 @@ c3_chart_internal_fn.updateXDomain = function (targets, withUpdateXDomain, withU
return
$$
.
x
.
domain
();
return
$$
.
x
.
domain
();
};
};
c3_chart_internal_fn
.
trimXDomain
=
function
(
domain
)
{
c3_chart_internal_fn
.
trimXDomain
=
function
(
domain
)
{
var
$$
=
this
;
var
$$
=
this
,
config
=
$$
.
config
,
d3
=
$$
.
d3
;
if
(
domain
[
0
]
<=
$$
.
orgXDomain
[
0
])
{
var
min
=
d3
.
min
([
$$
.
orgXDomain
[
0
],
config
.
axis_x_domain_min
]);
domain
[
1
]
=
+
domain
[
1
]
+
(
$$
.
orgXDomain
[
0
]
-
domain
[
0
]);
var
max
=
d3
.
max
([
$$
.
orgXDomain
[
1
],
config
.
axis_x_domain_max
]);
domain
[
0
]
=
$$
.
orgXDomain
[
0
];
if
(
domain
[
0
]
<=
min
)
{
}
domain
[
1
]
=
+
domain
[
1
]
+
(
min
-
domain
[
0
]);
if
(
$$
.
orgXDomain
[
1
]
<=
domain
[
1
])
{
domain
[
0
]
=
min
;
domain
[
0
]
=
+
domain
[
0
]
-
(
domain
[
1
]
-
$$
.
orgXDomain
[
1
]);
}
domain
[
1
]
=
$$
.
orgXDomain
[
1
];
if
(
max
<=
domain
[
1
])
{
domain
[
0
]
=
+
domain
[
0
]
-
(
domain
[
1
]
-
max
);
domain
[
1
]
=
max
;
}
}
return
domain
;
return
domain
;
};
};
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