@@ -217,21 +217,31 @@ drawing.symbolList = [];
217
217
218
218
Object . keys ( SYMBOLDEFS ) . forEach ( function ( k ) {
219
219
var symDef = SYMBOLDEFS [ k ] ;
220
- drawing . symbolList = drawing . symbolList . concat (
221
- [ symDef . n , k , symDef . n + 100 , k + '-open' ] ) ;
222
- drawing . symbolNames [ symDef . n ] = k ;
223
- drawing . symbolFuncs [ symDef . n ] = symDef . f ;
220
+ var n = symDef . n ;
221
+ drawing . symbolList . push (
222
+ n ,
223
+ k ,
224
+ n + 100 ,
225
+ k + '-open'
226
+ ) ;
227
+ drawing . symbolNames [ n ] = k ;
228
+ drawing . symbolFuncs [ n ] = symDef . f ;
229
+
224
230
if ( symDef . needLine ) {
225
- drawing . symbolNeedLines [ symDef . n ] = true ;
231
+ drawing . symbolNeedLines [ n ] = true ;
226
232
}
227
233
if ( symDef . noDot ) {
228
- drawing . symbolNoDot [ symDef . n ] = true ;
234
+ drawing . symbolNoDot [ n ] = true ;
229
235
} else {
230
- drawing . symbolList = drawing . symbolList . concat (
231
- [ symDef . n + 200 , k + '-dot' , symDef . n + 300 , k + '-open-dot' ] ) ;
236
+ drawing . symbolList . push (
237
+ n + 200 ,
238
+ k + '-dot' ,
239
+ n + 300 ,
240
+ k + '-open-dot'
241
+ ) ;
232
242
}
233
243
if ( symDef . noFill ) {
234
- drawing . symbolNoFill [ symDef . n ] = true ;
244
+ drawing . symbolNoFill [ n ] = true ;
235
245
}
236
246
} ) ;
237
247
@@ -253,8 +263,9 @@ drawing.symbolNumber = function(v) {
253
263
v = drawing . symbolNames . indexOf ( v ) ;
254
264
if ( v >= 0 ) { v += vbase ; }
255
265
}
256
- if ( ( v % 100 >= MAXSYMBOL ) || v >= 400 ) { return 0 ; }
257
- return Math . floor ( Math . max ( v , 0 ) ) ;
266
+
267
+ return ( v % 100 >= MAXSYMBOL || v >= 400 ) ?
268
+ 0 : Math . floor ( Math . max ( v , 0 ) ) ;
258
269
} ;
259
270
260
271
function makePointPath ( symbolNumber , r ) {
0 commit comments