Skip to content

Enable text for scattergl trace#2737

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
etpinard merged 50 commits into from
Jul 5, 2018
Merged

Enable text for scattergl trace #2737

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
50 commits
Select commit Hold shift + click to select a range
8ec98b9
Enable text-related attributes
dy Jun 14, 2018
862905c
Basic font rendering
dy Jun 15, 2018
d1a06c0
Make correct render output
dy Jun 15, 2018
cbc7f3f
Fix alignment
dy Jun 15, 2018
cc2cca1
use github 'regl-text'
etpinard Jun 18, 2018
e5a771c
Avoid double update
dy Jun 18, 2018
349b551
Fix image width
dy Jun 18, 2018
71c1acb
Add proper vertical alignment
dy Jun 20, 2018
4fe4e3a
Add textgl mocks
dy Jun 20, 2018
ff1d4fc
Use published gl-text package
dy Jun 20, 2018
95a3d1a
Compare license ignoring trailing spaces
dy Jun 20, 2018
ed7e0a0
Update deps
dy Jun 20, 2018
fa96cc7
Fix es5 word
dy Jun 20, 2018
9653fcf
Bump gl-util
dy Jun 21, 2018
17c1b0b
Add mocks
dy Jun 21, 2018
0154571
Fix mocks
dy Jun 21, 2018
c47d258
Unroll redundant change
dy Jun 21, 2018
79eae53
Bump gl-text deps
dy Jun 21, 2018
bd4491c
is isNumeric instead of typeof === 'number'
etpinard Jun 21, 2018
741bfb1
Rename mocks
dy Jun 21, 2018
4d67fa4
Fix panning
dy Jun 21, 2018
90479a7
Make text selection work
dy Jun 21, 2018
6def5e4
Fix text tests
dy Jun 21, 2018
47cf7e2
Make fast batch rendering
dy Jun 27, 2018
a53baf6
Make selection work
dy Jun 27, 2018
b3fb445
Bump gl-text
dy Jun 27, 2018
e09a4e1
Tmp fix
dy Jun 27, 2018
668d7ee
Fix undefined offsets/baseline
dy Jun 27, 2018
a41ea35
Bump gl-text
dy Jun 27, 2018
1702b30
Make selection work better
dy Jun 27, 2018
62bf263
Add baselines
dy Jun 27, 2018
65f97f3
Fix dep
dy Jun 27, 2018
55906cc
fixup package-lock
etpinard Jun 28, 2018
46bc623
clean up export names for scattergl/convert.js
etpinard Jun 28, 2018
7d75169
rename [un]selectedOptions -> marker{Unselected|Selected}Options
etpinard Jun 28, 2018
1a64005
cleanup scattergl text convert / select logic
etpinard Jun 28, 2018
bdc8f4a
apply [un]selected.textfont.color on plot
etpinard Jun 29, 2018
959a555
add & :lock: `hovertext` support for scattergl
etpinard Jun 29, 2018
431c564
fix & :lock: scattergl text visible toggles
etpinard Jun 29, 2018
9f3827c
add gl text chart select test
etpinard Jun 29, 2018
3af4d2f
use glText[0].regl to clear viewport during selection when `mode: 'te…
etpinard Jun 29, 2018
a83077b
Merge pull request #2770 from plotly/textgl-etienne
etpinard Jul 3, 2018
29fa2ef
Bump gl-text, fix safari
dy Jul 3, 2018
e462eda
fixup package-lock
etpinard Jul 4, 2018
52614d1
fix and :lock: selections + array textfont.color
etpinard Jul 4, 2018
143a61e
fixup selected textfont.color logic + add a few more tests
etpinard Jul 4, 2018
fb08f55
Bump gl-text
dy Jul 4, 2018
a5637dd
Update baselines
dy Jul 4, 2018
6aedaa6
Round texture shape
dy Jul 4, 2018
235f1ac
fixup package-lock
etpinard Jul 5, 2018
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
180 changes: 177 additions & 3 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions package.json
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -83,6 +83,7 @@
"gl-select-box": "^1.0.2",
"gl-spikes2d": "^1.0.1",
"gl-surface3d": "^1.3.5",
"gl-text": "^1.1.5",
"glslify": "^6.1.1",
"has-hover": "^1.0.1",
"has-passive-events": "^1.0.0",
Expand Down
6 changes: 4 additions & 2 deletions src/components/drawing/index.js
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -603,7 +603,9 @@ drawing.tryColorscale = function(marker, prefix) {
else return Lib.identity;
};

var TEXTOFFSETSIGN = {start: 1, end: -1, middle: 0, bottom: 1, top: -1};
var TEXTOFFSETSIGN = {
start: 1, end: -1, middle: 0, bottom: 1, top: -1
};

function textPointPosition(s, textPosition, fontSize, markerRadius) {
var group = d3.select(s.node().parentNode);
Expand All@@ -623,7 +625,7 @@ function textPointPosition(s, textPosition, fontSize, markerRadius) {
var numLines = (svgTextUtils.lineCount(s) - 1) * LINE_SPACING + 1;
var dx = TEXTOFFSETSIGN[h] * r;
var dy = fontSize * 0.75 + TEXTOFFSETSIGN[v] * r +
(TEXTOFFSETSIGN[v] - 1) * numLines * fontSize / 2;
(TEXTOFFSETSIGN[v] - 1) * numLines * fontSize / 2;

// fix the overall text group position
s.attr('text-anchor', h);
Expand Down
13 changes: 10 additions & 3 deletions src/traces/scattergl/attributes.js
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -37,9 +37,14 @@ var attrs = module.exports = overrideAll({
'this trace\'s (x,y) coordinates.'
].join(' ')
}),
hovertext: scatterAttrs.hovertext,

textposition: scatterAttrs.textposition,
textfont: scatterAttrs.textfont,

mode: {
valType: 'flaglist',
flags: ['lines', 'markers'],
flags: ['lines', 'markers', 'text'],

@etpinardetpinardJun 21, 2018

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Now that scattergl supports on-graph, we can add hovertext like in svg scatter traces:

plotly.js/src/traces/scatter/attributes.js

Lines 91 to 104 in 6ac47ec

hovertext: {
valType: 'string',
role: 'info',
dflt: '',
arrayOk: true,
editType: 'style',
description: [
'Sets hover text elements associated with each (x,y) pair.',
'If a single string, the same string appears over',
'all the data points.',
'If an array of string, the items are mapped in order to the',
'this trace\'s (x,y) coordinates.',
'To be seen, trace `hoverinfo` must contain a *text* flag.'
].join(' ')

@etpinardetpinardJun 29, 2018

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

done in 959a555

extras: ['none'],
role: 'info',
description: [
Expand DownExpand Up@@ -77,10 +82,12 @@ var attrs = module.exports = overrideAll({
hoveron: scatterAttrs.hoveron,

selected: {
marker: scatterAttrs.selected.marker
marker: scatterAttrs.selected.marker,
textfont: scatterAttrs.selected.textfont
},
unselected: {
marker: scatterAttrs.unselected.marker
marker: scatterAttrs.unselected.marker,
textfont: scatterAttrs.unselected.textfont

@etpinardetpinardJun 21, 2018

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Does this work? And what about selected.textfont?

@etpinardetpinardJun 21, 2018

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Confirmed. selected.textfont.color and unselected.textfont.color do not work.

@etpinardetpinardJun 29, 2018

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

mostly done in 1a64005

},

opacity: plotAttrs.opacity
Expand Down
Loading