playground
/
c3
mirror of https://github.com/masayuki0812/c3.git
1
0
Fork 0
Code Issues Releases Activity
Browse Source

Accept min/max of axis x in axis.min/max - #202

pull/213/merge
Masayuki Tanaka 11 years ago
parent
8c580629b8
commit
93c0082e95
3 changed files with 88 additions and 3 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 6
      c3.js
  2. 2
      c3.min.js
  3. 83
      htdocs/samples/api_axis_range.html

6
c3.js
Unescape View File

@ -4532,23 +4532,25 @@
c3.axis.max = function (max) { c3.axis.max = function (max) {
if (arguments.length) { if (arguments.length) {
if (typeof max === 'object') { if (typeof max === 'object') {
if (isValue(max.x)) { __axis_x_max = +max.x; }
if (isValue(max.y)) { __axis_y_max = +max.y; } if (isValue(max.y)) { __axis_y_max = +max.y; }
if (isValue(max.y2)) { __axis_y2_max = +max.y2; } if (isValue(max.y2)) { __axis_y2_max = +max.y2; }
} else { } else {
__axis_y_max = __axis_y2_max = +max; __axis_y_max = __axis_y2_max = +max;
} }
redraw(); redraw({withUpdateOrgXDomain: true, withUpdateXDomain: true});
} }
}; };
c3.axis.min = function (min) { c3.axis.min = function (min) {
if (arguments.length) { if (arguments.length) {
if (typeof min === 'object') { if (typeof min === 'object') {
if (isValue(min.x)) { __axis_x_min = +min.x; }
if (isValue(min.y)) { __axis_y_min = +min.y; } if (isValue(min.y)) { __axis_y_min = +min.y; }
if (isValue(min.y2)) { __axis_y2_min = +min.y2; } if (isValue(min.y2)) { __axis_y2_min = +min.y2; }
} else { } else {
__axis_y_min = __axis_y2_min = +min; __axis_y_min = __axis_y2_min = +min;
} }
redraw(); redraw({withUpdateOrgXDomain: true, withUpdateXDomain: true});
} }
}; };
c3.axis.range = function (range) { c3.axis.range = function (range) {

2
c3.min.js vendored
View File

File diff suppressed because one or more lines are too long

83
htdocs/samples/api_axis_range.html
Unescape View File

@ -0,0 +1,83 @@
<html>
<head>
<link href="/css/c3.css" rel="stylesheet" type="text/css">
</head>
<body>
<div id="chart"></div>
<script src="http://d3js.org/d3.v3.min.js" charset="utf-8"></script>
<script src="/js/c3.js"></script>
<script>
var chart = c3.generate({
data: {
columns: [
['data1', 30, 200, 100, 400, 150, 250],
['data2', 50, 20, 10, 40, 15, 25]
],
axes: {
data1: 'y',
data2: 'y2',
}
},
axis: {
x: {
label: 'X Label'
},
y: {
label: {
text: 'Y Axis Label',
position: 'outer-middle'
}
},
y2: {
show: true,
label: {
text: 'Y2 Axis Label',
position: 'outer-middle'
}
}
},
tooltip: {
// enabled: false
},
zoom: {
// enabled: true
},
subchart: {
// show: true
}
});
setTimeout(function () {
chart.axis.min({x: -10})
chart.axis.max({x: 10})
}, 1000);
/*
setTimeout(function () {
chart.axis.max(500);
}, 1000);
setTimeout(function () {
chart.axis.min(-500);
}, 2000);
setTimeout(function () {
chart.axis.max({y: 600, y2: 100});
}, 3000);
setTimeout(function () {
chart.axis.min({y: -600, y2: -100});
}, 4000);
setTimeout(function () {
chart.axis.range({max: 1000, min: -1000});
}, 5000);
setTimeout(function () {
chart.axis.range({max: {y: 600, y2: 100}, min: {y: -100, y2: 0}});
}, 6000);
*/
</script>
</body>
</html>
Write Preview
Loading…
Cancel
Save