aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-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 e764de4e..39300eb8 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 10b33a0e..39194412 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",
@@ -515,8 +508,7 @@ exports.PiData = Montage.create( Montage, {
515 type: "hottext", 508 type: "hottext",
516 id: "innerRadius", 509 id: "innerRadius",
517 prop: "innerRadius", 510 prop: "innerRadius",
518 label: "Inner R", 511 label: "Inner Radius",
519 valueMutator: parseFloat,
520 value : 0, 512 value : 0,
521 min : 0, 513 min : 0,
522 max : 100, 514 max : 100,
@@ -545,7 +537,6 @@ exports.PiData = Montage.create( Montage, {
545 { 537 {
546 type: "dropdown", 538 type: "dropdown",
547 id: "strokeMaterial", 539 id: "strokeMaterial",
548 prop: "strokeMaterial",
549 label: "Stroke", 540 label: "Stroke",
550 labelField: "_name", 541 labelField: "_name",
551 dataField: "_name", 542 dataField: "_name",
@@ -558,7 +549,6 @@ exports.PiData = Montage.create( Montage, {
558 { 549 {
559 type: "dropdown", 550 type: "dropdown",
560 id: "fillMaterial", 551 id: "fillMaterial",
561 prop: "fillMaterial",
562 label: "Fill", 552 label: "Fill",
563 labelField: "_name", 553 labelField: "_name",
564 dataField: "_name", 554 dataField: "_name",
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-27 08:20:38 +0000