diff options
Diffstat (limited to 'js/data/pi')
-rw-r--r-- | js/data/pi/pi-data.js | 38 |
1 files changed, 28 insertions, 10 deletions
diff --git a/js/data/pi/pi-data.js b/js/data/pi/pi-data.js index 748f19bb..1f8870ca 100644 --- a/js/data/pi/pi-data.js +++ b/js/data/pi/pi-data.js | |||
@@ -288,6 +288,7 @@ exports.PiData = Montage.create( Montage, { | |||
288 | type : "color", | 288 | type : "color", |
289 | prop: "background", | 289 | prop: "background", |
290 | id : "fill", | 290 | id : "fill", |
291 | prop : "fill", | ||
291 | divider : true | 292 | divider : true |
292 | } | 293 | } |
293 | ], | 294 | ], |
@@ -317,10 +318,11 @@ exports.PiData = Montage.create( Montage, { | |||
317 | id: "tlRadius", | 318 | id: "tlRadius", |
318 | prop : "tlRadius", | 319 | prop : "tlRadius", |
319 | label: "TL", | 320 | label: "TL", |
321 | valueMutator: parseFloat, | ||
320 | value : 0, | 322 | value : 0, |
321 | min : 0, | 323 | min : 0, |
322 | max : 100, | 324 | max : 100, |
323 | unit : "%", | 325 | unit : "px", |
324 | acceptableUnits: ["px", "pt", "%"] | 326 | acceptableUnits: ["px", "pt", "%"] |
325 | }, | 327 | }, |
326 | { | 328 | { |
@@ -328,10 +330,12 @@ exports.PiData = Montage.create( Montage, { | |||
328 | id : "trRadius", | 330 | id : "trRadius", |
329 | prop : "trRadius", | 331 | prop : "trRadius", |
330 | label : "TR", | 332 | label : "TR", |
333 | valueMutator: parseFloat, | ||
331 | min : 0, | 334 | min : 0, |
332 | max : 100, | 335 | max : 100, |
333 | unit : "%", | 336 | unit : "px", |
334 | acceptableUnits: ["px", "pt", "%"] | 337 | acceptableUnits: ["px", "pt", "%"], |
338 | divider: true | ||
335 | } | 339 | } |
336 | ], | 340 | ], |
337 | [ | 341 | [ |
@@ -340,9 +344,10 @@ exports.PiData = Montage.create( Montage, { | |||
340 | id : "blRadius", | 344 | id : "blRadius", |
341 | prop : "blRadius", | 345 | prop : "blRadius", |
342 | label : "BL", | 346 | label : "BL", |
347 | valueMutator: parseFloat, | ||
343 | min : 0, | 348 | min : 0, |
344 | max : 100, | 349 | max : 100, |
345 | unit : "%", | 350 | unit : "px", |
346 | acceptableUnits: ["px", "pt", "%"] | 351 | acceptableUnits: ["px", "pt", "%"] |
347 | }, | 352 | }, |
348 | { | 353 | { |
@@ -350,9 +355,10 @@ exports.PiData = Montage.create( Montage, { | |||
350 | id : "brRadius", | 355 | id : "brRadius", |
351 | prop : "brRadius", | 356 | prop : "brRadius", |
352 | label : "BR", | 357 | label : "BR", |
358 | valueMutator: parseFloat, | ||
353 | min : 0, | 359 | min : 0, |
354 | max : 100, | 360 | max : 100, |
355 | unit : "%", | 361 | unit : "px", |
356 | acceptableUnits: ["px", "pt", "%"] | 362 | acceptableUnits: ["px", "pt", "%"] |
357 | } | 363 | } |
358 | ] | 364 | ] |
@@ -366,13 +372,18 @@ exports.PiData = Montage.create( Montage, { | |||
366 | { | 372 | { |
367 | type: "dropdown", | 373 | type: "dropdown", |
368 | id: "strokeMaterial", | 374 | id: "strokeMaterial", |
375 | prop: "strokeMaterial", | ||
369 | label: "Stroke", | 376 | label: "Stroke", |
370 | labelField: "_name", | 377 | labelField: "_name", |
371 | items : { boundObject: "this.application.ninja.appModel", boundProperty: "materials" } | 378 | items : { boundObject: "this.application.ninja.appModel", boundProperty: "materials" }, |
372 | }, | 379 | divider : true |
380 | } | ||
381 | ], | ||
382 | [ | ||
373 | { | 383 | { |
374 | type: "dropdown", | 384 | type: "dropdown", |
375 | id: "fillMaterial", | 385 | id: "fillMaterial", |
386 | prop: "fillMaterial", | ||
376 | label: "Fill", | 387 | label: "Fill", |
377 | labelField: "_name", | 388 | labelField: "_name", |
378 | items : { boundObject: "this.application.ninja.appModel", boundProperty: "materials" } | 389 | items : { boundObject: "this.application.ninja.appModel", boundProperty: "materials" } |
@@ -451,6 +462,7 @@ exports.PiData = Montage.create( Montage, { | |||
451 | type : "color", | 462 | type : "color", |
452 | prop: "background", | 463 | prop: "background", |
453 | id : "fill", | 464 | id : "fill", |
465 | prop : "fill", | ||
454 | divider : true | 466 | divider : true |
455 | } | 467 | } |
456 | ], | 468 | ], |
@@ -479,7 +491,8 @@ exports.PiData = Montage.create( Montage, { | |||
479 | type: "hottext", | 491 | type: "hottext", |
480 | id: "innerRadius", | 492 | id: "innerRadius", |
481 | prop: "innerRadius", | 493 | prop: "innerRadius", |
482 | label: "Inner Radius", | 494 | label: "Inner R", |
495 | valueMutator: parseFloat, | ||
483 | value : 0, | 496 | value : 0, |
484 | min : 0, | 497 | min : 0, |
485 | max : 100, | 498 | max : 100, |
@@ -498,13 +511,18 @@ exports.PiData = Montage.create( Montage, { | |||
498 | { | 511 | { |
499 | type: "dropdown", | 512 | type: "dropdown", |
500 | id: "strokeMaterial", | 513 | id: "strokeMaterial", |
514 | prop: "strokeMaterial", | ||
501 | label: "Stroke", | 515 | label: "Stroke", |
502 | labelFunction: function(item) { return item.getName(); }, | 516 | labelFunction: function(item) { return item.getName(); }, |
503 | items : { boundObject: "this.application.ninja.appModel", boundProperty: "materials" } | 517 | items : { boundObject: "this.application.ninja.appModel", boundProperty: "materials" }, |
504 | }, | 518 | divider : true |
519 | } | ||
520 | ], | ||
521 | [ | ||
505 | { | 522 | { |
506 | type: "dropdown", | 523 | type: "dropdown", |
507 | id: "fillMaterial", | 524 | id: "fillMaterial", |
525 | prop: "fillMaterial", | ||
508 | label: "Fill", | 526 | label: "Fill", |
509 | labelField: "_name", | 527 | labelField: "_name", |
510 | items : { boundObject: "this.application.ninja.appModel", boundProperty: "materials" } | 528 | items : { boundObject: "this.application.ninja.appModel", boundProperty: "materials" } |