-
-
Notifications
You must be signed in to change notification settings - Fork 1.9k
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
More gl2d symbols! #1781
Merged
Merged
More gl2d symbols! #1781
Changes from 7 commits
Commits
Show all changes
19 commits
Select commit
Hold shift + click to select a range
2ab37c7
Add 49 more unicode symbols for scattergl symbol types
9890966
revert devtools folder to master
ee67e23
Changed gl_marker 'cross' back to original symbol and ran npm lint-fix
083b00a
add 'scatter' marker symbol mock
etpinard 151b986
update gl symbol list so that they all render in `imagetest` container
etpinard 70fe756
split gl markers into gl2d and gl3d lists
etpinard fe4cbe0
add gl3d marker symbols mock
etpinard b1bccdc
improve scattergl symbol coloring and border width
etpinard b4db0ef
update gl2d marker symbols mock
etpinard 5b89cf2
new scattergl baselines (w/ gl-scatter2d-sdf#4)
etpinard bb9a46c
AJ-proof gl2d marker symbols
etpinard 612921f
bump gl-scatter2d-sdf to ^1.3.10
etpinard f15db4b
add non-white bg to marker symbols mock
etpinard c35fcb3
check in font-atlas-sdf in dependencies
etpinard 9c9346a
add back 'x' and add 'cross-open' & 'x-open'
etpinard 39618de
update gl2d baselines for font-atlas-sdf@1.3.3
etpinard fffc702
simplify scattergl per-symbol logic
etpinard c7a49eb
replace bwFactor logic with minBorderWidth
etpinard 4444c36
add svg and gl2d mocks for marker line width scaling
etpinard File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains 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 |
---|---|---|
@@ -0,0 +1,77 @@ | ||
/** | ||
* Copyright 2012-2017, Plotly, Inc. | ||
* All rights reserved. | ||
* | ||
* This source code is licensed under the MIT license found in the | ||
* LICENSE file in the root directory of this source tree. | ||
*/ | ||
|
||
|
||
'use strict'; | ||
|
||
module.exports = { | ||
'circle': '●', | ||
'circle-open': '○', | ||
'square': '■', | ||
'square-open': '□', | ||
'diamond': '◆', | ||
'diamond-open': '◇', | ||
'cross': '✚', | ||
'triangle-up': '▲', | ||
'triangle-up-open': '△', | ||
'triangle-down': '▼', | ||
'triangle-down-open': '▽', | ||
'triangle-left': '◄', | ||
'triangle-left-open': '◁', | ||
'triangle-right': '►', | ||
'triangle-right-open': '▷', | ||
'triangle-ne': '◥', | ||
'triangle-ne-open': '◹', | ||
'triangle-nw': '◤', | ||
'triangle-nw-open': '◸', | ||
'triangle-se': '◢', | ||
'triangle-se-open': '◿', | ||
'triangle-sw': '◣', | ||
'triangle-sw-open': '◺', | ||
'pentagon': '⬟', | ||
'pentagon-open': '⬠', | ||
'hexagon': '⬢', | ||
'hexagon-open': '⬡', | ||
'hexagon2': '⬣', | ||
'star': '★', | ||
'star-open': '☆', | ||
'diamond-tall': '♦', | ||
'diamond-tall-open': '♢', | ||
'diamond-wide': '▰', | ||
'diamond-wide-open': '▱', | ||
'bowtie': '⧓', | ||
'bowtie-open': '⋈', | ||
'circle-cross': '⨁', | ||
'circle-x': '⨂', | ||
'square-cross': '⊞', | ||
'square-x': '⊠', | ||
'diamond-cross': '⟠', | ||
'diamond-x': '❖', | ||
'cross-thin': '+', | ||
'cross-thin-open': '+', | ||
'x-thin': '╳', | ||
'x-thin-open': '╳', | ||
'asterisk': '✳', | ||
'asterisk-open': '✳', | ||
'y-up': '⅄', | ||
'y-up-open': '⅄', | ||
'y-down': 'Y', | ||
'y-down-open': 'Y', | ||
'y-left': '≺', | ||
'y-left-open': '≺', | ||
'y-right': '≻', | ||
'y-right-open': '≻', | ||
'line-ew': '─', | ||
'line-ew-open': '─', | ||
'line-ns': '│', | ||
'line-ns-open': '│', | ||
'line-ne': '╱', | ||
'line-ne-open': '╱', | ||
'line-nw': '╲', | ||
'line-nw-open': '╲' | ||
}; |
File renamed without changes.
This file contains 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 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 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 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 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
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
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 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 |
---|---|---|
@@ -0,0 +1,77 @@ | ||
{ | ||
"data": [ | ||
{ | ||
"type": "scatter3d", | ||
"x": [1, 2, 3, 4, 5, 6, 7, 8], | ||
"y": [1, 1, 1, 1, 1, 1, 1, 1], | ||
"z": [1, 1, 1, 1, 1, 1, 1, 1], | ||
"mode": "markers", | ||
"text": [ | ||
"marker symbol: 'circle'", | ||
"marker symbol: 'circle-open'", | ||
"marker symbol: 'square'", | ||
"marker symbol: 'square-open'", | ||
"marker symbol: 'diamond'", | ||
"marker symbol: 'diamond-open'", | ||
"marker symbol: 'cross'" | ||
], | ||
"marker": { | ||
"color": "blue", | ||
"size": 8, | ||
"symbol": [ | ||
"circle", | ||
"circle-open", | ||
"square", | ||
"square-open", | ||
"diamond", | ||
"diamond-open", | ||
"cross" | ||
], | ||
"line": { | ||
"color": "orange", | ||
"width": 1.5 | ||
} | ||
}, | ||
"hovertext": "text" | ||
} | ||
], | ||
"layout": { | ||
"width": 500, | ||
"height": 500, | ||
"margin": {"l": 0, "r": 0, "b": 0, "t": 0}, | ||
"scene": { | ||
"camera": { | ||
"eye": { | ||
"x": 0.1, | ||
"y": 0.1, | ||
"z": 2.1 | ||
} | ||
}, | ||
"xaxis": { | ||
"showgrid": false, | ||
"zeroline": false, | ||
"showline": false, | ||
"showticklabels": false, | ||
"title": "", | ||
"range": [0, 10] | ||
}, | ||
"yaxis": { | ||
"showgrid": false, | ||
"zeroline": false, | ||
"showline": false, | ||
"showticklabels": false, | ||
"title": "", | ||
"range": [0, 6] | ||
}, | ||
"zaxis": { | ||
"showgrid": false, | ||
"zeroline": false, | ||
"showline": false, | ||
"showticklabels": false, | ||
"title": "", | ||
"range": [0, 2] | ||
} | ||
}, | ||
"hovermode": "closest" | ||
} | ||
} |
Oops, something went wrong.
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.
We should make sure new marker symbols are positioned and scaled properly in gl3d before adding them. To be completed in a future PR.