Skip to content

handle various time formats in ticklabelmode period#5065

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
archmoj merged 14 commits into from
Aug 13, 2020
Merged

handle various time formats in ticklabelmode period #5065

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
e220b65
handle various time formats in ticklabelmode period
archmoj Aug 11, 2020
9424347
move weekdays to ONEDAY bucket
archmoj Aug 12, 2020
cd53a6a
Merge remote-tracking branch 'origin/master' into new-formats-in-peri…
archmoj Aug 12, 2020
ca993b9
apply weekly and quarter offsets in periodic labels
archmoj Aug 12, 2020
4a87806
declare week and average quarter in milliseconds in numerical constants
archmoj Aug 12, 2020
c3e5181
update baseline
archmoj Aug 12, 2020
854c8c7
reuse constants for weeks and quarters
archmoj Aug 12, 2020
7b9391f
replace Sunday with Monday for ISO and Monday-based formats
archmoj Aug 12, 2020
e265f0d
replace multiple incexOf calls with a regex call
archmoj Aug 12, 2020
40c6df6
add jasmine tests for various tickformat using period mode
archmoj Aug 12, 2020
9399031
fix issue 5071
archmoj Aug 12, 2020
f0f078a
convert milliseconds to date strings in tests
archmoj Aug 12, 2020
90ee834
test label text based on different tick time formats
archmoj Aug 13, 2020
1c94ba9
merge assert functions
archmoj Aug 13, 2020
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
2 changes: 2 additions & 0 deletions src/constants/numerical.js
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -32,7 +32,9 @@ module.exports = {
* have the same length
*/
ONEAVGYEAR: 31557600000, // 365.25 days
ONEAVGQUARTER: 7889400000, // 1/4 of ONEAVGYEAR
ONEAVGMONTH: 2629800000, // 1/12 of ONEAVGYEAR
ONEWEEK: 604800000, // 7 * ONEDAY
ONEDAY: 86400000,
ONEHOUR: 3600000,
ONEMIN: 60000,
Expand Down
73 changes: 57 additions & 16 deletions src/plots/cartesian/axes.js
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -24,7 +24,9 @@ var cleanTicks = require('./clean_ticks');

var constants = require('../../constants/numerical');
var ONEAVGYEAR = constants.ONEAVGYEAR;
var ONEAVGQUARTER = constants.ONEAVGQUARTER;
var ONEAVGMONTH = constants.ONEAVGMONTH;
var ONEWEEK = constants.ONEWEEK;
var ONEDAY = constants.ONEDAY;
var ONEHOUR = constants.ONEHOUR;
var ONEMIN = constants.ONEMIN;
Expand DownExpand Up@@ -695,23 +697,51 @@ axes.calcTicks = function calcTicks(ax, opts) {

var definedDelta;
if(isPeriod && ax.tickformat) {
var _has = function(str) {
return ax.tickformat.indexOf(str) !== -1;
};

if(
!_has('%f') &&
!_has('%H') &&
!_has('%I') &&
!_has('%L') &&
!_has('%Q') &&
!_has('%S') &&
!_has('%s') &&
!_has('%X')
!(/%[fLQsSMHIpX]/.test(ax.tickformat))
// %f: microseconds as a decimal number [000000, 999999]
// %L: milliseconds as a decimal number [000, 999]
// %Q: milliseconds since UNIX epoch
// %s: seconds since UNIX epoch
// %S: second as a decimal number [00,61]
// %M: minute as a decimal number [00,59]
// %H: hour (24-hour clock) as a decimal number [00,23]
// %I: hour (12-hour clock) as a decimal number [01,12]
// %p: either AM or PM
// %X: the locale’s time, such as %-I:%M:%S %p
) {
if(_has('%x') || _has('%d') || _has('%e') || _has('%j')) definedDelta = ONEDAY;
else if(_has('%B') || _has('%b') || _has('%m')) definedDelta = ONEAVGMONTH;
else if(_has('%Y') || _has('%y')) definedDelta = ONEAVGYEAR;
if(
/%[Aadejuwx]/.test(ax.tickformat)
// %A: full weekday name
// %a: abbreviated weekday name
// %d: zero-padded day of the month as a decimal number [01,31]
// %e: space-padded day of the month as a decimal number [ 1,31]
// %j: day of the year as a decimal number [001,366]
// %u: Monday-based (ISO 8601) weekday as a decimal number [1,7]
// %w: Sunday-based weekday as a decimal number [0,6]
// %x: the locale’s date, such as %-m/%-d/%Y
) definedDelta = ONEDAY;
else if(
/%[UVW]/.test(ax.tickformat)
// %U: Sunday-based week of the year as a decimal number [00,53]
// %V: ISO 8601 week of the year as a decimal number [01, 53]
// %W: Monday-based week of the year as a decimal number [00,53]
) definedDelta = ONEWEEK;
else if(
/%[Bbm]/.test(ax.tickformat)
// %B: full month name
// %b: abbreviated month name
// %m: month as a decimal number [01,12]
) definedDelta = ONEAVGMONTH;
else if(
/%[q]/.test(ax.tickformat)
// %q: quarter of the year as a decimal number [1,4]
) definedDelta = ONEAVGQUARTER;
else if(
/%[Yy]/.test(ax.tickformat)
// %Y: year with century as a decimal number, such as 1999
// %y: year without century as a decimal number [00,99]
) definedDelta = ONEAVGYEAR;
}
}

Expand DownExpand Up@@ -748,8 +778,12 @@ axes.calcTicks = function calcTicks(ax, opts) {
var delta = definedDelta || Math.abs(B - A);
if(delta >= ONEDAY * 365) { // Years could have days less than ONEAVGYEAR period
v += ONEAVGYEAR / 2;
} else if(delta >= ONEAVGQUARTER) {
v += ONEAVGQUARTER / 2;
} else if(delta >= ONEDAY * 28) { // Months could have days less than ONEAVGMONTH period
v += ONEAVGMONTH / 2;
} else if(delta >= ONEWEEK) {
v += ONEWEEK / 2;
} else if(delta >= ONEDAY) {
v += ONEDAY / 2;
}
Expand All@@ -764,7 +798,7 @@ axes.calcTicks = function calcTicks(ax, opts) {
}

if(removedPreTick0Label) {
for(i = 1; i < ticksOut.length; i++) {
for(i = 0; i < ticksOut.length; i++) {
if(ticksOut[i].periodX <= maxRange && ticksOut[i].periodX >= minRange) {
// redo first visible tick
ax._prevDateHead = '';
Expand DownExpand Up@@ -882,6 +916,13 @@ axes.autoTicks = function(ax, roughDTick) {
// this will also move the base tick off 2000-01-01 if dtick is
// 2 or 3 days... but that's a weird enough case that we'll ignore it.
ax.tick0 = Lib.dateTick0(ax.calendar, true);

if(/%[uVW]/.test(ax.tickformat)) {
// replace Sunday with Monday for ISO and Monday-based formats
var len = ax.tick0.length;
var lastD = +ax.tick0[len - 1];
ax.tick0 = ax.tick0.substring(0, len - 2) + String(lastD + 1);
}
} else if(roughX2 > ONEHOUR) {
ax.dtick = roundDTick(roughDTick, ONEHOUR, roundBase24);
} else if(roughX2 > ONEMIN) {
Expand Down
3 changes: 2 additions & 1 deletion src/plots/cartesian/set_convert.js
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -23,6 +23,7 @@ var numConstants = require('../../constants/numerical');
var FP_SAFE = numConstants.FP_SAFE;
var BADNUM = numConstants.BADNUM;
var LOG_CLIP = numConstants.LOG_CLIP;
var ONEWEEK = numConstants.ONEWEEK;
var ONEDAY = numConstants.ONEDAY;
var ONEHOUR = numConstants.ONEHOUR;
var ONEMIN = numConstants.ONEMIN;
Expand DownExpand Up@@ -734,7 +735,7 @@ module.exports = function setConvert(ax, fullLayout) {

switch(brk.pattern) {
case WEEKDAY_PATTERN:
step = 7 * ONEDAY;
step = ONEWEEK;

bndDelta = (
(b1 < b0 ? 7 : 0) +
Expand Down
Binary file modifiedtest/image/baselines/date_axes_period.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Add copy buttons to all 
 blocks
(function() {
function addCopyButtons() {
document.querySelectorAll('pre code').forEach(function(codeBlock) {
if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;
codeBlock.parentElement.setAttribute('data-copy-added', 'true');
var btn = document.createElement('button');
btn.textContent = 'Copy';
btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';
btn.onmouseover = function() { this.style.opacity = '1'; };
btn.onmouseout = function() { this.style.opacity = '0.7'; };
btn.onclick = function() {
navigator.clipboard.writeText(codeBlock.textContent).then(function() {
btn.textContent = 'Copied!';
setTimeout(function() { btn.textContent = 'Copy'; }, 1500);
});
};
codeBlock.parentElement.style.position = 'relative';
codeBlock.parentElement.appendChild(btn);
});
}
addCopyButtons();
// Re-run on dynamic content
var observer = new MutationObserver(addCopyButtons);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
handle various time formats in ticklabelmode period by archmoj · Pull Request #5065 · plotly/plotly.js · GitHub
Skip to content
handle various time formats in ticklabelmode period#5065

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

archmoj
merged 14 commits into

from

Aug 13, 2020
 Merged


handle various time formats in ticklabelmode period
#5065
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


14 commits


Select commit
Hold shift + click to select a range
e220b65

handle various time formats in ticklabelmode period


archmoj Aug 11, 2020
9424347

move weekdays to ONEDAY bucket


archmoj Aug 12, 2020
cd53a6a

Merge remote-tracking branch 'origin/master' into new-formats-in-peri…


archmoj Aug 12, 2020
ca993b9

apply weekly and quarter offsets in periodic labels


archmoj Aug 12, 2020
4a87806

declare week and average quarter in milliseconds in numerical constants


archmoj Aug 12, 2020
c3e5181

update baseline


archmoj Aug 12, 2020
854c8c7

reuse constants for weeks and quarters


archmoj Aug 12, 2020
7b9391f

replace Sunday with Monday for ISO and Monday-based formats


archmoj Aug 12, 2020
e265f0d

replace multiple incexOf calls with a regex call


archmoj Aug 12, 2020
40c6df6

add jasmine tests for various tickformat using period mode


archmoj Aug 12, 2020
9399031

fix issue 5071


archmoj Aug 12, 2020
f0f078a

convert milliseconds to date strings in tests


archmoj Aug 12, 2020
90ee834

test label text based on different tick time formats


archmoj Aug 13, 2020
1c94ba9

merge assert functions


archmoj Aug 13, 2020

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


2 changes: 2 additions & 0 deletions
src/constants/numerical.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -32,7 +32,9 @@ module.exports = {
 * have the same length
 */
 ONEAVGYEAR: 31557600000, // 365.25 days
 ONEAVGQUARTER: 7889400000, // 1/4 of ONEAVGYEAR
 ONEAVGMONTH: 2629800000, // 1/12 of ONEAVGYEAR
 ONEWEEK: 604800000, // 7 * ONEDAY
 ONEDAY: 86400000,
 ONEHOUR: 3600000,
 ONEMIN: 60000,
Expand Down

73 changes: 57 additions & 16 deletions
src/plots/cartesian/axes.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -24,7 +24,9 @@ var cleanTicks = require('./clean_ticks');

var constants = require('../../constants/numerical');
var ONEAVGYEAR = constants.ONEAVGYEAR;
var ONEAVGQUARTER = constants.ONEAVGQUARTER;
var ONEAVGMONTH = constants.ONEAVGMONTH;
var ONEWEEK = constants.ONEWEEK;
var ONEDAY = constants.ONEDAY;
var ONEHOUR = constants.ONEHOUR;
var ONEMIN = constants.ONEMIN;
Expand DownExpand Up@@ -695,23 +697,51 @@ axes.calcTicks = function calcTicks(ax, opts) {

 var definedDelta;
 if(isPeriod && ax.tickformat) {
 var _has = function(str) {
 return ax.tickformat.indexOf(str) !== -1;
 };

 if(
 !_has('%f') &&
 !_has('%H') &&
 !_has('%I') &&
 !_has('%L') &&
 !_has('%Q') &&
 !_has('%S') &&
 !_has('%s') &&
 !_has('%X')
 !(/%[fLQsSMHIpX]/.test(ax.tickformat))
 // %f: microseconds as a decimal number [000000, 999999]
 // %L: milliseconds as a decimal number [000, 999]
 // %Q: milliseconds since UNIX epoch
 // %s: seconds since UNIX epoch
 // %S: second as a decimal number [00,61]
 // %M: minute as a decimal number [00,59]
 // %H: hour (24-hour clock) as a decimal number [00,23]
 // %I: hour (12-hour clock) as a decimal number [01,12]
 // %p: either AM or PM
 // %X: the locale’s time, such as %-I:%M:%S %p
 ) {
 if(_has('%x') || _has('%d') || _has('%e') || _has('%j')) definedDelta = ONEDAY;
 else if(_has('%B') || _has('%b') || _has('%m')) definedDelta = ONEAVGMONTH;
 else if(_has('%Y') || _has('%y')) definedDelta = ONEAVGYEAR;
 if(
 /%[Aadejuwx]/.test(ax.tickformat)
 // %A: full weekday name
 // %a: abbreviated weekday name
 // %d: zero-padded day of the month as a decimal number [01,31]
 // %e: space-padded day of the month as a decimal number [ 1,31]
 // %j: day of the year as a decimal number [001,366]
 // %u: Monday-based (ISO 8601) weekday as a decimal number [1,7]
 // %w: Sunday-based weekday as a decimal number [0,6]
 // %x: the locale’s date, such as %-m/%-d/%Y
 ) definedDelta = ONEDAY;
 else if(
 /%[UVW]/.test(ax.tickformat)
 // %U: Sunday-based week of the year as a decimal number [00,53]
 // %V: ISO 8601 week of the year as a decimal number [01, 53]
 // %W: Monday-based week of the year as a decimal number [00,53]
 ) definedDelta = ONEWEEK;
 else if(
 /%[Bbm]/.test(ax.tickformat)
 // %B: full month name
 // %b: abbreviated month name
 // %m: month as a decimal number [01,12]
 ) definedDelta = ONEAVGMONTH;
 else if(
 /%[q]/.test(ax.tickformat)
 // %q: quarter of the year as a decimal number [1,4]
 ) definedDelta = ONEAVGQUARTER;
 else if(
 /%[Yy]/.test(ax.tickformat)
 // %Y: year with century as a decimal number, such as 1999
 // %y: year without century as a decimal number [00,99]
 ) definedDelta = ONEAVGYEAR;
 }
 }

Expand DownExpand Up@@ -748,8 +778,12 @@ axes.calcTicks = function calcTicks(ax, opts) {
 var delta = definedDelta || Math.abs(B - A);
 if(delta >= ONEDAY * 365) { // Years could have days less than ONEAVGYEAR period
 v += ONEAVGYEAR / 2;
 } else if(delta >= ONEAVGQUARTER) {
 v += ONEAVGQUARTER / 2;
 } else if(delta >= ONEDAY * 28) { // Months could have days less than ONEAVGMONTH period
 v += ONEAVGMONTH / 2;
 } else if(delta >= ONEWEEK) {
 v += ONEWEEK / 2;
 } else if(delta >= ONEDAY) {
 v += ONEDAY / 2;
 }
Expand All@@ -764,7 +798,7 @@ axes.calcTicks = function calcTicks(ax, opts) {
 }

 if(removedPreTick0Label) {
 for(i = 1; i < ticksOut.length; i++) {
 for(i = 0; i < ticksOut.length; i++) {
 if(ticksOut[i].periodX <= maxRange && ticksOut[i].periodX >= minRange) {
 // redo first visible tick
 ax._prevDateHead = '';
Expand DownExpand Up@@ -882,6 +916,13 @@ axes.autoTicks = function(ax, roughDTick) {
 // this will also move the base tick off 2000-01-01 if dtick is
 // 2 or 3 days... but that's a weird enough case that we'll ignore it.
 ax.tick0 = Lib.dateTick0(ax.calendar, true);

 if(/%[uVW]/.test(ax.tickformat)) {
 // replace Sunday with Monday for ISO and Monday-based formats
 var len = ax.tick0.length;
 var lastD = +ax.tick0[len - 1];
 ax.tick0 = ax.tick0.substring(0, len - 2) + String(lastD + 1);
 }
 } else if(roughX2 > ONEHOUR) {
 ax.dtick = roundDTick(roughDTick, ONEHOUR, roundBase24);
 } else if(roughX2 > ONEMIN) {
Expand Down

3 changes: 2 additions & 1 deletion
src/plots/cartesian/set_convert.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -23,6 +23,7 @@ var numConstants = require('../../constants/numerical');
var FP_SAFE = numConstants.FP_SAFE;
var BADNUM = numConstants.BADNUM;
var LOG_CLIP = numConstants.LOG_CLIP;
var ONEWEEK = numConstants.ONEWEEK;
var ONEDAY = numConstants.ONEDAY;
var ONEHOUR = numConstants.ONEHOUR;
var ONEMIN = numConstants.ONEMIN;
Expand DownExpand Up@@ -734,7 +735,7 @@ module.exports = function setConvert(ax, fullLayout) {

 switch(brk.pattern) {
 case WEEKDAY_PATTERN:
 step = 7 * ONEDAY;
 step = ONEWEEK;

 bndDelta = (
 (b1 < b0 ? 7 : 0) +
Expand Down
Binary file modifiedtest/image/baselines/date_axes_period.png

View file


Open in desktop

Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Force GitHub README to respect dark mode
(function() {
var style = document.createElement('style');
style.textContent = '
.markdown-body {
color-scheme: dark light;
}
.markdown-body pre { background: #161b22 !important; }
.markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }
.markdown-body table th, .markdown-body table td { border-color: #30363d !important; }
.markdown-body img { background: #0d1117; }
.markdown-body blockquote { border-left-color: #8b949e; }
.markdown-body hr { border-color: #30363d; }
';
document.head.appendChild(style);
})();
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
handle various time formats in ticklabelmode period by archmoj · Pull Request #5065 · plotly/plotly.js · GitHub
Skip to content
handle various time formats in ticklabelmode period#5065

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

archmoj
merged 14 commits into

from

Aug 13, 2020
 Merged


handle various time formats in ticklabelmode period
#5065
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


14 commits


Select commit
Hold shift + click to select a range
e220b65

handle various time formats in ticklabelmode period


archmoj Aug 11, 2020
9424347

move weekdays to ONEDAY bucket


archmoj Aug 12, 2020
cd53a6a

Merge remote-tracking branch 'origin/master' into new-formats-in-peri…


archmoj Aug 12, 2020
ca993b9

apply weekly and quarter offsets in periodic labels


archmoj Aug 12, 2020
4a87806

declare week and average quarter in milliseconds in numerical constants


archmoj Aug 12, 2020
c3e5181

update baseline


archmoj Aug 12, 2020
854c8c7

reuse constants for weeks and quarters


archmoj Aug 12, 2020
7b9391f

replace Sunday with Monday for ISO and Monday-based formats


archmoj Aug 12, 2020
e265f0d

replace multiple incexOf calls with a regex call


archmoj Aug 12, 2020
40c6df6

add jasmine tests for various tickformat using period mode


archmoj Aug 12, 2020
9399031

fix issue 5071


archmoj Aug 12, 2020
f0f078a

convert milliseconds to date strings in tests


archmoj Aug 12, 2020
90ee834

test label text based on different tick time formats


archmoj Aug 13, 2020
1c94ba9

merge assert functions


archmoj Aug 13, 2020

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


2 changes: 2 additions & 0 deletions
src/constants/numerical.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -32,7 +32,9 @@ module.exports = {
 * have the same length
 */
 ONEAVGYEAR: 31557600000, // 365.25 days
 ONEAVGQUARTER: 7889400000, // 1/4 of ONEAVGYEAR
 ONEAVGMONTH: 2629800000, // 1/12 of ONEAVGYEAR
 ONEWEEK: 604800000, // 7 * ONEDAY
 ONEDAY: 86400000,
 ONEHOUR: 3600000,
 ONEMIN: 60000,
Expand Down

73 changes: 57 additions & 16 deletions
src/plots/cartesian/axes.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -24,7 +24,9 @@ var cleanTicks = require('./clean_ticks');

var constants = require('../../constants/numerical');
var ONEAVGYEAR = constants.ONEAVGYEAR;
var ONEAVGQUARTER = constants.ONEAVGQUARTER;
var ONEAVGMONTH = constants.ONEAVGMONTH;
var ONEWEEK = constants.ONEWEEK;
var ONEDAY = constants.ONEDAY;
var ONEHOUR = constants.ONEHOUR;
var ONEMIN = constants.ONEMIN;
Expand DownExpand Up@@ -695,23 +697,51 @@ axes.calcTicks = function calcTicks(ax, opts) {

 var definedDelta;
 if(isPeriod && ax.tickformat) {
 var _has = function(str) {
 return ax.tickformat.indexOf(str) !== -1;
 };

 if(
 !_has('%f') &&
 !_has('%H') &&
 !_has('%I') &&
 !_has('%L') &&
 !_has('%Q') &&
 !_has('%S') &&
 !_has('%s') &&
 !_has('%X')
 !(/%[fLQsSMHIpX]/.test(ax.tickformat))
 // %f: microseconds as a decimal number [000000, 999999]
 // %L: milliseconds as a decimal number [000, 999]
 // %Q: milliseconds since UNIX epoch
 // %s: seconds since UNIX epoch
 // %S: second as a decimal number [00,61]
 // %M: minute as a decimal number [00,59]
 // %H: hour (24-hour clock) as a decimal number [00,23]
 // %I: hour (12-hour clock) as a decimal number [01,12]
 // %p: either AM or PM
 // %X: the locale’s time, such as %-I:%M:%S %p
 ) {
 if(_has('%x') || _has('%d') || _has('%e') || _has('%j')) definedDelta = ONEDAY;
 else if(_has('%B') || _has('%b') || _has('%m')) definedDelta = ONEAVGMONTH;
 else if(_has('%Y') || _has('%y')) definedDelta = ONEAVGYEAR;
 if(
 /%[Aadejuwx]/.test(ax.tickformat)
 // %A: full weekday name
 // %a: abbreviated weekday name
 // %d: zero-padded day of the month as a decimal number [01,31]
 // %e: space-padded day of the month as a decimal number [ 1,31]
 // %j: day of the year as a decimal number [001,366]
 // %u: Monday-based (ISO 8601) weekday as a decimal number [1,7]
 // %w: Sunday-based weekday as a decimal number [0,6]
 // %x: the locale’s date, such as %-m/%-d/%Y
 ) definedDelta = ONEDAY;
 else if(
 /%[UVW]/.test(ax.tickformat)
 // %U: Sunday-based week of the year as a decimal number [00,53]
 // %V: ISO 8601 week of the year as a decimal number [01, 53]
 // %W: Monday-based week of the year as a decimal number [00,53]
 ) definedDelta = ONEWEEK;
 else if(
 /%[Bbm]/.test(ax.tickformat)
 // %B: full month name
 // %b: abbreviated month name
 // %m: month as a decimal number [01,12]
 ) definedDelta = ONEAVGMONTH;
 else if(
 /%[q]/.test(ax.tickformat)
 // %q: quarter of the year as a decimal number [1,4]
 ) definedDelta = ONEAVGQUARTER;
 else if(
 /%[Yy]/.test(ax.tickformat)
 // %Y: year with century as a decimal number, such as 1999
 // %y: year without century as a decimal number [00,99]
 ) definedDelta = ONEAVGYEAR;
 }
 }

Expand DownExpand Up@@ -748,8 +778,12 @@ axes.calcTicks = function calcTicks(ax, opts) {
 var delta = definedDelta || Math.abs(B - A);
 if(delta >= ONEDAY * 365) { // Years could have days less than ONEAVGYEAR period
 v += ONEAVGYEAR / 2;
 } else if(delta >= ONEAVGQUARTER) {
 v += ONEAVGQUARTER / 2;
 } else if(delta >= ONEDAY * 28) { // Months could have days less than ONEAVGMONTH period
 v += ONEAVGMONTH / 2;
 } else if(delta >= ONEWEEK) {
 v += ONEWEEK / 2;
 } else if(delta >= ONEDAY) {
 v += ONEDAY / 2;
 }
Expand All@@ -764,7 +798,7 @@ axes.calcTicks = function calcTicks(ax, opts) {
 }

 if(removedPreTick0Label) {
 for(i = 1; i < ticksOut.length; i++) {
 for(i = 0; i < ticksOut.length; i++) {
 if(ticksOut[i].periodX <= maxRange && ticksOut[i].periodX >= minRange) {
 // redo first visible tick
 ax._prevDateHead = '';
Expand DownExpand Up@@ -882,6 +916,13 @@ axes.autoTicks = function(ax, roughDTick) {
 // this will also move the base tick off 2000-01-01 if dtick is
 // 2 or 3 days... but that's a weird enough case that we'll ignore it.
 ax.tick0 = Lib.dateTick0(ax.calendar, true);

 if(/%[uVW]/.test(ax.tickformat)) {
 // replace Sunday with Monday for ISO and Monday-based formats
 var len = ax.tick0.length;
 var lastD = +ax.tick0[len - 1];
 ax.tick0 = ax.tick0.substring(0, len - 2) + String(lastD + 1);
 }
 } else if(roughX2 > ONEHOUR) {
 ax.dtick = roundDTick(roughDTick, ONEHOUR, roundBase24);
 } else if(roughX2 > ONEMIN) {
Expand Down

3 changes: 2 additions & 1 deletion
src/plots/cartesian/set_convert.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -23,6 +23,7 @@ var numConstants = require('../../constants/numerical');
var FP_SAFE = numConstants.FP_SAFE;
var BADNUM = numConstants.BADNUM;
var LOG_CLIP = numConstants.LOG_CLIP;
var ONEWEEK = numConstants.ONEWEEK;
var ONEDAY = numConstants.ONEDAY;
var ONEHOUR = numConstants.ONEHOUR;
var ONEMIN = numConstants.ONEMIN;
Expand DownExpand Up@@ -734,7 +735,7 @@ module.exports = function setConvert(ax, fullLayout) {

 switch(brk.pattern) {
 case WEEKDAY_PATTERN:
 step = 7 * ONEDAY;
 step = ONEWEEK;

 bndDelta = (
 (b1 < b0 ? 7 : 0) +
Expand Down
Binary file modifiedtest/image/baselines/date_axes_period.png

View file


Open in desktop

Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Highlight search terms from Google/DuckDuckGo/Bing referrer
(function() {
var ref = document.referrer;
var terms = [];
if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {
var url = new URL(ref);
var q = url.searchParams.get('q') || url.searchParams.get('p');
if (q) {
terms = q.split(/\s+/).filter(function(t) { return t.length > 2; });
}
}
if (terms.length === 0) return;
var style = document.createElement('style');
style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';
document.head.appendChild(style);
function highlight(node) {
if (node.nodeType === 3) { // text node
var text = node.textContent;
var found = false;
terms.forEach(function(term) {
var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\]\\]/g, '\\') + ')', 'gi');
if (regex.test(text)) {
found = true;
var frag = document.createDocumentFragment();
var parts = text.split(regex);
parts.forEach(function(part, i) {
if (i % 2 === 0) {
frag.appendChild(document.createTextNode(part));
} else {
var span = document.createElement('span');
span.className = 'userscript-highlight';
span.textContent = part;
frag.appendChild(span);
}
});
node.parentNode.replaceChild(frag, node);
}
});
} else if (node.nodeType === 1 && node.childNodes) { // element
var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];
if (!skipTags.includes(node.tagName)) {
Array.from(node.childNodes).forEach(highlight);
}
}
}
highlight(document.body);
// Re-highlight on dynamic content
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1 || node.nodeType === 3) highlight(node);
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
handle various time formats in ticklabelmode period by archmoj · Pull Request #5065 · plotly/plotly.js · GitHub
Skip to content
handle various time formats in ticklabelmode period#5065

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

archmoj
merged 14 commits into

from

Aug 13, 2020
 Merged


handle various time formats in ticklabelmode period
#5065
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


14 commits


Select commit
Hold shift + click to select a range
e220b65

handle various time formats in ticklabelmode period


archmoj Aug 11, 2020
9424347

move weekdays to ONEDAY bucket


archmoj Aug 12, 2020
cd53a6a

Merge remote-tracking branch 'origin/master' into new-formats-in-peri…


archmoj Aug 12, 2020
ca993b9

apply weekly and quarter offsets in periodic labels


archmoj Aug 12, 2020
4a87806

declare week and average quarter in milliseconds in numerical constants


archmoj Aug 12, 2020
c3e5181

update baseline


archmoj Aug 12, 2020
854c8c7

reuse constants for weeks and quarters


archmoj Aug 12, 2020
7b9391f

replace Sunday with Monday for ISO and Monday-based formats


archmoj Aug 12, 2020
e265f0d

replace multiple incexOf calls with a regex call


archmoj Aug 12, 2020
40c6df6

add jasmine tests for various tickformat using period mode


archmoj Aug 12, 2020
9399031

fix issue 5071


archmoj Aug 12, 2020
f0f078a

convert milliseconds to date strings in tests


archmoj Aug 12, 2020
90ee834

test label text based on different tick time formats


archmoj Aug 13, 2020
1c94ba9

merge assert functions


archmoj Aug 13, 2020

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


2 changes: 2 additions & 0 deletions
src/constants/numerical.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -32,7 +32,9 @@ module.exports = {
 * have the same length
 */
 ONEAVGYEAR: 31557600000, // 365.25 days
 ONEAVGQUARTER: 7889400000, // 1/4 of ONEAVGYEAR
 ONEAVGMONTH: 2629800000, // 1/12 of ONEAVGYEAR
 ONEWEEK: 604800000, // 7 * ONEDAY
 ONEDAY: 86400000,
 ONEHOUR: 3600000,
 ONEMIN: 60000,
Expand Down

73 changes: 57 additions & 16 deletions
src/plots/cartesian/axes.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -24,7 +24,9 @@ var cleanTicks = require('./clean_ticks');

var constants = require('../../constants/numerical');
var ONEAVGYEAR = constants.ONEAVGYEAR;
var ONEAVGQUARTER = constants.ONEAVGQUARTER;
var ONEAVGMONTH = constants.ONEAVGMONTH;
var ONEWEEK = constants.ONEWEEK;
var ONEDAY = constants.ONEDAY;
var ONEHOUR = constants.ONEHOUR;
var ONEMIN = constants.ONEMIN;
Expand DownExpand Up@@ -695,23 +697,51 @@ axes.calcTicks = function calcTicks(ax, opts) {

 var definedDelta;
 if(isPeriod && ax.tickformat) {
 var _has = function(str) {
 return ax.tickformat.indexOf(str) !== -1;
 };

 if(
 !_has('%f') &&
 !_has('%H') &&
 !_has('%I') &&
 !_has('%L') &&
 !_has('%Q') &&
 !_has('%S') &&
 !_has('%s') &&
 !_has('%X')
 !(/%[fLQsSMHIpX]/.test(ax.tickformat))
 // %f: microseconds as a decimal number [000000, 999999]
 // %L: milliseconds as a decimal number [000, 999]
 // %Q: milliseconds since UNIX epoch
 // %s: seconds since UNIX epoch
 // %S: second as a decimal number [00,61]
 // %M: minute as a decimal number [00,59]
 // %H: hour (24-hour clock) as a decimal number [00,23]
 // %I: hour (12-hour clock) as a decimal number [01,12]
 // %p: either AM or PM
 // %X: the locale’s time, such as %-I:%M:%S %p
 ) {
 if(_has('%x') || _has('%d') || _has('%e') || _has('%j')) definedDelta = ONEDAY;
 else if(_has('%B') || _has('%b') || _has('%m')) definedDelta = ONEAVGMONTH;
 else if(_has('%Y') || _has('%y')) definedDelta = ONEAVGYEAR;
 if(
 /%[Aadejuwx]/.test(ax.tickformat)
 // %A: full weekday name
 // %a: abbreviated weekday name
 // %d: zero-padded day of the month as a decimal number [01,31]
 // %e: space-padded day of the month as a decimal number [ 1,31]
 // %j: day of the year as a decimal number [001,366]
 // %u: Monday-based (ISO 8601) weekday as a decimal number [1,7]
 // %w: Sunday-based weekday as a decimal number [0,6]
 // %x: the locale’s date, such as %-m/%-d/%Y
 ) definedDelta = ONEDAY;
 else if(
 /%[UVW]/.test(ax.tickformat)
 // %U: Sunday-based week of the year as a decimal number [00,53]
 // %V: ISO 8601 week of the year as a decimal number [01, 53]
 // %W: Monday-based week of the year as a decimal number [00,53]
 ) definedDelta = ONEWEEK;
 else if(
 /%[Bbm]/.test(ax.tickformat)
 // %B: full month name
 // %b: abbreviated month name
 // %m: month as a decimal number [01,12]
 ) definedDelta = ONEAVGMONTH;
 else if(
 /%[q]/.test(ax.tickformat)
 // %q: quarter of the year as a decimal number [1,4]
 ) definedDelta = ONEAVGQUARTER;
 else if(
 /%[Yy]/.test(ax.tickformat)
 // %Y: year with century as a decimal number, such as 1999
 // %y: year without century as a decimal number [00,99]
 ) definedDelta = ONEAVGYEAR;
 }
 }

Expand DownExpand Up@@ -748,8 +778,12 @@ axes.calcTicks = function calcTicks(ax, opts) {
 var delta = definedDelta || Math.abs(B - A);
 if(delta >= ONEDAY * 365) { // Years could have days less than ONEAVGYEAR period
 v += ONEAVGYEAR / 2;
 } else if(delta >= ONEAVGQUARTER) {
 v += ONEAVGQUARTER / 2;
 } else if(delta >= ONEDAY * 28) { // Months could have days less than ONEAVGMONTH period
 v += ONEAVGMONTH / 2;
 } else if(delta >= ONEWEEK) {
 v += ONEWEEK / 2;
 } else if(delta >= ONEDAY) {
 v += ONEDAY / 2;
 }
Expand All@@ -764,7 +798,7 @@ axes.calcTicks = function calcTicks(ax, opts) {
 }

 if(removedPreTick0Label) {
 for(i = 1; i < ticksOut.length; i++) {
 for(i = 0; i < ticksOut.length; i++) {
 if(ticksOut[i].periodX <= maxRange && ticksOut[i].periodX >= minRange) {
 // redo first visible tick
 ax._prevDateHead = '';
Expand DownExpand Up@@ -882,6 +916,13 @@ axes.autoTicks = function(ax, roughDTick) {
 // this will also move the base tick off 2000-01-01 if dtick is
 // 2 or 3 days... but that's a weird enough case that we'll ignore it.
 ax.tick0 = Lib.dateTick0(ax.calendar, true);

 if(/%[uVW]/.test(ax.tickformat)) {
 // replace Sunday with Monday for ISO and Monday-based formats
 var len = ax.tick0.length;
 var lastD = +ax.tick0[len - 1];
 ax.tick0 = ax.tick0.substring(0, len - 2) + String(lastD + 1);
 }
 } else if(roughX2 > ONEHOUR) {
 ax.dtick = roundDTick(roughDTick, ONEHOUR, roundBase24);
 } else if(roughX2 > ONEMIN) {
Expand Down

3 changes: 2 additions & 1 deletion
src/plots/cartesian/set_convert.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -23,6 +23,7 @@ var numConstants = require('../../constants/numerical');
var FP_SAFE = numConstants.FP_SAFE;
var BADNUM = numConstants.BADNUM;
var LOG_CLIP = numConstants.LOG_CLIP;
var ONEWEEK = numConstants.ONEWEEK;
var ONEDAY = numConstants.ONEDAY;
var ONEHOUR = numConstants.ONEHOUR;
var ONEMIN = numConstants.ONEMIN;
Expand DownExpand Up@@ -734,7 +735,7 @@ module.exports = function setConvert(ax, fullLayout) {

 switch(brk.pattern) {
 case WEEKDAY_PATTERN:
 step = 7 * ONEDAY;
 step = ONEWEEK;

 bndDelta = (
 (b1 < b0 ? 7 : 0) +
Expand Down
Binary file modifiedtest/image/baselines/date_axes_period.png

View file


Open in desktop

Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Strip utm_, fbclid, gclid, etc. from all links on page
(function() {
var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',
'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',
'ref', 'ref_src', 'source', 'medium', 'campaign'];
function cleanUrl(url) {
try {
var u = new URL(url, window.location.origin);
var changed = false;
trackingParams.forEach(function(p) {
if (u.searchParams.has(p)) {
u.searchParams.delete(p);
changed = true;
}
});
return changed ? u.toString() : url;
} catch (e) {
return url;
}
}
function cleanLinks() {
document.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
cleanLinks();
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1) {
if (node.tagName === 'A') cleanLinks();
node.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '
handle various time formats in ticklabelmode period by archmoj · Pull Request #5065 · plotly/plotly.js · GitHub
Skip to content
handle various time formats in ticklabelmode period#5065

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

archmoj
merged 14 commits into

from

Aug 13, 2020
 Merged


handle various time formats in ticklabelmode period
#5065
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


14 commits


Select commit
Hold shift + click to select a range
e220b65

handle various time formats in ticklabelmode period


archmoj Aug 11, 2020
9424347

move weekdays to ONEDAY bucket


archmoj Aug 12, 2020
cd53a6a

Merge remote-tracking branch 'origin/master' into new-formats-in-peri…


archmoj Aug 12, 2020
ca993b9

apply weekly and quarter offsets in periodic labels


archmoj Aug 12, 2020
4a87806

declare week and average quarter in milliseconds in numerical constants


archmoj Aug 12, 2020
c3e5181

update baseline


archmoj Aug 12, 2020
854c8c7

reuse constants for weeks and quarters


archmoj Aug 12, 2020
7b9391f

replace Sunday with Monday for ISO and Monday-based formats


archmoj Aug 12, 2020
e265f0d

replace multiple incexOf calls with a regex call


archmoj Aug 12, 2020
40c6df6

add jasmine tests for various tickformat using period mode


archmoj Aug 12, 2020
9399031

fix issue 5071


archmoj Aug 12, 2020
f0f078a

convert milliseconds to date strings in tests


archmoj Aug 12, 2020
90ee834

test label text based on different tick time formats


archmoj Aug 13, 2020
1c94ba9

merge assert functions


archmoj Aug 13, 2020

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


2 changes: 2 additions & 0 deletions
src/constants/numerical.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -32,7 +32,9 @@ module.exports = {
 * have the same length
 */
 ONEAVGYEAR: 31557600000, // 365.25 days
 ONEAVGQUARTER: 7889400000, // 1/4 of ONEAVGYEAR
 ONEAVGMONTH: 2629800000, // 1/12 of ONEAVGYEAR
 ONEWEEK: 604800000, // 7 * ONEDAY
 ONEDAY: 86400000,
 ONEHOUR: 3600000,
 ONEMIN: 60000,
Expand Down

73 changes: 57 additions & 16 deletions
src/plots/cartesian/axes.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -24,7 +24,9 @@ var cleanTicks = require('./clean_ticks');

var constants = require('../../constants/numerical');
var ONEAVGYEAR = constants.ONEAVGYEAR;
var ONEAVGQUARTER = constants.ONEAVGQUARTER;
var ONEAVGMONTH = constants.ONEAVGMONTH;
var ONEWEEK = constants.ONEWEEK;
var ONEDAY = constants.ONEDAY;
var ONEHOUR = constants.ONEHOUR;
var ONEMIN = constants.ONEMIN;
Expand DownExpand Up@@ -695,23 +697,51 @@ axes.calcTicks = function calcTicks(ax, opts) {

 var definedDelta;
 if(isPeriod && ax.tickformat) {
 var _has = function(str) {
 return ax.tickformat.indexOf(str) !== -1;
 };

 if(
 !_has('%f') &&
 !_has('%H') &&
 !_has('%I') &&
 !_has('%L') &&
 !_has('%Q') &&
 !_has('%S') &&
 !_has('%s') &&
 !_has('%X')
 !(/%[fLQsSMHIpX]/.test(ax.tickformat))
 // %f: microseconds as a decimal number [000000, 999999]
 // %L: milliseconds as a decimal number [000, 999]
 // %Q: milliseconds since UNIX epoch
 // %s: seconds since UNIX epoch
 // %S: second as a decimal number [00,61]
 // %M: minute as a decimal number [00,59]
 // %H: hour (24-hour clock) as a decimal number [00,23]
 // %I: hour (12-hour clock) as a decimal number [01,12]
 // %p: either AM or PM
 // %X: the locale’s time, such as %-I:%M:%S %p
 ) {
 if(_has('%x') || _has('%d') || _has('%e') || _has('%j')) definedDelta = ONEDAY;
 else if(_has('%B') || _has('%b') || _has('%m')) definedDelta = ONEAVGMONTH;
 else if(_has('%Y') || _has('%y')) definedDelta = ONEAVGYEAR;
 if(
 /%[Aadejuwx]/.test(ax.tickformat)
 // %A: full weekday name
 // %a: abbreviated weekday name
 // %d: zero-padded day of the month as a decimal number [01,31]
 // %e: space-padded day of the month as a decimal number [ 1,31]
 // %j: day of the year as a decimal number [001,366]
 // %u: Monday-based (ISO 8601) weekday as a decimal number [1,7]
 // %w: Sunday-based weekday as a decimal number [0,6]
 // %x: the locale’s date, such as %-m/%-d/%Y
 ) definedDelta = ONEDAY;
 else if(
 /%[UVW]/.test(ax.tickformat)
 // %U: Sunday-based week of the year as a decimal number [00,53]
 // %V: ISO 8601 week of the year as a decimal number [01, 53]
 // %W: Monday-based week of the year as a decimal number [00,53]
 ) definedDelta = ONEWEEK;
 else if(
 /%[Bbm]/.test(ax.tickformat)
 // %B: full month name
 // %b: abbreviated month name
 // %m: month as a decimal number [01,12]
 ) definedDelta = ONEAVGMONTH;
 else if(
 /%[q]/.test(ax.tickformat)
 // %q: quarter of the year as a decimal number [1,4]
 ) definedDelta = ONEAVGQUARTER;
 else if(
 /%[Yy]/.test(ax.tickformat)
 // %Y: year with century as a decimal number, such as 1999
 // %y: year without century as a decimal number [00,99]
 ) definedDelta = ONEAVGYEAR;
 }
 }

Expand DownExpand Up@@ -748,8 +778,12 @@ axes.calcTicks = function calcTicks(ax, opts) {
 var delta = definedDelta || Math.abs(B - A);
 if(delta >= ONEDAY * 365) { // Years could have days less than ONEAVGYEAR period
 v += ONEAVGYEAR / 2;
 } else if(delta >= ONEAVGQUARTER) {
 v += ONEAVGQUARTER / 2;
 } else if(delta >= ONEDAY * 28) { // Months could have days less than ONEAVGMONTH period
 v += ONEAVGMONTH / 2;
 } else if(delta >= ONEWEEK) {
 v += ONEWEEK / 2;
 } else if(delta >= ONEDAY) {
 v += ONEDAY / 2;
 }
Expand All@@ -764,7 +798,7 @@ axes.calcTicks = function calcTicks(ax, opts) {
 }

 if(removedPreTick0Label) {
 for(i = 1; i < ticksOut.length; i++) {
 for(i = 0; i < ticksOut.length; i++) {
 if(ticksOut[i].periodX <= maxRange && ticksOut[i].periodX >= minRange) {
 // redo first visible tick
 ax._prevDateHead = '';
Expand DownExpand Up@@ -882,6 +916,13 @@ axes.autoTicks = function(ax, roughDTick) {
 // this will also move the base tick off 2000-01-01 if dtick is
 // 2 or 3 days... but that's a weird enough case that we'll ignore it.
 ax.tick0 = Lib.dateTick0(ax.calendar, true);

 if(/%[uVW]/.test(ax.tickformat)) {
 // replace Sunday with Monday for ISO and Monday-based formats
 var len = ax.tick0.length;
 var lastD = +ax.tick0[len - 1];
 ax.tick0 = ax.tick0.substring(0, len - 2) + String(lastD + 1);
 }
 } else if(roughX2 > ONEHOUR) {
 ax.dtick = roundDTick(roughDTick, ONEHOUR, roundBase24);
 } else if(roughX2 > ONEMIN) {
Expand Down

3 changes: 2 additions & 1 deletion
src/plots/cartesian/set_convert.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -23,6 +23,7 @@ var numConstants = require('../../constants/numerical');
var FP_SAFE = numConstants.FP_SAFE;
var BADNUM = numConstants.BADNUM;
var LOG_CLIP = numConstants.LOG_CLIP;
var ONEWEEK = numConstants.ONEWEEK;
var ONEDAY = numConstants.ONEDAY;
var ONEHOUR = numConstants.ONEHOUR;
var ONEMIN = numConstants.ONEMIN;
Expand DownExpand Up@@ -734,7 +735,7 @@ module.exports = function setConvert(ax, fullLayout) {

 switch(brk.pattern) {
 case WEEKDAY_PATTERN:
 step = 7 * ONEDAY;
 step = ONEWEEK;

 bndDelta = (
 (b1 < b0 ? 7 : 0) +
Expand Down
Binary file modifiedtest/image/baselines/date_axes_period.png

View file


Open in desktop

Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Auto-enable theater mode on YouTube
(function() {
function tryTheater() {
var btn = document.querySelector('button[aria-label="Theater mode"], ytd-player #player button[title="Theater mode"]');
if (btn && !btn.classList.contains('activated')) {
btn.click();
}
}
// Try immediately
tryTheater();
// Try after navigation (SPA)
var lastUrl = location.href;
setInterval(function() {
if (location.href !== lastUrl) {
lastUrl = location.href;
setTimeout(tryTheater, 500);
}
}, 1000);
// Also try on player load
var observer = new MutationObserver(tryTheater);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
handle various time formats in ticklabelmode period by archmoj · Pull Request #5065 · plotly/plotly.js · GitHub
Skip to content
handle various time formats in ticklabelmode period#5065

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

archmoj
merged 14 commits into

from

Aug 13, 2020
 Merged


handle various time formats in ticklabelmode period
#5065
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


14 commits


Select commit
Hold shift + click to select a range
e220b65

handle various time formats in ticklabelmode period


archmoj Aug 11, 2020
9424347

move weekdays to ONEDAY bucket


archmoj Aug 12, 2020
cd53a6a

Merge remote-tracking branch 'origin/master' into new-formats-in-peri…


archmoj Aug 12, 2020
ca993b9

apply weekly and quarter offsets in periodic labels


archmoj Aug 12, 2020
4a87806

declare week and average quarter in milliseconds in numerical constants


archmoj Aug 12, 2020
c3e5181

update baseline


archmoj Aug 12, 2020
854c8c7

reuse constants for weeks and quarters


archmoj Aug 12, 2020
7b9391f

replace Sunday with Monday for ISO and Monday-based formats


archmoj Aug 12, 2020
e265f0d

replace multiple incexOf calls with a regex call


archmoj Aug 12, 2020
40c6df6

add jasmine tests for various tickformat using period mode


archmoj Aug 12, 2020
9399031

fix issue 5071


archmoj Aug 12, 2020
f0f078a

convert milliseconds to date strings in tests


archmoj Aug 12, 2020
90ee834

test label text based on different tick time formats


archmoj Aug 13, 2020
1c94ba9

merge assert functions


archmoj Aug 13, 2020

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


2 changes: 2 additions & 0 deletions
src/constants/numerical.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -32,7 +32,9 @@ module.exports = {
 * have the same length
 */
 ONEAVGYEAR: 31557600000, // 365.25 days
 ONEAVGQUARTER: 7889400000, // 1/4 of ONEAVGYEAR
 ONEAVGMONTH: 2629800000, // 1/12 of ONEAVGYEAR
 ONEWEEK: 604800000, // 7 * ONEDAY
 ONEDAY: 86400000,
 ONEHOUR: 3600000,
 ONEMIN: 60000,
Expand Down

73 changes: 57 additions & 16 deletions
src/plots/cartesian/axes.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -24,7 +24,9 @@ var cleanTicks = require('./clean_ticks');

var constants = require('../../constants/numerical');
var ONEAVGYEAR = constants.ONEAVGYEAR;
var ONEAVGQUARTER = constants.ONEAVGQUARTER;
var ONEAVGMONTH = constants.ONEAVGMONTH;
var ONEWEEK = constants.ONEWEEK;
var ONEDAY = constants.ONEDAY;
var ONEHOUR = constants.ONEHOUR;
var ONEMIN = constants.ONEMIN;
Expand DownExpand Up@@ -695,23 +697,51 @@ axes.calcTicks = function calcTicks(ax, opts) {

 var definedDelta;
 if(isPeriod && ax.tickformat) {
 var _has = function(str) {
 return ax.tickformat.indexOf(str) !== -1;
 };

 if(
 !_has('%f') &&
 !_has('%H') &&
 !_has('%I') &&
 !_has('%L') &&
 !_has('%Q') &&
 !_has('%S') &&
 !_has('%s') &&
 !_has('%X')
 !(/%[fLQsSMHIpX]/.test(ax.tickformat))
 // %f: microseconds as a decimal number [000000, 999999]
 // %L: milliseconds as a decimal number [000, 999]
 // %Q: milliseconds since UNIX epoch
 // %s: seconds since UNIX epoch
 // %S: second as a decimal number [00,61]
 // %M: minute as a decimal number [00,59]
 // %H: hour (24-hour clock) as a decimal number [00,23]
 // %I: hour (12-hour clock) as a decimal number [01,12]
 // %p: either AM or PM
 // %X: the locale’s time, such as %-I:%M:%S %p
 ) {
 if(_has('%x') || _has('%d') || _has('%e') || _has('%j')) definedDelta = ONEDAY;
 else if(_has('%B') || _has('%b') || _has('%m')) definedDelta = ONEAVGMONTH;
 else if(_has('%Y') || _has('%y')) definedDelta = ONEAVGYEAR;
 if(
 /%[Aadejuwx]/.test(ax.tickformat)
 // %A: full weekday name
 // %a: abbreviated weekday name
 // %d: zero-padded day of the month as a decimal number [01,31]
 // %e: space-padded day of the month as a decimal number [ 1,31]
 // %j: day of the year as a decimal number [001,366]
 // %u: Monday-based (ISO 8601) weekday as a decimal number [1,7]
 // %w: Sunday-based weekday as a decimal number [0,6]
 // %x: the locale’s date, such as %-m/%-d/%Y
 ) definedDelta = ONEDAY;
 else if(
 /%[UVW]/.test(ax.tickformat)
 // %U: Sunday-based week of the year as a decimal number [00,53]
 // %V: ISO 8601 week of the year as a decimal number [01, 53]
 // %W: Monday-based week of the year as a decimal number [00,53]
 ) definedDelta = ONEWEEK;
 else if(
 /%[Bbm]/.test(ax.tickformat)
 // %B: full month name
 // %b: abbreviated month name
 // %m: month as a decimal number [01,12]
 ) definedDelta = ONEAVGMONTH;
 else if(
 /%[q]/.test(ax.tickformat)
 // %q: quarter of the year as a decimal number [1,4]
 ) definedDelta = ONEAVGQUARTER;
 else if(
 /%[Yy]/.test(ax.tickformat)
 // %Y: year with century as a decimal number, such as 1999
 // %y: year without century as a decimal number [00,99]
 ) definedDelta = ONEAVGYEAR;
 }
 }

Expand DownExpand Up@@ -748,8 +778,12 @@ axes.calcTicks = function calcTicks(ax, opts) {
 var delta = definedDelta || Math.abs(B - A);
 if(delta >= ONEDAY * 365) { // Years could have days less than ONEAVGYEAR period
 v += ONEAVGYEAR / 2;
 } else if(delta >= ONEAVGQUARTER) {
 v += ONEAVGQUARTER / 2;
 } else if(delta >= ONEDAY * 28) { // Months could have days less than ONEAVGMONTH period
 v += ONEAVGMONTH / 2;
 } else if(delta >= ONEWEEK) {
 v += ONEWEEK / 2;
 } else if(delta >= ONEDAY) {
 v += ONEDAY / 2;
 }
Expand All@@ -764,7 +798,7 @@ axes.calcTicks = function calcTicks(ax, opts) {
 }

 if(removedPreTick0Label) {
 for(i = 1; i < ticksOut.length; i++) {
 for(i = 0; i < ticksOut.length; i++) {
 if(ticksOut[i].periodX <= maxRange && ticksOut[i].periodX >= minRange) {
 // redo first visible tick
 ax._prevDateHead = '';
Expand DownExpand Up@@ -882,6 +916,13 @@ axes.autoTicks = function(ax, roughDTick) {
 // this will also move the base tick off 2000-01-01 if dtick is
 // 2 or 3 days... but that's a weird enough case that we'll ignore it.
 ax.tick0 = Lib.dateTick0(ax.calendar, true);

 if(/%[uVW]/.test(ax.tickformat)) {
 // replace Sunday with Monday for ISO and Monday-based formats
 var len = ax.tick0.length;
 var lastD = +ax.tick0[len - 1];
 ax.tick0 = ax.tick0.substring(0, len - 2) + String(lastD + 1);
 }
 } else if(roughX2 > ONEHOUR) {
 ax.dtick = roundDTick(roughDTick, ONEHOUR, roundBase24);
 } else if(roughX2 > ONEMIN) {
Expand Down

3 changes: 2 additions & 1 deletion
src/plots/cartesian/set_convert.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -23,6 +23,7 @@ var numConstants = require('../../constants/numerical');
var FP_SAFE = numConstants.FP_SAFE;
var BADNUM = numConstants.BADNUM;
var LOG_CLIP = numConstants.LOG_CLIP;
var ONEWEEK = numConstants.ONEWEEK;
var ONEDAY = numConstants.ONEDAY;
var ONEHOUR = numConstants.ONEHOUR;
var ONEMIN = numConstants.ONEMIN;
Expand DownExpand Up@@ -734,7 +735,7 @@ module.exports = function setConvert(ax, fullLayout) {

 switch(brk.pattern) {
 case WEEKDAY_PATTERN:
 step = 7 * ONEDAY;
 step = ONEWEEK;

 bndDelta = (
 (b1 < b0 ? 7 : 0) +
Expand Down
Binary file modifiedtest/image/baselines/date_axes_period.png

View file


Open in desktop

Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Remove or un-stick sticky/fixed headers that block content
(function() {
function unstick() {
document.querySelectorAll('header, nav, [role="banner"], .header, .navbar, .sticky, .fixed-top, [style*="position: fixed"], [style*="position:sticky"]').forEach(function(el) {
if (el.style.position === 'fixed' || el.style.position === 'sticky' || getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {
el.style.position = 'static';
el.style.top = 'auto';
el.style.zIndex = 'auto';
}
});
}
unstick();
var observer = new MutationObserver(unstick);
observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });
})();
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
handle various time formats in ticklabelmode period by archmoj · Pull Request #5065 · plotly/plotly.js · GitHub
Skip to content
handle various time formats in ticklabelmode period#5065

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

archmoj
merged 14 commits into

from

Aug 13, 2020
 Merged


handle various time formats in ticklabelmode period
#5065
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


14 commits


Select commit
Hold shift + click to select a range
e220b65

handle various time formats in ticklabelmode period


archmoj Aug 11, 2020
9424347

move weekdays to ONEDAY bucket


archmoj Aug 12, 2020
cd53a6a

Merge remote-tracking branch 'origin/master' into new-formats-in-peri…


archmoj Aug 12, 2020
ca993b9

apply weekly and quarter offsets in periodic labels


archmoj Aug 12, 2020
4a87806

declare week and average quarter in milliseconds in numerical constants


archmoj Aug 12, 2020
c3e5181

update baseline


archmoj Aug 12, 2020
854c8c7

reuse constants for weeks and quarters


archmoj Aug 12, 2020
7b9391f

replace Sunday with Monday for ISO and Monday-based formats


archmoj Aug 12, 2020
e265f0d

replace multiple incexOf calls with a regex call


archmoj Aug 12, 2020
40c6df6

add jasmine tests for various tickformat using period mode


archmoj Aug 12, 2020
9399031

fix issue 5071


archmoj Aug 12, 2020
f0f078a

convert milliseconds to date strings in tests


archmoj Aug 12, 2020
90ee834

test label text based on different tick time formats


archmoj Aug 13, 2020
1c94ba9

merge assert functions


archmoj Aug 13, 2020

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


2 changes: 2 additions & 0 deletions
src/constants/numerical.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -32,7 +32,9 @@ module.exports = {
 * have the same length
 */
 ONEAVGYEAR: 31557600000, // 365.25 days
 ONEAVGQUARTER: 7889400000, // 1/4 of ONEAVGYEAR
 ONEAVGMONTH: 2629800000, // 1/12 of ONEAVGYEAR
 ONEWEEK: 604800000, // 7 * ONEDAY
 ONEDAY: 86400000,
 ONEHOUR: 3600000,
 ONEMIN: 60000,
Expand Down

73 changes: 57 additions & 16 deletions
src/plots/cartesian/axes.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -24,7 +24,9 @@ var cleanTicks = require('./clean_ticks');

var constants = require('../../constants/numerical');
var ONEAVGYEAR = constants.ONEAVGYEAR;
var ONEAVGQUARTER = constants.ONEAVGQUARTER;
var ONEAVGMONTH = constants.ONEAVGMONTH;
var ONEWEEK = constants.ONEWEEK;
var ONEDAY = constants.ONEDAY;
var ONEHOUR = constants.ONEHOUR;
var ONEMIN = constants.ONEMIN;
Expand DownExpand Up@@ -695,23 +697,51 @@ axes.calcTicks = function calcTicks(ax, opts) {

 var definedDelta;
 if(isPeriod && ax.tickformat) {
 var _has = function(str) {
 return ax.tickformat.indexOf(str) !== -1;
 };

 if(
 !_has('%f') &&
 !_has('%H') &&
 !_has('%I') &&
 !_has('%L') &&
 !_has('%Q') &&
 !_has('%S') &&
 !_has('%s') &&
 !_has('%X')
 !(/%[fLQsSMHIpX]/.test(ax.tickformat))
 // %f: microseconds as a decimal number [000000, 999999]
 // %L: milliseconds as a decimal number [000, 999]
 // %Q: milliseconds since UNIX epoch
 // %s: seconds since UNIX epoch
 // %S: second as a decimal number [00,61]
 // %M: minute as a decimal number [00,59]
 // %H: hour (24-hour clock) as a decimal number [00,23]
 // %I: hour (12-hour clock) as a decimal number [01,12]
 // %p: either AM or PM
 // %X: the locale’s time, such as %-I:%M:%S %p
 ) {
 if(_has('%x') || _has('%d') || _has('%e') || _has('%j')) definedDelta = ONEDAY;
 else if(_has('%B') || _has('%b') || _has('%m')) definedDelta = ONEAVGMONTH;
 else if(_has('%Y') || _has('%y')) definedDelta = ONEAVGYEAR;
 if(
 /%[Aadejuwx]/.test(ax.tickformat)
 // %A: full weekday name
 // %a: abbreviated weekday name
 // %d: zero-padded day of the month as a decimal number [01,31]
 // %e: space-padded day of the month as a decimal number [ 1,31]
 // %j: day of the year as a decimal number [001,366]
 // %u: Monday-based (ISO 8601) weekday as a decimal number [1,7]
 // %w: Sunday-based weekday as a decimal number [0,6]
 // %x: the locale’s date, such as %-m/%-d/%Y
 ) definedDelta = ONEDAY;
 else if(
 /%[UVW]/.test(ax.tickformat)
 // %U: Sunday-based week of the year as a decimal number [00,53]
 // %V: ISO 8601 week of the year as a decimal number [01, 53]
 // %W: Monday-based week of the year as a decimal number [00,53]
 ) definedDelta = ONEWEEK;
 else if(
 /%[Bbm]/.test(ax.tickformat)
 // %B: full month name
 // %b: abbreviated month name
 // %m: month as a decimal number [01,12]
 ) definedDelta = ONEAVGMONTH;
 else if(
 /%[q]/.test(ax.tickformat)
 // %q: quarter of the year as a decimal number [1,4]
 ) definedDelta = ONEAVGQUARTER;
 else if(
 /%[Yy]/.test(ax.tickformat)
 // %Y: year with century as a decimal number, such as 1999
 // %y: year without century as a decimal number [00,99]
 ) definedDelta = ONEAVGYEAR;
 }
 }

Expand DownExpand Up@@ -748,8 +778,12 @@ axes.calcTicks = function calcTicks(ax, opts) {
 var delta = definedDelta || Math.abs(B - A);
 if(delta >= ONEDAY * 365) { // Years could have days less than ONEAVGYEAR period
 v += ONEAVGYEAR / 2;
 } else if(delta >= ONEAVGQUARTER) {
 v += ONEAVGQUARTER / 2;
 } else if(delta >= ONEDAY * 28) { // Months could have days less than ONEAVGMONTH period
 v += ONEAVGMONTH / 2;
 } else if(delta >= ONEWEEK) {
 v += ONEWEEK / 2;
 } else if(delta >= ONEDAY) {
 v += ONEDAY / 2;
 }
Expand All@@ -764,7 +798,7 @@ axes.calcTicks = function calcTicks(ax, opts) {
 }

 if(removedPreTick0Label) {
 for(i = 1; i < ticksOut.length; i++) {
 for(i = 0; i < ticksOut.length; i++) {
 if(ticksOut[i].periodX <= maxRange && ticksOut[i].periodX >= minRange) {
 // redo first visible tick
 ax._prevDateHead = '';
Expand DownExpand Up@@ -882,6 +916,13 @@ axes.autoTicks = function(ax, roughDTick) {
 // this will also move the base tick off 2000-01-01 if dtick is
 // 2 or 3 days... but that's a weird enough case that we'll ignore it.
 ax.tick0 = Lib.dateTick0(ax.calendar, true);

 if(/%[uVW]/.test(ax.tickformat)) {
 // replace Sunday with Monday for ISO and Monday-based formats
 var len = ax.tick0.length;
 var lastD = +ax.tick0[len - 1];
 ax.tick0 = ax.tick0.substring(0, len - 2) + String(lastD + 1);
 }
 } else if(roughX2 > ONEHOUR) {
 ax.dtick = roundDTick(roughDTick, ONEHOUR, roundBase24);
 } else if(roughX2 > ONEMIN) {
Expand Down

3 changes: 2 additions & 1 deletion
src/plots/cartesian/set_convert.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -23,6 +23,7 @@ var numConstants = require('../../constants/numerical');
var FP_SAFE = numConstants.FP_SAFE;
var BADNUM = numConstants.BADNUM;
var LOG_CLIP = numConstants.LOG_CLIP;
var ONEWEEK = numConstants.ONEWEEK;
var ONEDAY = numConstants.ONEDAY;
var ONEHOUR = numConstants.ONEHOUR;
var ONEMIN = numConstants.ONEMIN;
Expand DownExpand Up@@ -734,7 +735,7 @@ module.exports = function setConvert(ax, fullLayout) {

 switch(brk.pattern) {
 case WEEKDAY_PATTERN:
 step = 7 * ONEDAY;
 step = ONEWEEK;

 bndDelta = (
 (b1 < b0 ? 7 : 0) +
Expand Down
Binary file modifiedtest/image/baselines/date_axes_period.png

View file


Open in desktop

Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Universal Dark Mode - works on any site
(function() {
var enabled = true;
function applyDarkMode() {
if (!enabled) return;
// Create style element if it doesn't exist
var style = document.getElementById('universal-dark-mode-style');
if (!style) {
style = document.createElement('style');
style.id = 'universal-dark-mode-style';
document.head.appendChild(style);
}
// Dark mode CSS - inverts colors but preserves images/video
style.textContent = '
/* Invert everything except media */
html {
filter: invert(1) hue-rotate(180deg) !important;
background: #1a1a2e !important;
}
/* Restore images, videos, iframes, canvas */
img, video, iframe, canvas, svg, picture, [style*="background-image"] {
filter: invert(1) hue-rotate(180deg) !important;
}
/* Preserve specific elements that should not be inverted */
.no-dark-mode, .no-dark-mode *,
[data-theme="light"], [data-theme="light"],
.ace_editor, .ace_editor *,
.CodeMirror, .CodeMirror *,
.monaco-editor, .monaco-editor *,
.markdown-body pre, .markdown-body pre *,
.highlight, .highlight *,
pre code, pre code * {
filter: none !important;
}
/* Fix common UI elements */
.modal, .popup, .dropdown-menu, .tooltip, .popover {
filter: invert(1) hue-rotate(180deg) !important;
background: #2d2d44 !important;
border-color: #444 !important;
}
/* Scrollbars */
::-webkit-scrollbar { background: #1a1a2e !important; }
::-webkit-scrollbar-thumb { background: #444 !important; }
::-webkit-scrollbar-thumb:hover { background: #555 !important; }
/* Selection */
::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }
::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }
';
}
function removeDarkMode() {
var style = document.getElementById('universal-dark-mode-style');
if (style) style.remove();
}
// Toggle with Alt+Shift+D
document.addEventListener('keydown', function(e) {
if (e.altKey && e.shiftKey && e.key === 'D') {
e.preventDefault();
enabled = !enabled;
if (enabled) {
applyDarkMode();
console.log('[Universal Dark Mode] Enabled');
} else {
removeDarkMode();
console.log('[Universal Dark Mode] Disabled');
}
}
});
// Apply on load
applyDarkMode();
// Re-apply on dynamic content
var observer = new MutationObserver(function(mutations) {
if (enabled && !document.getElementById('universal-dark-mode-style')) {
applyDarkMode();
}
});
observer.observe(document.head, { childList: true });
console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');
})();
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();
handle various time formats in ticklabelmode period by archmoj · Pull Request #5065 · plotly/plotly.js · GitHub
Skip to content
handle various time formats in ticklabelmode period#5065

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

archmoj
merged 14 commits into

from

Aug 13, 2020
 Merged


handle various time formats in ticklabelmode period
#5065
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


14 commits


Select commit
Hold shift + click to select a range
e220b65

handle various time formats in ticklabelmode period


archmoj Aug 11, 2020
9424347

move weekdays to ONEDAY bucket


archmoj Aug 12, 2020
cd53a6a

Merge remote-tracking branch 'origin/master' into new-formats-in-peri…


archmoj Aug 12, 2020
ca993b9

apply weekly and quarter offsets in periodic labels


archmoj Aug 12, 2020
4a87806

declare week and average quarter in milliseconds in numerical constants


archmoj Aug 12, 2020
c3e5181

update baseline


archmoj Aug 12, 2020
854c8c7

reuse constants for weeks and quarters


archmoj Aug 12, 2020
7b9391f

replace Sunday with Monday for ISO and Monday-based formats


archmoj Aug 12, 2020
e265f0d

replace multiple incexOf calls with a regex call


archmoj Aug 12, 2020
40c6df6

add jasmine tests for various tickformat using period mode


archmoj Aug 12, 2020
9399031

fix issue 5071


archmoj Aug 12, 2020
f0f078a

convert milliseconds to date strings in tests


archmoj Aug 12, 2020
90ee834

test label text based on different tick time formats


archmoj Aug 13, 2020
1c94ba9

merge assert functions


archmoj Aug 13, 2020

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


2 changes: 2 additions & 0 deletions
src/constants/numerical.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -32,7 +32,9 @@ module.exports = {
 * have the same length
 */
 ONEAVGYEAR: 31557600000, // 365.25 days
 ONEAVGQUARTER: 7889400000, // 1/4 of ONEAVGYEAR
 ONEAVGMONTH: 2629800000, // 1/12 of ONEAVGYEAR
 ONEWEEK: 604800000, // 7 * ONEDAY
 ONEDAY: 86400000,
 ONEHOUR: 3600000,
 ONEMIN: 60000,
Expand Down

73 changes: 57 additions & 16 deletions
src/plots/cartesian/axes.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -24,7 +24,9 @@ var cleanTicks = require('./clean_ticks');

var constants = require('../../constants/numerical');
var ONEAVGYEAR = constants.ONEAVGYEAR;
var ONEAVGQUARTER = constants.ONEAVGQUARTER;
var ONEAVGMONTH = constants.ONEAVGMONTH;
var ONEWEEK = constants.ONEWEEK;
var ONEDAY = constants.ONEDAY;
var ONEHOUR = constants.ONEHOUR;
var ONEMIN = constants.ONEMIN;
Expand DownExpand Up@@ -695,23 +697,51 @@ axes.calcTicks = function calcTicks(ax, opts) {

 var definedDelta;
 if(isPeriod && ax.tickformat) {
 var _has = function(str) {
 return ax.tickformat.indexOf(str) !== -1;
 };

 if(
 !_has('%f') &&
 !_has('%H') &&
 !_has('%I') &&
 !_has('%L') &&
 !_has('%Q') &&
 !_has('%S') &&
 !_has('%s') &&
 !_has('%X')
 !(/%[fLQsSMHIpX]/.test(ax.tickformat))
 // %f: microseconds as a decimal number [000000, 999999]
 // %L: milliseconds as a decimal number [000, 999]
 // %Q: milliseconds since UNIX epoch
 // %s: seconds since UNIX epoch
 // %S: second as a decimal number [00,61]
 // %M: minute as a decimal number [00,59]
 // %H: hour (24-hour clock) as a decimal number [00,23]
 // %I: hour (12-hour clock) as a decimal number [01,12]
 // %p: either AM or PM
 // %X: the locale’s time, such as %-I:%M:%S %p
 ) {
 if(_has('%x') || _has('%d') || _has('%e') || _has('%j')) definedDelta = ONEDAY;
 else if(_has('%B') || _has('%b') || _has('%m')) definedDelta = ONEAVGMONTH;
 else if(_has('%Y') || _has('%y')) definedDelta = ONEAVGYEAR;
 if(
 /%[Aadejuwx]/.test(ax.tickformat)
 // %A: full weekday name
 // %a: abbreviated weekday name
 // %d: zero-padded day of the month as a decimal number [01,31]
 // %e: space-padded day of the month as a decimal number [ 1,31]
 // %j: day of the year as a decimal number [001,366]
 // %u: Monday-based (ISO 8601) weekday as a decimal number [1,7]
 // %w: Sunday-based weekday as a decimal number [0,6]
 // %x: the locale’s date, such as %-m/%-d/%Y
 ) definedDelta = ONEDAY;
 else if(
 /%[UVW]/.test(ax.tickformat)
 // %U: Sunday-based week of the year as a decimal number [00,53]
 // %V: ISO 8601 week of the year as a decimal number [01, 53]
 // %W: Monday-based week of the year as a decimal number [00,53]
 ) definedDelta = ONEWEEK;
 else if(
 /%[Bbm]/.test(ax.tickformat)
 // %B: full month name
 // %b: abbreviated month name
 // %m: month as a decimal number [01,12]
 ) definedDelta = ONEAVGMONTH;
 else if(
 /%[q]/.test(ax.tickformat)
 // %q: quarter of the year as a decimal number [1,4]
 ) definedDelta = ONEAVGQUARTER;
 else if(
 /%[Yy]/.test(ax.tickformat)
 // %Y: year with century as a decimal number, such as 1999
 // %y: year without century as a decimal number [00,99]
 ) definedDelta = ONEAVGYEAR;
 }
 }

Expand DownExpand Up@@ -748,8 +778,12 @@ axes.calcTicks = function calcTicks(ax, opts) {
 var delta = definedDelta || Math.abs(B - A);
 if(delta >= ONEDAY * 365) { // Years could have days less than ONEAVGYEAR period
 v += ONEAVGYEAR / 2;
 } else if(delta >= ONEAVGQUARTER) {
 v += ONEAVGQUARTER / 2;
 } else if(delta >= ONEDAY * 28) { // Months could have days less than ONEAVGMONTH period
 v += ONEAVGMONTH / 2;
 } else if(delta >= ONEWEEK) {
 v += ONEWEEK / 2;
 } else if(delta >= ONEDAY) {
 v += ONEDAY / 2;
 }
Expand All@@ -764,7 +798,7 @@ axes.calcTicks = function calcTicks(ax, opts) {
 }

 if(removedPreTick0Label) {
 for(i = 1; i < ticksOut.length; i++) {
 for(i = 0; i < ticksOut.length; i++) {
 if(ticksOut[i].periodX <= maxRange && ticksOut[i].periodX >= minRange) {
 // redo first visible tick
 ax._prevDateHead = '';
Expand DownExpand Up@@ -882,6 +916,13 @@ axes.autoTicks = function(ax, roughDTick) {
 // this will also move the base tick off 2000-01-01 if dtick is
 // 2 or 3 days... but that's a weird enough case that we'll ignore it.
 ax.tick0 = Lib.dateTick0(ax.calendar, true);

 if(/%[uVW]/.test(ax.tickformat)) {
 // replace Sunday with Monday for ISO and Monday-based formats
 var len = ax.tick0.length;
 var lastD = +ax.tick0[len - 1];
 ax.tick0 = ax.tick0.substring(0, len - 2) + String(lastD + 1);
 }
 } else if(roughX2 > ONEHOUR) {
 ax.dtick = roundDTick(roughDTick, ONEHOUR, roundBase24);
 } else if(roughX2 > ONEMIN) {
Expand Down

3 changes: 2 additions & 1 deletion
src/plots/cartesian/set_convert.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -23,6 +23,7 @@ var numConstants = require('../../constants/numerical');
var FP_SAFE = numConstants.FP_SAFE;
var BADNUM = numConstants.BADNUM;
var LOG_CLIP = numConstants.LOG_CLIP;
var ONEWEEK = numConstants.ONEWEEK;
var ONEDAY = numConstants.ONEDAY;
var ONEHOUR = numConstants.ONEHOUR;
var ONEMIN = numConstants.ONEMIN;
Expand DownExpand Up@@ -734,7 +735,7 @@ module.exports = function setConvert(ax, fullLayout) {

 switch(brk.pattern) {
 case WEEKDAY_PATTERN:
 step = 7 * ONEDAY;
 step = ONEWEEK;

 bndDelta = (
 (b1 < b0 ? 7 : 0) +
Expand Down
Binary file modifiedtest/image/baselines/date_axes_period.png

View file


Open in desktop

Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading