Skip to content

Commit 158a59c

Browse files
committed
simplify tozero logic and correct two baselines
1 parent cb43197 commit 158a59c

File tree

3 files changed

+8
-13
lines changed

3 files changed

+8
-13
lines changed

src/traces/bar/cross_trace_calc.js

+8-13
Original file line numberDiff line numberDiff line change
@@ -501,8 +501,7 @@ function setBaseAndTop(sa, sieve) {
501501
var calcTrace = calcTraces[i];
502502
var fullTrace = calcTrace[0].trace;
503503
var pts = [];
504-
var allBaseAboveZero = true;
505-
var allBaseBelowZero = true;
504+
var tozero = false;
506505

507506
for(var j = 0; j < calcTrace.length; j++) {
508507
var bar = calcTrace[j];
@@ -513,17 +512,13 @@ function setBaseAndTop(sa, sieve) {
513512
pts.push(top);
514513
if(bar.hasB) pts.push(base);
515514

516-
if(!bar.hasB || !(bar.b > 0 && bar.b + bar.s > 0)) {
517-
allBaseAboveZero = false;
518-
}
519-
520-
if(!bar.hasB || !(bar.b < 0 && bar.b + bar.s < 0)) {
521-
allBaseBelowZero = false;
515+
if(!bar.hasB || !bar.b) {
516+
tozero = true;
522517
}
523518
}
524519

525520
fullTrace._extremes[sa._id] = Axes.findExtremes(sa, pts, {
526-
tozero: !(allBaseAboveZero || allBaseBelowZero),
521+
tozero: tozero,
527522
padded: true
528523
});
529524
}
@@ -672,7 +667,7 @@ function normalizeBars(sa, sieve, opts) {
672667
var calcTrace = calcTraces[i];
673668
var fullTrace = calcTrace[0].trace;
674669
var pts = [];
675-
var allBaseAboveZero = true;
670+
var tozero = false;
676671
var padded = false;
677672

678673
for(var j = 0; j < calcTrace.length; j++) {
@@ -695,14 +690,14 @@ function normalizeBars(sa, sieve, opts) {
695690
padded = padded || needsPadding(base);
696691
}
697692

698-
if(!bar.hasB || !(bar.b > 0 && bar.s > 0)) {
699-
allBaseAboveZero = false;
693+
if(!bar.hasB || !bar.b) {
694+
tozero = true;
700695
}
701696
}
702697
}
703698

704699
fullTrace._extremes[sa._id] = Axes.findExtremes(sa, pts, {
705-
tozero: !allBaseAboveZero,
700+
tozero: tozero,
706701
padded: padded
707702
});
708703
}
-55 Bytes
Loading
-98 Bytes
Loading

0 commit comments

Comments
 (0)