Skip to content
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.

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

Implementation of break lines, sub & superscripts and bold & italic styles in WebGL texts #3207

Merged
merged 42 commits into from
Nov 19, 2018
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
42 commits
Select commit Hold shift + click to select a range
f607841
support for multi-line texts
archmoj Nov 2, 2018
87de8bf
correct baselines
archmoj Nov 2, 2018
eb8c36c
using title options in the new mock
archmoj Nov 2, 2018
8bc3da1
using vect-text with line-spacing
archmoj Nov 2, 2018
a0716a2
new baseline images using different default line spacing
archmoj Nov 2, 2018
342c3f5
using new vectorize-text module - no need to convert from html for webgl
archmoj Nov 2, 2018
bd11b26
support of br and sup elements for webgl texts
archmoj Nov 2, 2018
b5fc64a
updated the baseline image of new mock
archmoj Nov 2, 2018
d9ab3c0
updated baseline image
archmoj Nov 2, 2018
945f5cb
adding italic bold super and sub in webgl text
archmoj Nov 4, 2018
a9249f8
updated baseline images with bold italic and sub-super script text in…
archmoj Nov 4, 2018
8a91eae
adjust sub & sup positions and size
archmoj Nov 4, 2018
97909b0
updated baselines using adjusted sub and superscripts positions and size
archmoj Nov 4, 2018
4231e51
applying improvements to gl-plot2d
archmoj Nov 4, 2018
1178ee2
check not to assign undefined style
archmoj Nov 4, 2018
07aecd1
removed passes to HTML to unicode for 2D plots
archmoj Nov 4, 2018
88fef7a
Revert "removed passes to HTML to unicode for 2D plots"
archmoj Nov 4, 2018
29a3cc0
removed convert html to unicode only for ticks
archmoj Nov 4, 2018
9eda799
say no to backslash n
archmoj Nov 6, 2018
37d0a61
changed mock to lock the gl-axes3d bug to set various fonts as well a…
archmoj Nov 6, 2018
3f81998
new baseline to lock gl-axes3d apply font bug
archmoj Nov 6, 2018
1076b8a
renaming the new mock and baseline
archmoj Nov 6, 2018
0b8bc5b
remove previous mock and baseline
archmoj Nov 6, 2018
47215f0
using new module that supports multiple sub and super scripts
archmoj Nov 6, 2018
f8bd5eb
updated the mock to show multiple sub and super scripts
archmoj Nov 6, 2018
5c4df9d
test if we could remove convert html to unicode for 2d axes
archmoj Nov 6, 2018
abc24a5
updated the baseline with the version that has multiple levels of sub…
archmoj Nov 6, 2018
850d7bf
removed html2unicoe.js from lib directory
archmoj Nov 7, 2018
2864bb1
options to disable break lines for ticks in 3d plots
archmoj Nov 13, 2018
f1be3f0
3d baseline without line breaks on ticks
archmoj Nov 13, 2018
23748d5
replace breake line tag with space when breakLines are disabled
archmoj Nov 13, 2018
8f7dbe8
correct module to eplace break-line tags with spaces when breaklines …
archmoj Nov 13, 2018
f1dd3db
baseline image
archmoj Nov 13, 2018
e14e273
reset original baseline
archmoj Nov 13, 2018
7cd1be8
using new modules that enable styletags
archmoj Nov 16, 2018
6e8206e
enable tags
archmoj Nov 16, 2018
113fb63
revised vectorize-text text-cache gl-axes3d and gl-scatter3d modules
archmoj Nov 16, 2018
5bba5e7
removed unused variable
archmoj Nov 16, 2018
a7d9ac3
replace break-lines on 3d plot ticks when the axis type is date
archmoj Nov 16, 2018
9ece9ab
using new set of modules that use vectorize-text 3.2.0
archmoj Nov 19, 2018
2c5a70a
Merge branch 'master' into issue-br3d
archmoj Nov 19, 2018
fc82a19
one fixed to https
archmoj Nov 19, 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
79 changes: 46 additions & 33 deletions package-lock.json

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

4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -78,9 +78,9 @@
"gl-mat4": "^1.2.0",
"gl-mesh3d": "^2.0.1",
"gl-plot2d": "^1.3.1",
"gl-plot3d": "^1.5.10",
"gl-plot3d": "git://github.com/gl-vis/gl-plot3d.git#1c8aadc60eb026bd839f3c4e4a73dab719748843 ",
Copy link
Contributor Author

Choose a reason for hiding this comment

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

"gl-pointcloud2d": "^1.0.1",
"gl-scatter3d": "^1.0.14",
"gl-scatter3d": "git://github.com/gl-vis/gl-scatter3d.git#3a8129c164977857c578ca3aee9a74db1e2d5303",
"gl-select-box": "^1.0.2",
"gl-spikes2d": "^1.0.1",
"gl-streamtube3d": "^1.1.0",
Expand Down
Binary file modified test/image/baselines/gl3d_annotations.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added test/image/baselines/gl3d_multiple-line-texts.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified test/image/baselines/gl3d_world-cals.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
28 changes: 28 additions & 0 deletions test/image/mocks/gl3d_multiple-line-texts.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
{
"data": [
{
"x": [3],
"y": [0],
"z": [2],
"text": ["This text was a long\nline. And now it is\npresented on\nfour lines!"],
"type": "scatter3d",
"mode":"markers+text",
"textposition": "middle center"
}
],
"layout": {
"title":"Now texts could be displayed in 3D on multiple lines.",
"width": 800,
"height": 600,
"scene":{
"xaxis":{"title": "A short axis"},
"yaxis":{"title": "A very <br>long axis"},
"zaxis":{"title": "A very very<br>long long axis<br>Seriously!"},
"camera":{
"eye":{"x":-1.5,"y":1.5,"z":1.5},
"center":{"x":0,"y":0,"z":0},
"up":{"x":0,"y":0,"z":1}
}
}
}
}