Skip to content

Commit 70fe756

Browse files
committed
split gl markers into gl2d and gl3d lists
- so that gl3d list remains the same until we spend more time tweaking each symbol's positioning in gl3d
1 parent 151b986 commit 70fe756

File tree

7 files changed

+26
-5
lines changed

7 files changed

+26
-5
lines changed
File renamed without changes.

src/constants/gl3d_markers.js

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
/**
2+
* Copyright 2012-2017, Plotly, Inc.
3+
* All rights reserved.
4+
*
5+
* This source code is licensed under the MIT license found in the
6+
* LICENSE file in the root directory of this source tree.
7+
*/
8+
9+
10+
'use strict';
11+
12+
module.exports = {
13+
circle: '●',
14+
'circle-open': '○',
15+
square: '■',
16+
'square-open': '□',
17+
diamond: '◆',
18+
'diamond-open': '◇',
19+
cross: '+',
20+
x: '❌'
21+
};

src/traces/scatter3d/attributes.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ var colorAttributes = require('../../components/colorscale/color_attributes');
1313
var errorBarAttrs = require('../../components/errorbars/attributes');
1414
var DASHES = require('../../constants/gl3d_dashes');
1515

16-
var MARKER_SYMBOLS = require('../../constants/gl_markers');
16+
var MARKER_SYMBOLS = require('../../constants/gl3d_markers');
1717
var extendFlat = require('../../lib/extend').extendFlat;
1818

1919
var scatterLineAttrs = scatterAttrs.line,

src/traces/scatter3d/convert.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ var str2RgbaArray = require('../../lib/str2rgbarray');
2020
var formatColor = require('../../lib/gl_format_color');
2121
var makeBubbleSizeFn = require('../scatter/make_bubble_size_func');
2222
var DASH_PATTERNS = require('../../constants/gl3d_dashes');
23-
var MARKER_SYMBOLS = require('../../constants/gl_markers');
23+
var MARKER_SYMBOLS = require('../../constants/gl3d_markers');
2424

2525
var calculateError = require('./calc_errors');
2626

src/traces/scatter3d/index.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ var Scatter3D = {};
1212

1313
Scatter3D.plot = require('./convert');
1414
Scatter3D.attributes = require('./attributes');
15-
Scatter3D.markerSymbols = require('../../constants/gl_markers');
15+
Scatter3D.markerSymbols = require('../../constants/gl3d_markers');
1616
Scatter3D.supplyDefaults = require('./defaults');
1717
Scatter3D.colorbar = require('../scatter/colorbar');
1818
Scatter3D.calc = require('./calc');

src/traces/scattergl/attributes.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ var scatterAttrs = require('../scatter/attributes');
1212
var colorAttributes = require('../../components/colorscale/color_attributes');
1313

1414
var DASHES = require('../../constants/gl2d_dashes');
15-
var MARKERS = require('../../constants/gl_markers');
15+
var MARKERS = require('../../constants/gl2d_markers');
1616
var extendFlat = require('../../lib/extend').extendFlat;
1717
var extendDeep = require('../../lib/extend').extendDeep;
1818

src/traces/scattergl/convert.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ var formatColor = require('../../lib/gl_format_color');
2525
var subTypes = require('../scatter/subtypes');
2626
var makeBubbleSizeFn = require('../scatter/make_bubble_size_func');
2727
var getTraceColor = require('../scatter/get_trace_color');
28-
var MARKER_SYMBOLS = require('../../constants/gl_markers');
28+
var MARKER_SYMBOLS = require('../../constants/gl2d_markers');
2929
var DASHES = require('../../constants/gl2d_dashes');
3030

3131
var AXES = ['xaxis', 'yaxis'];

0 commit comments

Comments
 (0)