Annotation size & text alignment #1551
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -118,6 +118,19 @@ function drawOne(gd, index) { | |
| .call(Color.stroke, options.bordercolor) | ||
| .call(Color.fill, options.bgcolor); | ||
|
|
||
| var isSizeConstrained = options.width || options.height; | ||
|
|
||
| var annClipID = 'clip' + fullLayout._uid + '_ann' + index; | ||
| var annTextClip = fullLayout._defs.select('.clips') | ||
| .selectAll('#' + annClipID) | ||
| .data(isSizeConstrained ? [0] : []); | ||
|
|
||
| annTextClip.enter().append('clipPath') | ||
| .classed('annclip', true) | ||
| .attr('id', annClipID) | ||
| .append('rect'); | ||
| annTextClip.exit().remove(); | ||
|
Contributor
There was a problem hiding this comment. can we add a jasmine test, checking that the clip paths are removed when removing an annotation?
Collaborator
Author
There was a problem hiding this comment. In fact they're not removed - they don't proliferate, ie if you repeatedly make 100 annotations and delete them, you'll never get more than 100 clip paths, but I didn't bother deleting clip paths corresponding to annotations past the end of the new array after removing some. I can revisit that though...
Contributor
There was a problem hiding this comment. Ha I see. We can revisit this when we shift to a more d3-idiomatic pattern in annotation
Collaborator
Author
There was a problem hiding this comment. actually was easy to remove the unneeded clip paths after all -> b21154b |
||
|
|
||
| var font = options.font; | ||
|
|
||
| var annText = annTextGroupInner.append('text') | ||
|
|
@@ -144,19 +157,21 @@ function drawOne(gd, index) { | |
| // at the end, even if their position changes | ||
| annText.selectAll('tspan.line').attr({y: 0, x: 0}); | ||
|
|
||
| var mathjaxGroup = annTextGroupInner.select('.annotation-math-group'); | ||
| var hasMathjax = !mathjaxGroup.empty(); | ||
| var anntextBB = Drawing.bBox( | ||
| (hasMathjax ? mathjaxGroup : annText).node()); | ||
| var textWidth = anntextBB.width; | ||
| var textHeight = anntextBB.height; | ||
| var annWidth = options.width || textWidth; | ||
| var annHeight = options.height || textHeight; | ||
| var outerWidth = Math.round(annWidth + 2 * borderfull); | ||
| var outerHeight = Math.round(annHeight + 2 * borderfull); | ||
|
|
||
|
|
||
| // save size in the annotation object for use by autoscale | ||
| options._w = annWidth; | ||
| options._h = annHeight; | ||
|
|
||
| function shiftFraction(v, anchor) { | ||
| if(anchor === 'auto') { | ||
|
|
@@ -181,8 +196,8 @@ function drawOne(gd, index) { | |
| ax = Axes.getFromId(gd, axRef), | ||
| dimAngle = (textangle + (axLetter === 'x' ? 0 : -90)) * Math.PI / 180, | ||
| // note that these two can be either positive or negative | ||
| annSizeFromWidth = outerWidth * Math.cos(dimAngle), | ||
| annSizeFromHeight = outerHeight * Math.sin(dimAngle), | ||
| // but this one is the positive total size | ||
| annSize = Math.abs(annSizeFromWidth) + Math.abs(annSizeFromHeight), | ||
| anchor = options[axLetter + 'anchor'], | ||
|
|
@@ -299,22 +314,43 @@ function drawOne(gd, index) { | |
| return; | ||
| } | ||
|
|
||
| var xShift = 0; | ||
| var yShift = 0; | ||
|
|
||
| if(options.align !== 'left') { | ||
| xShift = (annWidth - textWidth) * (options.align === 'center' ? 0.5 : 1); | ||
| } | ||
| if(options.valign !== 'top') { | ||
| yShift = (annHeight - textHeight) * (options.valign === 'middle' ? 0.5 : 1); | ||
| } | ||
|
|
||
| if(hasMathjax) { | ||
| mathjaxGroup.select('svg').attr({ | ||
| x: borderfull + xShift - 1, | ||
| y: borderfull + yShift | ||
| }) | ||
| .call(Drawing.setClipUrl, isSizeConstrained ? annClipID : null); | ||
| } | ||
| else { | ||
| var texty = borderfull + yShift - anntextBB.top, | ||
| textx = borderfull + xShift - anntextBB.left; | ||
| annText.attr({ | ||
| x: textx, | ||
| y: texty | ||
| }) | ||
| .call(Drawing.setClipUrl, isSizeConstrained ? annClipID : null); | ||
| annText.selectAll('tspan.line').attr({y: texty, x: textx}); | ||
| } | ||
|
|
||
| annTextClip.select('rect').call(Drawing.setRect, borderfull, borderfull, | ||
| annWidth, annHeight); | ||
|
|
||
| annTextBG.call(Drawing.setRect, borderwidth / 2, borderwidth / 2, | ||
| outerWidth - borderwidth, outerHeight - borderwidth); | ||
|
|
||
| annTextGroupInner.call(Drawing.setTranslate, | ||
| Math.round(annPosPx.x.text - outerWidth / 2), | ||
| Math.round(annPosPx.y.text - outerHeight / 2)); | ||
|
|
||
| /* | ||
| * rotate text and background | ||
|
|
||
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I guess we don't need to coerce
valignisheightisn't set?There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
👍 -> 2e132bd