8000 Fix uniformtext and enable coloraxis for sunburst and treemap as well as pathbar.textfont by archmoj · Pull Request #4444 · plotly/plotly.js · GitHub
[go: up one dir, main page]
Skip to content

Fix uniformtext and enable coloraxis for sunburst and treemap as well as pathbar.textfont #4444

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 16 commits into from
Jan 6, 2020
Merged

Fix uniformtext and enable coloraxis for sunburst and treemap as well as pathbar.textfont #4444

Changes from 1 commit
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
869b97b
Fixes of uniformtext and enable coloraxis for sunburst and treemap
archmoj Dec 25, 2019
b129c5d
no transition with uniformtext for now
archmoj Dec 26, 2019
c630060
only call resizeText not the whole style
archmoj Dec 26, 2019
3737ca9
add jasmine tests for sunburst and treemap transition with uniformtext
archmoj Dec 26, 2019
f6b91e8
tweak new test to pass on CI
archmoj Dec 27, 2019
ef6a952
add comment about special logic to consider values colorscales in sun…
archmoj Dec 27, 2019
2cf7def
make new transition tests more robust
archmoj Dec 29, 2019
6a4b451
treemap pathbar.textfont should have an effect similar to insidetext.…
archmoj Dec 30, 2019
16848b3
improve treemap image test with unifromtext and pathbar custom font
archmoj Dec 30, 2019
79ea1cc
uniform treemap pathbar text
archmoj Dec 31, 2019
2a7721c
textangle bug fix issue 4456
archmoj Dec 31, 2019
ba1ae6f
move all uniformtext functions to bar/uniform_text.js
archmoj Dec 31, 2019
599de22
declare uniform functions on top of bar plot
archmoj Dec 31, 2019
0e3e6e2
simplify (Inside | Outside) transform logic in bar
archmoj Dec 31, 2019
a827bff
Merge branch 'master' into more-unifotrm-text
archmoj Jan 2, 2020
a9c9589
keep text pad consistent when uniformtext rescales at start/end ancho…
archmoj Jan 5, 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
Prev Previous commit
Next Next commit
simplify (Inside | Outside) transform logic in bar
  • Loading branch information
@archmoj
archmoj committed Dec 31, 2019
commit 0e3e6e268b5d7bb8c32930b46d0c4643a913d785
48 changes: 24 additions & 24 deletions src/traces/bar/plot.js
8000
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -424,18 +424,31 @@ function getRotateFromAngle(angle) {
return (angle === 'auto') ? 0 : angle;
}

function getRotatedTextSize(textBB, rotate) {
var a = Math.PI / 180 * rotate;
var absSin = Math.abs(Math.sin(a));
var absCos = Math.abs(Math.cos(a));

return {
x: textBB.width * absCos + textBB.height * absSin,
y: textBB.width * absSin + textBB.height * absCos
};
}

function toMoveInsideBar(x0, x1, y0, y1, textBB, opts) {
var isHorizontal = !!opts.isHorizontal;
var constrained = !!opts.constrained;
var angle = opts.angle || 0;
var anchor = opts.anchor || 0;
var anchor = opts.anchor || 'end';
var isEnd = anchor === 'end';
var isStart = anchor === 'start';

var textWidth = textBB.width;
var textHeight = textBB.height;
var lx = Math.abs(x1 - x0);
var ly = Math.abs(y1 - y0);

// compute left space
// compute remaining space
var textpad = (
lx > (2 * TEXTPAD) &&
ly > (2 * TEXTPAD)
Expand Down Expand Up @@ -463,38 +476,29 @@ function toMoveInsideBar(x0, x1, y0, y1, textBB, opts) {
}

var rotate = getRotateFromAngle(angle);
var absSin = Math.abs(Math.sin(Math.PI / 180 * rotate));
var absCos = Math.abs(Math.cos(Math.PI / 180 * rotate));

// compute text space
var tx = textWidth * absCos + textHeight * absSin;
var ty = textWidth * absSin + textHeight * absCos;
var t = getRotatedTextSize(textBB, rotate);

var scale = 1;
if(constrained) {
scale = Math.min(
1,
lx / tx,
ly / ty
lx / t.x,
ly / t.y
);
scale = Math.min(1, scale);
}

// compute text and target positions
var targetX = (x0 + x1) / 2;
var targetY = (y0 + y1) / 2;

if(anchor !== 'middle') { // case of 'start' or 'end'
var targetWidth = scale * (isHorizontal !== isAutoRotated ? textHeight : textWidth);
var targetHeight = scale * (isHorizontal !== isAutoRotated ? textWidth : textHeight);
textpad += 0.5 * (targetWidth * absSin + targetHeight * absCos);
if(isStart || isEnd) {
textpad += 0.5 * scale * (isHorizontal !== isAutoRotated ? t.x : t.y);

if(isHorizontal) {
textpad *= dirSign(x0, x1);
targetX = (anchor === 'start') ? x0 + textpad : x1 - textpad;
targetX = isStart ? x0 + textpad : x1 - textpad;
} else {
textpad *= dirSign(y0, y1);
targetY = (anchor === 'start') ? y0 + textpad : y1 - textpad;
targetY = isStart ? y0 + textpad : y1 - textpad;
}
}

Expand Down Expand Up @@ -542,14 +546,10 @@ function toMoveOutsideBar(x0, x1, y0, y1, textBB, opts) {
}

var rotate = getRotateFromAngle(angle);
var absSin = Math.abs(Math.sin(Math.PI / 180 * rotate));
var absCos = Math.abs(Math.cos(Math.PI / 180 * rotate));
var t = getRotatedTextSize(textBB, rotate);

// compute text and target positions
var targetWidth = scale * (isHorizontal ? textHeight : textWidth);
var targetHeight = scale * (isHorizontal ? textWidth : textHeight);
textpad += 0.5 * (targetWidth * absSin + targetHeight * absCos);

textpad += 0.5 * scale * (isHorizontal ? t.x : t.y);
var targetX = (x0 + x1) / 2;
var targetY = (y0 + y1) / 2;

Expand Down
0