Bar text constraint configuration#1931

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
rreusser merged 8 commits into from
Aug 5, 2017
Merged

Bar text constraint configuration #1931

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
969cac6
Add bar text test case
rreusser Aug 4, 2017
013c871
Add bar text constraint configuration
rreusser Aug 4, 2017
b20ce67
Remove unused testing mock
rreusser Aug 4, 2017
3e92d7a
Fix typo in attr description
rreusser Aug 4, 2017
06bd80d
Fix test expectation
rreusser Aug 4, 2017
5d67212
Recreate bar baselines with modified constraint behavior
rreusser Aug 4, 2017
f690d9b
*actually* fix bar baselines
rreusser Aug 5, 2017
30bba26
Fix test and remove dead code from bar trace
rreusser Aug 5, 2017
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
11 changes: 11 additions & 0 deletions src/traces/bar/attributes.js
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -80,6 +80,17 @@ module.exports = {
description: 'Sets the font used for `text` lying outside the bar.'
}),

constraintext: {
valType: 'enumerated',
values: ['inside', 'outside', 'both', 'none'],
role: 'info',
dflt: 'both',
description: [
'Constrain the size of text inside or outside a bar to be no',
'larger than the bar itself.'
].join(' ')
},

orientation: {
valType: 'enumerated',
role: 'info',
Expand Down
1 change: 1 addition & 0 deletions src/traces/bar/defaults.js
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -48,6 +48,7 @@ module.exports = function supplyDefaults(traceIn, traceOut, defaultColor, layout
var textFont = coerceFont(coerce, 'textfont', layout.font);
if(hasInside) coerceFont(coerce, 'insidetextfont', textFont);
if(hasOutside) coerceFont(coerce, 'outsidetextfont', textFont);
coerce('constraintext');
}

handleStyleDefaults(traceIn, traceOut, coerce, defaultColor, layout);
Expand Down
37 changes: 18 additions & 19 deletions src/traces/bar/plot.js
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -237,20 +237,22 @@ function appendBarText(gd, bar, calcTrace, i, x0, x1, y0, y1) {
}

// compute text transform
var transform;
var transform, constrained;
if(textPosition === 'outside') {
constrained = trace.constraintext === 'both' || trace.constraintext === 'outside';
transform = getTransformToMoveOutsideBar(x0, x1, y0, y1, textBB,
orientation);
orientation, constrained);
}
else {
constrained = trace.constraintext === 'both' || trace.constraintext === 'inside';
transform = getTransformToMoveInsideBar(x0, x1, y0, y1, textBB,
orientation);
orientation, constrained);
}

textSelection.attr('transform', transform);
}

function getTransformToMoveInsideBar(x0, x1, y0, y1, textBB, orientation) {
function getTransformToMoveInsideBar(x0, x1, y0, y1, textBB, orientation, constrained) {
// compute text and target positions
var textWidth = textBB.width,
textHeight = textBB.height,
Expand DownExpand Up@@ -289,12 +291,12 @@ function getTransformToMoveInsideBar(x0, x1, y0, y1, textBB, orientation) {
else if((textWidth < textHeight) === (barWidth < barHeight)) {
// only scale is required
rotate = false;
scale = Math.min(barWidth / textWidth, barHeight / textHeight);
scale = constrained ? Math.min(barWidth / textWidth, barHeight / textHeight) : 1;
}
else {
// both scale and rotation are required
rotate = true;
scale = Math.min(barHeight / textWidth, barWidth / textHeight);
scale = constrained ? Math.min(barHeight / textWidth, barWidth / textHeight) : 1;
}

if(rotate) rotate = 90; // rotate clockwise
Expand DownExpand Up@@ -335,23 +337,25 @@ function getTransformToMoveInsideBar(x0, x1, y0, y1, textBB, orientation) {
return getTransform(textX, textY, targetX, targetY, scale, rotate);
}

function getTransformToMoveOutsideBar(x0, x1, y0, y1, textBB, orientation) {
function getTransformToMoveOutsideBar(x0, x1, y0, y1, textBB, orientation, constrained) {
var barWidth = (orientation === 'h') ?
Math.abs(y1 - y0) :
Math.abs(x1 - x0),
textpad;

// apply text padding if possible
// Keep the padding so the text doesn't sit right against
// the bars, but don't factor it into barWidth

@alexcjohnsonalexcjohnsonAug 5, 2017

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah, good call.

if(barWidth > 2 * TEXTPAD) {
textpad = TEXTPAD;
barWidth -= 2 * textpad;
}

// compute rotation and scale
var rotate = false,
var scale = 1;
if(constrained) {
scale = (orientation === 'h') ?
Math.min(1, barWidth / textBB.height) :
Math.min(1, barWidth / textBB.width);
}

// compute text and target positions
var textX = (textBB.left + textBB.right) / 2,
Expand All@@ -360,14 +364,9 @@ function getTransformToMoveOutsideBar(x0, x1, y0, y1, textBB, orientation) {
targetHeight,
targetX,
targetY;
if(rotate) {
targetWidth = scale * textBB.height;
targetHeight = scale * textBB.width;
}
else {
targetWidth = scale * textBB.width;
targetHeight = scale * textBB.height;
}

targetWidth = scale * textBB.width;
targetHeight = scale * textBB.height;

if(orientation === 'h') {
if(x1 < x0) {
Expand All@@ -392,7 +391,7 @@ function getTransformToMoveOutsideBar(x0, x1, y0, y1, textBB, orientation) {
}
}

return getTransform(textX, textY, targetX, targetY, scale, rotate);
return getTransform(textX, textY, targetX, targetY, scale, false);
}

function getTransform(textX, textY, targetX, targetY, scale, rotate) {
Expand Down
Binary file modifiedtest/image/baselines/bar_attrs_group_norm.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.
Binary file modifiedtest/image/baselines/bar_attrs_relative.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.
2 changes: 2 additions & 0 deletions test/jasmine/tests/bar_test.js
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -95,6 +95,7 @@ describe('Bar.supplyDefaults', function() {
expect(traceOut.texfont).toBeUndefined();
expect(traceOut.insidetexfont).toBeUndefined();
expect(traceOut.outsidetexfont).toBeUndefined();
expect(traceOut.constraintext).toBeUndefined();
});

it('should default textfont to layout.font', function() {
Expand All@@ -116,6 +117,7 @@ describe('Bar.supplyDefaults', function() {
expect(traceOut.insidetextfont).not.toBe(layout.font);
expect(traceOut.insidetextfont).not.toBe(traceOut.textfont);
expect(traceOut.outsidetexfont).toBeUndefined();
expect(traceOut.constraintext).toBe('both');
});

it('should inherit layout.calendar', function() {
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all 
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n 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;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
Bar text constraint configuration#1931

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

rreusser
merged 8 commits into

from

Aug 5, 2017
 Merged


Bar text constraint configuration
#1931
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


8 commits


Select commit
Hold shift + click to select a range
969cac6

Add bar text test case


rreusser Aug 4, 2017
013c871

Add bar text constraint configuration


rreusser Aug 4, 2017
b20ce67

Remove unused testing mock


rreusser Aug 4, 2017
3e92d7a

Fix typo in attr description


rreusser Aug 4, 2017
06bd80d

Fix test expectation


rreusser Aug 4, 2017
5d67212

Recreate bar baselines with modified constraint behavior


rreusser Aug 4, 2017
f690d9b

*actually* fix bar baselines


rreusser Aug 5, 2017
30bba26

Fix test and remove dead code from bar trace


rreusser Aug 5, 2017

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


11 changes: 11 additions & 0 deletions
src/traces/bar/attributes.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -80,6 +80,17 @@ module.exports = {
 description: 'Sets the font used for `text` lying outside the bar.'
 }),

 constraintext: {
 valType: 'enumerated',
 values: ['inside', 'outside', 'both', 'none'],
 role: 'info',
 dflt: 'both',
 description: [
 'Constrain the size of text inside or outside a bar to be no',
 'larger than the bar itself.'
 ].join(' ')
 },

 orientation: {
 valType: 'enumerated',
 role: 'info',
Expand Down

1 change: 1 addition & 0 deletions
src/traces/bar/defaults.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -48,6 +48,7 @@ module.exports = function supplyDefaults(traceIn, traceOut, defaultColor, layout
 var textFont = coerceFont(coerce, 'textfont', layout.font);
 if(hasInside) coerceFont(coerce, 'insidetextfont', textFont);
 if(hasOutside) coerceFont(coerce, 'outsidetextfont', textFont);
 coerce('constraintext');
 }

 handleStyleDefaults(traceIn, traceOut, coerce, defaultColor, layout);
Expand Down

37 changes: 18 additions & 19 deletions
src/traces/bar/plot.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -237,20 +237,22 @@ function appendBarText(gd, bar, calcTrace, i, x0, x1, y0, y1) {
 }

 // compute text transform
 var transform;
 var transform, constrained;
 if(textPosition === 'outside') {
 constrained = trace.constraintext === 'both' || trace.constraintext === 'outside';
 transform = getTransformToMoveOutsideBar(x0, x1, y0, y1, textBB,
 orientation);
 orientation, constrained);
 }
 else {
 constrained = trace.constraintext === 'both' || trace.constraintext === 'inside';
 transform = getTransformToMoveInsideBar(x0, x1, y0, y1, textBB,
 orientation);
 orientation, constrained);
 }

 textSelection.attr('transform', transform);
}

function getTransformToMoveInsideBar(x0, x1, y0, y1, textBB, orientation) {
function getTransformToMoveInsideBar(x0, x1, y0, y1, textBB, orientation, constrained) {
 // compute text and target positions
 var textWidth = textBB.width,
 textHeight = textBB.height,
Expand DownExpand Up@@ -289,12 +291,12 @@ function getTransformToMoveInsideBar(x0, x1, y0, y1, textBB, orientation) {
 else if((textWidth < textHeight) === (barWidth < barHeight)) {
 // only scale is required
 rotate = false;
 scale = Math.min(barWidth / textWidth, barHeight / textHeight);
 scale = constrained ? Math.min(barWidth / textWidth, barHeight / textHeight) : 1;
 }
 else {
 // both scale and rotation are required
 rotate = true;
 scale = Math.min(barHeight / textWidth, barWidth / textHeight);
 scale = constrained ? Math.min(barHeight / textWidth, barWidth / textHeight) : 1;
 }

 if(rotate) rotate = 90; // rotate clockwise
Expand DownExpand Up@@ -335,23 +337,25 @@ function getTransformToMoveInsideBar(x0, x1, y0, y1, textBB, orientation) {
 return getTransform(textX, textY, targetX, targetY, scale, rotate);
}

function getTransformToMoveOutsideBar(x0, x1, y0, y1, textBB, orientation) {
function getTransformToMoveOutsideBar(x0, x1, y0, y1, textBB, orientation, constrained) {
 var barWidth = (orientation === 'h') ?
 Math.abs(y1 - y0) :
 Math.abs(x1 - x0),
 textpad;

 // apply text padding if possible
 // Keep the padding so the text doesn't sit right against
 // the bars, but don't factor it into barWidth
@alexcjohnsonalexcjohnsonAug 5, 2017

Copy link


Copy Markdown

Collaborator
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah, good call.
 if(barWidth > 2 * TEXTPAD) {
 textpad = TEXTPAD;
 barWidth -= 2 * textpad;
 }

 // compute rotation and scale
 var rotate = false,
 var scale = 1;
 if(constrained) {
 scale = (orientation === 'h') ?
 Math.min(1, barWidth / textBB.height) :
 Math.min(1, barWidth / textBB.width);
 }

 // compute text and target positions
 var textX = (textBB.left + textBB.right) / 2,
Expand All@@ -360,14 +364,9 @@ function getTransformToMoveOutsideBar(x0, x1, y0, y1, textBB, orientation) {
 targetHeight,
 targetX,
 targetY;
 if(rotate) {
 targetWidth = scale * textBB.height;
 targetHeight = scale * textBB.width;
 }
 else {
 targetWidth = scale * textBB.width;
 targetHeight = scale * textBB.height;
 }

 targetWidth = scale * textBB.width;
 targetHeight = scale * textBB.height;

 if(orientation === 'h') {
 if(x1 < x0) {
Expand All@@ -392,7 +391,7 @@ function getTransformToMoveOutsideBar(x0, x1, y0, y1, textBB, orientation) {
 }
 }

 return getTransform(textX, textY, targetX, targetY, scale, rotate);
 return getTransform(textX, textY, targetX, targetY, scale, false);
}

function getTransform(textX, textY, targetX, targetY, scale, rotate) {
Expand Down
Binary file modifiedtest/image/baselines/bar_attrs_group_norm.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.
Binary file modifiedtest/image/baselines/bar_attrs_relative.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.

2 changes: 2 additions & 0 deletions
test/jasmine/tests/bar_test.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -95,6 +95,7 @@ describe('Bar.supplyDefaults', function() {
 expect(traceOut.texfont).toBeUndefined();
 expect(traceOut.insidetexfont).toBeUndefined();
 expect(traceOut.outsidetexfont).toBeUndefined();
 expect(traceOut.constraintext).toBeUndefined();
 });

 it('should default textfont to layout.font', function() {
Expand All@@ -116,6 +117,7 @@ describe('Bar.supplyDefaults', function() {
 expect(traceOut.insidetextfont).not.toBe(layout.font);
 expect(traceOut.insidetextfont).not.toBe(traceOut.textfont);
 expect(traceOut.outsidetexfont).toBeUndefined();
 expect(traceOut.constraintext).toBe('both');
 });

 it('should inherit layout.calendar', function() {
Expand Down

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

Skip to content
Bar text constraint configuration#1931

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

rreusser
merged 8 commits into

from

Aug 5, 2017
 Merged


Bar text constraint configuration
#1931
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


8 commits


Select commit
Hold shift + click to select a range
969cac6

Add bar text test case


rreusser Aug 4, 2017
013c871

Add bar text constraint configuration


rreusser Aug 4, 2017
b20ce67

Remove unused testing mock


rreusser Aug 4, 2017
3e92d7a

Fix typo in attr description


rreusser Aug 4, 2017
06bd80d

Fix test expectation


rreusser Aug 4, 2017
5d67212

Recreate bar baselines with modified constraint behavior


rreusser Aug 4, 2017
f690d9b

*actually* fix bar baselines


rreusser Aug 5, 2017
30bba26

Fix test and remove dead code from bar trace


rreusser Aug 5, 2017

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


11 changes: 11 additions & 0 deletions
src/traces/bar/attributes.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -80,6 +80,17 @@ module.exports = {
 description: 'Sets the font used for `text` lying outside the bar.'
 }),

 constraintext: {
 valType: 'enumerated',
 values: ['inside', 'outside', 'both', 'none'],
 role: 'info',
 dflt: 'both',
 description: [
 'Constrain the size of text inside or outside a bar to be no',
 'larger than the bar itself.'
 ].join(' ')
 },

 orientation: {
 valType: 'enumerated',
 role: 'info',
Expand Down

1 change: 1 addition & 0 deletions
src/traces/bar/defaults.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -48,6 +48,7 @@ module.exports = function supplyDefaults(traceIn, traceOut, defaultColor, layout
 var textFont = coerceFont(coerce, 'textfont', layout.font);
 if(hasInside) coerceFont(coerce, 'insidetextfont', textFont);
 if(hasOutside) coerceFont(coerce, 'outsidetextfont', textFont);
 coerce('constraintext');
 }

 handleStyleDefaults(traceIn, traceOut, coerce, defaultColor, layout);
Expand Down

37 changes: 18 additions & 19 deletions
src/traces/bar/plot.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -237,20 +237,22 @@ function appendBarText(gd, bar, calcTrace, i, x0, x1, y0, y1) {
 }

 // compute text transform
 var transform;
 var transform, constrained;
 if(textPosition === 'outside') {
 constrained = trace.constraintext === 'both' || trace.constraintext === 'outside';
 transform = getTransformToMoveOutsideBar(x0, x1, y0, y1, textBB,
 orientation);
 orientation, constrained);
 }
 else {
 constrained = trace.constraintext === 'both' || trace.constraintext === 'inside';
 transform = getTransformToMoveInsideBar(x0, x1, y0, y1, textBB,
 orientation);
 orientation, constrained);
 }

 textSelection.attr('transform', transform);
}

function getTransformToMoveInsideBar(x0, x1, y0, y1, textBB, orientation) {
function getTransformToMoveInsideBar(x0, x1, y0, y1, textBB, orientation, constrained) {
 // compute text and target positions
 var textWidth = textBB.width,
 textHeight = textBB.height,
Expand DownExpand Up@@ -289,12 +291,12 @@ function getTransformToMoveInsideBar(x0, x1, y0, y1, textBB, orientation) {
 else if((textWidth < textHeight) === (barWidth < barHeight)) {
 // only scale is required
 rotate = false;
 scale = Math.min(barWidth / textWidth, barHeight / textHeight);
 scale = constrained ? Math.min(barWidth / textWidth, barHeight / textHeight) : 1;
 }
 else {
 // both scale and rotation are required
 rotate = true;
 scale = Math.min(barHeight / textWidth, barWidth / textHeight);
 scale = constrained ? Math.min(barHeight / textWidth, barWidth / textHeight) : 1;
 }

 if(rotate) rotate = 90; // rotate clockwise
Expand DownExpand Up@@ -335,23 +337,25 @@ function getTransformToMoveInsideBar(x0, x1, y0, y1, textBB, orientation) {
 return getTransform(textX, textY, targetX, targetY, scale, rotate);
}

function getTransformToMoveOutsideBar(x0, x1, y0, y1, textBB, orientation) {
function getTransformToMoveOutsideBar(x0, x1, y0, y1, textBB, orientation, constrained) {
 var barWidth = (orientation === 'h') ?
 Math.abs(y1 - y0) :
 Math.abs(x1 - x0),
 textpad;

 // apply text padding if possible
 // Keep the padding so the text doesn't sit right against
 // the bars, but don't factor it into barWidth
@alexcjohnsonalexcjohnsonAug 5, 2017

Copy link


Copy Markdown

Collaborator
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah, good call.
 if(barWidth > 2 * TEXTPAD) {
 textpad = TEXTPAD;
 barWidth -= 2 * textpad;
 }

 // compute rotation and scale
 var rotate = false,
 var scale = 1;
 if(constrained) {
 scale = (orientation === 'h') ?
 Math.min(1, barWidth / textBB.height) :
 Math.min(1, barWidth / textBB.width);
 }

 // compute text and target positions
 var textX = (textBB.left + textBB.right) / 2,
Expand All@@ -360,14 +364,9 @@ function getTransformToMoveOutsideBar(x0, x1, y0, y1, textBB, orientation) {
 targetHeight,
 targetX,
 targetY;
 if(rotate) {
 targetWidth = scale * textBB.height;
 targetHeight = scale * textBB.width;
 }
 else {
 targetWidth = scale * textBB.width;
 targetHeight = scale * textBB.height;
 }

 targetWidth = scale * textBB.width;
 targetHeight = scale * textBB.height;

 if(orientation === 'h') {
 if(x1 < x0) {
Expand All@@ -392,7 +391,7 @@ function getTransformToMoveOutsideBar(x0, x1, y0, y1, textBB, orientation) {
 }
 }

 return getTransform(textX, textY, targetX, targetY, scale, rotate);
 return getTransform(textX, textY, targetX, targetY, scale, false);
}

function getTransform(textX, textY, targetX, targetY, scale, rotate) {
Expand Down
Binary file modifiedtest/image/baselines/bar_attrs_group_norm.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.
Binary file modifiedtest/image/baselines/bar_attrs_relative.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.

2 changes: 2 additions & 0 deletions
test/jasmine/tests/bar_test.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -95,6 +95,7 @@ describe('Bar.supplyDefaults', function() {
 expect(traceOut.texfont).toBeUndefined();
 expect(traceOut.insidetexfont).toBeUndefined();
 expect(traceOut.outsidetexfont).toBeUndefined();
 expect(traceOut.constraintext).toBeUndefined();
 });

 it('should default textfont to layout.font', function() {
Expand All@@ -116,6 +117,7 @@ describe('Bar.supplyDefaults', function() {
 expect(traceOut.insidetextfont).not.toBe(layout.font);
 expect(traceOut.insidetextfont).not.toBe(traceOut.textfont);
 expect(traceOut.outsidetexfont).toBeUndefined();
 expect(traceOut.constraintext).toBe('both');
 });

 it('should inherit layout.calendar', function() {
Expand Down

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

Skip to content
Bar text constraint configuration#1931

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

rreusser
merged 8 commits into

from

Aug 5, 2017
 Merged


Bar text constraint configuration
#1931
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


8 commits


Select commit
Hold shift + click to select a range
969cac6

Add bar text test case


rreusser Aug 4, 2017
013c871

Add bar text constraint configuration


rreusser Aug 4, 2017
b20ce67

Remove unused testing mock


rreusser Aug 4, 2017
3e92d7a

Fix typo in attr description


rreusser Aug 4, 2017
06bd80d

Fix test expectation


rreusser Aug 4, 2017
5d67212

Recreate bar baselines with modified constraint behavior


rreusser Aug 4, 2017
f690d9b

*actually* fix bar baselines


rreusser Aug 5, 2017
30bba26

Fix test and remove dead code from bar trace


rreusser Aug 5, 2017

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


11 changes: 11 additions & 0 deletions
src/traces/bar/attributes.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -80,6 +80,17 @@ module.exports = {
 description: 'Sets the font used for `text` lying outside the bar.'
 }),

 constraintext: {
 valType: 'enumerated',
 values: ['inside', 'outside', 'both', 'none'],
 role: 'info',
 dflt: 'both',
 description: [
 'Constrain the size of text inside or outside a bar to be no',
 'larger than the bar itself.'
 ].join(' ')
 },

 orientation: {
 valType: 'enumerated',
 role: 'info',
Expand Down

1 change: 1 addition & 0 deletions
src/traces/bar/defaults.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -48,6 +48,7 @@ module.exports = function supplyDefaults(traceIn, traceOut, defaultColor, layout
 var textFont = coerceFont(coerce, 'textfont', layout.font);
 if(hasInside) coerceFont(coerce, 'insidetextfont', textFont);
 if(hasOutside) coerceFont(coerce, 'outsidetextfont', textFont);
 coerce('constraintext');
 }

 handleStyleDefaults(traceIn, traceOut, coerce, defaultColor, layout);
Expand Down

37 changes: 18 additions & 19 deletions
src/traces/bar/plot.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -237,20 +237,22 @@ function appendBarText(gd, bar, calcTrace, i, x0, x1, y0, y1) {
 }

 // compute text transform
 var transform;
 var transform, constrained;
 if(textPosition === 'outside') {
 constrained = trace.constraintext === 'both' || trace.constraintext === 'outside';
 transform = getTransformToMoveOutsideBar(x0, x1, y0, y1, textBB,
 orientation);
 orientation, constrained);
 }
 else {
 constrained = trace.constraintext === 'both' || trace.constraintext === 'inside';
 transform = getTransformToMoveInsideBar(x0, x1, y0, y1, textBB,
 orientation);
 orientation, constrained);
 }

 textSelection.attr('transform', transform);
}

function getTransformToMoveInsideBar(x0, x1, y0, y1, textBB, orientation) {
function getTransformToMoveInsideBar(x0, x1, y0, y1, textBB, orientation, constrained) {
 // compute text and target positions
 var textWidth = textBB.width,
 textHeight = textBB.height,
Expand DownExpand Up@@ -289,12 +291,12 @@ function getTransformToMoveInsideBar(x0, x1, y0, y1, textBB, orientation) {
 else if((textWidth < textHeight) === (barWidth < barHeight)) {
 // only scale is required
 rotate = false;
 scale = Math.min(barWidth / textWidth, barHeight / textHeight);
 scale = constrained ? Math.min(barWidth / textWidth, barHeight / textHeight) : 1;
 }
 else {
 // both scale and rotation are required
 rotate = true;
 scale = Math.min(barHeight / textWidth, barWidth / textHeight);
 scale = constrained ? Math.min(barHeight / textWidth, barWidth / textHeight) : 1;
 }

 if(rotate) rotate = 90; // rotate clockwise
Expand DownExpand Up@@ -335,23 +337,25 @@ function getTransformToMoveInsideBar(x0, x1, y0, y1, textBB, orientation) {
 return getTransform(textX, textY, targetX, targetY, scale, rotate);
}

function getTransformToMoveOutsideBar(x0, x1, y0, y1, textBB, orientation) {
function getTransformToMoveOutsideBar(x0, x1, y0, y1, textBB, orientation, constrained) {
 var barWidth = (orientation === 'h') ?
 Math.abs(y1 - y0) :
 Math.abs(x1 - x0),
 textpad;

 // apply text padding if possible
 // Keep the padding so the text doesn't sit right against
 // the bars, but don't factor it into barWidth
@alexcjohnsonalexcjohnsonAug 5, 2017

Copy link


Copy Markdown

Collaborator
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah, good call.
 if(barWidth > 2 * TEXTPAD) {
 textpad = TEXTPAD;
 barWidth -= 2 * textpad;
 }

 // compute rotation and scale
 var rotate = false,
 var scale = 1;
 if(constrained) {
 scale = (orientation === 'h') ?
 Math.min(1, barWidth / textBB.height) :
 Math.min(1, barWidth / textBB.width);
 }

 // compute text and target positions
 var textX = (textBB.left + textBB.right) / 2,
Expand All@@ -360,14 +364,9 @@ function getTransformToMoveOutsideBar(x0, x1, y0, y1, textBB, orientation) {
 targetHeight,
 targetX,
 targetY;
 if(rotate) {
 targetWidth = scale * textBB.height;
 targetHeight = scale * textBB.width;
 }
 else {
 targetWidth = scale * textBB.width;
 targetHeight = scale * textBB.height;
 }

 targetWidth = scale * textBB.width;
 targetHeight = scale * textBB.height;

 if(orientation === 'h') {
 if(x1 < x0) {
Expand All@@ -392,7 +391,7 @@ function getTransformToMoveOutsideBar(x0, x1, y0, y1, textBB, orientation) {
 }
 }

 return getTransform(textX, textY, targetX, targetY, scale, rotate);
 return getTransform(textX, textY, targetX, targetY, scale, false);
}

function getTransform(textX, textY, targetX, targetY, scale, rotate) {
Expand Down
Binary file modifiedtest/image/baselines/bar_attrs_group_norm.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.
Binary file modifiedtest/image/baselines/bar_attrs_relative.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.

2 changes: 2 additions & 0 deletions
test/jasmine/tests/bar_test.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -95,6 +95,7 @@ describe('Bar.supplyDefaults', function() {
 expect(traceOut.texfont).toBeUndefined();
 expect(traceOut.insidetexfont).toBeUndefined();
 expect(traceOut.outsidetexfont).toBeUndefined();
 expect(traceOut.constraintext).toBeUndefined();
 });

 it('should default textfont to layout.font', function() {
Expand All@@ -116,6 +117,7 @@ describe('Bar.supplyDefaults', function() {
 expect(traceOut.insidetextfont).not.toBe(layout.font);
 expect(traceOut.insidetextfont).not.toBe(traceOut.textfont);
 expect(traceOut.outsidetexfont).toBeUndefined();
 expect(traceOut.constraintext).toBe('both');
 });

 it('should inherit layout.calendar', function() {
Expand Down

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

Skip to content
Bar text constraint configuration#1931

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

rreusser
merged 8 commits into

from

Aug 5, 2017
 Merged


Bar text constraint configuration
#1931
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


8 commits


Select commit
Hold shift + click to select a range
969cac6

Add bar text test case


rreusser Aug 4, 2017
013c871

Add bar text constraint configuration


rreusser Aug 4, 2017
b20ce67

Remove unused testing mock


rreusser Aug 4, 2017
3e92d7a

Fix typo in attr description


rreusser Aug 4, 2017
06bd80d

Fix test expectation


rreusser Aug 4, 2017
5d67212

Recreate bar baselines with modified constraint behavior


rreusser Aug 4, 2017
f690d9b

*actually* fix bar baselines


rreusser Aug 5, 2017
30bba26

Fix test and remove dead code from bar trace


rreusser Aug 5, 2017

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


11 changes: 11 additions & 0 deletions
src/traces/bar/attributes.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -80,6 +80,17 @@ module.exports = {
 description: 'Sets the font used for `text` lying outside the bar.'
 }),

 constraintext: {
 valType: 'enumerated',
 values: ['inside', 'outside', 'both', 'none'],
 role: 'info',
 dflt: 'both',
 description: [
 'Constrain the size of text inside or outside a bar to be no',
 'larger than the bar itself.'
 ].join(' ')
 },

 orientation: {
 valType: 'enumerated',
 role: 'info',
Expand Down

1 change: 1 addition & 0 deletions
src/traces/bar/defaults.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -48,6 +48,7 @@ module.exports = function supplyDefaults(traceIn, traceOut, defaultColor, layout
 var textFont = coerceFont(coerce, 'textfont', layout.font);
 if(hasInside) coerceFont(coerce, 'insidetextfont', textFont);
 if(hasOutside) coerceFont(coerce, 'outsidetextfont', textFont);
 coerce('constraintext');
 }

 handleStyleDefaults(traceIn, traceOut, coerce, defaultColor, layout);
Expand Down

37 changes: 18 additions & 19 deletions
src/traces/bar/plot.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -237,20 +237,22 @@ function appendBarText(gd, bar, calcTrace, i, x0, x1, y0, y1) {
 }

 // compute text transform
 var transform;
 var transform, constrained;
 if(textPosition === 'outside') {
 constrained = trace.constraintext === 'both' || trace.constraintext === 'outside';
 transform = getTransformToMoveOutsideBar(x0, x1, y0, y1, textBB,
 orientation);
 orientation, constrained);
 }
 else {
 constrained = trace.constraintext === 'both' || trace.constraintext === 'inside';
 transform = getTransformToMoveInsideBar(x0, x1, y0, y1, textBB,
 orientation);
 orientation, constrained);
 }

 textSelection.attr('transform', transform);
}

function getTransformToMoveInsideBar(x0, x1, y0, y1, textBB, orientation) {
function getTransformToMoveInsideBar(x0, x1, y0, y1, textBB, orientation, constrained) {
 // compute text and target positions
 var textWidth = textBB.width,
 textHeight = textBB.height,
Expand DownExpand Up@@ -289,12 +291,12 @@ function getTransformToMoveInsideBar(x0, x1, y0, y1, textBB, orientation) {
 else if((textWidth < textHeight) === (barWidth < barHeight)) {
 // only scale is required
 rotate = false;
 scale = Math.min(barWidth / textWidth, barHeight / textHeight);
 scale = constrained ? Math.min(barWidth / textWidth, barHeight / textHeight) : 1;
 }
 else {
 // both scale and rotation are required
 rotate = true;
 scale = Math.min(barHeight / textWidth, barWidth / textHeight);
 scale = constrained ? Math.min(barHeight / textWidth, barWidth / textHeight) : 1;
 }

 if(rotate) rotate = 90; // rotate clockwise
Expand DownExpand Up@@ -335,23 +337,25 @@ function getTransformToMoveInsideBar(x0, x1, y0, y1, textBB, orientation) {
 return getTransform(textX, textY, targetX, targetY, scale, rotate);
}

function getTransformToMoveOutsideBar(x0, x1, y0, y1, textBB, orientation) {
function getTransformToMoveOutsideBar(x0, x1, y0, y1, textBB, orientation, constrained) {
 var barWidth = (orientation === 'h') ?
 Math.abs(y1 - y0) :
 Math.abs(x1 - x0),
 textpad;

 // apply text padding if possible
 // Keep the padding so the text doesn't sit right against
 // the bars, but don't factor it into barWidth
@alexcjohnsonalexcjohnsonAug 5, 2017

Copy link


Copy Markdown

Collaborator
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah, good call.
 if(barWidth > 2 * TEXTPAD) {
 textpad = TEXTPAD;
 barWidth -= 2 * textpad;
 }

 // compute rotation and scale
 var rotate = false,
 var scale = 1;
 if(constrained) {
 scale = (orientation === 'h') ?
 Math.min(1, barWidth / textBB.height) :
 Math.min(1, barWidth / textBB.width);
 }

 // compute text and target positions
 var textX = (textBB.left + textBB.right) / 2,
Expand All@@ -360,14 +364,9 @@ function getTransformToMoveOutsideBar(x0, x1, y0, y1, textBB, orientation) {
 targetHeight,
 targetX,
 targetY;
 if(rotate) {
 targetWidth = scale * textBB.height;
 targetHeight = scale * textBB.width;
 }
 else {
 targetWidth = scale * textBB.width;
 targetHeight = scale * textBB.height;
 }

 targetWidth = scale * textBB.width;
 targetHeight = scale * textBB.height;

 if(orientation === 'h') {
 if(x1 < x0) {
Expand All@@ -392,7 +391,7 @@ function getTransformToMoveOutsideBar(x0, x1, y0, y1, textBB, orientation) {
 }
 }

 return getTransform(textX, textY, targetX, targetY, scale, rotate);
 return getTransform(textX, textY, targetX, targetY, scale, false);
}

function getTransform(textX, textY, targetX, targetY, scale, rotate) {
Expand Down
Binary file modifiedtest/image/baselines/bar_attrs_group_norm.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.
Binary file modifiedtest/image/baselines/bar_attrs_relative.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.

2 changes: 2 additions & 0 deletions
test/jasmine/tests/bar_test.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -95,6 +95,7 @@ describe('Bar.supplyDefaults', function() {
 expect(traceOut.texfont).toBeUndefined();
 expect(traceOut.insidetexfont).toBeUndefined();
 expect(traceOut.outsidetexfont).toBeUndefined();
 expect(traceOut.constraintext).toBeUndefined();
 });

 it('should default textfont to layout.font', function() {
Expand All@@ -116,6 +117,7 @@ describe('Bar.supplyDefaults', function() {
 expect(traceOut.insidetextfont).not.toBe(layout.font);
 expect(traceOut.insidetextfont).not.toBe(traceOut.textfont);
 expect(traceOut.outsidetexfont).toBeUndefined();
 expect(traceOut.constraintext).toBe('both');
 });

 it('should inherit layout.calendar', function() {
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default");
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Bar text constraint configuration#1931

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

rreusser
merged 8 commits into

from

Aug 5, 2017
 Merged


Bar text constraint configuration
#1931
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


8 commits


Select commit
Hold shift + click to select a range
969cac6

Add bar text test case


rreusser Aug 4, 2017
013c871

Add bar text constraint configuration


rreusser Aug 4, 2017
b20ce67

Remove unused testing mock


rreusser Aug 4, 2017
3e92d7a

Fix typo in attr description


rreusser Aug 4, 2017
06bd80d

Fix test expectation


rreusser Aug 4, 2017
5d67212

Recreate bar baselines with modified constraint behavior


rreusser Aug 4, 2017
f690d9b

*actually* fix bar baselines


rreusser Aug 5, 2017
30bba26

Fix test and remove dead code from bar trace


rreusser Aug 5, 2017

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


11 changes: 11 additions & 0 deletions
src/traces/bar/attributes.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -80,6 +80,17 @@ module.exports = {
 description: 'Sets the font used for `text` lying outside the bar.'
 }),

 constraintext: {
 valType: 'enumerated',
 values: ['inside', 'outside', 'both', 'none'],
 role: 'info',
 dflt: 'both',
 description: [
 'Constrain the size of text inside or outside a bar to be no',
 'larger than the bar itself.'
 ].join(' ')
 },

 orientation: {
 valType: 'enumerated',
 role: 'info',
Expand Down

1 change: 1 addition & 0 deletions
src/traces/bar/defaults.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -48,6 +48,7 @@ module.exports = function supplyDefaults(traceIn, traceOut, defaultColor, layout
 var textFont = coerceFont(coerce, 'textfont', layout.font);
 if(hasInside) coerceFont(coerce, 'insidetextfont', textFont);
 if(hasOutside) coerceFont(coerce, 'outsidetextfont', textFont);
 coerce('constraintext');
 }

 handleStyleDefaults(traceIn, traceOut, coerce, defaultColor, layout);
Expand Down

37 changes: 18 additions & 19 deletions
src/traces/bar/plot.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -237,20 +237,22 @@ function appendBarText(gd, bar, calcTrace, i, x0, x1, y0, y1) {
 }

 // compute text transform
 var transform;
 var transform, constrained;
 if(textPosition === 'outside') {
 constrained = trace.constraintext === 'both' || trace.constraintext === 'outside';
 transform = getTransformToMoveOutsideBar(x0, x1, y0, y1, textBB,
 orientation);
 orientation, constrained);
 }
 else {
 constrained = trace.constraintext === 'both' || trace.constraintext === 'inside';
 transform = getTransformToMoveInsideBar(x0, x1, y0, y1, textBB,
 orientation);
 orientation, constrained);
 }

 textSelection.attr('transform', transform);
}

function getTransformToMoveInsideBar(x0, x1, y0, y1, textBB, orientation) {
function getTransformToMoveInsideBar(x0, x1, y0, y1, textBB, orientation, constrained) {
 // compute text and target positions
 var textWidth = textBB.width,
 textHeight = textBB.height,
Expand DownExpand Up@@ -289,12 +291,12 @@ function getTransformToMoveInsideBar(x0, x1, y0, y1, textBB, orientation) {
 else if((textWidth < textHeight) === (barWidth < barHeight)) {
 // only scale is required
 rotate = false;
 scale = Math.min(barWidth / textWidth, barHeight / textHeight);
 scale = constrained ? Math.min(barWidth / textWidth, barHeight / textHeight) : 1;
 }
 else {
 // both scale and rotation are required
 rotate = true;
 scale = Math.min(barHeight / textWidth, barWidth / textHeight);
 scale = constrained ? Math.min(barHeight / textWidth, barWidth / textHeight) : 1;
 }

 if(rotate) rotate = 90; // rotate clockwise
Expand DownExpand Up@@ -335,23 +337,25 @@ function getTransformToMoveInsideBar(x0, x1, y0, y1, textBB, orientation) {
 return getTransform(textX, textY, targetX, targetY, scale, rotate);
}

function getTransformToMoveOutsideBar(x0, x1, y0, y1, textBB, orientation) {
function getTransformToMoveOutsideBar(x0, x1, y0, y1, textBB, orientation, constrained) {
 var barWidth = (orientation === 'h') ?
 Math.abs(y1 - y0) :
 Math.abs(x1 - x0),
 textpad;

 // apply text padding if possible
 // Keep the padding so the text doesn't sit right against
 // the bars, but don't factor it into barWidth
@alexcjohnsonalexcjohnsonAug 5, 2017

Copy link


Copy Markdown

Collaborator
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah, good call.
 if(barWidth > 2 * TEXTPAD) {
 textpad = TEXTPAD;
 barWidth -= 2 * textpad;
 }

 // compute rotation and scale
 var rotate = false,
 var scale = 1;
 if(constrained) {
 scale = (orientation === 'h') ?
 Math.min(1, barWidth / textBB.height) :
 Math.min(1, barWidth / textBB.width);
 }

 // compute text and target positions
 var textX = (textBB.left + textBB.right) / 2,
Expand All@@ -360,14 +364,9 @@ function getTransformToMoveOutsideBar(x0, x1, y0, y1, textBB, orientation) {
 targetHeight,
 targetX,
 targetY;
 if(rotate) {
 targetWidth = scale * textBB.height;
 targetHeight = scale * textBB.width;
 }
 else {
 targetWidth = scale * textBB.width;
 targetHeight = scale * textBB.height;
 }

 targetWidth = scale * textBB.width;
 targetHeight = scale * textBB.height;

 if(orientation === 'h') {
 if(x1 < x0) {
Expand All@@ -392,7 +391,7 @@ function getTransformToMoveOutsideBar(x0, x1, y0, y1, textBB, orientation) {
 }
 }

 return getTransform(textX, textY, targetX, targetY, scale, rotate);
 return getTransform(textX, textY, targetX, targetY, scale, false);
}

function getTransform(textX, textY, targetX, targetY, scale, rotate) {
Expand Down
Binary file modifiedtest/image/baselines/bar_attrs_group_norm.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.
Binary file modifiedtest/image/baselines/bar_attrs_relative.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.

2 changes: 2 additions & 0 deletions
test/jasmine/tests/bar_test.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -95,6 +95,7 @@ describe('Bar.supplyDefaults', function() {
 expect(traceOut.texfont).toBeUndefined();
 expect(traceOut.insidetexfont).toBeUndefined();
 expect(traceOut.outsidetexfont).toBeUndefined();
 expect(traceOut.constraintext).toBeUndefined();
 });

 it('should default textfont to layout.font', function() {
Expand All@@ -116,6 +117,7 @@ describe('Bar.supplyDefaults', function() {
 expect(traceOut.insidetextfont).not.toBe(layout.font);
 expect(traceOut.insidetextfont).not.toBe(traceOut.textfont);
 expect(traceOut.outsidetexfont).toBeUndefined();
 expect(traceOut.constraintext).toBe('both');
 });

 it('should inherit layout.calendar', function() {
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers");
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Bar text constraint configuration#1931

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

rreusser
merged 8 commits into

from

Aug 5, 2017
 Merged


Bar text constraint configuration
#1931
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


8 commits


Select commit
Hold shift + click to select a range
969cac6

Add bar text test case


rreusser Aug 4, 2017
013c871

Add bar text constraint configuration


rreusser Aug 4, 2017
b20ce67

Remove unused testing mock


rreusser Aug 4, 2017
3e92d7a

Fix typo in attr description


rreusser Aug 4, 2017
06bd80d

Fix test expectation


rreusser Aug 4, 2017
5d67212

Recreate bar baselines with modified constraint behavior


rreusser Aug 4, 2017
f690d9b

*actually* fix bar baselines


rreusser Aug 5, 2017
30bba26

Fix test and remove dead code from bar trace


rreusser Aug 5, 2017

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


11 changes: 11 additions & 0 deletions
src/traces/bar/attributes.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -80,6 +80,17 @@ module.exports = {
 description: 'Sets the font used for `text` lying outside the bar.'
 }),

 constraintext: {
 valType: 'enumerated',
 values: ['inside', 'outside', 'both', 'none'],
 role: 'info',
 dflt: 'both',
 description: [
 'Constrain the size of text inside or outside a bar to be no',
 'larger than the bar itself.'
 ].join(' ')
 },

 orientation: {
 valType: 'enumerated',
 role: 'info',
Expand Down

1 change: 1 addition & 0 deletions
src/traces/bar/defaults.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -48,6 +48,7 @@ module.exports = function supplyDefaults(traceIn, traceOut, defaultColor, layout
 var textFont = coerceFont(coerce, 'textfont', layout.font);
 if(hasInside) coerceFont(coerce, 'insidetextfont', textFont);
 if(hasOutside) coerceFont(coerce, 'outsidetextfont', textFont);
 coerce('constraintext');
 }

 handleStyleDefaults(traceIn, traceOut, coerce, defaultColor, layout);
Expand Down

37 changes: 18 additions & 19 deletions
src/traces/bar/plot.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -237,20 +237,22 @@ function appendBarText(gd, bar, calcTrace, i, x0, x1, y0, y1) {
 }

 // compute text transform
 var transform;
 var transform, constrained;
 if(textPosition === 'outside') {
 constrained = trace.constraintext === 'both' || trace.constraintext === 'outside';
 transform = getTransformToMoveOutsideBar(x0, x1, y0, y1, textBB,
 orientation);
 orientation, constrained);
 }
 else {
 constrained = trace.constraintext === 'both' || trace.constraintext === 'inside';
 transform = getTransformToMoveInsideBar(x0, x1, y0, y1, textBB,
 orientation);
 orientation, constrained);
 }

 textSelection.attr('transform', transform);
}

function getTransformToMoveInsideBar(x0, x1, y0, y1, textBB, orientation) {
function getTransformToMoveInsideBar(x0, x1, y0, y1, textBB, orientation, constrained) {
 // compute text and target positions
 var textWidth = textBB.width,
 textHeight = textBB.height,
Expand DownExpand Up@@ -289,12 +291,12 @@ function getTransformToMoveInsideBar(x0, x1, y0, y1, textBB, orientation) {
 else if((textWidth < textHeight) === (barWidth < barHeight)) {
 // only scale is required
 rotate = false;
 scale = Math.min(barWidth / textWidth, barHeight / textHeight);
 scale = constrained ? Math.min(barWidth / textWidth, barHeight / textHeight) : 1;
 }
 else {
 // both scale and rotation are required
 rotate = true;
 scale = Math.min(barHeight / textWidth, barWidth / textHeight);
 scale = constrained ? Math.min(barHeight / textWidth, barWidth / textHeight) : 1;
 }

 if(rotate) rotate = 90; // rotate clockwise
Expand DownExpand Up@@ -335,23 +337,25 @@ function getTransformToMoveInsideBar(x0, x1, y0, y1, textBB, orientation) {
 return getTransform(textX, textY, targetX, targetY, scale, rotate);
}

function getTransformToMoveOutsideBar(x0, x1, y0, y1, textBB, orientation) {
function getTransformToMoveOutsideBar(x0, x1, y0, y1, textBB, orientation, constrained) {
 var barWidth = (orientation === 'h') ?
 Math.abs(y1 - y0) :
 Math.abs(x1 - x0),
 textpad;

 // apply text padding if possible
 // Keep the padding so the text doesn't sit right against
 // the bars, but don't factor it into barWidth
@alexcjohnsonalexcjohnsonAug 5, 2017

Copy link


Copy Markdown

Collaborator
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah, good call.
 if(barWidth > 2 * TEXTPAD) {
 textpad = TEXTPAD;
 barWidth -= 2 * textpad;
 }

 // compute rotation and scale
 var rotate = false,
 var scale = 1;
 if(constrained) {
 scale = (orientation === 'h') ?
 Math.min(1, barWidth / textBB.height) :
 Math.min(1, barWidth / textBB.width);
 }

 // compute text and target positions
 var textX = (textBB.left + textBB.right) / 2,
Expand All@@ -360,14 +364,9 @@ function getTransformToMoveOutsideBar(x0, x1, y0, y1, textBB, orientation) {
 targetHeight,
 targetX,
 targetY;
 if(rotate) {
 targetWidth = scale * textBB.height;
 targetHeight = scale * textBB.width;
 }
 else {
 targetWidth = scale * textBB.width;
 targetHeight = scale * textBB.height;
 }

 targetWidth = scale * textBB.width;
 targetHeight = scale * textBB.height;

 if(orientation === 'h') {
 if(x1 < x0) {
Expand All@@ -392,7 +391,7 @@ function getTransformToMoveOutsideBar(x0, x1, y0, y1, textBB, orientation) {
 }
 }

 return getTransform(textX, textY, targetX, targetY, scale, rotate);
 return getTransform(textX, textY, targetX, targetY, scale, false);
}

function getTransform(textX, textY, targetX, targetY, scale, rotate) {
Expand Down
Binary file modifiedtest/image/baselines/bar_attrs_group_norm.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.
Binary file modifiedtest/image/baselines/bar_attrs_relative.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.

2 changes: 2 additions & 0 deletions
test/jasmine/tests/bar_test.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -95,6 +95,7 @@ describe('Bar.supplyDefaults', function() {
 expect(traceOut.texfont).toBeUndefined();
 expect(traceOut.insidetexfont).toBeUndefined();
 expect(traceOut.outsidetexfont).toBeUndefined();
 expect(traceOut.constraintext).toBeUndefined();
 });

 it('should default textfont to layout.font', function() {
Expand All@@ -116,6 +117,7 @@ describe('Bar.supplyDefaults', function() {
 expect(traceOut.insidetextfont).not.toBe(layout.font);
 expect(traceOut.insidetextfont).not.toBe(traceOut.textfont);
 expect(traceOut.outsidetexfont).toBeUndefined();
 expect(traceOut.constraintext).toBe('both');
 });

 it('should inherit layout.calendar', function() {
Expand Down

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

Skip to content
Bar text constraint configuration#1931

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

rreusser
merged 8 commits into

from

Aug 5, 2017
 Merged


Bar text constraint configuration
#1931
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


8 commits


Select commit
Hold shift + click to select a range
969cac6

Add bar text test case


rreusser Aug 4, 2017
013c871

Add bar text constraint configuration


rreusser Aug 4, 2017
b20ce67

Remove unused testing mock


rreusser Aug 4, 2017
3e92d7a

Fix typo in attr description


rreusser Aug 4, 2017
06bd80d

Fix test expectation


rreusser Aug 4, 2017
5d67212

Recreate bar baselines with modified constraint behavior


rreusser Aug 4, 2017
f690d9b

*actually* fix bar baselines


rreusser Aug 5, 2017
30bba26

Fix test and remove dead code from bar trace


rreusser Aug 5, 2017

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


11 changes: 11 additions & 0 deletions
src/traces/bar/attributes.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -80,6 +80,17 @@ module.exports = {
 description: 'Sets the font used for `text` lying outside the bar.'
 }),

 constraintext: {
 valType: 'enumerated',
 values: ['inside', 'outside', 'both', 'none'],
 role: 'info',
 dflt: 'both',
 description: [
 'Constrain the size of text inside or outside a bar to be no',
 'larger than the bar itself.'
 ].join(' ')
 },

 orientation: {
 valType: 'enumerated',
 role: 'info',
Expand Down

1 change: 1 addition & 0 deletions
src/traces/bar/defaults.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -48,6 +48,7 @@ module.exports = function supplyDefaults(traceIn, traceOut, defaultColor, layout
 var textFont = coerceFont(coerce, 'textfont', layout.font);
 if(hasInside) coerceFont(coerce, 'insidetextfont', textFont);
 if(hasOutside) coerceFont(coerce, 'outsidetextfont', textFont);
 coerce('constraintext');
 }

 handleStyleDefaults(traceIn, traceOut, coerce, defaultColor, layout);
Expand Down

37 changes: 18 additions & 19 deletions
src/traces/bar/plot.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -237,20 +237,22 @@ function appendBarText(gd, bar, calcTrace, i, x0, x1, y0, y1) {
 }

 // compute text transform
 var transform;
 var transform, constrained;
 if(textPosition === 'outside') {
 constrained = trace.constraintext === 'both' || trace.constraintext === 'outside';
 transform = getTransformToMoveOutsideBar(x0, x1, y0, y1, textBB,
 orientation);
 orientation, constrained);
 }
 else {
 constrained = trace.constraintext === 'both' || trace.constraintext === 'inside';
 transform = getTransformToMoveInsideBar(x0, x1, y0, y1, textBB,
 orientation);
 orientation, constrained);
 }

 textSelection.attr('transform', transform);
}

function getTransformToMoveInsideBar(x0, x1, y0, y1, textBB, orientation) {
function getTransformToMoveInsideBar(x0, x1, y0, y1, textBB, orientation, constrained) {
 // compute text and target positions
 var textWidth = textBB.width,
 textHeight = textBB.height,
Expand DownExpand Up@@ -289,12 +291,12 @@ function getTransformToMoveInsideBar(x0, x1, y0, y1, textBB, orientation) {
 else if((textWidth < textHeight) === (barWidth < barHeight)) {
 // only scale is required
 rotate = false;
 scale = Math.min(barWidth / textWidth, barHeight / textHeight);
 scale = constrained ? Math.min(barWidth / textWidth, barHeight / textHeight) : 1;
 }
 else {
 // both scale and rotation are required
 rotate = true;
 scale = Math.min(barHeight / textWidth, barWidth / textHeight);
 scale = constrained ? Math.min(barHeight / textWidth, barWidth / textHeight) : 1;
 }

 if(rotate) rotate = 90; // rotate clockwise
Expand DownExpand Up@@ -335,23 +337,25 @@ function getTransformToMoveInsideBar(x0, x1, y0, y1, textBB, orientation) {
 return getTransform(textX, textY, targetX, targetY, scale, rotate);
}

function getTransformToMoveOutsideBar(x0, x1, y0, y1, textBB, orientation) {
function getTransformToMoveOutsideBar(x0, x1, y0, y1, textBB, orientation, constrained) {
 var barWidth = (orientation === 'h') ?
 Math.abs(y1 - y0) :
 Math.abs(x1 - x0),
 textpad;

 // apply text padding if possible
 // Keep the padding so the text doesn't sit right against
 // the bars, but don't factor it into barWidth
@alexcjohnsonalexcjohnsonAug 5, 2017

Copy link


Copy Markdown

Collaborator
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah, good call.
 if(barWidth > 2 * TEXTPAD) {
 textpad = TEXTPAD;
 barWidth -= 2 * textpad;
 }

 // compute rotation and scale
 var rotate = false,
 var scale = 1;
 if(constrained) {
 scale = (orientation === 'h') ?
 Math.min(1, barWidth / textBB.height) :
 Math.min(1, barWidth / textBB.width);
 }

 // compute text and target positions
 var textX = (textBB.left + textBB.right) / 2,
Expand All@@ -360,14 +364,9 @@ function getTransformToMoveOutsideBar(x0, x1, y0, y1, textBB, orientation) {
 targetHeight,
 targetX,
 targetY;
 if(rotate) {
 targetWidth = scale * textBB.height;
 targetHeight = scale * textBB.width;
 }
 else {
 targetWidth = scale * textBB.width;
 targetHeight = scale * textBB.height;
 }

 targetWidth = scale * textBB.width;
 targetHeight = scale * textBB.height;

 if(orientation === 'h') {
 if(x1 < x0) {
Expand All@@ -392,7 +391,7 @@ function getTransformToMoveOutsideBar(x0, x1, y0, y1, textBB, orientation) {
 }
 }

 return getTransform(textX, textY, targetX, targetY, scale, rotate);
 return getTransform(textX, textY, targetX, targetY, scale, false);
}

function getTransform(textX, textY, targetX, targetY, scale, rotate) {
Expand Down
Binary file modifiedtest/image/baselines/bar_attrs_group_norm.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.
Binary file modifiedtest/image/baselines/bar_attrs_relative.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.

2 changes: 2 additions & 0 deletions
test/jasmine/tests/bar_test.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -95,6 +95,7 @@ describe('Bar.supplyDefaults', function() {
 expect(traceOut.texfont).toBeUndefined();
 expect(traceOut.insidetexfont).toBeUndefined();
 expect(traceOut.outsidetexfont).toBeUndefined();
 expect(traceOut.constraintext).toBeUndefined();
 });

 it('should default textfont to layout.font', function() {
Expand All@@ -116,6 +117,7 @@ describe('Bar.supplyDefaults', function() {
 expect(traceOut.insidetextfont).not.toBe(layout.font);
 expect(traceOut.insidetextfont).not.toBe(traceOut.textfont);
 expect(traceOut.outsidetexfont).toBeUndefined();
 expect(traceOut.constraintext).toBe('both');
 });

 it('should inherit layout.calendar', function() {
Expand Down