dojo_src 1.4.102 → 1.5.0

data/dojo/dojox/drawing/tools/custom/Vector.js

@@ -16,6 +16,7 @@ dojox.drawing.tools.custom.Vector = dojox.drawing.util.oo.declare(
 	dojox.drawing.tools.Arrow,
 	function(options){
 		this.minimumSize = this.style.arrows.length;
+		this.addShadow({size:3, mult:2});
 	},
 	{
 		draws:true,
@@ -35,11 +36,32 @@ dojox.drawing.tools.custom.Vector = dojox.drawing.util.oo.declare(
 			}
 		},
 		
+		changeAxis: function(cosphi){
+			//	summary:
+			//		Converts a vector to and from the z axis.
+			//		If passed a cosphi value that is used to set
+			//		the axis, otherwise it is the opp of what it is.
+			cosphi = cosphi!==undefined?cosphi:this.style.zAxis? 0 : 1;
+			if(cosphi == 0){
+				this.style.zAxis = false;
+				this.data.cosphi = 0;
+			}else{
+				this.style.zAxis = true;
+				var p = this.points;
+				var pt = this.zPoint();
+				this.setPoints([
+					{x:p[0].x, y:p[0].y},
+					{x:pt.x, y:pt.y}
+				]);
+			}
+			this.render();
+		},
+		
 		_createZeroVector: function(shp, d, sty){
 			// summary:
 			//		Special creation function for the zero-vector shape
 			//
-			var s = shp=="hit" ? this.minimumSize : this.minimumSize/2;
+			var s = shp=="hit" ? this.minimumSize : this.minimumSize/6;
 			var f = shp=="hit" ? sty.fill : null;
 			d = {
 				cx:this.data.x1,
@@ -55,6 +77,164 @@ dojox.drawing.tools.custom.Vector = dojox.drawing.util.oo.declare(
 			this.util.attr(this[shp], "drawingType", "stencil");
 		},
 		
+		_create: function(/*String*/shp, /*StencilData*/d, /*Object*/sty){
+			// summary:
+			//		Creates a dojox.gfx.shape based on passed arguments.
+			//		Can be called many times by implementation to create
+			//		multiple shapes in one stencil.
+			//
+			this.remove(this[shp]);
+			this[shp] = this.container.createLine(d)
+				.setStroke(sty);
+			this._setNodeAtts(this[shp]);
+		},
+		
+		onDrag: function(/*EventObject*/obj){
+			// summary: See stencil._Base.onDrag
+			//
+			if(this.created){ return; }
+			
+			var x1 = obj.start.x,
+				y1 = obj.start.y,
+				x2 = obj.x,
+				y2 = obj.y;
+			
+			if(this.keys.shift && !this.style.zAxis){
+				var pt = this.util.snapAngle(obj, 45/180);
+				x2 = pt.x;
+				y2 = pt.y;
+			}
+			
+			if(this.keys.alt){
+				// FIXME:
+				//	should double the length of the line
+				// FIXME:
+				//	if alt dragging past ZERO it seems to work
+				//	but select/deselect shows bugs
+				var dx = x2>x1 ? ((x2-x1)/2) : ((x1-x2)/-2);
+				var dy = y2>y1 ? ((y2-y1)/2) : ((y1-y2)/-2);
+				x1 -= dx;
+				x2 -= dx;
+				y1 -= dy;
+				y2 -= dy;
+			}
+			
+			if(this.style.zAxis){
+				var pts = this.zPoint(obj);
+				x2 = pts.x;
+				y2 = pts.y;
+			}
+			
+			this.setPoints([
+				{x:x1, y:y1},
+				{x:x2, y:y2}
+			]);
+			this.render();
+		},
+		
+		onTransform: function(/* ? manager.Anchor */anchor){
+			// summary:
+			// 		Called from anchor point mouse drag
+			// 		also called from plugins.Pan.checkBounds
+			if(!this._isBeingModified){
+				this.onTransformBegin();
+			}
+			// this is not needed for anchor moves, but it
+			// is for stencil move:
+			
+			this.setPoints(this.points);
+			this.render();			
+		},
+		
+		anchorConstrain: function(x, y){
+			//	summary:
+			//		Called from anchor point mouse drag
+			if(!this.style.zAxis){ return null; }
+			var radians = this.style.zAngle*Math.PI/180;
+			//Constrain to angle
+			var test = x<0 ? x>-y : x<-y;
+			var dx = test ? x : -y/Math.tan(radians); 
+			var dy = !test ? y : -Math.tan(radians)*x;
+			return {x:dx, y:dy}
+		},
+		
+		zPoint: function(obj){
+			//	summary:
+			//		Takes any point and converts it to
+			//		be on the z-axis.
+			if(obj===undefined){
+				if(!this.points[0]){ return null; };
+				var d = this.pointsToData();
+				obj = {
+					start:{
+						x:d.x1,
+						y:d.y1
+					},
+					x:d.x2,
+					y:d.y2
+				};
+			}
+			var radius = this.util.length(obj);
+			var angle = this.util.angle(obj);
+			angle<0 ? angle = 360 + angle : angle;
+			
+			angle = angle > 135 && angle < 315 ? this.style.zAngle : this.util.oppAngle(this.style.zAngle);
+			
+			return this.util.pointOnCircle(obj.start.x, obj.start.y, radius, angle);
+		},
+		
+		pointsToData: function(p){
+			// summary:
+			//		Converts points to data
+			p = p || this.points;
+			var cosphi = 0;
+			var obj = {start:{x:p[0].x, y:p[0].y}, x:p[1].x, y:p[1].y};
+			if(this.style.zAxis && (this.util.length(obj)>this.minimumSize)){
+				
+				var angle = this.util.angle(obj);
+				angle<0 ? angle = 360 + angle : angle;
+				cosphi = angle > 135 && angle < 315 ? 1 : -1;
+			}
+			this.data = {
+				x1: p[0].x,
+				y1: p[0].y,
+				x2: p[1].x,
+				y2: p[1].y,
+				cosphi: cosphi
+			};
+			return this.data;
+		},
+		
+		dataToPoints: function(o){
+			//summary:
+			//		Converts data to points.
+			o = o || this.data;
+			if(o.radius || o.angle){
+				// instead of using x1,x2,y1,y1,
+				// it's been set as x,y,angle,radius
+				var cosphi = 0;
+				var pt = this.util.pointOnCircle(o.x,o.y,o.radius,o.angle);
+				if(this.style.zAxis || (o.cosphi && o.cosphi!=0)){
+					this.style.zAxis = true;
+					cosphi = o.angle > 135 && o.angle < 315 ? 1 : -1;
+				}
+				//console.log(" ---- pts:", pt.x, pt.y);
+				this.data = o = {
+					x1:o.x,
+					y1:o.y,
+					x2:pt.x,
+					y2:pt.y,
+					cosphi:cosphi
+				}
+				
+			}
+			this.points = [
+				{x:o.x1, y:o.y1},
+				{x:o.x2, y:o.y2}
+			];
+			return this.points;
+		},
+		
 		render: function(){
 			// summary:
 			//		Renders the 'hit' object (the shape used for an expanded
@@ -66,7 +246,9 @@ dojox.drawing.tools.custom.Vector = dojox.drawing.util.oo.declare(
 			if(this.getRadius() >= this.minimumSize){
 				this._create("hit", this.data, this.style.currentHit);
 				this._create("shape", this.data, this.style.current);
+			
 			}else{
+				this.data.cosphi = 0;
 				this._createZeroVector("hit", this.data, this.style.currentHit);
 				this._createZeroVector("shape", this.data, this.style.current);
 			}
@@ -74,24 +256,37 @@ dojox.drawing.tools.custom.Vector = dojox.drawing.util.oo.declare(
 		onUp: function(/*EventObject*/obj){
 			// summary: See stencil._Base.onUp
 			//
-			if(this.created || !this.shape){ return; }
+			if(this.created || !this._downOnCanvas){ return; }
+			this._downOnCanvas = false;
+			//Default vector for single click
+			if(!this.shape){
+				var d = 100;
+				obj.start.x = this.style.zAxis ? obj.start.x + d : obj.start.x;
+				obj.y = obj.y+d;
+				this.setPoints([
+					{x:obj.start.x, y:obj.start.y},
+					{x:obj.x, y:obj.y}
+				]);
+				this.render();
+			}
+			
 			// if too small, need to reset
 			// 		This sets the zero length vector to zero within the minimum size 
+			
 			if(this.getRadius()<this.minimumSize){
 				var p = this.points; 
 				this.setPoints([ 
 					{x:p[0].x, y:p[0].y}, 
 					{x:p[0].x, y:p[0].y} 
 				]); 
-			} else { 			
-				//ace: needed as else to avoid zero length problem in snapAngle 
-				var pt = this.util.snapAngle(obj, this.angleSnap/180);
+			}else{ 			
+				//needed as else to avoid zero length problem in snapAngle 
 				var p = this.points;
+				var pt = this.style.zAxis ? this.zPoint(obj) : this.util.snapAngle(obj, this.angleSnap/180);
 				this.setPoints([
 					{x:p[0].x, y:p[0].y},
 					{x:pt.x, y:pt.y}
 				]);
-				
 			}
 			this.renderedOnce = true;
 			this.onRender(this);
@@ -107,4 +302,101 @@ dojox.drawing.tools.custom.Vector.setup = {
 	tooltip:"Vector Tool",
 	iconClass:"iconVector"
 };
+
+if(dojox.drawing.defaults.zAxisEnabled){
+	dojox.drawing.tools.custom.Vector.setup.secondary = {
+		// summary:
+		//		Creates a secondary tool for the Vector Stencil.
+		// description:
+		//		See Toolbar.js makeButtons function.  The toolbar 
+		//		checks Vector.setup for a secondary tool and requires
+		//		name, label, and funct.  Currently it doesn't accept icon
+		//		and only uses text from label for the button.  Funct is the
+		//		function that fires when the button is clicked.
+		//
+		//		Setup and postSetup are optional
+		//		and allow tool specific functions to be added to the
+		//		Toolbar object as if they were written there.
+		name: "vectorSecondary",
+		label: "z-axis",
+		funct: function(button){
+			button.selected ? this.zDeselect(button) : this.zSelect(button);
+			
+			var stencils = this.drawing.stencils.selectedStencils;
+			for(var nm in stencils){
+				if(stencils[nm].shortType == "vector" && (stencils[nm].style.zAxis != dojox.drawing.defaults.zAxis)){
+					var s = stencils[nm];
+					s.changeAxis();
+					//Reset anchors
+					if(s.style.zAxis){ s.deselect(); s.select(); }
+				}
+			}
+			
+		},
+		setup: function(){
+			// summary:
+			//		All functions, variables and connections defined here
+			//		are treated as if they were added directly to toolbar.
+			//		They are included with the tool because secondary buttons
+			//		are tool specific.
+			var zAxis = dojox.drawing.defaults.zAxis;
+			this.zSelect = function(button){
+				if(!button.enabled){ return; }
+				zAxis = true;
+				dojox.drawing.defaults.zAxis = true;
+				button.select();
+				this.vectorTest();
+				this.zSelected = button;
+			};
+			this.zDeselect = function(button){
+				if(!button.enabled){ return; }
+				zAxis = false;
+				dojox.drawing.defaults.zAxis = false;
+				button.deselect();
+				this.vectorTest();
+				this.zSelected = null;
+			};
+			this.vectorTest = function(){
+				dojo.forEach(this.buttons, function(b){
+					if(b.toolType=="vector" && b.selected){
+						this.drawing.currentStencil.style.zAxis = zAxis;
+					} 
+				},this);
+			};
+			dojo.connect(this, "onRenderStencil", this, function(){ if(this.zSelected){ this.zDeselect(this.zSelected)}});
+			var c = dojo.connect(this.drawing, "onSurfaceReady", this, function(){
+				dojo.disconnect(c);
+				dojo.connect(this.drawing.stencils, "onSelect", this, function(stencil){
+					if(stencil.shortType == "vector"){
+						if(stencil.style.zAxis){
+							//If stencil is on the z-axis, update button to reflect that
+							dojo.forEach(this.buttons, function(b){
+								if(b.toolType=="vectorSecondary"){
+									this.zSelect(b);
+								}
+							},this);
+							
+						}else{
+							//Update button to not be z-axis
+							dojo.forEach(this.buttons, function(b){
+								if(b.toolType=="vectorSecondary"){
+									this.zDeselect(b);
+								}
+							},this);
+						}
+					};
+				});
+			});
+		},
+		postSetup: function(btn){
+			// summary:
+			//		Depending on the secondary tool, it may need
+			//		extra functionality for some of the basic functions.
+			//		Post is passed the button so those connections can
+			//		be made.
+			dojo.connect(btn, "enable", function(){ dojox.drawing.defaults.zAxisEnabled = true; });
+			dojo.connect(btn, "disable", function(){ dojox.drawing.defaults.zAxisEnabled = false; });
+		}
+	};
+}
 dojox.drawing.register(dojox.drawing.tools.custom.Vector.setup, "tool");

data/dojo/dojox/drawing/ui/Button.js

@@ -10,30 +10,40 @@ dojox.drawing.ui.Button =  dojox.drawing.util.oo.declare(
 		options.subShape = true;
 		dojo.mixin(this, options);
 		//console.log("  button:", this);
-		this.width = options.data.width;
-		this.height = options.data.height;
+		this.width = options.data.width || options.data.rx*2;
+		this.height = options.data.height || options.data.ry*2;
+		this.y = options.data.y || options.data.cy - options.data.ry;
+		//
 		this.id = this.id || this.util.uid(this.type);
 		this.util.attr(this.container, "id", this.id);
-		
 		if(this.callback){
 			this.hitched = dojo.hitch(this.scope || window, this.callback, this);
 		}
 		
-		this.shape = new dojox.drawing.stencil.Rect(options)
+		// Rectangle itself must be "ui" for radio buttons to work.
+		// This is a work-around for messy code associated with drawingType;
+		// see http://www.andestutor.org/bugzilla/show_bug.cgi?id=1745
+		options.drawingType="ui";
+		// Choose between rectangle and ellipse based on options
+		if(options.data.width && options.data.height){
+			this.shape = new dojox.drawing.stencil.Rect(options);
+		}else{
+			this.shape = new dojox.drawing.stencil.Ellipse(options);
+		}
 		
 		var setGrad = function(s, p, v){
 			dojo.forEach(["norm", "over", "down", "selected"], function(nm){
 				s[nm].fill[p] = v;
 			});
-		}
+		};
 		// for button backs, not for icons
-		setGrad(this.style.button, "y2", this.data.height + this.data.y);
-		setGrad(this.style.button, "y1", this.data.y);
+		setGrad(this.style.button, "y2", this.height + this.y);
+		setGrad(this.style.button, "y1", this.y);
 		
 		if(options.icon && !options.icon.text){
 			var constr = this.drawing.getConstructor(options.icon.type);
 			var o = this.makeOptions(options.icon);
-			o.data = dojo.mixin(o.data, this.style.button.icon.norm)
+			o.data = dojo.mixin(o.data, this.style.button.icon.norm);
 			
 			if(o.data && o.data.borderWidth===0){
 				o.data.fill = this.style.button.icon.norm.fill = o.data.color;
@@ -44,15 +54,15 @@ dojox.drawing.ui.Button =  dojox.drawing.util.oo.declare(
 			}
 			this.icon = new constr(o);
 			//console.log("  button:", this.toolType, this.style.button.icon)
-		}else if(options.text || options.icon.text){
+		}else if(options.text || (options.icon && options.icon.text)){
 			//console.warn("button text:", options.text || options.icon.text)
-			var o = this.makeOptions(options.text || options.icon.text);
-			o.data.color = this.style.button.icon.norm.color //= o.data.fill;
+			o = this.makeOptions(options.text || options.icon.text);
+			o.data.color = this.style.button.icon.norm.color; //= o.data.fill;
 			this.style.button.icon.selected.color = this.style.button.icon.selected.fill;
 			this.icon = new dojox.drawing.stencil.Text(o);
 			this.icon.attr({
 				height:	this.icon._lineHeight,
-				y:((this.data.height-this.icon._lineHeight)/2)+this.data.y
+				y:((this.height-this.icon._lineHeight)/2)+this.y
 			});
 		}
 		
@@ -86,7 +96,7 @@ dojox.drawing.ui.Button =  dojox.drawing.util.oo.declare(
 				mouse: this.mouse,
 				container: this.container,
 				subShape:true
-			}
+			};
 			
 			if(typeof(d)=="string"){
 				
@@ -115,7 +125,7 @@ dojox.drawing.ui.Button =  dojox.drawing.util.oo.declare(
 				
 			}else{
 				//console.warn("data")
-				for(var n in d){
+				for(n in d){
 					if(/x|width/.test(n)){
 						d[n] = d[n] * this.data.width * .01 * s;
 					}else if(/y|height/.test(n)){
@@ -153,27 +163,38 @@ dojox.drawing.ui.Button =  dojox.drawing.util.oo.declare(
 		// moveTo.. methods.
 		select: function(){
 			this.selected = true;
-			this.icon.attr(this.style.button.icon.selected);
+			if(this.icon){this.icon.attr(this.style.button.icon.selected);}
 			this._change(this.style.button.selected);
 			this.shape.shadow && this.shape.shadow.hide();
 		},
 		deselect: function(){
 			this.selected = false;
-			this.icon.attr(this.style.button.icon.norm);
+			if(this.icon){this.icon.attr(this.style.button.icon.norm);}
 			this.shape.shadow && this.shape.shadow.show();
 			this._change(this.style.button.norm);
 			
 		},
+		disable: function(){
+			if(!this.enabled){ return; }
+			this.enabled = false;
+			this._change(this.style.button.disabled);
+			this.icon.attr({color:this.style.button.norm.color});
+		},
+		enable: function(){
+			if(this.enabled){ return; }
+			this.enabled = true;
+			this._change(this.style.button.norm);
+			this.icon.attr({color:this.style.button.icon.norm.color});
+		},
 		
 		_change: function(/*Object*/sty){
 			this.shape.attr(sty);
 			this.shape.shadow && this.shape.shadow.container.moveToBack();	
-			this.icon.shape.moveToFront();
-			
+			if(this.icon){this.icon.shape.moveToFront();};
 		},
 		onOver: function(){
 			//console.log("BUTTON OVER")
-			if(this.selected){ return; }
+			if(this.selected || !this.enabled){ return; }
 			this._change(this.style.button.over);
 		},
 		onOut: function(){
@@ -181,16 +202,20 @@ dojox.drawing.ui.Button =  dojox.drawing.util.oo.declare(
 			this._change(this.style.button.norm);
 		},
 		onDown: function(){
-			if(this.selected){ return; }
+			if(this.selected || !this.enabled){ return; }
 			this._change(this.style.button.selected);
 		},
 		onUp: function(){
 			//console.log("BUTTON UP")
+			if(!this.enabled){ return; }
 			this._change(this.style.button.over);
 			if(this.hitched){
 				this.hitched();
 			}
 			this.onClick(this);
+		},
+		attr: function(options){
+			if(this.icon){this.icon.attr(options);}
 		}
 	}