aboutsummaryrefslogtreecommitdiff
path: root/js
diff options
context:
space:
mode:
Diffstat (limited to 'js')
-rwxr-xr-xjs/controllers/elements/shapes-controller.js20
-rwxr-xr-xjs/data/pi/pi-data.js22
2 files changed, 6 insertions, 36 deletions
diff --git a/js/controllers/elements/shapes-controller.js b/js/controllers/elements/shapes-controller.js
index 15a18a51..5ced8820 100755
--- a/js/controllers/elements/shapes-controller.js
+++ b/js/controllers/elements/shapes-controller.js
@@ -25,26 +25,6 @@ exports.ShapesController = Montage.create(CanvasController, {
25 el.elementModel.shapeModel.GLGeomObj.setInnerRadius(val/100); 25 el.elementModel.shapeModel.GLGeomObj.setInnerRadius(val/100);
26 el.elementModel.shapeModel.GLGeomObj.buildBuffers(); 26 el.elementModel.shapeModel.GLGeomObj.buildBuffers();
27 break; 27 break;
28 case "tlRadius":
29 this.setShapeProperty(el, "tlRadius", value);
30 el.elementModel.shapeModel.GLGeomObj.setTLRadius(val);
31 el.elementModel.shapeModel.GLGeomObj.buildBuffers();
32 break;
33 case "trRadius":
34 this.setShapeProperty(el, "trRadius", value);
35 el.elementModel.shapeModel.GLGeomObj.setTRRadius(val);
36 el.elementModel.shapeModel.GLGeomObj.buildBuffers();
37 break;
38 case "blRadius":
39 this.setShapeProperty(el, "blRadius", value);
40 el.elementModel.shapeModel.GLGeomObj.setBLRadius(val);
41 el.elementModel.shapeModel.GLGeomObj.buildBuffers();
42 break;
43 case "brRadius":
44 this.setShapeProperty(el, "brRadius", value);
45 el.elementModel.shapeModel.GLGeomObj.setBRRadius(val);
46 el.elementModel.shapeModel.GLGeomObj.buildBuffers();
47 break;
48 case "width": 28 case "width":
49 el.elementModel.shapeModel.GLGeomObj.setWidth(val); 29 el.elementModel.shapeModel.GLGeomObj.setWidth(val);
50 CanvasController.setProperty(el, p, value); 30 CanvasController.setProperty(el, p, value);
diff --git a/js/data/pi/pi-data.js b/js/data/pi/pi-data.js
index ba03c347..c42d9082 100755
--- a/js/data/pi/pi-data.js
+++ b/js/data/pi/pi-data.js
@@ -331,11 +331,10 @@ exports.PiData = Montage.create( Montage, {
331 id: "tlRadius", 331 id: "tlRadius",
332 prop : "tlRadius", 332 prop : "tlRadius",
333 label: "TL", 333 label: "TL",
334 valueMutator: parseFloat,
335 value : 0, 334 value : 0,
336 min : 0, 335 min : 0,
337 max : 100, 336 max : 100,
338 unit : "px", 337 unit : "%",
339 acceptableUnits: ["px", "pt", "%"] 338 acceptableUnits: ["px", "pt", "%"]
340 }, 339 },
341 { 340 {
@@ -343,12 +342,10 @@ exports.PiData = Montage.create( Montage, {
343 id : "trRadius", 342 id : "trRadius",
344 prop : "trRadius", 343 prop : "trRadius",
345 label : "TR", 344 label : "TR",
346 valueMutator: parseFloat,
347 min : 0, 345 min : 0,
348 max : 100, 346 max : 100,
349 unit : "px", 347 unit : "%",
350 acceptableUnits: ["px", "pt", "%"], 348 acceptableUnits: ["px", "pt", "%"]
351 divider: true
352 } 349 }
353 ], 350 ],
354 [ 351 [
@@ -357,10 +354,9 @@ exports.PiData = Montage.create( Montage, {
357 id : "blRadius", 354 id : "blRadius",
358 prop : "blRadius", 355 prop : "blRadius",
359 label : "BL", 356 label : "BL",
360 valueMutator: parseFloat,
361 min : 0, 357 min : 0,
362 max : 100, 358 max : 100,
363 unit : "px", 359 unit : "%",
364 acceptableUnits: ["px", "pt", "%"] 360 acceptableUnits: ["px", "pt", "%"]
365 }, 361 },
366 { 362 {
@@ -368,10 +364,9 @@ exports.PiData = Montage.create( Montage, {
368 id : "brRadius", 364 id : "brRadius",
369 prop : "brRadius", 365 prop : "brRadius",
370 label : "BR", 366 label : "BR",
371 valueMutator: parseFloat,
372 min : 0, 367 min : 0,
373 max : 100, 368 max : 100,
374 unit : "px", 369 unit : "%",
375 acceptableUnits: ["px", "pt", "%"] 370 acceptableUnits: ["px", "pt", "%"]
376 } 371 }
377 ] 372 ]
@@ -395,7 +390,6 @@ exports.PiData = Montage.create( Montage, {
395 { 390 {
396 type: "dropdown", 391 type: "dropdown",
397 id: "strokeMaterial", 392 id: "strokeMaterial",
398 prop: "strokeMaterial",
399 label: "Stroke", 393 label: "Stroke",
400 labelField: "_name", 394 labelField: "_name",
401 dataField: "_name", 395 dataField: "_name",
@@ -408,7 +402,6 @@ exports.PiData = Montage.create( Montage, {
408 { 402 {
409 type: "dropdown", 403 type: "dropdown",
410 id: "fillMaterial", 404 id: "fillMaterial",
411 prop: "fillMaterial",
412 label: "Fill", 405 label: "Fill",
413 labelField: "_name", 406 labelField: "_name",
414 dataField: "_name", 407 dataField: "_name",
@@ -531,8 +524,7 @@ exports.PiData = Montage.create( Montage, {
531 type: "hottext", 524 type: "hottext",
532 id: "innerRadius", 525 id: "innerRadius",
533 prop: "innerRadius", 526 prop: "innerRadius",
534 label: "Inner R", 527 label: "Inner Radius",
535 valueMutator: parseFloat,
536 value : 0, 528 value : 0,
537 min : 0, 529 min : 0,
538 max : 100, 530 max : 100,
@@ -561,7 +553,6 @@ exports.PiData = Montage.create( Montage, {
561 { 553 {
562 type: "dropdown", 554 type: "dropdown",
563 id: "strokeMaterial", 555 id: "strokeMaterial",
564 prop: "strokeMaterial",
565 label: "Stroke", 556 label: "Stroke",
566 labelField: "_name", 557 labelField: "_name",
567 dataField: "_name", 558 dataField: "_name",
@@ -574,7 +565,6 @@ exports.PiData = Montage.create( Montage, {
574 { 565 {
575 type: "dropdown", 566 type: "dropdown",
576 id: "fillMaterial", 567 id: "fillMaterial",
577 prop: "fillMaterial",
578 label: "Fill", 568 label: "Fill",
579 labelField: "_name", 569 labelField: "_name",
580 dataField: "_name", 570 dataField: "_name",