Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Make autoskip aware of major ticks #6509

Merged
merged 5 commits into from
Oct 19, 2019
Merged

Make autoskip aware of major ticks #6509

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
28e3435
Make autoskip aware of major ticks
benmccann May 14, 2019
30157ba
Address review comments
benmccann Oct 14, 2019
98532b1
Fix codeclimate warning
benmccann Oct 14, 2019
98ef930
Add test for major and minor tick autoskipping
benmccann Oct 15, 2019
35f7262
Revert change for determining _majorUnit and fix sample
benmccann Oct 16, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Address review comments
  • Loading branch information
@benmccann
benmccann committed Oct 14, 2019
commit 30157baa3e7b04e7277a0ae5ee6f499199313e35
2 changes: 1 addition & 1 deletion samples/scales/time/financial.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<head>
<title>Line Chart</title>
<script src="https://cdnjs.cloudflare.com/ajax/libs/moment.js/2.18.1/moment.min.js"></script>
<script src="../../../dist/Chart.js"></script>
<script src="../../../dist/Chart.min.js"></script>
<script src="../../utils.js"></script>
<style>
canvas {
Expand Down
57 changes: 38 additions & 19 deletions src/core/core.scale.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -214,11 +214,24 @@ function parseTickFontOptions(options) {
return {minor: minor, major: major};
}

function getEvenSpacing(arr) {
var len = arr.length;
var i, diff;

if (len < 2) {
return false;
}

for (diff = arr[0], i = 1; i < len; ++i) {
if (arr[i] - arr[i - 1] !== diff) {
return false;
}
}
return diff;
}

function calculateSpacing(majorIndices, ticks, axisLength, ticksLimit) {
var evenMajorSpacing = majorIndices.length > 1 ? majorIndices.reduce(function(acc, val, idx, arr) {
var diff = idx === 0 ? acc : arr[idx] - arr[idx - 1];
return acc && acc === diff ? diff : false;
}, majorIndices[1] - majorIndices[0]) : false;
var evenMajorSpacing = getEvenSpacing(majorIndices);
var spacing = (ticks.length - 1) / ticksLimit;
var factors, factor, i, ilen;

Expand Down Expand Up @@ -248,42 +261,42 @@ function getMajorIndices(ticks) {
}

function skipMajors(ticks, majorIndices, spacing) {
var ticksToKeep = {};
var count = 0;
var next = majorIndices[0];
var i, tick;

spacing = Math.ceil(spacing);
for (i = 0; i < majorIndices.length; i += spacing) {
ticksToKeep[majorIndices[i]] = 1;
}
for (i = 0; i < ticks.length; i++) {
tick = ticks[i];
if (ticksToKeep[i]) {
if (i === next) {
tick._index = i;
count++;
next = majorIndices[count * spacing];
} else {
delete tick.label;
}
}
}

function skip(ticks, spacing, majorStart, majorEnd) {
var ticksToKeep = {};
var start = valueOrDefault(majorStart, 0);
var end = Math.min(valueOrDefault(majorEnd, ticks.length), ticks.length);
var length, i, tick;
var count = 0;
var length, i, tick, next;

spacing = Math.ceil(spacing);
if (majorEnd) {
length = majorEnd - majorStart;
spacing = length / Math.floor(length / spacing);
}
for (i = 0, tick = start; tick < end; i++) {
tick = Math.round(start + i * spacing);
ticksToKeep[tick] = 1;
}

next = start;
for (i = Math.max(start, 0); i < end; i++) {
tick = ticks[i];
if (ticksToKeep[i]) {
if (i === next) {
tick._index = i;
count++;
next = Math.round(start + count * spacing);
} else {
delete tick.label;
}
Expand Down Expand Up @@ -933,9 +946,15 @@ var Scale = Element.extend({
var i, ilen, spacing, avgMajorSpacing;

function nonSkipped(ticksToFilter) {
return ticksToFilter.filter(function(item) {
return typeof item._index !== 'undefined';
});
var filtered = [];
var item, index, len;
for (index = 0, len = ticksToFilter.length; index < len; ++index) {
item = ticksToFilter[index];
if (typeof item._index !== 'undefined') {
filtered.push(item);
}
}
return filtered;
}

// If there are too many major ticks to display them all
Expand Down