dojo_src 1.4.102 → 1.5.0

data/dojo/dojox/gfx/gradutils.js

@@ -0,0 +1,91 @@
+dojo.provide("dojox.gfx.gradutils");
+
+dojo.require("dojox.gfx.matrix");
+
+// Various generic utilities to deal with a linear gradient
+
+(function(){
+	var d = dojo, m = dojox.gfx.matrix, C = d.Color;
+	
+	function findColor(o, c){
+		if(o <= 0){
+			return c[0].color;
+		}
+		var len = c.length;
+		if(o >= 1){
+			return c[len - 1].color;
+		}
+		//TODO: use binary search
+		for(var i = 0; i < len; ++i){
+			var stop = c[i];
+			if(stop.offset >= o){
+				if(i){
+					var prev = c[i - 1];
+					return d.blendColors(new C(prev.color), new C(stop.color),
+						(o - prev.offset) / (stop.offset - prev.offset));
+				}
+				return stop.color;
+			}
+		}
+		return c[len - 1].color;
+	}
+
+	dojox.gfx.gradutils.getColor = function(fill, pt){
+		// summary:
+		//		sample a color from a gradient using a point
+		// fill: Object:
+		//		fill object
+		// pt: dojox.gfx.Point:
+		//		point where to sample a color
+		var o;
+		if(fill){
+			switch(fill.type){
+				case "linear":
+					var angle = Math.atan2(fill.y2 - fill.y1, fill.x2 - fill.x1),
+						rotation = m.rotate(-angle),
+						projection = m.project(fill.x2 - fill.x1, fill.y2 - fill.y1),
+						p = m.multiplyPoint(projection, pt),
+						pf1 = m.multiplyPoint(projection, fill.x1, fill.y1),
+						pf2 = m.multiplyPoint(projection, fill.x2, fill.y2),
+						scale = m.multiplyPoint(rotation, pf2.x - pf1.x, pf2.y - pf1.y).x,
+						o = m.multiplyPoint(rotation, p.x - pf1.x, p.y - pf1.y).x / scale;
+					break;
+				case "radial":
+					var dx = pt.x - fill.cx, dy = pt.y - fill.cy,
+						o = Math.sqrt(dx * dx + dy * dy) / fill.r;
+					break;
+			}
+			return findColor(o, fill.colors);	// dojo.Color
+		}
+		// simple color
+		return new C(fill || [0, 0, 0, 0]);	// dojo.Color
+	};
+
+	dojox.gfx.gradutils.reverse = function(fill){
+		// summary:
+		//		reverses a gradient
+		// fill: Object:
+		//		fill object
+		if(fill){
+			switch(fill.type){
+				case "linear":
+				case "radial":
+					fill = dojo.delegate(fill);
+					if(fill.colors){
+						var c = fill.colors, l = c.length, i = 0, stop,
+							n = fill.colors = new Array(c.length);
+						for(; i < l; ++i){
+							stop = c[i];
+							n[i] = {
+								offset: 1 - stop.offset,
+								color:  stop.color
+							};
+						}
+						n.sort(function(a, b){ return a.offset - b.offset; });
+					}
+					break;
+			}
+		}
+		return fill;	// Object
+	};
+})();

data/dojo/dojox/gfx/path.js

@@ -1,5 +1,6 @@
 dojo.provide("dojox.gfx.path");
 
+dojo.require("dojox.gfx.matrix");
 dojo.require("dojox.gfx.shape");
 
 dojo.declare("dojox.gfx.path.Path", dojox.gfx.Shape, {
@@ -10,38 +11,78 @@ dojo.declare("dojox.gfx.path.Path", dojox.gfx.Shape, {
 		// rawNode: Node: a DOM node to be used by this path object
 		this.shape = dojo.clone(dojox.gfx.defaultPath);
 		this.segments = [];
+		this.tbbox = null;
 		this.absolute = true;
 		this.last = {};
 		this.rawNode = rawNode;
+		this.segmented = false;
 	},
 
 	// mode manipulations
 	setAbsoluteMode: function(mode){
 		// summary: sets an absolute or relative mode for path points
 		// mode: Boolean: true/false or "absolute"/"relative" to specify the mode
+		this._confirmSegmented();
 		this.absolute = typeof mode == "string" ? (mode == "absolute") : mode;
 		return this; // self
 	},
 	getAbsoluteMode: function(){
 		// summary: returns a current value of the absolute mode
+		this._confirmSegmented();
 		return this.absolute; // Boolean
 	},
 
 	getBoundingBox: function(){
 		// summary: returns the bounding box {x, y, width, height} or null
+		this._confirmSegmented();
 		return (this.bbox && ("l" in this.bbox)) ? {x: this.bbox.l, y: this.bbox.t, width: this.bbox.r - this.bbox.l, height: this.bbox.b - this.bbox.t} : null; // dojox.gfx.Rectangle
 	},
 
+	_getRealBBox: function(){
+		// summary: returns an array of four points or null
+		//	four points represent four corners of the untransformed bounding box
+		this._confirmSegmented();
+		if(this.tbbox){
+			return this.tbbox;	// Array
+		}
+		var bbox = this.bbox, matrix = this._getRealMatrix();
+		this.bbox = null;
+		for(var i = 0, len = this.segments.length; i < len; ++i){
+			this._updateWithSegment(this.segments[i], matrix);
+		}
+		var t = this.bbox;
+		this.bbox = bbox;
+		this.tbbox = t ? [
+			{x: t.l, y: t.t},
+			{x: t.r, y: t.t},
+			{x: t.r, y: t.b},
+			{x: t.l, y: t.b}
+		] : null;
+		return this.tbbox;	// Array
+	},
+
 	getLastPosition: function(){
 		// summary: returns the last point in the path, or null
+		this._confirmSegmented();
 		return "x" in this.last ? this.last : null; // Object
 	},
 
+	_applyTransform: function(){
+		this.tbbox = null;
+		return dojox.gfx.Shape.prototype._applyTransform.call(this);
+	},
+
 	// segment interpretation
-	_updateBBox: function(x, y){
+	_updateBBox: function(x, y, matrix){
 		// summary: updates the bounding box of path with new point
 		// x: Number: an x coordinate
 		// y: Number: a y coordinate
+		
+		if(matrix){
+			var t = dojox.gfx.matrix.multiplyPoint(matrix, x, y);
+			x = t.x;
+			y = t.y;
+		}
 
 		// we use {l, b, r, t} representation of a bbox
 		if(this.bbox && ("l" in this.bbox)){
@@ -53,7 +94,7 @@ dojo.declare("dojox.gfx.path.Path", dojox.gfx.Shape, {
 			this.bbox = {l: x, b: y, r: x, t: y};
 		}
 	},
-	_updateWithSegment: function(segment){
+	_updateWithSegment: function(segment, matrix){
 		// summary: updates the bounding box of path with new segment
 		// segment: Object: a segment
 		var n = segment.args, l = n.length;
@@ -66,7 +107,7 @@ dojo.declare("dojox.gfx.path.Path", dojox.gfx.Shape, {
 			case "Q":
 			case "T":
 				for(var i = 0; i < l; i += 2){
-					this._updateBBox(n[i], n[i + 1]);
+					this._updateBBox(n[i], n[i + 1], matrix);
 				}
 				this.last.x = n[l - 2];
 				this.last.y = n[l - 1];
@@ -74,14 +115,14 @@ dojo.declare("dojox.gfx.path.Path", dojox.gfx.Shape, {
 				break;
 			case "H":
 				for(var i = 0; i < l; ++i){
-					this._updateBBox(n[i], this.last.y);
+					this._updateBBox(n[i], this.last.y, matrix);
 				}
 				this.last.x = n[l - 1];
 				this.absolute = true;
 				break;
 			case "V":
 				for(var i = 0; i < l; ++i){
-					this._updateBBox(this.last.x, n[i]);
+					this._updateBBox(this.last.x, n[i], matrix);
 				}
 				this.last.y = n[l - 1];
 				this.absolute = true;
@@ -89,52 +130,52 @@ dojo.declare("dojox.gfx.path.Path", dojox.gfx.Shape, {
 			case "m":
 				var start = 0;
 				if(!("x" in this.last)){
-					this._updateBBox(this.last.x = n[0], this.last.y = n[1]);
+					this._updateBBox(this.last.x = n[0], this.last.y = n[1], matrix);
 					start = 2;
 				}
 				for(var i = start; i < l; i += 2){
-					this._updateBBox(this.last.x += n[i], this.last.y += n[i + 1]);
+					this._updateBBox(this.last.x += n[i], this.last.y += n[i + 1], matrix);
 				}
 				this.absolute = false;
 				break;
 			case "l":
 			case "t":
 				for(var i = 0; i < l; i += 2){
-					this._updateBBox(this.last.x += n[i], this.last.y += n[i + 1]);
+					this._updateBBox(this.last.x += n[i], this.last.y += n[i + 1], matrix);
 				}
 				this.absolute = false;
 				break;
 			case "h":
 				for(var i = 0; i < l; ++i){
-					this._updateBBox(this.last.x += n[i], this.last.y);
+					this._updateBBox(this.last.x += n[i], this.last.y, matrix);
 				}
 				this.absolute = false;
 				break;
 			case "v":
 				for(var i = 0; i < l; ++i){
-					this._updateBBox(this.last.x, this.last.y += n[i]);
+					this._updateBBox(this.last.x, this.last.y += n[i], matrix);
 				}
 				this.absolute = false;
 				break;
 			case "c":
 				for(var i = 0; i < l; i += 6){
-					this._updateBBox(this.last.x + n[i], this.last.y + n[i + 1]);
-					this._updateBBox(this.last.x + n[i + 2], this.last.y + n[i + 3]);
-					this._updateBBox(this.last.x += n[i + 4], this.last.y += n[i + 5]);
+					this._updateBBox(this.last.x + n[i], this.last.y + n[i + 1], matrix);
+					this._updateBBox(this.last.x + n[i + 2], this.last.y + n[i + 3], matrix);
+					this._updateBBox(this.last.x += n[i + 4], this.last.y += n[i + 5], matrix);
 				}
 				this.absolute = false;
 				break;
 			case "s":
 			case "q":
 				for(var i = 0; i < l; i += 4){
-					this._updateBBox(this.last.x + n[i], this.last.y + n[i + 1]);
-					this._updateBBox(this.last.x += n[i + 2], this.last.y += n[i + 3]);
+					this._updateBBox(this.last.x + n[i], this.last.y + n[i + 1], matrix);
+					this._updateBBox(this.last.x += n[i + 2], this.last.y += n[i + 3], matrix);
 				}
 				this.absolute = false;
 				break;
 			case "A":
 				for(var i = 0; i < l; i += 7){
-					this._updateBBox(n[i + 5], n[i + 6]);
+					this._updateBBox(n[i + 5], n[i + 6], matrix);
 				}
 				this.last.x = n[l - 2];
 				this.last.y = n[l - 1];
@@ -142,7 +183,7 @@ dojo.declare("dojox.gfx.path.Path", dojox.gfx.Shape, {
 				break;
 			case "a":
 				for(var i = 0; i < l; i += 7){
-					this._updateBBox(this.last.x += n[i + 5], this.last.y += n[i + 6]);
+					this._updateBBox(this.last.x += n[i + 5], this.last.y += n[i + 6], matrix);
 				}
 				this.absolute = false;
 				break;
@@ -159,13 +200,14 @@ dojo.declare("dojox.gfx.path.Path", dojox.gfx.Shape, {
 		}
 	},
 
-	// a dictionary, which maps segment type codes to a number of their argemnts
+	// a dictionary, which maps segment type codes to a number of their arguments
 	_validSegments: {m: 2, l: 2, h: 1, v: 1, c: 6, s: 4, q: 4, t: 2, a: 7, z: 0},
 
 	_pushSegment: function(action, args){
 		// summary: adds a segment
 		// action: String: valid SVG code for a segment's type
 		// args: Array: a list of parameters for this segment
+		this.tbbox = null;
 		var group = this._validSegments[action.toLowerCase()];
 		if(typeof group == "number"){
 			if(group){
@@ -203,6 +245,7 @@ dojo.declare("dojox.gfx.path.Path", dojox.gfx.Shape, {
 	// segments
 	moveTo: function(){
 		// summary: formes a move segment
+		this._confirmSegmented();
 		var args = [];
 		this._collectArgs(args, arguments);
 		this._pushSegment(this.absolute ? "M" : "m", args);
@@ -210,6 +253,7 @@ dojo.declare("dojox.gfx.path.Path", dojox.gfx.Shape, {
 	},
 	lineTo: function(){
 		// summary: formes a line segment
+		this._confirmSegmented();
 		var args = [];
 		this._collectArgs(args, arguments);
 		this._pushSegment(this.absolute ? "L" : "l", args);
@@ -217,6 +261,7 @@ dojo.declare("dojox.gfx.path.Path", dojox.gfx.Shape, {
 	},
 	hLineTo: function(){
 		// summary: formes a horizontal line segment
+		this._confirmSegmented();
 		var args = [];
 		this._collectArgs(args, arguments);
 		this._pushSegment(this.absolute ? "H" : "h", args);
@@ -224,6 +269,7 @@ dojo.declare("dojox.gfx.path.Path", dojox.gfx.Shape, {
 	},
 	vLineTo: function(){
 		// summary: formes a vertical line segment
+		this._confirmSegmented();
 		var args = [];
 		this._collectArgs(args, arguments);
 		this._pushSegment(this.absolute ? "V" : "v", args);
@@ -231,6 +277,7 @@ dojo.declare("dojox.gfx.path.Path", dojox.gfx.Shape, {
 	},
 	curveTo: function(){
 		// summary: formes a curve segment
+		this._confirmSegmented();
 		var args = [];
 		this._collectArgs(args, arguments);
 		this._pushSegment(this.absolute ? "C" : "c", args);
@@ -238,6 +285,7 @@ dojo.declare("dojox.gfx.path.Path", dojox.gfx.Shape, {
 	},
 	smoothCurveTo: function(){
 		// summary: formes a smooth curve segment
+		this._confirmSegmented();
 		var args = [];
 		this._collectArgs(args, arguments);
 		this._pushSegment(this.absolute ? "S" : "s", args);
@@ -245,6 +293,7 @@ dojo.declare("dojox.gfx.path.Path", dojox.gfx.Shape, {
 	},
 	qCurveTo: function(){
 		// summary: formes a quadratic curve segment
+		this._confirmSegmented();
 		var args = [];
 		this._collectArgs(args, arguments);
 		this._pushSegment(this.absolute ? "Q" : "q", args);
@@ -252,6 +301,7 @@ dojo.declare("dojox.gfx.path.Path", dojox.gfx.Shape, {
 	},
 	qSmoothCurveTo: function(){
 		// summary: formes a quadratic smooth curve segment
+		this._confirmSegmented();
 		var args = [];
 		this._collectArgs(args, arguments);
 		this._pushSegment(this.absolute ? "T" : "t", args);
@@ -259,6 +309,7 @@ dojo.declare("dojox.gfx.path.Path", dojox.gfx.Shape, {
 	},
 	arcTo: function(){
 		// summary: formes an elliptic arc segment
+		this._confirmSegmented();
 		var args = [];
 		this._collectArgs(args, arguments);
 		this._pushSegment(this.absolute ? "A" : "a", args);
@@ -266,10 +317,24 @@ dojo.declare("dojox.gfx.path.Path", dojox.gfx.Shape, {
 	},
 	closePath: function(){
 		// summary: closes a path
+		this._confirmSegmented();
 		this._pushSegment("Z", []);
 		return this; // self
 	},
 
+	_confirmSegmented: function() {
+		if (!this.segmented) {
+			var path = this.shape.path;
+			// switch to non-updating version of path building
+			this.shape.path = [];
+			this._setPath(path);
+			// switch back to the string path
+			this.shape.path = this.shape.path.join("");
+			// become segmented
+			this.segmented = true;
+		}
+	},
+
 	// setShape
 	_setPath: function(path){
 		// summary: forms a path using an SVG path string
@@ -302,12 +367,12 @@ dojo.declare("dojox.gfx.path.Path", dojox.gfx.Shape, {
 		// summary: forms a path using a shape
 		// newShape: Object: an SVG path string or a path object (see dojox.gfx.defaultPath)
 		dojox.gfx.Shape.prototype.setShape.call(this, typeof newShape == "string" ? {path: newShape} : newShape);
-		var path = this.shape.path;
-		// switch to non-updating version of path building
-		this.shape.path = [];
-		this._setPath(path);
-		// switch back to the string path
-		this.shape.path = this.shape.path.join("");
+		
+		this.segmented = false;
+		this.segments = [];
+		if(!dojox.gfx.lazyPathSegmentation){
+			this._confirmSegmented();
+		}
 		return this; // self
 	},
 

data/dojo/dojox/gfx/resources/svg2gfx.xsl

@@ -707,7 +707,10 @@ GMail, etc.) or Eric (Saugus.net, ShellTown, etc.)
 		<xsl:call-template name="transform-processor">
 			<xsl:with-param name="transforms" select="."/>
 		</xsl:call-template>
-		<xsl:text>},</xsl:text>		
+		<xsl:text>}</xsl:text>		
+		<xsl:if test="not(position()=last())"> 
+			<xsl:text >,</xsl:text> 
+		</xsl:if>
 	</xsl:template>
 
 	<!-- SVG Element Handling -->
@@ -741,7 +744,10 @@ GMail, etc.) or Eric (Saugus.net, ShellTown, etc.)
 		<xsl:call-template name="common-attributes">
 			<xsl:with-param name="node" select="."/>
 		</xsl:call-template>
-		<xsl:text>},</xsl:text>
+		<xsl:text>}</xsl:text>
+		<xsl:if test="not(position()=last())"> 
+			<xsl:text >,</xsl:text> 
+		</xsl:if>
 	</xsl:template>
 
 	<xsl:template match="svg:ellipse">
@@ -750,12 +756,15 @@ GMail, etc.) or Eric (Saugus.net, ShellTown, etc.)
 		<xsl:apply-templates select="@id"/>
 		<xsl:text>shape:{type:"ellipse",</xsl:text>
 		<xsl:apply-templates select="@cx|@cy|@rx|@ry"/>
-		<xsl:text>},</xsl:text>
+		<xsl:text>}</xsl:text>
 		<xsl:value-of select="$groupAttrs"/>
 		<xsl:call-template name="common-attributes">
 			<xsl:with-param name="node" select="."/>
 		</xsl:call-template>
-		<xsl:text>},</xsl:text>
+		<xsl:text>}</xsl:text>
+		<xsl:if test="not(position()=last())"> 
+			<xsl:text >,</xsl:text> 
+		</xsl:if>
 	</xsl:template>
 
 	<xsl:template match="svg:g">
@@ -780,13 +789,19 @@ GMail, etc.) or Eric (Saugus.net, ShellTown, etc.)
 		<xsl:apply-templates select="&SupportedElements;">
 			<xsl:with-param name="groupAttrs" select="$newGroupAttrs"/>
 		</xsl:apply-templates>
-		<xsl:text>],</xsl:text>
+		<xsl:text>]</xsl:text>
+		<xsl:if test="not(position()=last())"> 
+			<xsl:text >,</xsl:text> 
+		</xsl:if>
 		<!-- When GFX gets group fills etc., remove the following line and uncomment the ones below. -->
 		<xsl:apply-templates select="@transform"/>
 		<!--<xsl:call-template name="common-attributes">-->
 		<!--	<xsl:with-param name="node" select="."/>-->
 		<!--</xsl:call-template>-->
-		<xsl:text>},</xsl:text>
+		<xsl:text>}</xsl:text>
+		<xsl:if test="not(position()=last())"> 
+			<xsl:text >,</xsl:text> 
+		</xsl:if>
 	</xsl:template>
 
 	<xsl:template match="svg:image">
@@ -823,7 +838,10 @@ GMail, etc.) or Eric (Saugus.net, ShellTown, etc.)
 		<xsl:call-template name="common-attributes">
 			<xsl:with-param name="node" select="."/>
 		</xsl:call-template>
-		<xsl:text>},</xsl:text>
+		<xsl:text>}</xsl:text>
+		<xsl:if test="not(position()=last())"> 
+			<xsl:text >,</xsl:text> 
+		</xsl:if>
 	</xsl:template>
 
 	<xsl:template match="svg:linearGradient">
@@ -849,7 +867,10 @@ GMail, etc.) or Eric (Saugus.net, ShellTown, etc.)
 		<!-- Uncommenting the following would support it here. -->
 		<!-- <xsl:apply-templates select="@x1|@x2|@y1|@y2"/> -->
 		<!-- <xsl:apply-templates select="@gradientTransform"/> -->
-		<xsl:text>]},</xsl:text>
+		<xsl:text>]}</xsl:text>
+		<xsl:if test="not(position()=last())"> 
+			<xsl:text >,</xsl:text> 
+		</xsl:if>
 	</xsl:template>
 
 	<xsl:template match="svg:path">
@@ -875,7 +896,10 @@ GMail, etc.) or Eric (Saugus.net, ShellTown, etc.)
 		<!-- GFX only seems to handle image pattern type fills, so that's all we do -->
 		<xsl:text>{type:"pattern",</xsl:text>
 		<xsl:apply-templates select="@width|@height|@xlink:href"/>
-		<xsl:text>},</xsl:text>
+		<xsl:text>}</xsl:text>
+		<xsl:if test="not(position()=last())"> 
+			<xsl:text >,</xsl:text> 
+		</xsl:if>
 	</xsl:template>
 
 	<xsl:template match="svg:polygon|svg:polyline">
@@ -910,7 +934,10 @@ GMail, etc.) or Eric (Saugus.net, ShellTown, etc.)
 		<xsl:call-template name="common-attributes">
 			<xsl:with-param name="node" select="."/>
 		</xsl:call-template>
-		<xsl:text>},</xsl:text>
+		<xsl:text>}</xsl:text>
+		<xsl:if test="not(position()=last())"> 
+			<xsl:text >,</xsl:text> 
+		</xsl:if>
 	</xsl:template>
 
 	<xsl:template match="svg:radialGradient">
@@ -939,7 +966,10 @@ GMail, etc.) or Eric (Saugus.net, ShellTown, etc.)
 		<!-- Uncommenting the following would support it here. -->
 		<!-- <xsl:apply-templates select="@cx|@cy|@r"/> -->
 		<!-- <xsl:apply-templates select="@gradientTransform"/> -->
-		<xsl:text>]},</xsl:text>
+		<xsl:text>]}</xsl:text>
+		<xsl:if test="not(position()=last())"> 
+			<xsl:text >,</xsl:text> 
+		</xsl:if>
 	</xsl:template>
 
 	<xsl:template match="svg:rect">
@@ -959,7 +989,10 @@ GMail, etc.) or Eric (Saugus.net, ShellTown, etc.)
 		<xsl:call-template name="common-attributes">
 			<xsl:with-param name="node" select="."/>
 		</xsl:call-template>
-		<xsl:text>},</xsl:text>
+		<xsl:text>}</xsl:text>
+		<xsl:if test="not(position()=last())"> 
+			<xsl:text >,</xsl:text> 
+		</xsl:if>
 	</xsl:template>
 
 	<xsl:template match="svg:stop">
@@ -968,7 +1001,10 @@ GMail, etc.) or Eric (Saugus.net, ShellTown, etc.)
 		<xsl:apply-templates select="@offset"/>
 		<xsl:text>color:</xsl:text>
 		<xsl:apply-templates select="@style"/>
-		<xsl:text>},</xsl:text>
+		<xsl:text>}</xsl:text>
+		<xsl:if test="not(position()=last())"> 
+			<xsl:text >,</xsl:text> 
+		</xsl:if>
 	</xsl:template>
 
 	<xsl:template match="svg:text|svg:textPath">
@@ -1013,7 +1049,10 @@ GMail, etc.) or Eric (Saugus.net, ShellTown, etc.)
 		<xsl:call-template name="common-attributes">
 			<xsl:with-param name="node" select="."/>
 		</xsl:call-template>
-		<xsl:text>},</xsl:text>
+		<xsl:text>}</xsl:text>
+		<xsl:if test="not(position()=last())"> 
+			<xsl:text >,</xsl:text> 
+		</xsl:if>
 	</xsl:template>
 	
 	<xsl:template match="svg:use">