From 23baa44e0bc7bfb24e42702c1ef58bf62da083d8 Mon Sep 17 00:00:00 2001 From: Pushkar Joshi Date: Wed, 14 Mar 2012 15:37:09 -0700 Subject: PI for pen and brush strokes --- js/data/pi/pi-data.js | 139 +++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 138 insertions(+), 1 deletion(-) (limited to 'js/data') diff --git a/js/data/pi/pi-data.js b/js/data/pi/pi-data.js index ba03c347..ebd15832 100755 --- a/js/data/pi/pi-data.js +++ b/js/data/pi/pi-data.js @@ -585,7 +585,144 @@ exports.PiData = Montage.create( Montage, { ] } ] - } + }, + SubpathPi: { + value: [ + { + label: "Stroke", + + Section: [ + [ + { + type : "color", + prop: "border", + id : "stroke" + }, + { + type : "color", + id : "fill", + prop: "background", + divider : true + } + ], + [ + { + type : "hottext", + id : "strokeSize", + prop : "strokeSize", + label : "Stroke", + valueMutator: parseFloat, + min : 1, + max : 100, + value : 1, + unit : "px", + acceptableUnits: ["pt", "px"] + } + ] + ] + } + ] + }, + BrushStrokePi: { + value: [ + { + label: "Stroke", + + Section: [ + [ + { + type : "color", + prop: "border", + id : "stroke" + }, + { + type : "color", + id : "fill", + prop: "background", + visible : false, + divider : true + } + ], + [ + { + type : "hottext", + id : "strokeSize", + prop : "strokeSize", + label : "Stroke", + valueMutator: parseFloat, + min : 1, + max : 100, + value : 1, + unit : "px", + acceptableUnits: ["pt", "px"] + }, + { + type : "hottext", + id : "strokeHardness", + prop : "strokeHardness", + label : "Hardness", + valueMutator: parseFloat, + min : 0, + max : 100, + value : 100, + unit : "%", + acceptableUnits: ["%"] + } + ] + ] + }, + { + label: "Smoothing", + Section: [ + [ + { + type: "checkbox", + id: "doSmoothing", + prop: "doSmoothing", + defaultValue: false, + value: "Smoothing", + checked: false + }, + { + type : "hottext", + id : "strokeSmoothing", + prop : "strokeSmoothing", + label : "", + valueMutator: parseFloat, + min : 0, + max : 100, + value : 0 + } + ] + ] + }, + { + label: "Calligraphic", + Section: [ + [ + { + type: "checkbox", + id: "isCalligraphic", + prop: "isCalligraphic", + defaultValue: false, + value: "Calligraphic", + checked: false + }, + { + type : "hottext", + id : "strokeAngle", + prop : "strokeAngle", + label : "", + valueMutator: parseFloat, + min : -90, + max : 90, + value : 0 + } + ] + ] + } + ] //value: [ + } //BrushStrokePi: { }); -- cgit v1.2.3 From e574f722864a246bad40d3f5a4e59f7ccb206ea9 Mon Sep 17 00:00:00 2001 From: Pushkar Joshi Date: Thu, 15 Mar 2012 14:33:48 -0700 Subject: update values in the PI from values of the selected brush stroke or pen tool path --- js/data/pi/pi-data.js | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) (limited to 'js/data') diff --git a/js/data/pi/pi-data.js b/js/data/pi/pi-data.js index ebd15832..9d90aa3d 100755 --- a/js/data/pi/pi-data.js +++ b/js/data/pi/pi-data.js @@ -680,14 +680,14 @@ exports.PiData = Montage.create( Montage, { id: "doSmoothing", prop: "doSmoothing", defaultValue: false, - value: "Smoothing", + value: "Y/N", checked: false }, { type : "hottext", id : "strokeSmoothing", prop : "strokeSmoothing", - label : "", + label : "Amount", valueMutator: parseFloat, min : 0, max : 100, @@ -705,18 +705,20 @@ exports.PiData = Montage.create( Montage, { id: "isCalligraphic", prop: "isCalligraphic", defaultValue: false, - value: "Calligraphic", - checked: false + value: "Y/N", + checked: false, + divider : true }, { type : "hottext", id : "strokeAngle", prop : "strokeAngle", - label : "", + label : "Angle", valueMutator: parseFloat, min : -90, max : 90, - value : 0 + value : 0, + unit : "deg." } ] ] -- cgit v1.2.3 From 92bc54df4acfec849568ab619150a5da49c087fa Mon Sep 17 00:00:00 2001 From: Pushkar Joshi Date: Tue, 20 Mar 2012 10:24:15 -0700 Subject: revert to using the angle without flipping its sign...fixing some minor bugs and code cleanup GOOD status before doing 3D unprojection step --- js/data/pi/pi-data.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'js/data') diff --git a/js/data/pi/pi-data.js b/js/data/pi/pi-data.js index 9d90aa3d..ad2f3088 100755 --- a/js/data/pi/pi-data.js +++ b/js/data/pi/pi-data.js @@ -649,7 +649,7 @@ exports.PiData = Montage.create( Montage, { id : "strokeSize", prop : "strokeSize", label : "Stroke", - valueMutator: parseFloat, + valueMutator: parseInt, min : 1, max : 100, value : 1, @@ -661,7 +661,7 @@ exports.PiData = Montage.create( Montage, { id : "strokeHardness", prop : "strokeHardness", label : "Hardness", - valueMutator: parseFloat, + valueMutator: parseInt, min : 0, max : 100, value : 100, -- cgit v1.2.3 From 4c2948447482fe57110e7fd674e362bbbd5814b6 Mon Sep 17 00:00:00 2001 From: Ananya Sen Date: Wed, 28 Mar 2012 14:00:28 -0700 Subject: IKNINJA-719 - removed Zoom In/Zoom Out under View menu in the Main menu Disabled cut, copy, paste, debug, since that functionality is not there yet Signed-off-by: Ananya Sen --- js/data/menu-data.js | 40 ++++------------------------------------ 1 file changed, 4 insertions(+), 36 deletions(-) (limited to 'js/data') diff --git a/js/data/menu-data.js b/js/data/menu-data.js index 12007f4a..3333d209 100755 --- a/js/data/menu-data.js +++ b/js/data/menu-data.js @@ -154,55 +154,23 @@ exports.MenuData = Montage.create( Montage, { { "displayText" : "Cut", "hasSubMenu" : false, - "enabled": true + "enabled": false }, { "displayText" : "Copy", "hasSubMenu" : false, - "enabled": true + "enabled": false }, { "displayText" : "Paste", "hasSubMenu" : false, - "enabled": true + "enabled": false } ] }, { "header": "View", "entries": [ - { - "displayText" : "Zoom In", - "hasSubMenu" : false, - "enabled": { - "value": false, - "boundObj": "documentController", - "boundProperty": "activeDocument", - "oneway": true, - "boundValueMutator": function(activeDocument){ - if((activeDocument !== null) && (activeDocument.currentView === "design")){return true;} - else{return false;} - } - } - }, - { - "displayText" : "Zoom Out", - "hasSubMenu" : false, - "enabled": { - "value": false, - "boundObj": "documentController", - "boundProperty": "activeDocument", - "oneway": true, - "boundValueMutator": function(activeDocument){ - if((activeDocument !== null) && (activeDocument.currentView === "design")){return true;} - else{return false;} - } - } - }, - { - "displayText" : "", - "separator": true - }, { "displayText" : "Live Preview", "hasSubMenu" : false, @@ -431,7 +399,7 @@ exports.MenuData = Montage.create( Montage, { { "displayText" : "Debug", "hasSubMenu" : false, - "enabled": true, + "enabled": false, "checked": { "value": true, "boundProperty": "debug" -- cgit v1.2.3