corrade-nucleus-nucleons – Diff between revs 1 and 11
?pathlinks?
| Rev 1 | Rev 11 | |||
|---|---|---|---|---|
| Line 1... | Line 1... | |||
| 1 | /** |
1 | /** |
|
| 2 | * @license Highcharts JS v5.0.10 (2017-03-31) |
2 | * @license Highcharts JS v5.0.12 (2017-05-24) |
|
| 3 | * |
3 | * |
|
| 4 | * (c) 2009-2017 Torstein Honsi |
4 | * (c) 2009-2017 Torstein Honsi |
|
| 5 | * |
5 | * |
|
| 6 | * License: www.highcharts.com/license |
6 | * License: www.highcharts.com/license |
|
| 7 | */ |
7 | */ |
|
| Line 167... | Line 167... | |||
| 167 | breakArrayT = [], // Temporary one |
167 | breakArrayT = [], // Temporary one |
|
| 168 | breakArray = [], |
168 | breakArray = [], |
|
| 169 | length = 0, |
169 | length = 0, |
|
| 170 | inBrk, |
170 | inBrk, |
|
| 171 | repeat, |
171 | repeat, |
|
| 172 | brk, |
- | ||
| 173 | min = axis.userMin || axis.min, |
172 | min = axis.userMin || axis.min, |
|
| 174 | max = axis.userMax || axis.max, |
173 | max = axis.userMax || axis.max, |
|
| 175 | pointRangePadding = pick(axis.pointRangePadding, 0), |
174 | pointRangePadding = pick(axis.pointRangePadding, 0), |
|
| 176 | start, |
175 | start, |
|
| 177 | i, |
- | ||
| 178 | j; |
176 | i; |
|
| Line 179... | Line 177... | |||
| 179 | |
177 | |
|
| 180 | // Min & max check (#4247) |
178 | // Min & max check (#4247) |
|
| 181 | for (i in breaks) { |
- | ||
| 182 | brk = breaks[i]; |
179 | each(breaks, function(brk) { |
|
| 183 | repeat = brk.repeat || Infinity; |
180 | repeat = brk.repeat || Infinity; |
|
| 184 | if (axis.isInBreak(brk, min)) { |
181 | if (axis.isInBreak(brk, min)) { |
|
| 185 | min += (brk.to % repeat) - (min % repeat); |
182 | min += (brk.to % repeat) - (min % repeat); |
|
| 186 | } |
183 | } |
|
| 187 | if (axis.isInBreak(brk, max)) { |
184 | if (axis.isInBreak(brk, max)) { |
|
| 188 | max -= (max % repeat) - (brk.from % repeat); |
185 | max -= (max % repeat) - (brk.from % repeat); |
|
| 189 | } |
186 | } |
|
| Line 190... | Line 187... | |||
| 190 | } |
187 | }); |
|
| 191 | |
188 | |
|
| 192 | // Construct an array holding all breaks in the axis |
- | ||
| 193 | for (i in breaks) { |
189 | // Construct an array holding all breaks in the axis |
|
| 194 | brk = breaks[i]; |
190 | each(breaks, function(brk) { |
|
| Line 195... | Line 191... | |||
| 195 | start = brk.from; |
191 | start = brk.from; |
|
| 196 | repeat = brk.repeat || Infinity; |
192 | repeat = brk.repeat || Infinity; |
|
| 197 | |
193 | |
|
| 198 | while (start - repeat > min) { |
194 | while (start - repeat > min) { |
|
| 199 | start -= repeat; |
195 | start -= repeat; |
|
| 200 | } |
196 | } |
|
| Line 201... | Line 197... | |||
| 201 | while (start < min) { |
197 | while (start < min) { |
|
| 202 | start += repeat; |
198 | start += repeat; |
|
| 203 | } |
199 | } |
|
| 204 | |
200 | |
|
| 205 | for (j = start; j < max; j += repeat) { |
201 | for (i = start; i < max; i += repeat) { |
|
| 206 | breakArrayT.push({ |
202 | breakArrayT.push({ |
|
| 207 | value: j, |
203 | value: i, |
|
| 208 | move: 'in' |
204 | move: 'in' |
|
| 209 | }); |
205 | }); |
|
| 210 | breakArrayT.push({ |
206 | breakArrayT.push({ |
|
| 211 | value: j + (brk.to - brk.from), |
207 | value: i + (brk.to - brk.from), |
|
| 212 | move: 'out', |
208 | move: 'out', |
|
| Line 213... | Line 209... | |||
| 213 | size: brk.breakSize |
209 | size: brk.breakSize |
|
| 214 | }); |
210 | }); |
|
| 215 | } |
211 | } |
|
| 216 | } |
212 | }); |
|
| Line 227... | Line 223... | |||
| 227 | |
223 | |
|
| 228 | // Simplify the breaks |
224 | // Simplify the breaks |
|
| 229 | inBrk = 0; |
225 | inBrk = 0; |
|
| Line 230... | Line 226... | |||
| 230 | start = min; |
226 | start = min; |
|
| 231 | |
- | ||
| 232 | for (i in breakArrayT) { |
227 | |
|
| Line 233... | Line 228... | |||
| 233 | brk = breakArrayT[i]; |
228 | each(breakArrayT, function(brk) { |
|
| 234 | inBrk += (brk.move === 'in' ? 1 : -1); |
229 | inBrk += (brk.move === 'in' ? 1 : -1); |
|
| 235 | |
230 | |
|
| Line 242... | Line 237... | |||
| 242 | to: brk.value, |
237 | to: brk.value, |
|
| 243 | len: brk.value - start - (brk.size || 0) |
238 | len: brk.value - start - (brk.size || 0) |
|
| 244 | }); |
239 | }); |
|
| 245 | length += brk.value - start - (brk.size || 0); |
240 | length += brk.value - start - (brk.size || 0); |
|
| 246 | } |
241 | } |
|
| 247 | } |
242 | }); |
|
| Line 248... | Line 243... | |||
| 248 | |
243 | |
|
| Line 249... | Line 244... | |||
| 249 | axis.breakArray = breakArray; |
244 | axis.breakArray = breakArray; |
|
| 250 | |
245 | |
|
| Line 254... | Line 249... | |||
| 254 | |
249 | |
|
| Line 255... | Line 250... | |||
| 255 | fireEvent(axis, 'afterBreaks'); |
250 | fireEvent(axis, 'afterBreaks'); |
|
| 256 | |
251 | |
|
| 257 | if (axis.options.staticScale) { |
252 | if (axis.options.staticScale) { |
|
| 258 | axis.transA = axis.options.staticScale; |
253 | axis.transA = axis.options.staticScale; |
|
| 259 | } else { |
254 | } else if (axis.unitLength) { |
|
| 260 | axis.transA *= (max - axis.min + pointRangePadding) / |
255 | axis.transA *= (max - axis.min + pointRangePadding) / |
|
| Line 261... | Line 256... | |||
| 261 | axis.unitLength; |
256 | axis.unitLength; |
|
| Line 341... | Line 336... | |||
| 341 | < brk.from && y >< brk.from)) {< brk.from && y >< brk.to) || (threshold >< brk.from)) { / }); |
336 | < brk.from && y >< brk.from)) {< brk.from && y >< brk.to) || (threshold >< brk.from)) { / }); |
|
| 342 | < brk.from && y >< brk.from)) {< brk.from && y >< brk.to) || (threshold >< brk.from)) { / }); |
337 | < brk.from && y >< brk.from)) {< brk.from && y >< brk.to) || (threshold >< brk.from)) { / }); |
|
| 343 | < brk.from && y >< brk.from)) {< brk.from && y >< brk.to) || (threshold >< brk.from)) { / }); |
338 | < brk.from && y >< brk.from)) {< brk.from && y >< brk.to) || (threshold >< brk.from)) { / }); |
|
| 344 | < brk.from && y >< brk.from)) {< brk.from && y >< brk.to) || (threshold >< brk.from)) { / }; |
339 | < brk.from && y >< brk.from)) {< brk.from && y >< brk.to) || (threshold >< brk.from)) { / }; |
|
| Line -... | Line 340... | |||
| - | 340 | < brk.from && y >< brk.from)) {< brk.from && y >< brk.to) || (threshold >< brk.from)) { / |
||
| - | 341 | < brk.from && y >< brk.from)) {< brk.from && y >< brk.to) || (threshold >< brk.from)) { / |
||
| - | 342 | < brk.from && y >< brk.from)) {< brk.from && y >< brk.to) || (threshold >< brk.from)) { / /** |
||
| - | 343 | < brk.from && y >< brk.from)) {< brk.from && y >< brk.to) || (threshold >< brk.from)) { / * Extend getGraphPath by identifying gaps in the data so that we can draw a gap |
||
| - | 344 | < brk.from && y >< brk.from)) {< brk.from && y >< brk.to) || (threshold >< brk.from)) { / * in the line or area. This was moved from ordinal axis module to broken axis |
||
| - | 345 | < brk.from && y >< brk.from)) {< brk.from && y >< brk.to) || (threshold >< brk.from)) { / * module as of #5045. |
||
| - | 346 | < brk.from && y >< brk.from)) {< brk.from && y >< brk.to) || (threshold >< brk.from)) { / */ |
||
| - | 347 | < brk.from && y >< brk.from)) {< brk.from && y >< brk.to) || (threshold >< brk.from)) { / H.Series.prototype.gappedPath = function() { |
||
| - | 348 | < brk.from && y >< brk.from)) {< brk.from && y >< brk.to) || (threshold >< brk.from)) { / var gapSize = this.options.gapSize, |
||
| - | 349 | < brk.from && y >< brk.from)) {< brk.from && y >< brk.to) || (threshold >< brk.from)) { / points = this.points.slice(), |
||
| - | 350 | < brk.from && y >< brk.from)) {< brk.from && y >< brk.to) || (threshold >< brk.from)) { / i = points.length - 1; |
||
| - | 351 | < brk.from && y >< brk.from)) {< brk.from && y >< brk.to) || (threshold >< brk.from)) { / |
||
| - | 352 | < brk.from && y >< brk.from)) {< brk.from && y >< brk.to) || (threshold >< brk.from)) { / if (gapSize && i > 0) { // #5008 |
||
| - | 353 | < brk.from && y >< brk.from)) {< brk.from && y >< brk.to) || (threshold >< brk.from)) { / |
||
| - | 354 | < brk.from && y >< brk.from)) {< brk.from && y >< brk.to) || (threshold >< brk.from)) { / // extension for ordinal breaks |
||
| - | 355 | < brk.from && y >< brk.from)) {< brk.from && y >< brk.to) || (threshold >< brk.from)) { / while (i--) { |
||
| - | 356 | < brk.from && y >< brk.from)) {< brk.from && y >< brk.to) || (threshold >< brk.from)) { / if (points[i + 1].x - points[i].x > this.closestPointRange * gapSize) { |
||
| - | 357 | < brk.from && y >< brk.from)) {< brk.from && y >< brk.to) || (threshold >< brk.from)) { / points.splice( // insert after this one |
||
| - | 358 | < brk.from && y >< brk.from)) {< brk.from && y >< brk.to) || (threshold >< brk.from)) { / i + 1, |
||
| - | 359 | < brk.from && y >< brk.from)) {< brk.from && y >< brk.to) || (threshold >< brk.from)) { / 0, { |
||
| - | 360 | < brk.from && y >< brk.from)) {< brk.from && y >< brk.to) || (threshold >< brk.from)) { / isNull: true |
||
| - | 361 | < brk.from && y >< brk.from)) {< brk.from && y >< brk.to) || (threshold >< brk.from)) { / } |
||
| - | 362 | < brk.from && y >< brk.from)) {< brk.from && y >< brk.to) || (threshold >< brk.from)) { / ); |
||
| - | 363 | < brk.from && y >< brk.from)) {< brk.from && y >< brk.to) || (threshold >< brk.from)) { / } |
||
| - | 364 | < brk.from && y >< brk.from)) {< brk.from && y >< brk.to) || (threshold >< brk.from)) { / } |
||
| - | 365 | < brk.from && y >< brk.from)) {< brk.from && y >< brk.to) || (threshold >< brk.from)) { / } |
||
| - | 366 | < brk.from && y >< brk.from)) {< brk.from && y >< brk.to) || (threshold >< brk.from)) { / |
||
| - | 367 | < brk.from && y >< brk.from)) {< brk.from && y >< brk.to) || (threshold >< brk.from)) { / // Call base method |
||
| - | 368 | < brk.from && y >< brk.from)) {< brk.from && y >< brk.to) || (threshold >< brk.from)) { / return this.getGraphPath(points); |
||
| - | 369 | < brk.from && y >< brk.from)) {< brk.from && y >< brk.to) || (threshold >< brk.from)) { / }; |
||
| 345 | < brk.from && y >< brk.from)) {< brk.from && y >< brk.to) || (threshold >< brk.from)) { / |
370 | < brk.from && y >< brk.from)) {< brk.from && y >< brk.to) || (threshold >< brk.from)) { / |
|
| 346 | < brk.from && y >< brk.from)) {< brk.from && y >< brk.to) || (threshold >< brk.from)) { / wrap(H.seriesTypes.column.prototype, 'drawPoints', drawPointsWrapped); |
371 | < brk.from && y >< brk.from)) {< brk.from && y >< brk.to) || (threshold >< brk.from)) { / wrap(H.seriesTypes.column.prototype, 'drawPoints', drawPointsWrapped); |
|
| Line 347... | Line 372... | |||
| 347 | < brk.from && y >< brk.from)) {< brk.from && y >< brk.to) || (threshold >< brk.from)) { / wrap(H.Series.prototype, 'drawPoints', drawPointsWrapped); |
372 | < brk.from && y >< brk.from)) {< brk.from && y >< brk.to) || (threshold >< brk.from)) { / wrap(H.Series.prototype, 'drawPoints', drawPointsWrapped); |
|
| 348 | < brk.from && y >< brk.from)) {< brk.from && y >< brk.to) || (threshold >< brk.from)) { / |
373 | < brk.from && y >< brk.from)) {< brk.from && y >< brk.to) || (threshold >< brk.from)) { / |
|