Skip to content

Commit 8837b2e

Browse files
etpinardetpinard
committed
Merge branch 'master' into scattergl-errors
2 parents 2f4786d + a9040d1 commit 8837b2e

File tree

87 files changed

+131673
-437
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

87 files changed

+131673
-437
lines changed

‎README.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
[![npm version](https://badge.fury.io/js/plotly.js.svg)](https://badge.fury.io/js/plotly.js)
44
[![circle ci](https://circleci.com/gh/plotly/plotly.js.png?&style=shield&circle-token=1f42a03b242bd969756fc3e53ede204af9b507c0)](https://circleci.com/gh/plotly/plotly.js)
5+
[![MIT License](https://img.shields.io/badge/License-MIT-brightgreen.svg)](https://github.com/plotly/plotly.js/blob/master/LICENSE)
56

67
Built on top of [d3.js](http://d3js.org/) and [stack.gl](http://stack.gl/),
78
plotly.js is a high-level, declarative charting library. plotly.js ships with over 20
@@ -175,6 +176,7 @@ plotly.js charts can also be created and saved online for free at [plot.ly/creat
175176
|**Alex C. Johnson**| [@alexcjohnson](https://github.com/alexcjohnson) | |
176177
|**Étienne Tétreault-Pinard**| [@etpinard](https://github.com/etpinard) | [@etpinard](https://twitter.com/etpinard) |
177178
|**Mikola Lysenko**| [@mikolalysenko](https://github.com/mikolalysenko) | [@MikolaLysenko](https://twitter.com/MikolaLysenko) |
179+
| **Dmitry Yv.** | [@dy](https://github.com/dy) | [@DimaYv](https://twitter.com/dimayv)|
178180
|**Ricky Reusser**| [@rreusser](https://github.com/rreusser) | [@rickyreusser](https://twitter.com/rickyreusser) |
179181
|**Robert Monfera**| [@monfera](https://github.com/monfera) | [@monfera](https://twitter.com/monfera) |
180182
|**Nicolas Riesco**| [@n-riesco](https://github.com/n-riesco) | |

‎build/plotcss.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ var rules = {
3030
"X .cursor-nw-resize": "cursor:nw-resize;",
3131
"X .cursor-n-resize": "cursor:n-resize;",
3232
"X .cursor-ne-resize": "cursor:ne-resize;",
33+
"X .cursor-grab": "cursor:-webkit-grab;cursor:grab;",
3334
"X .modebar": "position:absolute;top:2px;right:2px;z-index:1001;background:rgba(255,255,255,0.7);",
3435
"X .modebar--hover": "opacity:0;-webkit-transition:opacity 0.3s ease 0s;-moz-transition:opacity 0.3s ease 0s;-ms-transition:opacity 0.3s ease 0s;-o-transition:opacity 0.3s ease 0s;transition:opacity 0.3s ease 0s;",
3536
"X:hover .modebar--hover": "opacity:1;",

‎lib/cone.js

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
/**
2+
* Copyright 2012-2018, 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+
'use strict';
10+
11+
module.exports = require('../src/traces/cone');

‎lib/index-gl3d.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,8 @@ var Plotly = require('./core');
1313
Plotly.register([
1414
require('./scatter3d'),
1515
require('./surface'),
16-
require('./mesh3d')
16+
require('./mesh3d'),
17+
require('./cone')
1718
]);
1819

1920
module.exports = Plotly;

‎lib/index.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ Plotly.register([
2626
require('./scatter3d'),
2727
require('./surface'),
2828
require('./mesh3d'),
29+
require('./cone'),
2930

3031
require('./scattergeo'),
3132
require('./choropleth'),

‎lib/locales/it.js

Lines changed: 60 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,66 @@
1111
module.exports = {
1212
moduleType: 'locale',
1313
name: 'it',
14-
dictionary: {},
14+
dictionary: {
15+
'Autoscale': 'Scala automaticamente', // components/modebar/buttons.js:139
16+
'Box Select': 'Selezione box', // components/modebar/buttons.js:103
17+
'Click to enter Colorscale title': 'Clicca per inserire un titolo alla scala di colori', // plots/plots.js:437
18+
'Click to enter Component A title': 'Clicca per inserire un titolo al componente A', // plots/ternary/ternary.js:386
19+
'Click to enter Component B title': 'Clicca per inserire un titolo al componente B', // plots/ternary/ternary.js:400
20+
'Click to enter Component C title': 'Clicca per inserire un titolo al componente C', // plots/ternary/ternary.js:411
21+
'Click to enter Plot title': 'Clicca per inserire un titolo al grafico', // plot_api/plot_api.js:579
22+
'Click to enter X axis title': 'Clicca per inserire un titolo all\'asse X', // plots/plots.js:435
23+
'Click to enter Y axis title': 'Clicca per inserire un titolo all\'asse Y', // plots/plots.js:436
24+
'Click to enter radial axis title': 'Clicca per inserire un titolo per l\' asse radiale', // plots/plots.js:436
25+
'Compare data on hover': 'Paragona i dati al passaggio del mouse', // components/modebar/buttons.js:167
26+
'Double-click on legend to isolate one trace': 'Doppio click per isolare i dati di una traccia', // components/legend/handle_click.js:90
27+
'Double-click to zoom back out': 'Doppio click per tornare allo zoom iniziale', // plots/cartesian/dragbox.js:299
28+
'Download plot as a png': 'Scarica il grafico come immagine png', // components/modebar/buttons.js:52
29+
'Edit in Chart Studio': 'Modifica in Chart Studio', // components/modebar/buttons.js:76
30+
'IE only supports svg. Changing format to svg.': 'IE supporta solo svg. Modifica formato in svg.', // components/modebar/buttons.js:60
31+
'Lasso Select': 'Selezione lazo', // components/modebar/buttons.js:112
32+
'Orbital rotation': 'Rotazione orbitale', // components/modebar/buttons.js:279
33+
'Pan': 'Sposta', // components/modebar/buttons.js:94
34+
'Produced with Plotly': 'Creato con Plotly', // components/modebar/modebar.js:256
35+
'Reset': 'Reset', // components/modebar/buttons.js:432
36+
'Reset axes': 'Resetta gli assi', // components/modebar/buttons.js:148
37+
'Reset camera to default': 'Reimposta la camera ai valori predefiniti', // components/modebar/buttons.js:314
38+
'Reset camera to last save': 'Reimposta la camera all\' ultimo salvataggio', // components/modebar/buttons.js:322
39+
'Reset view': 'Reimposta la vista', // components/modebar/buttons.js:583
40+
'Reset views': 'Reimposta le viste', // components/modebar/buttons.js:529
41+
'Show closest data on hover': 'Mostra i dati più vicini al passaggio del mouse', // components/modebar/buttons.js:157
42+
'Snapshot succeeded': 'Screenshot creato con successo', // components/modebar/buttons.js:66
43+
'Sorry, there was a problem downloading your snapshot!': 'Si è verificato un errore durante la creazione dello screenshot', // components/modebar/buttons.js:69
44+
'Taking snapshot - this may take a few seconds': 'Creazione screenshot - potrebbe richiedere qualche secondo', // components/modebar/buttons.js:57
45+
'Zoom': 'Zoom', // components/modebar/buttons.js:85
46+
'Zoom in': 'Ingrandisci', // components/modebar/buttons.js:121
47+
'Zoom out': 'Rimpicciolisci', // components/modebar/buttons.js:130
48+
'close:': 'chiudi:', // traces/ohlc/transform.js:139
49+
'trace': 'traccia', // plots/plots.js:439
50+
'lat:': 'lat.:', // traces/scattergeo/calc.js:48
51+
'lon:': 'lon.:', // traces/scattergeo/calc.js:49
52+
'q1:': 'q1:', // traces/box/calc.js:130
53+
'q3:': 'q3:', // traces/box/calc.js:131
54+
'source:': 'sorgente:', // traces/sankey/plot.js:140
55+
'target:': 'target:', // traces/sankey/plot.js:141
56+
'max:': 'max.:', // traces/box/calc.js:132
57+
'mean ± σ:': 'media ± σ:', // traces/box/calc.js:133
58+
'mean:': 'media:', // traces/box/calc.js:133
59+
'median:': 'mediana:', // traces/box/calc.js:128
60+
'min:': 'min.:', // traces/box/calc.js:129
61+
'new text:': 'Nuovo testo:', // plots/plots.js:327
62+
'upper fence:': 'limite superiore:', // traces/box/calc.js:129
63+
'lower fence:': 'limite inferiore:', // traces/box/calc.js:129
64+
'Turntable rotation': 'Rotazione piattaforma', // components/modebar/buttons.js:288
65+
'Toggle Spike Lines': 'Abilita linee di identificazione', // components/modebar/buttons.js:548
66+
'open:': 'apri:', // traces/ohlc/transform.js:136
67+
'high:': 'alto:', // traces/ohlc/transform.js:137
68+
'kde:': 'kde:', // traces/violin/calc.js:73
69+
'low:': 'basso:', // traces/ohlc/transform.js:138
70+
'incoming flow count:': 'Flusso in entrata:', // traces/sankey/plot.js:142
71+
'outgoing flow count:': 'Flusso in uscita:', // traces/sankey/plot.js:143
72+
'Toggle show closest data on hover': 'Abilita mostra i dati più vicini al passaggio del mouse', // components/modebar/buttons.js:353
73+
},
1574
format: {
1675
days: [
1776
'Domenica', 'Lunedì', 'Martedì', 'Mercoledì',

‎lib/locales/pt-br.js

Lines changed: 60 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,66 @@
1111
module.exports = {
1212
moduleType: 'locale',
1313
name: 'pt-BR',
14-
dictionary: {},
14+
dictionary: {
15+
'Autoscale': 'Escala automática',
16+
'Box Select': 'Seleção retangular',
17+
'Click to enter Colorscale title': 'Clique para editar o título da escala de cor',
18+
'Click to enter Component A title': 'Clique para editar o título do Componente A',
19+
'Click to enter Component B title': 'Clique para editar o título do Componente B',
20+
'Click to enter Component C title': 'Clique para editar o título do Componente C',
21+
'Click to enter Plot title': 'Clique para editar o título do Gráfico',
22+
'Click to enter X axis title': 'Clique para editar o título do eixo X',
23+
'Click to enter Y axis title': 'Clique para editar o título do eixo Y',
24+
'Click to enter radial axis title': 'Clique para editar o título do eixo radial',
25+
'Compare data on hover': 'Comparar dados ao pairar',
26+
'Double-click on legend to isolate one trace': 'Duplo clique na legenda para isolar uma série',
27+
'Double-click to zoom back out': 'Duplo clique para reverter zoom',
28+
'Download plot as a png': 'Fazer download do gráfico como imagem (png)',
29+
'Edit in Chart Studio': 'Editar no Chart Studio',
30+
'IE only supports svg. Changing format to svg.': 'IE suporta apenas svg. Alterando formato para svg',
31+
'Lasso Select': 'Seleção de laço',
32+
'Orbital rotation': 'Rotação orbital',
33+
'Pan': 'Mover',
34+
'Produced with Plotly': 'Criado com o Plotly',
35+
'Reset': 'Restaurar',
36+
'Reset axes': 'Restaurar eixos',
37+
'Reset camera to default': 'Restaurar câmera para padrão',
38+
'Reset camera to last save': 'Restaurar câmera para última salva',
39+
'Reset view': 'Restaurar visão',
40+
'Reset views': 'Restaurar visões',
41+
'Show closest data on hover': 'Exibir dado mais próximo ao pairar',
42+
'Snapshot succeeded': 'Captura instantânea completa',
43+
'Sorry, there was a problem downloading your snapshot!': 'Desculpe, houve um problema no download de sua captura instantânea!',
44+
'Taking snapshot - this may take a few seconds': 'Efetuando captura instantânea - isso pode levar alguns instantes',
45+
'Toggle Spike Lines': 'Habilitar/desabilitar triangulação de linhas',
46+
'Toggle show closest data on hover': 'Habilitar/desabilitar exibição de dado mais próximo ao pairar',
47+
'Turntable rotation': 'Rotação de mesa',
48+
'Zoom': 'Zoom',
49+
'Zoom in': 'Ampliar zoom',
50+
'Zoom out': 'Reduzir zoom',
51+
'close': 'fechamento',
52+
'high': 'alta',
53+
'incoming flow count': 'contagem de fluxo de entrada',
54+
'kde': 'kde',
55+
'lat': 'latitude',
56+
'lon': 'longitude',
57+
'low': 'baixa',
58+
'lower fence': 'limite inferior',
59+
'max': 'máximo',
60+
'mean ± σ': 'média ± σ',
61+
'mean': 'média',
62+
'median': 'mediana',
63+
'min': 'mínimo',
64+
'new text': 'novo texto',
65+
'open': 'abertura',
66+
'outgoing flow count': 'contagem de fluxo de saída',
67+
'q1': 'q1',
68+
'q3': 'q3',
69+
'source': 'origem',
70+
'target': 'destino',
71+
'trace': 'série',
72+
'upper fence': 'limite superior'
73+
},
1574
format: {
1675
days: [
1776
'Domingo', 'Segunda-feira', 'Terça-feira', 'Quarta-feira',

‎package-lock.json

Lines changed: 11 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,7 @@
7070
"es6-promise": "^3.0.2",
7171
"fast-isnumeric": "^1.1.1",
7272
"font-atlas-sdf": "^1.3.3",
73+
"gl-cone3d": "^v1.0.1",
7374
"gl-contour2d": "^1.1.4",
7475
"gl-error3d": "^1.0.7",
7576
"gl-heatmap2d": "^1.0.4",

‎src/components/annotations/draw.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ function drawRaw(gd, options, index, subplotId, xa, ya) {
132132

133133
var annTextGroupInner = annTextGroup.append('g')
134134
.style('pointer-events', textEvents ? 'all' : null)
135-
.call(setCursor, 'default')
135+
.call(setCursor, 'pointer')
136136
.on('click', function() {
137137
gd._dragging = false;
138138

@@ -533,6 +533,7 @@ function drawRaw(gd, options, index, subplotId, xa, ya) {
533533
var arrowDrag = arrowGroup.append('path')
534534
.classed('annotation-arrow', true)
535535
.classed('anndrag', true)
536+
.classed('cursor-move', true)
536537
.attr({
537538
d: 'M3,3H-3V-3H3ZM0,0L' + (tailX - arrowDragHeadX) + ',' + (tailY - arrowDragHeadY),
538539
transform: 'translate(' + arrowDragHeadX + ',' + arrowDragHeadY + ')'

0 commit comments

Comments
 (0)