Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Appearance settings

Add switch to specify major/minor in axes.arrayTicks() #6829

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

Merged
merged 11 commits into from
Jan 4, 2024
Merged

Add switch to specify major/minor in axes.arrayTicks() #6829

Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
9eb6bc4
Add switch to specify major/minor in arrayTicks
ayjayt Dec 27, 2023
24821c8
Merge branch 'master' into pikul-arrayTicks-duplicate-tick-bug
ayjayt Jan 2, 2024
9a6de43
Add test to verify expected quantity of ticks
ayjayt Jan 2, 2024
392b103
Add draftlog for PR #6829
ayjayt Jan 2, 2024
41ae65d
Fix linter errors
ayjayt Jan 3, 2024
095ce0c
Set tick test to use fullLayout, not mock x
ayjayt Jan 3, 2024
69345fc
Eliminate unnecesary closure in parameterized test
ayjayt Jan 3, 2024
365231d
Use Lib.psuedoRandom(), not Math.random()
ayjayt Jan 3, 2024
00cdcc8
Merge branch 'master' into pikul-arrayTicks-duplicate-tick-bug
ayjayt Jan 3, 2024
cd3b261
Remove closure function from tickArray test
ayjayt Jan 3, 2024
1051bb7
Add legacy mode to arrayTicks()
ayjayt Jan 3, 2024
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
Add legacy mode to arrayTicks()
  • Loading branch information
@ayjayt
ayjayt committed Jan 3, 2024
commit 1051bb7f89bfad160238e9f9ca43614d69cf7900
12 changes: 5 additions & 7 deletions 12 src/plots/cartesian/axes.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -949,10 +949,10 @@ axes.calcTicks = function calcTicks(ax, opts) {
if(mockAx.tickmode === 'array') {
if(major) {
tickVals = [];
ticksOut = arrayTicks(ax, major);
ticksOut = arrayTicks(ax, !isMinor);
} else {
minorTickVals = [];
minorTicks = arrayTicks(ax, false);
minorTicks = arrayTicks(ax, !isMinor);
}
continue;
}
Expand Down Expand Up @@ -1261,8 +1261,7 @@ function syncTicks(ax) {
return ticksOut;
}

function arrayTicks(ax, major) {
if(major === undefined) throw new Error('arrayTicks must specify ticktype');
function arrayTicks(ax, majorOnly) {
var rng = Lib.simpleMap(ax.range, ax.r2l);
var exRng = expandRange(rng);
var tickMin = Math.min(exRng[0], exRng[1]);
Expand All @@ -1280,11 +1279,10 @@ function arrayTicks(ax, major) {

var ticksOut = [];
for(var isMinor = 0; isMinor <= 1; isMinor++) {
if(!isMinor && !major) continue;
if(isMinor && (!ax.minor || major)) continue;
if((majorOnly !== undefined) && ((majorOnly && isMinor) || (majorOnly === false && !isMinor))) continue;
if(isMinor && !ax.minor) continue;
var vals = !isMinor ? ax.tickvals : ax.minor.tickvals;
var text = !isMinor ? ax.ticktext : [];

if(!vals) continue;


Expand Down
Morty Proxy This is a proxified and sanitized view of the page, visit original site.