@@ -22,6 +22,7 @@ var makeBubbleSizeFn = require('../scatter/make_bubble_size_func');
2222var DASH_PATTERNS = require ( '../../constants/gl3d_dashes' ) ;
2323var MARKER_SYMBOLS = require ( '../../constants/gl3d_markers' ) ;
2424
25+ var Axes = require ( '../../plots/cartesian/axes' ) ;
2526var appendArrayPointValue = require ( '../../components/fx/helpers' ) . appendArrayPointValue ;
2627
2728var calculateError = require ( './calc_errors' ) ;
@@ -241,19 +242,35 @@ function convertPlotlyOptions(scene, data) {
241242 for ( i = 0 ; i < len ; i ++ ) text [ i ] = data . text ;
242243 }
243244
245+ function formatter ( axName , val ) {
246+ var ax = sceneLayout [ axName ] ;
247+ return Axes . tickText ( ax , ax . d2l ( val ) , true ) . text ;
248+ }
249+
244250 // check texttemplate
245251 var texttemplate = data . texttemplate ;
246252 if ( texttemplate ) {
253+ var fullLayout = scene . fullLayout ;
254+ var d3locale = fullLayout . _d3locale ;
247255 var isArray = Array . isArray ( texttemplate ) ;
248256 var N = isArray ? Math . min ( texttemplate . length , len ) : len ;
249- var txt = isArray ? function ( i ) { return texttemplate [ i ] ; } : function ( ) { return texttemplate ; } ;
250- var d3locale = scene . fullLayout . _d3locale ;
257+ var txt = isArray ?
258+ function ( i ) { return texttemplate [ i ] ; } :
259+ function ( ) { return texttemplate ; } ;
260+
251261 text = new Array ( N ) ;
262+
252263 for ( i = 0 ; i < N ; i ++ ) {
253- var pt = { } ;
254- pt . text = text [ i ] ;
255- appendArrayPointValue ( pt , data , i ) ;
256- text [ i ] = Lib . texttemplateString ( txt ( i ) , pt , d3locale , pt , data . _meta || { } ) ;
264+ var d = { x : x [ i ] , y : y [ i ] , z : z [ i ] } ;
265+ var labels = {
266+ xLabel : formatter ( 'xaxis' , x [ i ] ) ,
267+ yLabel : formatter ( 'yaxis' , y [ i ] ) ,
268+ zLabel : formatter ( 'zaxis' , z [ i ] )
269+ } ;
270+ var pointValues = { } ;
271+ appendArrayPointValue ( pointValues , data , i ) ;
272+ var meta = data . _meta || { } ;
273+ text [ i ] = Lib . texttemplateString ( txt ( i ) , labels , d3locale , pointValues , d , meta ) ;
257274 }
258275 }
259276
0 commit comments