aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--js/controllers/elements/shapes-controller.js20
-rw-r--r--js/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 640119c4..f69e6fc9 100644
--- 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 8ffd0ec7..eba55535 100644
--- a/js/data/pi/pi-data.js
+++ b/js/data/pi/pi-data.js
@@ -317,11 +317,10 @@ exports.PiData = Montage.create( Montage, {
317 id: "tlRadius", 317 id: "tlRadius",
318 prop : "tlRadius", 318 prop : "tlRadius",
319 label: "TL", 319 label: "TL",
320 valueMutator: parseFloat,
321 value : 0, 320 value : 0,
322 min : 0, 321 min : 0,
323 max : 100, 322 max : 100,
324 unit : "px", 323 unit : "%",
325 acceptableUnits: ["px", "pt", "%"] 324 acceptableUnits: ["px", "pt", "%"]
326 }, 325 },
327 { 326 {
@@ -329,12 +328,10 @@ exports.PiData = Montage.create( Montage, {
329 id : "trRadius", 328 id : "trRadius",
330 prop : "trRadius", 329 prop : "trRadius",
331 label : "TR", 330 label : "TR",
332 valueMutator: parseFloat,
333 min : 0, 331 min : 0,
334 max : 100, 332 max : 100,
335 unit : "px", 333 unit : "%",
336 acceptableUnits: ["px", "pt", "%"], 334 acceptableUnits: ["px", "pt", "%"]
337 divider: true
338 } 335 }
339 ], 336 ],
340 [ 337 [
@@ -343,10 +340,9 @@ exports.PiData = Montage.create( Montage, {
343 id : "blRadius", 340 id : "blRadius",
344 prop : "blRadius", 341 prop : "blRadius",
345 label : "BL", 342 label : "BL",
346 valueMutator: parseFloat,
347 min : 0, 343 min : 0,
348 max : 100, 344 max : 100,
349 unit : "px", 345 unit : "%",
350 acceptableUnits: ["px", "pt", "%"] 346 acceptableUnits: ["px", "pt", "%"]
351 }, 347 },
352 { 348 {
@@ -354,10 +350,9 @@ exports.PiData = Montage.create( Montage, {
354 id : "brRadius", 350 id : "brRadius",
355 prop : "brRadius", 351 prop : "brRadius",
356 label : "BR", 352 label : "BR",
357 valueMutator: parseFloat,
358 min : 0, 353 min : 0,
359 max : 100, 354 max : 100,
360 unit : "px", 355 unit : "%",
361 acceptableUnits: ["px", "pt", "%"] 356 acceptableUnits: ["px", "pt", "%"]
362 } 357 }
363 ] 358 ]
@@ -381,7 +376,6 @@ exports.PiData = Montage.create( Montage, {
381 { 376 {
382 type: "dropdown", 377 type: "dropdown",
383 id: "strokeMaterial", 378 id: "strokeMaterial",
384 prop: "strokeMaterial",
385 label: "Stroke", 379 label: "Stroke",
386 labelField: "_name", 380 labelField: "_name",
387 dataField: "_name", 381 dataField: "_name",
@@ -394,7 +388,6 @@ exports.PiData = Montage.create( Montage, {
394 { 388 {
395 type: "dropdown", 389 type: "dropdown",
396 id: "fillMaterial", 390 id: "fillMaterial",
397 prop: "fillMaterial",
398 label: "Fill", 391 label: "Fill",
399 labelField: "_name", 392 labelField: "_name",
400 dataField: "_name", 393 dataField: "_name",
@@ -517,8 +510,7 @@ exports.PiData = Montage.create( Montage, {
517 type: "hottext", 510 type: "hottext",
518 id: "innerRadius", 511 id: "innerRadius",
519 prop: "innerRadius", 512 prop: "innerRadius",
520 label: "Inner R", 513 label: "Inner Radius",
521 valueMutator: parseFloat,
522 value : 0, 514 value : 0,
523 min : 0, 515 min : 0,
524 max : 100, 516 max : 100,
@@ -547,7 +539,6 @@ exports.PiData = Montage.create( Montage, {
547 { 539 {
548 type: "dropdown", 540 type: "dropdown",
549 id: "strokeMaterial", 541 id: "strokeMaterial",
550 prop: "strokeMaterial",
551 label: "Stroke", 542 label: "Stroke",
552 labelField: "_name", 543 labelField: "_name",
553 dataField: "_name", 544 dataField: "_name",
@@ -560,7 +551,6 @@ exports.PiData = Montage.create( Montage, {
560 { 551 {
561 type: "dropdown", 552 type: "dropdown",
562 id: "fillMaterial", 553 id: "fillMaterial",
563 prop: "fillMaterial",
564 label: "Fill", 554 label: "Fill",
565 labelField: "_name", 555 labelField: "_name",
566 dataField: "_name", 556 dataField: "_name",