Skip to content

Commit 01c5f68

Browse files
archmojarchmoj
committed
use onPathbar everywhere referring to points on pathbar - this make lookup code readable and similar to sunburst
1 parent 14674d6 commit 01c5f68

File tree

5 files changed

+43
-43
lines changed

5 files changed

+43
-43
lines changed

‎src/traces/sunburst/fx.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ module.exports = function attachFxHandlers(sliceTop, entry, gd, cd, opts) {
118118
if(ref1 && getVal(ref1)) {
119119
hoverPt.percentEntry = pt.percentEntry = val / getVal(ref1);
120120
hoverPt.entry = pt.entry = helpers.getLabelString(ref1.data.data.label);
121-
if(hasFlag('percent entry') && !isRoot && !pt._onPathbar) {
121+
if(hasFlag('percent entry') && !isRoot && !pt.onPathbar) {
122122
tx = helpers.formatPercent(hoverPt.percentEntry, separators) + ' of ' + hoverPt.entry;
123123
insertPercent();
124124
}

‎src/traces/treemap/draw_ancestors.js

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ var constants = require('./constants');
1919
var helpers = require('../sunburst/helpers');
2020
var attachFxHandlers = require('../sunburst/fx');
2121

22-
var upDown = true; // for Ancestors
22+
var onPathbar = true; // for Ancestors
2323

2424
module.exports = function drawAncestors(gd, cd, entry, slices, opts) {
2525
var barDifY = opts.barDifY;
@@ -68,7 +68,7 @@ module.exports = function drawAncestors(gd, cd, entry, slices, opts) {
6868
pt.y0 = barDifY;
6969
pt.y1 = barDifY + height;
7070

71-
pt._onPathbar = true;
71+
pt.onPathbar = true;
7272

7373
return true;
7474
});
@@ -80,7 +80,7 @@ module.exports = function drawAncestors(gd, cd, entry, slices, opts) {
8080
slices.enter().append('g')
8181
.classed('pathbar', true);
8282

83-
handleSlicesExit(slices, upDown, refRect, [width, height], pathSlice);
83+
handleSlicesExit(slices, onPathbar, refRect, [width, height], pathSlice);
8484

8585
slices.order();
8686

@@ -110,7 +110,7 @@ module.exports = function drawAncestors(gd, cd, entry, slices, opts) {
110110

111111
if(hasTransition) {
112112
slicePath.transition().attrTween('d', function(pt2) {
113-
var interp = makeUpdateSliceInterpolator(pt2, upDown, refRect, [width, height]);
113+
var interp = makeUpdateSliceInterpolator(pt2, onPathbar, refRect, [width, height]);
114114
return function(t) { return pathSlice(interp(t)); };
115115
});
116116
} else {
@@ -157,7 +157,7 @@ module.exports = function drawAncestors(gd, cd, entry, slices, opts) {
157157
pt.y1,
158158
pt.textBB,
159159
{
160-
isMenu: true
160+
onPathbar: true
161161
}
162162
);
163163

@@ -171,7 +171,7 @@ module.exports = function drawAncestors(gd, cd, entry, slices, opts) {
171171

172172
if(hasTransition) {
173173
sliceText.transition().attrTween('transform', function(pt2) {
174-
var interp = makeUpdateTextInterpolator(pt2, upDown, refRect, [width, height]);
174+
var interp = makeUpdateTextInterpolator(pt2, onPathbar, refRect, [width, height]);
175175
return function(t) { return strTransform(interp(t)); };
176176
});
177177
} else {

‎src/traces/treemap/draw_descendants.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ var helpers = require('../sunburst/helpers');
2020
var attachFxHandlers = require('../sunburst/fx');
2121
var formatSliceLabel = require('../sunburst/plot').formatSliceLabel;
2222

23-
var upDown = false; // for Descendants
23+
var onPathbar = false; // for Descendants
2424

2525
module.exports = function drawDescendants(gd, cd, entry, slices, opts) {
2626
var width = opts.width;
@@ -78,7 +78,7 @@ module.exports = function drawDescendants(gd, cd, entry, slices, opts) {
7878
slices.enter().append('g')
7979
.classed('slice', true);
8080

81-
handleSlicesExit(slices, upDown, refRect, [width, height], pathSlice);
81+
handleSlicesExit(slices, onPathbar, refRect, [width, height], pathSlice);
8282

8383
slices.order();
8484

@@ -137,7 +137,7 @@ module.exports = function drawDescendants(gd, cd, entry, slices, opts) {
137137

138138
if(hasTransition) {
139139
slicePath.transition().attrTween('d', function(pt2) {
140-
var interp = makeUpdateSliceInterpolator(pt2, upDown, getRefRect(), [width, height]);
140+
var interp = makeUpdateSliceInterpolator(pt2, onPathbar, getRefRect(), [width, height]);
141141
return function(t) { return pathSlice(interp(t)); };
142142
});
143143
} else {
@@ -196,7 +196,7 @@ module.exports = function drawDescendants(gd, cd, entry, slices, opts) {
196196

197197
if(hasTransition) {
198198
sliceText.transition().attrTween('transform', function(pt2) {
199-
var interp = makeUpdateTextInterpolator(pt2, upDown, getRefRect(), [width, height]);
199+
var interp = makeUpdateTextInterpolator(pt2, onPathbar, getRefRect(), [width, height]);
200200
return function(t) { return strTransform(interp(t)); };
201201
});
202202
} else {

‎src/traces/treemap/plot.js

Lines changed: 31 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -119,20 +119,20 @@ function plotOne(gd, cd, element, transitionOpts) {
119119

120120
// stash of 'previous' position data used by tweening functions
121121
var prevEntry = null;
122-
var prevLookup = {};
123-
var prevLookdown = {};
122+
var prevLookupPathbar = {};
123+
var prevLookupSlices = {};
124124
var nextOfPrevEntry = null;
125-
var getPrev = function(pt, upDown) {
126-
return upDown ?
127-
prevLookup[helpers.getPtId(pt)] :
128-
prevLookdown[helpers.getPtId(pt)];
125+
var getPrev = function(pt, onPathbar) {
126+
return onPathbar ?
127+
prevLookupPathbar[helpers.getPtId(pt)] :
128+
prevLookupSlices[helpers.getPtId(pt)];
129129
};
130130

131-
var getOrigin = function(pt, upDown, refRect, size) {
132-
if(upDown) {
133-
return prevLookup[helpers.getPtId(hierarchy)] || pathbarOrigin;
131+
var getOrigin = function(pt, onPathbar, refRect, size) {
132+
if(onPathbar) {
133+
return prevLookupPathbar[helpers.getPtId(hierarchy)] || pathbarOrigin;
134134
} else {
135-
var ref = prevLookdown[trace.level] || refRect;
135+
var ref = prevLookupSlices[trace.level] || refRect;
136136

137137
if(hasVisibleDepth(pt)) { // case of an empty object - happens when maxdepth is set
138138
return findClosestEdge(pt, ref, size);
@@ -277,13 +277,13 @@ function plotOne(gd, cd, element, transitionOpts) {
277277
hasBottom ? 'end' : 'middle';
278278

279279
var hasRight = hasFlag('right');
280-
var hasLeft = hasFlag('left') || opts.isMenu;
280+
var hasLeft = hasFlag('left') || opts.onPathbar;
281281

282282
var offsetDir =
283283
hasLeft ? 'left' :
284284
hasRight ? 'right' : 'center';
285285

286-
if(opts.isMenu || !opts.isHeader) {
286+
if(opts.onPathbar || !opts.isHeader) {
287287
x0 += hasLeft ? TEXTPAD : 0;
288288
x1 -= hasRight ? TEXTPAD : 0;
289289
}
@@ -336,28 +336,28 @@ function plotOne(gd, cd, element, transitionOpts) {
336336
};
337337
};
338338

339-
var interpFromParent = function(pt, upDown) {
339+
var interpFromParent = function(pt, onPathbar) {
340340
var parentPrev;
341341
var i = 0;
342342
var Q = pt;
343343
while(!parentPrev && i < maxDepth) { // loop to find a parent/grandParent on the previous graph
344344
i++;
345345
Q = Q.parent;
346346
if(Q) {
347-
parentPrev = getPrev(Q, upDown);
347+
parentPrev = getPrev(Q, onPathbar);
348348
} else i = maxDepth;
349349
}
350350
return parentPrev || {};
351351
};
352352

353-
var makeExitSliceInterpolator = function(pt, upDown, refRect, size) {
354-
var prev = getPrev(pt, upDown);
353+
var makeExitSliceInterpolator = function(pt, onPathbar, refRect, size) {
354+
var prev = getPrev(pt, onPathbar);
355355
var next;
356356

357-
if(upDown) {
357+
if(onPathbar) {
358358
next = pathbarOrigin;
359359
} else {
360-
var entryPrev = getPrev(entry, upDown);
360+
var entryPrev = getPrev(entry, onPathbar);
361361
if(entryPrev) {
362362
// 'entryPrev' is here has the previous coordinates of the entry
363363
// node, which corresponds to the last "clicked" node when zooming in
@@ -372,30 +372,30 @@ function plotOne(gd, cd, element, transitionOpts) {
372372
return d3.interpolate(prev, next);
373373
};
374374

375-
var makeUpdateSliceInterpolator = function(pt, upDown, refRect, size) {
376-
var prev0 = getPrev(pt, upDown);
375+
var makeUpdateSliceInterpolator = function(pt, onPathbar, refRect, size) {
376+
var prev0 = getPrev(pt, onPathbar);
377377
var prev;
378378

379379
if(prev0) {
380380
// if pt already on graph, this is easy
381381
prev = prev0;
382382
} else {
383383
// for new pts:
384-
if(upDown) {
384+
if(onPathbar) {
385385
prev = pathbarOrigin;
386386
} else {
387387
if(prevEntry) {
388388
// if trace was visible before
389389
if(pt.parent) {
390390
var ref = nextOfPrevEntry || refRect;
391391

392-
if(ref && !upDown) {
392+
if(ref && !onPathbar) {
393393
prev = findClosestEdge(pt, ref, size);
394394
} else {
395395
// if new leaf (when maxdepth is set),
396396
// grow it from its parent node
397397
prev = {};
398-
Lib.extendFlat(prev, interpFromParent(pt, upDown));
398+
Lib.extendFlat(prev, interpFromParent(pt, onPathbar));
399399
}
400400
} else {
401401
prev = pt;
@@ -414,10 +414,10 @@ function plotOne(gd, cd, element, transitionOpts) {
414414
});
415415
};
416416

417-
var makeUpdateTextInterpolator = function(pt, upDown, refRect, size) {
418-
var prev0 = getPrev(pt, upDown);
417+
var makeUpdateTextInterpolator = function(pt, onPathbar, refRect, size) {
418+
var prev0 = getPrev(pt, onPathbar);
419419
var prev = {};
420-
var origin = getOrigin(pt, upDown, refRect, size);
420+
var origin = getOrigin(pt, onPathbar, refRect, size);
421421

422422
Lib.extendFlat(prev, {
423423
transform: toMoveInsideSlice(
@@ -438,7 +438,7 @@ function plotOne(gd, cd, element, transitionOpts) {
438438
} else {
439439
// for new pts:
440440
if(pt.parent) {
441-
Lib.extendFlat(prev, interpFromParent(pt, upDown));
441+
Lib.extendFlat(prev, interpFromParent(pt, onPathbar));
442442
}
443443
}
444444

@@ -454,7 +454,7 @@ function plotOne(gd, cd, element, transitionOpts) {
454454
});
455455
};
456456

457-
var handleSlicesExit = function(slices, upDown, refRect, size, pathSlice) {
457+
var handleSlicesExit = function(slices, onPathbar, refRect, size, pathSlice) {
458458
var width = size[0];
459459
var height = size[1];
460460

@@ -465,7 +465,7 @@ function plotOne(gd, cd, element, transitionOpts) {
465465

466466
var slicePath = sliceTop.select('path.surface');
467467
slicePath.transition().attrTween('d', function(pt2) {
468-
var interp = makeExitSliceInterpolator(pt2, upDown, refRect, [width, height]);
468+
var interp = makeExitSliceInterpolator(pt2, onPathbar, refRect, [width, height]);
469469
return function(t) { return pathSlice(interp(t)); };
470470
});
471471

@@ -501,7 +501,7 @@ function plotOne(gd, cd, element, transitionOpts) {
501501
// Important: do this before binding new sliceData!
502502

503503
selAncestors.each(function(pt) {
504-
prevLookup[helpers.getPtId(pt)] = {
504+
prevLookupPathbar[helpers.getPtId(pt)] = {
505505
x0: pt.x0,
506506
x1: pt.x1,
507507
y0: pt.y0,
@@ -511,7 +511,7 @@ function plotOne(gd, cd, element, transitionOpts) {
511511
});
512512

513513
selDescendants.each(function(pt) {
514-
prevLookdown[helpers.getPtId(pt)] = {
514+
prevLookupSlices[helpers.getPtId(pt)] = {
515515
x0: pt.x0,
516516
x1: pt.x1,
517517
y0: pt.y0,

‎src/traces/treemap/style.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ function styleOne(s, pt, trace, opts) {
5959
lineColor = Lib.castOption(trace, ptNumber, 'marker.line.color') || Color.defaultLine;
6060
lineWidth = Lib.castOption(trace, ptNumber, 'marker.line.width') || 0;
6161

62-
opacity = pt._onPathbar ?
62+
opacity = pt.onPathbar ?
6363
sumUpTo(pt.depth) :
6464
depthFn(pt.height);
6565
}

0 commit comments

Comments
 (0)