|
116 | 116 |
|
117 | 117 | if (opts.axis) { |
118 | 118 | var ax = (opts.axis + "").split(/[,\s]+/); |
119 | | - (+ax[0] || +ax[2]) && chartinst.grid(x + gutter, gutter + 10, width - 2 * gutter, height - 2 * gutter, opts.axisxstep || Math.floor((width - 2 * gutter) / 20), 0, paper); |
| 119 | + //(+ax[0] || +ax[2]) && chartinst.grid(x + gutter, gutter + 10, width - 2 * gutter, height - 2 * gutter, opts.axisxstep || Math.floor((width - 2 * gutter) / 20), 0, paper); |
120 | 120 | (+ax[1] || +ax[3]) && chartinst.grid(x + gutter, y + height - gutter, width - 2 * gutter, height - 2 * gutter, opts.axisystep || Math.floor((height - 2 * gutter) / 20), 1, paper); |
121 | 121 | } |
122 | 122 |
|
|
215 | 215 | var cvrs = f || paper.set(); |
216 | 216 |
|
217 | 217 | for (i = 0; i < ii; i++) { |
218 | | - var X = xs[i] - (xs[i] - (xs[i - 1] || x)) / 2, |
219 | | - w = ((xs[i + 1] || x + width) - xs[i]) / 2 + (xs[i] - (xs[i - 1] || x)) / 2, |
220 | | - C; |
| 218 | + var X = xs[i] - (xs[i] - (xs[i - 1] || x)) / 2; |
| 219 | + var w = ((xs[i + 1] || x + width) - xs[i]) / 2 + (xs[i] - (xs[i - 1] || x)) / 2; |
| 220 | + var C; |
221 | 221 |
|
222 | 222 | f ? (C = {}) : cvrs.push(C = paper.rect(X - 1, y, Math.max(w + 1, 1), height).attr({ stroke: "none", fill: "#000", opacity: 0 })); |
223 | 223 | C.values = []; |
|
243 | 243 | f && f.call(C); |
244 | 244 | } |
245 | 245 |
|
246 | | - console.log(cvrs); |
247 | 246 | !f && (columns = cvrs); |
| 247 | + |
| 248 | + chart.columns = columns; |
248 | 249 | } |
249 | 250 |
|
250 | 251 | function createDots(f) { |
|
271 | 272 | } |
272 | 273 |
|
273 | 274 | !f && (dots = cvrs); |
| 275 | + |
| 276 | + chart.dots = dots; |
274 | 277 | } |
275 | 278 |
|
276 | | - chart.push(lines, shades, symbols, axis, columns, dots); |
| 279 | + chart.push(lines, shades, symbols, axis); |
277 | 280 | chart.lines = lines; |
278 | 281 | chart.shades = shades; |
279 | 282 | chart.symbols = symbols; |
|
0 commit comments