Merge branch 'refs/heads/Ninja-Internal' into FileIO

1 files changed, 16 insertions, 6 deletions

diff --git a/js/data/pi/pi-data.js b/js/data/pi/pi-data.js
index c42d9082..ba03c347 100755
--- a/js/data/pi/pi-data.js
+++ b/js/data/pi/pi-data.js
@@ -331,10 +331,11 @@ exports.PiData = Montage.create( Montage, {
                             id: "tlRadius",
                             prop : "tlRadius",
                             label: "TL",
+                            valueMutator: parseFloat,
                             value : 0,
                             min :   0,
                             max :   100,
-                            unit : "%",
+                            unit : "px",
                             acceptableUnits: ["px", "pt", "%"]
                         },
                         {
@@ -342,10 +343,12 @@ exports.PiData = Montage.create( Montage, {
                             id : "trRadius",
                             prop : "trRadius",
                             label : "TR",
+                            valueMutator: parseFloat,
                             min :   0,
                             max :   100,
-                            unit : "%",
-                            acceptableUnits: ["px", "pt", "%"]
+                            unit : "px",
+                            acceptableUnits: ["px", "pt", "%"],
+                            divider: true
                         }
                     ],
                     [
@@ -354,9 +357,10 @@ exports.PiData = Montage.create( Montage, {
                             id : "blRadius",
                             prop : "blRadius",
                             label : "BL",
+                            valueMutator: parseFloat,
                             min :   0,
                             max :   100,
-                            unit : "%",
+                            unit : "px",
                             acceptableUnits: ["px", "pt", "%"]
                         },
                         {
@@ -364,9 +368,10 @@ exports.PiData = Montage.create( Montage, {
                             id : "brRadius",
                             prop : "brRadius",
                             label : "BR",
+                            valueMutator: parseFloat,
                             min :   0,
                             max :   100,
-                            unit : "%",
+                            unit : "px",
                             acceptableUnits: ["px", "pt", "%"]
                         }
                     ]
@@ -390,6 +395,7 @@ exports.PiData = Montage.create( Montage, {
                         {
                             type: "dropdown",
                             id:   "strokeMaterial",
+                            prop:   "strokeMaterial",
                             label: "Stroke",
                             labelField: "_name",
                             dataField: "_name",
@@ -402,6 +408,7 @@ exports.PiData = Montage.create( Montage, {
                         {
                             type: "dropdown",
                             id:   "fillMaterial",
+                            prop:   "fillMaterial",
                             label: "Fill",
                             labelField: "_name",
                             dataField: "_name",
@@ -524,7 +531,8 @@ exports.PiData = Montage.create( Montage, {
                             type: "hottext",
                             id: "innerRadius",
                             prop: "innerRadius",
-                            label: "Inner Radius",
+                            label: "Inner R",
+                            valueMutator: parseFloat,
                             value : 0,
                             min :   0,
                             max :   100,
@@ -553,6 +561,7 @@ exports.PiData = Montage.create( Montage, {
                         {
                             type: "dropdown",
                             id:   "strokeMaterial",
+                            prop:   "strokeMaterial",
                             label: "Stroke",
                             labelField: "_name",
                             dataField: "_name",
@@ -565,6 +574,7 @@ exports.PiData = Montage.create( Montage, {
                         {
                             type: "dropdown",
                             id:   "fillMaterial",
+                            prop:   "fillMaterial",
                             label: "Fill",
                             labelField: "_name",
                             dataField: "_name",