You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tapestry.apache.org by jk...@apache.org on 2006/09/23 01:22:51 UTC
svn commit: r449122 [11/40] - in
/tapestry/tapestry4/trunk/tapestry-framework/src: java/org/apache/tapestry/
java/org/apache/tapestry/dojo/ java/org/apache/tapestry/dojo/form/
java/org/apache/tapestry/dojo/html/ java/org/apache/tapestry/form/
java/org/...
Added: tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/gfx/Colorspace.js
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/gfx/Colorspace.js?view=auto&rev=449122
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/gfx/Colorspace.js (added)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/gfx/Colorspace.js Fri Sep 22 16:22:30 2006
@@ -0,0 +1,820 @@
+/*
+ Copyright (c) 2004-2006, The Dojo Foundation
+ All Rights Reserved.
+
+ Licensed under the Academic Free License version 2.1 or above OR the
+ modified BSD license. For more information on Dojo licensing, see:
+
+ http://dojotoolkit.org/community/licensing.shtml
+*/
+
+dojo.provide("dojo.gfx.Colorspace");
+
+dojo.require("dojo.lang.common");
+dojo.require("dojo.math.matrix");
+
+// to convert to YUV:
+// c.whitePoint = 'D65';
+// c.RGBWorkingSpace = 'pal_secam_rgb';
+// var out = c.convert([r,g,b], 'RGB', 'XYZ');
+//
+// to convert to YIQ:
+// c.whitePoint = 'D65';
+// c.RGBWorkingSpace = 'ntsc_rgb';
+// var out = c.convert([r,g,b], 'RGB', 'XYZ');
+//
+
+dojo.gfx.Colorspace = function(){
+ // summary
+ // An object for dealing with colorspace conversions.
+ this.whitePoint = 'D65';
+ this.stdObserver = '10';
+ this.chromaticAdaptationAlg = 'bradford';
+ this.RGBWorkingSpace = 's_rgb';
+ this.useApproxCIELabMapping = 1; // see http://www.brucelindbloom.com/LContinuity.html
+
+ this.chainMaps = {
+ 'RGB_to_xyY' : ['XYZ'],
+ 'xyY_to_RGB' : ['XYZ'],
+ 'RGB_to_Lab' : ['XYZ'],
+ 'Lab_to_RGB' : ['XYZ'],
+ 'RGB_to_LCHab': ['XYZ', 'Lab'],
+ 'LCHab_to_RGB': ['Lab'],
+ 'xyY_to_Lab' : ['XYZ'],
+ 'Lab_to_xyY' : ['XYZ'],
+ 'XYZ_to_LCHab': ['Lab'],
+ 'LCHab_to_XYZ': ['Lab'],
+ 'xyY_to_LCHab': ['XYZ', 'Lab'],
+ 'LCHab_to_xyY': ['Lab', 'XYZ'],
+ 'RGB_to_Luv' : ['XYZ'],
+ 'Luv_to_RGB' : ['XYZ'],
+ 'xyY_to_Luv' : ['XYZ'],
+ 'Luv_to_xyY' : ['XYZ'],
+ 'Lab_to_Luv' : ['XYZ'],
+ 'Luv_to_Lab' : ['XYZ'],
+ 'LCHab_to_Luv': ['Lab', 'XYZ'],
+ 'Luv_to_LCHab': ['XYZ', 'Lab'],
+ 'RGB_to_LCHuv' : ['XYZ', 'Luv'],
+ 'LCHuv_to_RGB' : ['Luv', 'XYZ'],
+ 'XYZ_to_LCHuv' : ['Luv'],
+ 'LCHuv_to_XYZ' : ['Luv'],
+ 'xyY_to_LCHuv' : ['XYZ', 'Luv'],
+ 'LCHuv_to_xyY' : ['Luv', 'XYZ'],
+ 'Lab_to_LCHuv' : ['XYZ', 'Luv'],
+ 'LCHuv_to_Lab' : ['Luv', 'XYZ'],
+ 'LCHab_to_LCHuv': ['Lab', 'XYZ', 'Luv'],
+ 'LCHuv_to_LCHab': ['Luv', 'XYZ', 'Lab'],
+ 'XYZ_to_CMY' : ['RGB'],
+ 'CMY_to_XYZ' : ['RGB'],
+ 'xyY_to_CMY' : ['RGB'],
+ 'CMY_to_xyY' : ['RGB'],
+ 'Lab_to_CMY' : ['RGB'],
+ 'CMY_to_Lab' : ['RGB'],
+ 'LCHab_to_CMY' : ['RGB'],
+ 'CMY_to_LCHab' : ['RGB'],
+ 'Luv_to_CMY' : ['RGB'],
+ 'CMY_to_Luv' : ['RGB'],
+ 'LCHuv_to_CMY' : ['RGB'],
+ 'CMY_to_LCHuv' : ['RGB'],
+ 'XYZ_to_HSL' : ['RGB'],
+ 'HSL_to_XYZ' : ['RGB'],
+ 'xyY_to_HSL' : ['RGB'],
+ 'HSL_to_xyY' : ['RGB'],
+ 'Lab_to_HSL' : ['RGB'],
+ 'HSL_to_Lab' : ['RGB'],
+ 'LCHab_to_HSL' : ['RGB'],
+ 'HSL_to_LCHab' : ['RGB'],
+ 'Luv_to_HSL' : ['RGB'],
+ 'HSL_to_Luv' : ['RGB'],
+ 'LCHuv_to_HSL' : ['RGB'],
+ 'HSL_to_LCHuv' : ['RGB'],
+ 'CMY_to_HSL' : ['RGB'],
+ 'HSL_to_CMY' : ['RGB'],
+ 'CMYK_to_HSL' : ['RGB'],
+ 'HSL_to_CMYK' : ['RGB'],
+ 'XYZ_to_HSV' : ['RGB'],
+ 'HSV_to_XYZ' : ['RGB'],
+ 'xyY_to_HSV' : ['RGB'],
+ 'HSV_to_xyY' : ['RGB'],
+ 'Lab_to_HSV' : ['RGB'],
+ 'HSV_to_Lab' : ['RGB'],
+ 'LCHab_to_HSV' : ['RGB'],
+ 'HSV_to_LCHab' : ['RGB'],
+ 'Luv_to_HSV' : ['RGB'],
+ 'HSV_to_Luv' : ['RGB'],
+ 'LCHuv_to_HSV' : ['RGB'],
+ 'HSV_to_LCHuv' : ['RGB'],
+ 'CMY_to_HSV' : ['RGB'],
+ 'HSV_to_CMY' : ['RGB'],
+ 'CMYK_to_HSV' : ['RGB'],
+ 'HSV_to_CMYK' : ['RGB'],
+ 'HSL_to_HSV' : ['RGB'],
+ 'HSV_to_HSL' : ['RGB'],
+ 'XYZ_to_CMYK' : ['RGB'],
+ 'CMYK_to_XYZ' : ['RGB'],
+ 'xyY_to_CMYK' : ['RGB'],
+ 'CMYK_to_xyY' : ['RGB'],
+ 'Lab_to_CMYK' : ['RGB'],
+ 'CMYK_to_Lab' : ['RGB'],
+ 'LCHab_to_CMYK' : ['RGB'],
+ 'CMYK_to_LCHab' : ['RGB'],
+ 'Luv_to_CMYK' : ['RGB'],
+ 'CMYK_to_Luv' : ['RGB'],
+ 'LCHuv_to_CMYK' : ['RGB'],
+ 'CMYK_to_LCHuv' : ['RGB']
+ };
+ return this;
+}
+
+dojo.gfx.Colorspace.prototype.convert = function(col, model_from, model_to){
+ var k = model_from+'_to_'+model_to;
+ if (this[k]){
+ return this[k](col);
+ }else{
+ if (this.chainMaps[k]){
+ var cur = model_from;
+ var models = this.chainMaps[k].concat();
+ models.push(model_to);
+ for(var i=0; i<models.length; i++){
+ col = this.convert(col, cur, models[i]);
+ cur = models[i];
+ }
+ return col;
+ }else{
+ dojo.debug("Can't convert from "+model_from+' to '+model_to);
+ }
+ }
+}
+
+dojo.gfx.Colorspace.prototype.munge = function(keys, args){
+ if (dojo.lang.isArray(args[0])){
+ args = args[0];
+ }
+ var out = new Array();
+ for (var i=0; i<keys.length; i++){
+ out[keys.charAt(i)] = args[i];
+ }
+ return out;
+}
+
+dojo.gfx.Colorspace.prototype.getWhitePoint = function(){
+ var x = 0;
+ var y = 0;
+ var t = 0;
+
+ // ref: http://en.wikipedia.org/wiki/White_point
+ // TODO: i need some good/better white point values
+
+ switch(this.stdObserver){
+ case '2' :
+ switch(this.whitePoint){
+ case 'E' : x=1/3 ; y=1/3 ; t=5400; break; //Equal energy
+ case 'D50' : x=0.34567; y=0.35850; t=5000; break;
+ case 'D55' : x=0.33242; y=0.34743; t=5500; break;
+ case 'D65' : x=0.31271; y=0.32902; t=6500; break;
+ case 'D75' : x=0.29902; y=0.31485; t=7500; break;
+ case 'A' : x=0.44757; y=0.40745; t=2856; break; //Incandescent tungsten
+ case 'B' : x=0.34842; y=0.35161; t=4874; break;
+ case 'C' : x=0.31006; y=0.31616; t=6774; break;
+ case '9300': x=0.28480; y=0.29320; t=9300; break; //Blue phosphor monitors
+ case 'F2' : x=0.37207; y=0.37512; t=4200; break; //Cool White Fluorescent
+ case 'F7' : x=0.31285; y=0.32918; t=6500; break; //Narrow Band Daylight Fluorescent
+ case 'F11' : x=0.38054; y=0.37691; t=4000; break; //Narrow Band White Fluorescent
+ default: dojo.debug('White point '+this.whitePoint+" isn't defined for Std. Observer "+this.strObserver);
+ };
+ break;
+ case '10' :
+ switch(this.whitePoint){
+ case 'E' : x=1/3 ; y=1/3 ; t=5400; break; //Equal energy
+ case 'D50' : x=0.34773; y=0.35952; t=5000; break;
+ case 'D55' : x=0.33411; y=0.34877; t=5500; break;
+ case 'D65' : x=0.31382; y=0.33100; t=6500; break;
+ case 'D75' : x=0.29968; y=0.31740; t=7500; break;
+ case 'A' : x=0.45117; y=0.40594; t=2856; break; //Incandescent tungsten
+ case 'B' : x=0.3498 ; y=0.3527 ; t=4874; break;
+ case 'C' : x=0.31039; y=0.31905; t=6774; break;
+ case 'F2' : x=0.37928; y=0.36723; t=4200; break; //Cool White Fluorescent
+ case 'F7' : x=0.31565; y=0.32951; t=6500; break; //Narrow Band Daylight Fluorescent
+ case 'F11' : x=0.38543; y=0.37110; t=4000; break; //Narrow Band White Fluorescent
+ default: dojo.debug('White point '+this.whitePoint+" isn't defined for Std. Observer "+this.strObserver);
+ };
+ break;
+ default:
+ dojo.debug("Std. Observer "+this.strObserver+" isn't defined");
+ }
+
+ var z = 1 - x - y;
+ var wp = {'x':x, 'y':y, 'z':z, 't':t};
+ wp.Y = 1;
+
+ var XYZ = this.xyY_to_XYZ([wp.x, wp.y, wp.Y]);
+ wp.X = XYZ[0];
+ wp.Y = XYZ[1];
+ wp.Z = XYZ[2];
+ return wp;
+}
+
+dojo.gfx.Colorspace.prototype.getPrimaries = function(){
+ // ref: http://www.fho-emden.de/~hoffmann/ciexyz29082000.pdf
+ // ref: http://www.brucelindbloom.com/index.html?Eqn_RGB_XYZ_Matrix.html
+ var m = [];
+ switch(this.RGBWorkingSpace){
+ case 'adobe_rgb_1998' : m = [2.2, 'D65', 0.6400, 0.3300, 0.297361, 0.2100, 0.7100, 0.627355, 0.1500, 0.0600, 0.075285]; break;
+ case 'apple_rgb' : m = [1.8, 'D65', 0.6250, 0.3400, 0.244634, 0.2800, 0.5950, 0.672034, 0.1550, 0.0700, 0.083332]; break;
+ case 'best_rgb' : m = [2.2, 'D50', 0.7347, 0.2653, 0.228457, 0.2150, 0.7750, 0.737352, 0.1300, 0.0350, 0.034191]; break;
+ case 'beta_rgb' : m = [2.2, 'D50', 0.6888, 0.3112, 0.303273, 0.1986, 0.7551, 0.663786, 0.1265, 0.0352, 0.032941]; break;
+ case 'bruce_rgb' : m = [2.2, 'D65', 0.6400, 0.3300, 0.240995, 0.2800, 0.6500, 0.683554, 0.1500, 0.0600, 0.075452]; break;
+ case 'cie_rgb' : m = [2.2, 'E' , 0.7350, 0.2650, 0.176204, 0.2740, 0.7170, 0.812985, 0.1670, 0.0090, 0.010811]; break;
+ case 'color_match_rgb' : m = [1.8, 'D50', 0.6300, 0.3400, 0.274884, 0.2950, 0.6050, 0.658132, 0.1500, 0.0750, 0.066985]; break;
+ case 'don_rgb_4' : m = [2.2, 'D50', 0.6960, 0.3000, 0.278350, 0.2150, 0.7650, 0.687970, 0.1300, 0.0350, 0.033680]; break;
+ case 'eci_rgb' : m = [1.8, 'D50', 0.6700, 0.3300, 0.320250, 0.2100, 0.7100, 0.602071, 0.1400, 0.0800, 0.077679]; break;
+ case 'ekta_space_ps5' : m = [2.2, 'D50', 0.6950, 0.3050, 0.260629, 0.2600, 0.7000, 0.734946, 0.1100, 0.0050, 0.004425]; break;
+ case 'ntsc_rgb' : m = [2.2, 'C' , 0.6700, 0.3300, 0.298839, 0.2100, 0.7100, 0.586811, 0.1400, 0.0800, 0.114350]; break;
+ case 'pal_secam_rgb' : m = [2.2, 'D65', 0.6400, 0.3300, 0.222021, 0.2900, 0.6000, 0.706645, 0.1500, 0.0600, 0.071334]; break;
+ case 'pro_photo_rgb' : m = [1.8, 'D50', 0.7347, 0.2653, 0.288040, 0.1596, 0.8404, 0.711874, 0.0366, 0.0001, 0.000086]; break;
+ case 'smpte-c_rgb' : m = [2.2, 'D65', 0.6300, 0.3400, 0.212395, 0.3100, 0.5950, 0.701049, 0.1550, 0.0700, 0.086556]; break;
+ case 's_rgb' : m = [2.2, 'D65', 0.6400, 0.3300, 0.212656, 0.3000, 0.6000, 0.715158, 0.1500, 0.0600, 0.072186]; break;
+ case 'wide_gamut_rgb' : m = [2.2, 'D50', 0.7350, 0.2650, 0.258187, 0.1150, 0.8260, 0.724938, 0.1570, 0.0180, 0.016875]; break;
+ default: dojo.debug("RGB working space "+this.RGBWorkingSpace+" isn't defined");
+ }
+
+ var p = {
+ name: this.RGBWorkingSpace,
+ gamma:m[0],
+ wp:m[1],
+ xr:m[2],
+ yr:m[3],
+ Yr:m[4],
+ xg:m[5],
+ yg:m[6],
+ Yg:m[7],
+ xb:m[8],
+ yb:m[9],
+ Yb:m[10]
+ };
+
+ // if WP doesn't match current WP, convert the primaries over
+ if (p.wp != this.whitePoint){
+ var r = this.XYZ_to_xyY( this.chromaticAdaptation( this.xyY_to_XYZ([p.xr, p.yr, p.Yr]), p.wp, this.whitePoint ) );
+ var g = this.XYZ_to_xyY( this.chromaticAdaptation( this.xyY_to_XYZ([p.xg, p.yg, p.Yg]), p.wp, this.whitePoint ) );
+ var b = this.XYZ_to_xyY( this.chromaticAdaptation( this.xyY_to_XYZ([p.xb, p.yb, p.Yb]), p.wp, this.whitePoint ) );
+
+ p.xr = r[0];
+ p.yr = r[1];
+ p.Yr = r[2];
+
+ p.xg = g[0];
+ p.yg = g[1];
+ p.Yg = g[2];
+
+ p.xb = b[0];
+ p.yb = b[1];
+ p.Yb = b[2];
+
+ p.wp = this.whitePoint;
+ }
+
+ p.zr = 1 - p.xr - p.yr;
+ p.zg = 1 - p.xg - p.yg;
+ p.zb = 1 - p.xb - p.yb;
+ return p;
+}
+
+dojo.gfx.Colorspace.prototype.epsilon = function(){
+ return this.useApproxCIELabMapping ? 0.008856 : 216 / 24289;
+}
+
+dojo.gfx.Colorspace.prototype.kappa = function(){
+ return this.useApproxCIELabMapping ? 903.3 : 24389 / 27;
+}
+
+dojo.gfx.Colorspace.prototype.XYZ_to_xyY = function(){
+ var src = this.munge('XYZ', arguments);
+ var sum = src.X + src.Y + src.Z;
+ if (sum == 0){
+ var wp = this.getWhitePoint();
+ var x = wp.x;
+ var y = wp.y;
+ }else{
+ var x = src.X / sum;
+ var y = src.Y / sum;
+ }
+
+ var Y = src.Y;
+ return [x, y, Y];
+}
+
+dojo.gfx.Colorspace.prototype.xyY_to_XYZ = function(){
+ var src = this.munge('xyY', arguments);
+ if (src.y == 0){
+ var X = 0;
+ var Y = 0;
+ var Z = 0;
+ }else{
+ var X = (src.x * src.Y) / src.y;
+ var Y = src.Y;
+ var Z = ((1 - src.x - src.y) * src.Y) / src.y;
+ }
+
+ return [X, Y, Z];
+}
+
+dojo.gfx.Colorspace.prototype.RGB_to_XYZ = function(){
+ var src = this.munge('RGB', arguments);
+ var m = this.getRGB_XYZ_Matrix();
+ var pr = this.getPrimaries();
+
+ if (this.RGBWorkingSpace == 's_rgb'){
+ var r = (src.R > 0.04045) ? Math.pow(((src.R + 0.055) / 1.055), 2.4) : src.R / 12.92;
+ var g = (src.G > 0.04045) ? Math.pow(((src.G + 0.055) / 1.055), 2.4) : src.G / 12.92;
+ var b = (src.B > 0.04045) ? Math.pow(((src.B + 0.055) / 1.055), 2.4) : src.B / 12.92;
+ }else{
+ var r = Math.pow(src.R, pr.gamma);
+ var g = Math.pow(src.G, pr.gamma);
+ var b = Math.pow(src.B, pr.gamma);
+ }
+
+ var XYZ = dojo.math.matrix.multiply([[r, g, b]], m);
+ return [XYZ[0][0], XYZ[0][1], XYZ[0][2]];
+}
+
+dojo.gfx.Colorspace.prototype.XYZ_to_RGB = function(){
+ var src = this.munge('XYZ', arguments);
+ var mi = this.getXYZ_RGB_Matrix();
+ var pr = this.getPrimaries();
+
+ var rgb = dojo.math.matrix.multiply([[src.X, src.Y, src.Z]], mi);
+ var r = rgb[0][0];
+ var g = rgb[0][1];
+ var b = rgb[0][2];
+
+ if (this.RGBWorkingSpace == 's_rgb'){
+ var R = (r > 0.0031308) ? (1.055 * Math.pow(r, 1.0/2.4)) - 0.055 : 12.92 * r;
+ var G = (g > 0.0031308) ? (1.055 * Math.pow(g, 1.0/2.4)) - 0.055 : 12.92 * g;
+ var B = (b > 0.0031308) ? (1.055 * Math.pow(b, 1.0/2.4)) - 0.055 : 12.92 * b;
+ }else{
+ var R = Math.pow(r, 1/pr.gamma);
+ var G = Math.pow(g, 1/pr.gamma);
+ var B = Math.pow(b, 1/pr.gamma);
+ }
+ return [R, G, B];
+}
+
+dojo.gfx.Colorspace.prototype.XYZ_to_Lab = function(){
+ var src = this.munge('XYZ', arguments);
+ var wp = this.getWhitePoint();
+
+ var xr = src.X / wp.X;
+ var yr = src.Y / wp.Y;
+ var zr = src.Z / wp.Z;
+
+ var fx = (xr > this.epsilon()) ? Math.pow(xr, 1/3) : (this.kappa() * xr + 16) / 116;
+ var fy = (yr > this.epsilon()) ? Math.pow(yr, 1/3) : (this.kappa() * yr + 16) / 116;
+ var fz = (zr > this.epsilon()) ? Math.pow(zr, 1/3) : (this.kappa() * zr + 16) / 116;
+
+ var L = 116 * fy - 16;
+ var a = 500 * (fx - fy);
+ var b = 200 * (fy - fz);
+
+ return [L, a, b];
+}
+
+dojo.gfx.Colorspace.prototype.Lab_to_XYZ = function(){
+ var src = this.munge('Lab', arguments);
+ var wp = this.getWhitePoint();
+ var yr = (src.L > (this.kappa() * this.epsilon())) ? Math.pow((src.L + 16) / 116, 3) : src.L / this.kappa();
+
+ var fy = (yr > this.epsilon()) ? (src.L + 16) / 116 : (this.kappa() * yr + 16) / 116;
+ var fx = (src.a / 500) + fy;
+ var fz = fy - (src.b / 200);
+
+ var fxcube = Math.pow(fx, 3);
+ var fzcube = Math.pow(fz, 3);
+
+ var xr = (fxcube > this.epsilon()) ? fxcube : (116 * fx - 16) / this.kappa();
+ var zr = (fzcube > this.epsilon()) ? fzcube : (116 * fz - 16) / this.kappa();
+
+ var X = xr * wp.X;
+ var Y = yr * wp.Y;
+ var Z = zr * wp.Z;
+
+ return [X, Y, Z];
+}
+
+dojo.gfx.Colorspace.prototype.Lab_to_LCHab = function(){
+ var src = this.munge('Lab', arguments);
+
+ var L = src.L;
+ var C = Math.pow(src.a * src.a + src.b * src.b, 0.5);
+ var H = Math.atan2(src.b, src.a) * (180 / Math.PI);
+
+ if (H < 0){ H += 360; }
+ if (H > 360){ H -= 360; }
+
+ return [L, C, H];
+}
+
+dojo.gfx.Colorspace.prototype.LCHab_to_Lab = function(){
+ var src = this.munge('LCH', arguments);
+
+ var H_rad = src.H * (Math.PI / 180);
+ var L = src.L;
+ var a = src.C / Math.pow(Math.pow(Math.tan(H_rad), 2) + 1, 0.5);
+ if ((90 < src.H) && (src.H < 270)){ a= -a; }
+
+ var b = Math.pow(Math.pow(src.C, 2) - Math.pow(a, 2), 0.5);
+ if (src.H > 180){ b = -b; }
+
+ return [L, a, b];
+}
+
+//////////////////////////////////////////////////////////////////////////////////////////////////////
+//
+// this function converts an XYZ color array (col) from one whitepoint (src_w) to another (dst_w)
+//
+
+dojo.gfx.Colorspace.prototype.chromaticAdaptation = function(col, src_w, dst_w){
+ col = this.munge('XYZ', [col]);
+ var old_wp = this.whitePoint;
+
+ this.whitePoint = src_w;
+ var wp_src = this.getWhitePoint();
+
+ this.whitePoint = dst_w;
+ var wp_dst = this.getWhitePoint();
+
+ this.whitePoint = old_wp;
+
+ switch(this.chromaticAdaptationAlg){
+ case 'xyz_scaling':
+ var ma = [[1,0,0],[0,1,0],[0,0,1]];
+ var mai = [[1,0,0],[0,1,0],[0,0,1]];
+ break;
+ case 'bradford':
+ var ma = [[0.8951, -0.7502, 0.0389],[0.2664, 1.7135, -0.0685],[-0.1614, 0.0367, 1.0296]];
+ var mai = [[0.986993, 0.432305, -0.008529],[-0.147054, 0.518360, 0.040043],[0.159963, 0.049291, 0.968487]];
+ break;
+ case 'von_kries':
+ var ma = [[0.40024, -0.22630, 0.00000],[0.70760, 1.16532, 0.00000],[-0.08081, 0.04570, 0.91822]]
+ var mai = [[1.859936, 0.361191, 0.000000],[-1.129382, 0.638812, 0.000000],[0.219897, -0.000006, 1.089064]]
+ break;
+ default:
+ dojo.debug("The "+this.chromaticAdaptationAlg+" chromatic adaptation algorithm matricies are not defined");
+ }
+
+ var domain_src = dojo.math.matrix.multiply( [[wp_src.x, wp_src.y, wp_src.z]], ma);
+ var domain_dst = dojo.math.matrix.multiply( [[wp_dst.x, wp_dst.y, wp_dst.z]], ma);
+
+ var centre = [
+ [domain_dst[0][0]/domain_src[0][0], 0, 0],
+ [0, domain_dst[0][1]/domain_src[0][1], 0],
+ [0, 0, domain_dst[0][2]/domain_src[0][2]]
+ ];
+
+ var m = dojo.math.matrix.multiply( dojo.math.matrix.multiply( ma, centre ), mai );
+ var dst = dojo.math.matrix.multiply( [[ col.X, col.Y, col.Z ]], m );
+ return dst[0];
+}
+
+//////////////////////////////////////////////////////////////////////////////////////////////////////
+dojo.gfx.Colorspace.prototype.getRGB_XYZ_Matrix = function(){
+ var wp = this.getWhitePoint();
+ var pr = this.getPrimaries();
+
+ var Xr = pr.xr / pr.yr;
+ var Yr = 1;
+ var Zr = (1 - pr.xr - pr.yr) / pr.yr;
+
+ var Xg = pr.xg / pr.yg;
+ var Yg = 1;
+ var Zg = (1 - pr.xg - pr.yg) / pr.yg;
+
+ var Xb = pr.xb / pr.yb;
+ var Yb = 1;
+ var Zb = (1 - pr.xb - pr.yb) / pr.yb;
+
+ var m1 = [[Xr, Yr, Zr],[Xg, Yg, Zg],[Xb, Yb, Zb]];
+ var m2 = [[wp.X, wp.Y, wp.Z]];
+ var sm = dojo.math.matrix.multiply(m2, dojo.math.matrix.inverse(m1));
+
+ var Sr = sm[0][0];
+ var Sg = sm[0][1];
+ var Sb = sm[0][2];
+
+ var m4 = [[Sr*Xr, Sr*Yr, Sr*Zr],
+ [Sg*Xg, Sg*Yg, Sg*Zg],
+ [Sb*Xb, Sb*Yb, Sb*Zb]];
+
+ return m4;
+}
+
+dojo.gfx.Colorspace.prototype.getXYZ_RGB_Matrix = function(){
+ var m = this.getRGB_XYZ_Matrix();
+ return dojo.math.matrix.inverse(m);
+}
+
+dojo.gfx.Colorspace.prototype.XYZ_to_Luv = function(){
+ var src = this.munge('XYZ', arguments);
+
+ var wp = this.getWhitePoint();
+ var ud = (4 * src.X) / (src.X + 15 * src.Y + 3 * src.Z);
+ var vd = (9 * src.Y) / (src.X + 15 * src.Y + 3 * src.Z);
+
+ var udr = (4 * wp.X) / (wp.X + 15 * wp.Y + 3 * wp.Z);
+ var vdr = (9 * wp.Y) / (wp.X + 15 * wp.Y + 3 * wp.Z);
+ var yr = src.Y / wp.Y;
+
+ var L = (yr > this.epsilon()) ? 116 * Math.pow(yr, 1/3) - 16 : this.kappa() * yr;
+ var u = 13 * L * (ud-udr);
+ var v = 13 * L * (vd-vdr);
+
+ return [L, u, v];
+}
+
+dojo.gfx.Colorspace.prototype.Luv_to_XYZ = function(){
+ var src = this.munge('Luv', arguments);
+
+ var wp = this.getWhitePoint();
+ var uz = (4 * wp.X) / (wp.X + 15 * wp.Y + 3 * wp.Z);
+ var vz = (9 * wp.Y) / (wp.X + 15 * wp.Y + 3 * wp.Z);
+ var Y = (src.L > this.kappa() * this.epsilon()) ? Math.pow((src.L + 16) / 116, 3) : src.L / this.kappa();
+
+ var a = (1 / 3) * (((52 * src.L) / (src.u + 13 * src.L * uz)) - 1);
+ var b = -5 * Y;
+ var c = - (1 / 3);
+ var d = Y * (((39 * src.L) / (src.v + 13 * src.L * vz)) - 5);
+
+ var X = (d - b) / (a - c);
+ var Z = X * a + b;
+
+ return [X, Y, Z];
+}
+
+dojo.gfx.Colorspace.prototype.Luv_to_LCHuv = function(){
+ var src = this.munge('Luv', arguments);
+
+ var L = src.L;
+ var C = Math.pow(src.u * src.u + src.v * src.v, 0.5);
+ var H = Math.atan2(src.v, src.u) * (180 / Math.PI);
+
+ if (H < 0){ H += 360; }
+ if (H > 360){ H -= 360; }
+
+ return [L, C, H];
+}
+
+dojo.gfx.Colorspace.prototype.LCHuv_to_Luv = function(){
+ var src = this.munge('LCH', arguments);
+
+ var H_rad = src.H * (Math.PI / 180);
+ var L = src.L;
+ var u = src.C / Math.pow(Math.pow(Math.tan(H_rad), 2) + 1, 0.5);
+ var v = Math.pow(src.C * src.C - u * u, 0.5);
+
+ if ((90 < src.H) && (src.H < 270)){ u *= -1; }
+ if (src.H > 180){ v *= -1; }
+
+ return [L, u, v];
+}
+
+dojo.gfx.Colorspace.colorTemp_to_whitePoint = function(T){
+ if (T < 4000){
+ dojo.debug("Can't find a white point for temperatures under 4000K");
+ return [0,0];
+ }
+
+ if (T > 25000){
+ dojo.debug("Can't find a white point for temperatures over 25000K");
+ return [0,0];
+ }
+
+ var T1 = T;
+ var T2 = T * T;
+ var T3 = T2 * T;
+
+ var ten9 = Math.pow(10, 9);
+ var ten6 = Math.pow(10, 6);
+ var ten3 = Math.pow(10, 3);
+
+ if (T <= 7000){
+ var x = (-4.6070 * ten9 / T3) + (2.9678 * ten6 / T2) + (0.09911 * ten3 / T) + 0.244063;
+ }else{
+ var x = (-2.0064 * ten9 / T3) + (1.9018 * ten6 / T2) + (0.24748 * ten3 / T) + 0.237040;
+ }
+ var y = -3.000 * x * x + 2.870 * x - 0.275;
+
+ return [x, y];
+}
+
+dojo.gfx.Colorspace.prototype.RGB_to_CMY = function(){
+ var src = this.munge('RGB', arguments);
+
+ var C = 1 - src.R;
+ var M = 1 - src.G;
+ var Y = 1 - src.B;
+
+ return [C, M, Y];
+}
+
+dojo.gfx.Colorspace.prototype.CMY_to_RGB = function(){
+ var src = this.munge('CMY', arguments);
+
+ var R = 1 - src.C;
+ var G = 1 - src.M;
+ var B = 1 - src.Y;
+
+ return [R, G, B];
+}
+
+dojo.gfx.Colorspace.prototype.RGB_to_CMYK = function(){
+ var src = this.munge('RGB', arguments);
+
+ var K = Math.min(1-src.R, 1-src.G, 1-src.B);
+ var C = (1 - src.R - K) / (1 - K);
+ var M = (1 - src.G - K) / (1 - K);
+ var Y = (1 - src.B - K) / (1 - K);
+
+ return [C, M, Y, K];
+}
+
+dojo.gfx.Colorspace.prototype.CMYK_to_RGB = function(){
+ var src = this.munge('CMYK', arguments);
+
+ var R = 1 - Math.min(1, src.C * (1-src.K) + src.K);
+ var G = 1 - Math.min(1, src.M * (1-src.K) + src.K);
+ var B = 1 - Math.min(1, src.Y * (1-src.K) + src.K);
+
+ return [R, G, B];
+}
+
+dojo.gfx.Colorspace.prototype.CMY_to_CMYK = function(){
+ var src = this.munge('CMY', arguments);
+
+ var K = Math.min(src.C, src.M, src.Y);
+ var C = (src.C - K) / (1 - K);
+ var M = (src.M - K) / (1 - K);
+ var Y = (src.Y - K) / (1 - K);
+
+ return [C, M, Y, K];
+}
+
+dojo.gfx.Colorspace.prototype.CMYK_to_CMY = function(){
+ var src = this.munge('CMYK', arguments);
+
+ var C = Math.min(1, src.C * (1-src.K) + src.K);
+ var M = Math.min(1, src.M * (1-src.K) + src.K);
+ var Y = Math.min(1, src.Y * (1-src.K) + src.K);
+
+ return [C, M, Y];
+}
+
+dojo.gfx.Colorspace.prototype.RGB_to_HSV = function(){
+ var src = this.munge('RGB', arguments);
+
+ // Based on C Code in "Computer Graphics -- Principles and Practice,"
+ // Foley et al, 1996, p. 592.
+
+ var min = Math.min(src.R, src.G, src.B);
+ var V = Math.max(src.R, src.G, src.B);
+
+ var delta = V - min;
+
+ var H = null;
+ var S = (V == 0) ? 0 : delta / V;
+
+ if (S == 0){
+ H = 0;
+ }else{
+ if (src.R == V){
+ H = 60 * (src.G - src.B) / delta;
+ }else{
+ if (src.G == V){
+ H = 120 + 60 * (src.B - src.R) / delta;
+ }else{
+ if (src.B == V){
+ // between magenta and cyan
+ H = 240 + 60 * (src.R - src.G) / delta;
+ }
+ }
+ }
+ if (H < 0){
+ H += 360;
+ }
+ }
+
+ H = (H == 0) ? 360 : H;
+
+ return [H, S, V];
+}
+
+dojo.gfx.Colorspace.prototype.HSV_to_RGB = function(){
+ var src = this.munge('HSV', arguments);
+ if (src.H == 360){ src.H = 0;}
+
+ // Based on C Code in "Computer Graphics -- Principles and Practice,"
+ // Foley et al, 1996, p. 593.
+ var r = null;
+ var g = null;
+ var b = null;
+
+ if (src.S == 0){
+ // color is on black-and-white center line
+ // achromatic: shades of gray
+ var R = src.V;
+ var G = src.V;
+ var B = src.V;
+ }else{
+ // chromatic color
+ var hTemp = src.H / 60; // h is now IN [0,6]
+ var i = Math.floor(hTemp); // largest integer <= h
+ var f = hTemp - i; // fractional part of h
+
+ var p = src.V * (1 - src.S);
+ var q = src.V * (1 - (src.S * f));
+ var t = src.V * (1 - (src.S * (1 - f)));
+
+ switch(i){
+ case 0: R = src.V; G = t ; B = p ; break;
+ case 1: R = q ; G = src.V; B = p ; break;
+ case 2: R = p ; G = src.V; B = t ; break;
+ case 3: R = p ; G = q ; B = src.V; break;
+ case 4: R = t ; G = p ; B = src.V; break;
+ case 5: R = src.V; G = p ; B = q ; break;
+ }
+ }
+
+ return [R, G, B];
+}
+
+dojo.gfx.Colorspace.prototype.RGB_to_HSL = function(){
+ var src = this.munge('RGB', arguments);
+
+ // based on C code from http://astronomy.swin.edu.au/~pbourke/colour/hsl/
+ var min = Math.min(src.R, src.G, src.B);
+ var max = Math.max(src.R, src.G, src.B);
+ var delta = max - min;
+
+ var H = 0;
+ var S = 0;
+ var L = (min + max) / 2;
+
+ if ((L > 0) && (L < 1)){
+ S = delta / ((L < 0.5) ? (2 * L) : (2 - 2 * L));
+ }
+
+ if (delta > 0) {
+ if ((max == src.R) && (max != src.G)){
+ H += (src.G - src.B) / delta;
+ }
+ if ((max == src.G) && (max != src.B)){
+ H += (2 + (src.B - src.R) / delta);
+ }
+ if ((max == src.B) && (max != src.R)){
+ H += (4 + (src.R - src.G) / delta);
+ }
+ H *= 60;
+ }
+ H = (H == 0) ? 360 : H;
+ return [H, S, L];
+}
+
+dojo.gfx.Colorspace.prototype.HSL_to_RGB = function(){
+ var src = this.munge('HSL', arguments);
+
+ // based on C code from http://astronomy.swin.edu.au/~pbourke/colour/hsl/
+ while (src.H < 0){ src.H += 360; }
+ while (src.H >= 360){ src.H -= 360; }
+
+ var R = 0;
+ var G = 0;
+ var B = 0;
+
+ if (src.H < 120){
+ R = (120 - src.H) / 60;
+ G = src.H / 60;
+ B = 0;
+ }else if (src.H < 240){
+ R = 0;
+ G = (240 - src.H) / 60;
+ B = (src.H - 120) / 60;
+ }else{
+ R = (src.H - 240) / 60;
+ G = 0;
+ B = (360 - src.H) / 60;
+ }
+
+ R = 2 * src.S * Math.min(R, 1) + (1 - src.S);
+ G = 2 * src.S * Math.min(G, 1) + (1 - src.S);
+ B = 2 * src.S * Math.min(B, 1) + (1 - src.S);
+
+ if (src.L < 0.5){
+ R = src.L * R;
+ G = src.L * G;
+ B = src.L * B;
+ }else{
+ R = (1 - src.L) * R + 2 * src.L - 1;
+ G = (1 - src.L) * G + 2 * src.L - 1;
+ B = (1 - src.L) * B + 2 * src.L - 1;
+ }
+ return [R, G, B];
+}
Propchange: tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/gfx/Colorspace.js
------------------------------------------------------------------------------
svn:eol-style = native
Added: tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/gfx/__package__.js
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/gfx/__package__.js?view=auto&rev=449122
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/gfx/__package__.js (added)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/gfx/__package__.js Fri Sep 22 16:22:30 2006
@@ -0,0 +1,23 @@
+/*
+ Copyright (c) 2004-2006, The Dojo Foundation
+ All Rights Reserved.
+
+ Licensed under the Academic Free License version 2.1 or above OR the
+ modified BSD license. For more information on Dojo licensing, see:
+
+ http://dojotoolkit.org/community/licensing.shtml
+*/
+
+dojo.kwCompoundRequire({
+ common: [
+ "dojo.gfx.color",
+ "dojo.gfx.matrix",
+ "dojo.gfx.common"
+ ]
+});
+
+// include a renderer conditionally
+dojo["requireIf"](dojo.render.svg.capable, "dojo.gfx.svg");
+dojo["requireIf"](!dojo.render.svg.capable && dojo.render.vml.capable, "dojo.gfx.vml");
+
+dojo.provide("dojo.gfx.*");
\ No newline at end of file
Propchange: tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/gfx/__package__.js
------------------------------------------------------------------------------
svn:eol-style = native
Added: tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/gfx/color.js
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/gfx/color.js?view=auto&rev=449122
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/gfx/color.js (added)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/gfx/color.js Fri Sep 22 16:22:30 2006
@@ -0,0 +1,182 @@
+/*
+ Copyright (c) 2004-2006, The Dojo Foundation
+ All Rights Reserved.
+
+ Licensed under the Academic Free License version 2.1 or above OR the
+ modified BSD license. For more information on Dojo licensing, see:
+
+ http://dojotoolkit.org/community/licensing.shtml
+*/
+
+dojo.provide("dojo.gfx.color");
+dojo.require("dojo.lang.common");
+dojo.require("dojo.lang.array");
+
+// TODO: rewrite the "x2y" methods to take advantage of the parsing
+// abilities of the Color object. Also, beef up the Color
+// object (as possible) to parse most common formats
+
+// takes an r, g, b, a(lpha) value, [r, g, b, a] array, "rgb(...)" string, hex string (#aaa, #aaaaaa, aaaaaaa)
+dojo.gfx.color.Color = function(r, g, b, a) {
+ // dojo.debug("r:", r[0], "g:", r[1], "b:", r[2]);
+ if(dojo.lang.isArray(r)){
+ this.r = r[0];
+ this.g = r[1];
+ this.b = r[2];
+ this.a = r[3]||1.0;
+ }else if(dojo.lang.isString(r)){
+ var rgb = dojo.gfx.color.extractRGB(r);
+ this.r = rgb[0];
+ this.g = rgb[1];
+ this.b = rgb[2];
+ this.a = g||1.0;
+ }else if(r instanceof dojo.gfx.color.Color){
+ // why does this create a new instance if we were passed one?
+ this.r = r.r;
+ this.b = r.b;
+ this.g = r.g;
+ this.a = r.a;
+ }else{
+ this.r = r;
+ this.g = g;
+ this.b = b;
+ this.a = a;
+ }
+}
+
+dojo.gfx.color.Color.fromArray = function(arr) {
+ return new dojo.gfx.color.Color(arr[0], arr[1], arr[2], arr[3]);
+}
+
+dojo.extend(dojo.gfx.color.Color, {
+ toRgb: function(includeAlpha) {
+ if(includeAlpha) {
+ return this.toRgba();
+ } else {
+ return [this.r, this.g, this.b];
+ }
+ },
+ toRgba: function() {
+ return [this.r, this.g, this.b, this.a];
+ },
+ toHex: function() {
+ return dojo.gfx.color.rgb2hex(this.toRgb());
+ },
+ toCss: function() {
+ return "rgb(" + this.toRgb().join() + ")";
+ },
+ toString: function() {
+ return this.toHex(); // decent default?
+ },
+ blend: function(color, weight){
+ var rgb = null;
+ if(dojo.lang.isArray(color)){
+ rgb = color;
+ }else if(color instanceof dojo.gfx.color.Color){
+ rgb = color.toRgb();
+ }else{
+ rgb = new dojo.gfx.color.Color(color).toRgb();
+ }
+ return dojo.gfx.color.blend(this.toRgb(), rgb, weight);
+ }
+});
+
+dojo.gfx.color.named = {
+ white: [255,255,255],
+ black: [0,0,0],
+ red: [255,0,0],
+ green: [0,255,0],
+ blue: [0,0,255],
+ navy: [0,0,128],
+ gray: [128,128,128],
+ silver: [192,192,192]
+};
+
+dojo.gfx.color.blend = function(a, b, weight){
+ // summary:
+ // blend colors a and b (both as RGB array or hex strings) with weight
+ // from -1 to +1, 0 being a 50/50 blend
+ if(typeof a == "string"){
+ return dojo.gfx.color.blendHex(a, b, weight);
+ }
+ if(!weight){
+ weight = 0;
+ }
+ weight = Math.min(Math.max(-1, weight), 1);
+
+ // alex: this interface blows.
+ // map -1 to 1 to the range 0 to 1
+ weight = ((weight + 1)/2);
+
+ var c = [];
+
+ // var stop = (1000*weight);
+ for(var x = 0; x < 3; x++){
+ c[x] = parseInt( b[x] + ( (a[x] - b[x]) * weight) );
+ }
+ return c;
+}
+
+// very convenient blend that takes and returns hex values
+// (will get called automatically by blend when blend gets strings)
+dojo.gfx.color.blendHex = function(a, b, weight) {
+ return dojo.gfx.color.rgb2hex(dojo.gfx.color.blend(dojo.gfx.color.hex2rgb(a), dojo.gfx.color.hex2rgb(b), weight));
+}
+
+// get RGB array from css-style color declarations
+dojo.gfx.color.extractRGB = function(color) {
+ var hex = "0123456789abcdef";
+ color = color.toLowerCase();
+ if( color.indexOf("rgb") == 0 ) {
+ var matches = color.match(/rgba*\((\d+), *(\d+), *(\d+)/i);
+ var ret = matches.splice(1, 3);
+ return ret;
+ } else {
+ var colors = dojo.gfx.color.hex2rgb(color);
+ if(colors) {
+ return colors;
+ } else {
+ // named color (how many do we support?)
+ return dojo.gfx.color.named[color] || [255, 255, 255];
+ }
+ }
+}
+
+dojo.gfx.color.hex2rgb = function(hex) {
+ var hexNum = "0123456789ABCDEF";
+ var rgb = new Array(3);
+ if( hex.indexOf("#") == 0 ) { hex = hex.substring(1); }
+ hex = hex.toUpperCase();
+ if(hex.replace(new RegExp("["+hexNum+"]", "g"), "") != "") {
+ return null;
+ }
+ if( hex.length == 3 ) {
+ rgb[0] = hex.charAt(0) + hex.charAt(0)
+ rgb[1] = hex.charAt(1) + hex.charAt(1)
+ rgb[2] = hex.charAt(2) + hex.charAt(2);
+ } else {
+ rgb[0] = hex.substring(0, 2);
+ rgb[1] = hex.substring(2, 4);
+ rgb[2] = hex.substring(4);
+ }
+ for(var i = 0; i < rgb.length; i++) {
+ rgb[i] = hexNum.indexOf(rgb[i].charAt(0)) * 16 + hexNum.indexOf(rgb[i].charAt(1));
+ }
+ return rgb;
+}
+
+dojo.gfx.color.rgb2hex = function(r, g, b) {
+ if(dojo.lang.isArray(r)) {
+ g = r[1] || 0;
+ b = r[2] || 0;
+ r = r[0] || 0;
+ }
+ var ret = dojo.lang.map([r, g, b], function(x) {
+ x = new Number(x);
+ var s = x.toString(16);
+ while(s.length < 2) { s = "0" + s; }
+ return s;
+ });
+ ret.unshift("#");
+ return ret.join("");
+}
Propchange: tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/gfx/color.js
------------------------------------------------------------------------------
svn:eol-style = native
Added: tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/gfx/color/hsl.js
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/gfx/color/hsl.js?view=auto&rev=449122
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/gfx/color/hsl.js (added)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/gfx/color/hsl.js Fri Sep 22 16:22:30 2006
@@ -0,0 +1,139 @@
+/*
+ Copyright (c) 2004-2006, The Dojo Foundation
+ All Rights Reserved.
+
+ Licensed under the Academic Free License version 2.1 or above OR the
+ modified BSD license. For more information on Dojo licensing, see:
+
+ http://dojotoolkit.org/community/licensing.shtml
+*/
+
+dojo.provide("dojo.gfx.color.hsl");
+dojo.require("dojo.lang.array");
+
+dojo.lang.extend(dojo.gfx.color.Color, {
+ toHsl: function() {
+ return dojo.gfx.color.rgb2hsl(this.toRgb());
+ }
+});
+
+dojo.gfx.color.rgb2hsl = function(r, g, b){
+ if (dojo.lang.isArray(r)) {
+ b = r[2] || 0;
+ g = r[1] || 0;
+ r = r[0] || 0;
+ }
+
+ r /= 255;
+ g /= 255;
+ b /= 255;
+
+ //
+ // based on C code from http://astronomy.swin.edu.au/~pbourke/colour/hsl/
+ //
+
+ var h = null;
+ var s = null;
+ var l = null;
+
+ var min = Math.min(r, g, b);
+ var max = Math.max(r, g, b);
+ var delta = max - min;
+
+ l = (min + max) / 2;
+ s = 0;
+
+ if ((l > 0) && (l < 1)){
+ s = delta / ((l < 0.5) ? (2 * l) : (2 - 2 * l));
+ }
+
+ h = 0;
+
+ if (delta > 0) {
+ if ((max == r) && (max != g)){
+ h += (g - b) / delta;
+ }
+ if ((max == g) && (max != b)){
+ h += (2 + (b - r) / delta);
+ }
+ if ((max == b) && (max != r)){
+ h += (4 + (r - g) / delta);
+ }
+ h *= 60;
+ }
+
+ h = (h == 0) ? 360 : Math.ceil((h / 360) * 255);
+ s = Math.ceil(s * 255);
+ l = Math.ceil(l * 255);
+
+ return [h, s, l];
+}
+
+dojo.gfx.color.hsl2rgb = function(h, s, l){
+ if (dojo.lang.isArray(h)) {
+ l = h[2] || 0;
+ s = h[1] || 0;
+ h = h[0] || 0;
+ }
+
+ h = (h / 255) * 360;
+ if (h == 360){ h = 0;}
+ s = s / 255;
+ l = l / 255;
+
+ //
+ // based on C code from http://astronomy.swin.edu.au/~pbourke/colour/hsl/
+ //
+
+
+ while (h < 0){ h += 360; }
+ while (h > 360){ h -= 360; }
+ var r, g, b;
+ if (h < 120){
+ r = (120 - h) / 60;
+ g = h / 60;
+ b = 0;
+ }else if (h < 240){
+ r = 0;
+ g = (240 - h) / 60;
+ b = (h - 120) / 60;
+ }else{
+ r = (h - 240) / 60;
+ g = 0;
+ b = (360 - h) / 60;
+ }
+
+ r = Math.min(r, 1);
+ g = Math.min(g, 1);
+ b = Math.min(b, 1);
+
+ r = 2 * s * r + (1 - s);
+ g = 2 * s * g + (1 - s);
+ b = 2 * s * b + (1 - s);
+
+ if (l < 0.5){
+ r = l * r;
+ g = l * g;
+ b = l * b;
+ }else{
+ r = (1 - l) * r + 2 * l - 1;
+ g = (1 - l) * g + 2 * l - 1;
+ b = (1 - l) * b + 2 * l - 1;
+ }
+
+ r = Math.ceil(r * 255);
+ g = Math.ceil(g * 255);
+ b = Math.ceil(b * 255);
+
+ return [r, g, b];
+}
+
+dojo.gfx.color.hsl2hex = function(h, s, l){
+ var rgb = dojo.gfx.color.hsl2rgb(h, s, l);
+ return dojo.gfx.color.rgb2hex(rgb[0], rgb[1], rgb[2]);
+}
+
+dojo.gfx.color.hex2hsl = function(hex){
+ var rgb = dojo.gfx.color.hex2rgb(hex);
+ return dojo.gfx.color.rgb2hsl(rgb[0], rgb[1], rgb[2]);
+}
Propchange: tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/gfx/color/hsl.js
------------------------------------------------------------------------------
svn:eol-style = native
Added: tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/gfx/color/hsv.js
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/gfx/color/hsv.js?view=auto&rev=449122
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/gfx/color/hsv.js (added)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/gfx/color/hsv.js Fri Sep 22 16:22:30 2006
@@ -0,0 +1,177 @@
+/*
+ Copyright (c) 2004-2006, The Dojo Foundation
+ All Rights Reserved.
+
+ Licensed under the Academic Free License version 2.1 or above OR the
+ modified BSD license. For more information on Dojo licensing, see:
+
+ http://dojotoolkit.org/community/licensing.shtml
+*/
+
+dojo.provide("dojo.gfx.color.hsv");
+dojo.require("dojo.lang.array");
+dojo.require("dojo.math");
+
+dojo.lang.extend(dojo.gfx.color.Color, {
+ toHsv: function() {
+ return dojo.gfx.color.rgb2hsv(this.toRgb());
+ }
+
+});
+
+dojo.gfx.color.rgb2hsv = function(r, g, b){
+ if (dojo.lang.isArray(r)) {
+ b = r[2] || 0;
+ g = r[1] || 0;
+ r = r[0] || 0;
+ }
+
+ // r,g,b, each 0 to 255, to HSV.
+ // h = 0.0 to 360.0 (corresponding to 0..360.0 degrees around hexcone)
+ // s = 0.0 (shade of gray) to 1.0 (pure color)
+ // v = 0.0 (black) to 1.0 {white)
+ //
+ // Based on C Code in "Computer Graphics -- Principles and Practice,"
+ // Foley et al, 1996, p. 592.
+ //
+ // our calculatuions are based on 'regular' values (0-360, 0-1, 0-1)
+ // but we return bytes values (0-255, 0-255, 0-255)
+
+ var h = null;
+ var s = null;
+ var v = null;
+
+ var min = Math.min(r, g, b);
+ v = Math.max(r, g, b);
+
+ var delta = v - min;
+
+ // calculate saturation (0 if r, g and b are all 0)
+
+ s = (v == 0) ? 0 : delta/v;
+ if (s == 0){
+ // achromatic: when saturation is, hue is undefined
+ h = 0;
+ }else{
+ // chromatic
+ if (r == v){
+ // between yellow and magenta
+ h = 60 * (g - b) / delta;
+ }else{
+ if (g == v){
+ // between cyan and yellow
+ h = 120 + 60 * (b - r) / delta;
+ }else{
+ if (b == v){
+ // between magenta and cyan
+ h = 240 + 60 * (r - g) / delta;
+ }
+ }
+ }
+ if (h < 0){
+ h += 360;
+ }
+ }
+
+ h = (h == 0) ? 360 : Math.ceil((h / 360) * 255);
+ s = Math.ceil(s * 255);
+ return [h, s, v];
+}
+
+// Based on C Code in "Computer Graphics -- Principles and Practice,"
+// Foley et al, 1996, p. 593.
+//
+// H = 0.0 to 360.0 (corresponding to 0..360 degrees around hexcone) 0 for S = 0
+// S = 0.0 (shade of gray) to 1.0 (pure color)
+// V = 0.0 (black) to 1.0 (white)
+dojo.gfx.color.hsv2rgb = function(/* int || Array */h, /* int */s, /* int */v, /* Object? */options){
+ // summary
+ // converts an HSV value set to RGB, ranges depending on optional options object.
+ // patch for options by Matthew Eernisse
+ if (dojo.lang.isArray(h)) {
+ if(s){
+ options = s;
+ }
+ v = h[2] || 0;
+ s = h[1] || 0;
+ h = h[0] || 0;
+ }
+
+ var opt = {
+ inputRange: (options && options.inputRange) ? options.inputRange : [255, 255, 255],
+ outputRange: (options && options.outputRange) ? options.outputRange : 255
+ };
+
+ switch(opt.inputRange[0]) {
+ // 0.0-1.0
+ case 1: h = h * 360; break;
+ // 0-100
+ case 100: h = (h / 100) * 360; break;
+ // 0-360
+ case 360: h = h; break;
+ // 0-255
+ default: h = (h / 255) * 360;
+ }
+ if (h == 360){ h = 0;}
+
+ // no need to alter if inputRange[1] = 1
+ switch(opt.inputRange[1]){
+ case 100: s /= 100; break;
+ case 255: s /= 255;
+ }
+
+ // no need to alter if inputRange[1] = 1
+ switch(opt.inputRange[2]){
+ case 100: v /= 100; break;
+ case 255: v /= 255;
+ }
+
+ var r = null;
+ var g = null;
+ var b = null;
+
+ if (s == 0){
+ // color is on black-and-white center line
+ // achromatic: shades of gray
+ r = v;
+ g = v;
+ b = v;
+ }else{
+ // chromatic color
+ var hTemp = h / 60; // h is now IN [0,6]
+ var i = Math.floor(hTemp); // largest integer <= h
+ var f = hTemp - i; // fractional part of h
+
+ var p = v * (1 - s);
+ var q = v * (1 - (s * f));
+ var t = v * (1 - (s * (1 - f)));
+
+ switch(i){
+ case 0: r = v; g = t; b = p; break;
+ case 1: r = q; g = v; b = p; break;
+ case 2: r = p; g = v; b = t; break;
+ case 3: r = p; g = q; b = v; break;
+ case 4: r = t; g = p; b = v; break;
+ case 5: r = v; g = p; b = q; break;
+ }
+ }
+
+ switch(opt.outputRange){
+ case 1:
+ r = dojo.math.round(r, 2);
+ g = dojo.math.round(g, 2);
+ b = dojo.math.round(b, 2);
+ break;
+ case 100:
+ r = Math.ceil(r * 100);
+ g = Math.ceil(g * 100);
+ b = Math.ceil(b * 100);
+ break;
+ default:
+ r = Math.ceil(r * 255);
+ g = Math.ceil(g * 255);
+ b = Math.ceil(b * 255);
+ }
+
+ return [r, g, b];
+}
Propchange: tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/gfx/color/hsv.js
------------------------------------------------------------------------------
svn:eol-style = native
Added: tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/gfx/common.js
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/gfx/common.js?view=auto&rev=449122
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/gfx/common.js (added)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/gfx/common.js Fri Sep 22 16:22:30 2006
@@ -0,0 +1,224 @@
+/*
+ Copyright (c) 2004-2006, The Dojo Foundation
+ All Rights Reserved.
+
+ Licensed under the Academic Free License version 2.1 or above OR the
+ modified BSD license. For more information on Dojo licensing, see:
+
+ http://dojotoolkit.org/community/licensing.shtml
+*/
+
+dojo.provide("dojo.gfx.common");
+
+dojo.require("dojo.gfx.color");
+dojo.require("dojo.lang.declare");
+dojo.require("dojo.lang.extras");
+
+//dojo.gfx.defaultRenderer.init();
+
+dojo.lang.mixin(dojo.gfx, {
+ defaultPath: {type: "path", path: "", absolute: true},
+ defaultPolyline: {type: "polyline", points: []},
+ defaultRect: {type: "rect", x: 0, y: 0, width: 100, height: 100, r: 0},
+ defaultEllipse: {type: "ellipse", cx: 0, cy: 0, rx: 100, ry: 200},
+ defaultCircle: {type: "circle", cx: 0, cy: 0, r: 100},
+ defaultLine: {type: "line", x1: 0, y1: 0, x2: 100, y2: 100},
+ defaultImage: {type: "image", width: 0, height: 0, src: ""},
+
+ defaultStroke: {color: "black", width: 1, cap: "butt", join: 4},
+ defaultLinearGradient: {type: "linear", x1: 0, y1: 0, x2: 100, y2: 100,
+ colors: [{offset: 0, color: "black"}, {offset: 1, color: "white"}]},
+ defaultRadialGradient: {type: "radial", cx: 0, cy: 0, r: 100,
+ colors: [{offset: 0, color: "black"}, {offset: 1, color: "white"}]},
+ defaultPattern: {type: "pattern", x: 0, y: 0, width: 0, height: 0, src: ""},
+
+ normalizeColor: function(color){
+ return (color instanceof dojo.gfx.color.Color) ? color : new dojo.gfx.color.Color(color);
+ },
+ normalizeParameters: function(existed, update){
+ if(update){
+ var empty = {};
+ for(x in existed){
+ if(x in update && !(x in empty)){
+ existed[x] = update[x];
+ }
+ }
+ }
+ return existed;
+ },
+ makeParameters: function(defaults, update){
+ if(!update) return dojo.lang.shallowCopy(defaults, true);
+ var result = {};
+ for(var i in defaults){
+ if(!(i in result)){
+ result[i] = dojo.lang.shallowCopy((i in update) ? update[i] : defaults[i], true);
+ }
+ }
+ return result;
+ },
+
+ _GUID: 1,
+ guid: function(){ return "dj_gfx_guid_" + dojo.gfx._GUID++; }
+});
+
+// this is a Shape object, which knows how to apply graphical attributes and a transformation
+dojo.gfx.Shape = function(){
+ // underlying node
+ this.rawNode = null;
+ // abstract shape object
+ this.shape = null;
+ // transformation matrix
+ this.matrix = null;
+ // graphical attributes
+ this.fillStyle = null;
+ this.strokeStyle = null;
+ // virtual group structure
+ this.parent = null;
+ this.parentMatrix = null;
+};
+
+dojo.lang.extend(dojo.gfx.Shape, {
+ // trivial getters
+ getNode: function(){ return this.rawNode; },
+ getShape: function(){ return this.shape; },
+ getTransform: function(){ return this.matrix; },
+ getFill: function(){ return this.fillStyle; },
+ getStroke: function(){ return this.strokeStyle; },
+ getParent: function(){ return this.parent; },
+
+ getEventSource: function(){ return this.rawNode; },
+
+ // empty settings
+ setShape: function(shape) { return this; }, // ignore
+ setStroke: function(stroke){ return this; }, // ignore
+ setFill: function(fill) { return this; }, // ignore
+
+ // z-index
+ moveToFront: function(){ return this; }, // ignore
+ moveToBack: function(){ return this; }, // ignore
+
+ // apply transformations
+ setTransform: function(matrix){
+ this.matrix = dojo.gfx.matrix.clone(matrix ? dojo.gfx.matrix.normalize(matrix) : dojo.gfx.identity, true);
+ return this._applyTransform();
+ },
+
+ // apply left & right transformation
+ applyRightTransform: function(matrix){
+ return matrix ? this.setTransform([this.matrix, matrix]) : this;
+ },
+ applyLeftTransform: function(matrix){
+ return matrix ? this.setTransform([matrix, this.matrix]) : this;
+ },
+
+ // a shortcut for apply-right
+ applyTransform: function(matrix){
+ return matrix ? this.setTransform([this.matrix, matrix]) : this;
+ },
+
+ // virtual group methods
+ remove: function(silently){
+ if(this.parent){
+ this.parent.remove(this, silently);
+ }
+ return this;
+ },
+ _setParent: function(parent, matrix){
+ this.parent = parent;
+ return this._updateParentMatrix(matrix);
+ },
+ _updateParentMatrix: function(matrix){
+ this.parentMatrix = matrix ? dojo.gfx.matrix.clone(matrix) : null;
+ return this._applyTransform();
+ },
+ _getRealMatrix: function(){
+ return this.parentMatrix ? new dojo.gfx.matrix.Matrix2D([this.parentMatrix, this.matrix]) : this.matrix;
+ }
+});
+
+dojo.declare("dojo.gfx.VirtualGroup", dojo.gfx.Shape, {
+ initializer: function() {
+ this.children = [];
+ },
+
+ // group management
+ add: function(shape){
+ var oldParent = shape.getParent();
+ if(oldParent){
+ oldParent.remove(shape, true);
+ }
+ this.children.push(shape);
+ return shape._setParent(this, this._getRealMatrix());
+ },
+ remove: function(shape, silently){
+ var i = 0;
+ for(; i < this.children.length; ++i){
+ if(this.children[i] == shape){
+ if(silently){
+ // skip for now
+ }else{
+ shape._setParent(null, null);
+ }
+ this.children.splice(i, 1);
+ break;
+ }
+ }
+ return this;
+ },
+
+ // apply transformation
+ _applyTransform: function(){
+ var matrix = this._getRealMatrix();
+ for(var i = 0; i < this.children.length; ++i){
+ this.children[i]._updateParentMatrix(matrix);
+ }
+ return this;
+ }
+});
+
+// this is a Surface object
+dojo.gfx.Surface = function(){
+ // underlying node
+ this.rawNode = null;
+};
+
+dojo.lang.extend(dojo.gfx.Surface, {
+ getEventSource: function(){ return this.rawNode; }
+});
+
+// this is a Path shape
+dojo.declare("dojo.gfx.Path", dojo.gfx.Shape, {
+ initializer: function(rawNode) {
+ this.shape = dojo.lang.shallowCopy(dojo.gfx.defaultPath, true);
+ this.lastPos = {x: 0, y: 0};
+ this._extraInit(rawNode);
+ this.attach(rawNode);
+ },
+ setAbsoluteMode: function(mode){
+ this.shape.absolute = typeof(mode) == "string" ? (mode == "absolute") : mode;
+ return this;
+ },
+ getAbsoluteMode: function(){
+ return this.shape.absolute;
+ },
+ closePath: function(){
+ return this._drawTo("z", []);
+ },
+ moveTo: function(x, y){
+ this._update(x, y);
+ return this._drawTo("m", [x, y]);
+ },
+ lineTo: function(x, y){
+ this._update(x, y);
+ return this._drawTo("l", [x, y]);
+ },
+ curveTo: function(x1, y1, x2, y2, x, y){
+ this._update(x, y, x2, y2);
+ return this._drawTo("c", [x1, y1, x2, y2, x, y]);
+ },
+ _2PI: Math.PI * 2,
+ // these are meant to be overridden in derived classes
+ _extraInit: function(rawNode) {},
+ _drawTo: function(action) { return this; },
+ _update: function(x, y, x2, y2) {}
+});
Propchange: tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/gfx/common.js
------------------------------------------------------------------------------
svn:eol-style = native
Added: tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/gfx/matrix.js
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/gfx/matrix.js?view=auto&rev=449122
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/gfx/matrix.js (added)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/gfx/matrix.js Fri Sep 22 16:22:30 2006
@@ -0,0 +1,172 @@
+/*
+ Copyright (c) 2004-2006, The Dojo Foundation
+ All Rights Reserved.
+
+ Licensed under the Academic Free License version 2.1 or above OR the
+ modified BSD license. For more information on Dojo licensing, see:
+
+ http://dojotoolkit.org/community/licensing.shtml
+*/
+
+dojo.provide("dojo.gfx.matrix");
+
+dojo.require("dojo.lang.common");
+dojo.require("dojo.math.*");
+
+dojo.gfx.matrix.Matrix2D = function(arg){
+ if(arg){
+ if(arg instanceof Array){
+ if(arg.length > 0){
+ var m = dojo.gfx.matrix.normalize(arg[0]);
+ // combine matrices
+ for(var i = 1; i < arg.length; ++i){
+ var l = m;
+ var r = dojo.gfx.matrix.normalize(arg[i]);
+ m = new dojo.gfx.matrix.Matrix2D();
+ m.xx = l.xx * r.xx + l.xy * r.yx;
+ m.xy = l.xx * r.xy + l.xy * r.yy;
+ m.yx = l.yx * r.xx + l.yy * r.yx;
+ m.yy = l.yx * r.xy + l.yy * r.yy;
+ m.dx = l.xx * r.dx + l.xy * r.dy + l.dx;
+ m.dy = l.yx * r.dx + l.yy * r.dy + l.dy;
+ }
+ dojo.mixin(this, m);
+ }
+ }else{
+ dojo.mixin(this, arg);
+ }
+ }
+};
+
+dojo.extend(dojo.gfx.matrix.Matrix2D, {xx: 1, xy: 0, yx: 0, yy: 1, dx: 0, dy: 0});
+
+dojo.mixin(dojo.gfx.matrix, {
+ // matrix constants
+ identity: new dojo.gfx.matrix.Matrix2D(),
+ flipX: new dojo.gfx.matrix.Matrix2D({xx: -1}),
+ flipY: new dojo.gfx.matrix.Matrix2D({yy: -1}),
+ flipXY: new dojo.gfx.matrix.Matrix2D({xx: -1, yy: -1}),
+ // matrix creators
+ translate: function(a, b){
+ return arguments.length > 1 ? new dojo.gfx.matrix.Matrix2D({dx: a, dy: b}) : new dojo.gfx.matrix.Matrix2D({dx: a.x, dy: a.y});
+ },
+ scale: function(a, b){
+ return arguments.length > 1 ? new dojo.gfx.matrix.Matrix2D({xx: a, yy: b}) :
+ typeof a == "number" ? new dojo.gfx.matrix.Matrix2D({xx: a, yy: a}) : new dojo.gfx.matrix.Matrix2D({xx: a.x, yy: a.y});
+ },
+ rotate: function(angle){
+ var c = Math.cos(angle);
+ var s = Math.sin(angle);
+ return new dojo.gfx.matrix.Matrix2D({xx: c, xy: s, yx: -s, yy: c});
+ },
+ rotateg: function(degree){ return this.rotate(dojo.math.degToRad(degree)); },
+ skewX: function(angle) { return new dojo.gfx.matrix.Matrix2D({xy: Math.tan(angle)}); },
+ skewXg: function(degree){ return this.skewX(dojo.math.degToRad(degree)); },
+ skewY: function(angle) { return new dojo.gfx.matrix.Matrix2D({yx: -Math.tan(angle)}); },
+ skewYg: function(degree){ return this.skewY(dojo.math.degToRad(degree)); },
+ // ensure matrix 2D conformance
+ normalize: function(matrix){
+ return (matrix instanceof dojo.gfx.matrix.Matrix2D) ? matrix : new dojo.gfx.matrix.Matrix2D(matrix);
+ },
+ // common operations
+ clone: function(matrix){
+ var obj = new dojo.gfx.matrix.Matrix2D();
+ for(var i in matrix){
+ if(typeof(matrix[i]) == "number" && typeof(obj[i]) == "number" && obj[i] != matrix[i]) obj[i] = matrix[i];
+ }
+ return obj;
+ },
+ invert: function(matrix){
+ var m = this.normalize(matrix);
+ var D = m.xx * m.yy - m.xy * m.yx;
+ return new dojo.gfx.matrix.Matrix2D({xx: m.yy/D, xy: -m.xy/D, yx: -m.yx/D, yy: m.xx/D,
+ dx: (m.yx * m.dy - m.yy * m.dx) / D, dy: (m.xy * m.dx - m.xx * m.dy) / D});
+ },
+ _multiplyPoint: function(m, x, y){
+ return {x: m.xx * x + m.xy * y + m.dx, y: m.yx * x + m.yy * y + m.dy};
+ },
+ multiplyPoint: function(matrix, a, b){
+ var m = this.normalize(matrix);
+ if(typeof a == "number" && typeof b == "number") return this._multiplyPoint(m, a, b);
+ return this._multiplyPoint(m, a.x, a.y);
+ },
+ multiply: function(matrix){
+ var m = this.normalize(matrix);
+ // combine matrices
+ for(var i = 1; i < arguments.length; ++i){
+ var l = m;
+ var r = this.normalize(arguments[i]);
+ m = new dojo.gfx.matrix.Matrix2D();
+ m.xx = l.xx * r.xx + l.xy * r.yx;
+ m.xy = l.xx * r.xy + l.xy * r.yy;
+ m.yx = l.yx * r.xx + l.yy * r.yx;
+ m.yy = l.yx * r.xy + l.yy * r.yy;
+ m.dx = l.xx * r.dx + l.xy * r.dy + l.dx;
+ m.dy = l.yx * r.dx + l.yy * r.dy + l.dy;
+ }
+ return m;
+ },
+ // high level operations
+ _sandwich: function(m, x, y){
+ return this.multiply(this.translate(x, y), m, this.translate(-x, -y));
+ },
+ scaleAt: function(a, b, c, d){
+ switch(arguments.length){
+ case 2:
+ // a is a scale factor, b is a point
+ return this._sandwich(this.scale(a), b.x, b.y);
+ case 3:
+ if(typeof c == "number"){
+ // a is scale factor, b and c are x and y components of a point
+ return this._sandwich(this.scale(a), b, c);
+ }
+ // a and b are scale factor components, c is a point
+ return this._sandwich(this.scale(a, b), c.x, c.y);
+ }
+ // a and b are scale factor components, c and d are components of a point
+ return this._sandwich(this.scale(a, b), c, d);
+ },
+ rotateAt: function(angle, a, b){
+ return arguments.length > 1 ?
+ // a and b are components of point
+ this._sandwich(this.rotate(angle), a, b) :
+ // a is a point
+ this._sandwich(this.rotate(angle), a.x, a.y);
+ },
+ rotategAt: function(degree, a, b){
+ return arguments.length > 1 ?
+ // a and b are components of point
+ this._sandwich(this.rotateg(degree), a, b) :
+ // a is a point
+ this._sandwich(this.rotateg(degree), a.x, a.y);
+ },
+ skewXAt: function(angle, a, b){
+ return arguments.length > 1 ?
+ // a and b are components of point
+ this._sandwich(this.skewX(angle), a, b) :
+ // a is a point
+ this._sandwich(this.skewX(angle), a.x, a.y);
+ },
+ skewXgAt: function(degree, a, b){
+ return arguments.length > 1 ?
+ // a and b are components of point
+ this._sandwich(this.skewXg(degree), a, b) :
+ // a is a point
+ this._sandwich(this.skewXg(degree), a.x, a.y);
+ },
+ skewYAt: function(angle, a, b){
+ return arguments.length > 1 ?
+ // a and b are components of point
+ this._sandwich(this.skewY(angle), a, b) :
+ // a is a point
+ this._sandwich(this.skewY(angle), a.x, a.y);
+ },
+ skewYgAt: function(degree, a, b){
+ return arguments.length > 1 ?
+ // a and b are components of point
+ this._sandwich(this.skewYg(degree), a, b) :
+ // a is a point
+ this._sandwich(this.skewYg(degree), a.x, a.y);
+ }
+ // TODO: rect-to-rect mapping, scale-to-fit (isotropic and anisotropic versions)
+});
Propchange: tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/gfx/matrix.js
------------------------------------------------------------------------------
svn:eol-style = native
Added: tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/gfx/svg.js
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/gfx/svg.js?view=auto&rev=449122
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/gfx/svg.js (added)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/gfx/svg.js Fri Sep 22 16:22:30 2006
@@ -0,0 +1,604 @@
+/*
+ Copyright (c) 2004-2006, The Dojo Foundation
+ All Rights Reserved.
+
+ Licensed under the Academic Free License version 2.1 or above OR the
+ modified BSD license. For more information on Dojo licensing, see:
+
+ http://dojotoolkit.org/community/licensing.shtml
+*/
+
+dojo.provide("dojo.gfx.svg");
+
+dojo.require("dojo.lang.declare");
+dojo.require("dojo.svg");
+
+dojo.require("dojo.gfx.color");
+dojo.require("dojo.gfx.common");
+
+dojo.require("dojo.experimental");
+dojo.experimental("dojo.gfx.svg");
+
+dojo.lang.extend(dojo.gfx.Shape, {
+ setStroke: function(stroke){
+ if(!stroke){
+ // don't stroke
+ this.strokeStyle = null;
+ this.rawNode.setAttribute("stroke", "none");
+ this.rawNode.setAttribute("stroke-opacity", 0);
+ return this;
+ }
+ // normalize the stroke
+ this.strokeStyle = dojo.gfx.makeParameters(dojo.gfx.defaultStroke, stroke);
+ this.strokeStyle.color = dojo.gfx.normalizeColor(this.strokeStyle.color);
+ // generate attributes
+ var s = this.strokeStyle;
+ var rn = this.rawNode;
+ if(s){
+ rn.setAttribute("stroke", s.color.toCss());
+ rn.setAttribute("stroke-opacity", s.color.a);
+ rn.setAttribute("stroke-width", s.width);
+ rn.setAttribute("stroke-linecap", s.cap);
+ if(typeof(s.join) == "number"){
+ rn.setAttribute("stroke-linejoin", "miter");
+ rn.setAttribute("stroke-miterlimit", s.join);
+ }else{
+ rn.setAttribute("stroke-linejoin", s.join);
+ }
+ }
+ return this;
+ },
+
+ setFill: function(fill){
+ if(!fill){
+ // don't fill
+ this.fillStyle = null;
+ this.rawNode.setAttribute("fill", "none");
+ this.rawNode.setAttribute("fill-opacity", 0);
+ return this;
+ }
+ if(typeof(fill) == "object" && "type" in fill){
+ // gradient
+ switch(fill.type){
+ case "linear":
+ var f = dojo.gfx.makeParameters(dojo.gfx.defaultLinearGradient, fill);
+ var gradient = this._setFillObject(f, "linearGradient");
+ dojo.lang.forEach(["x1", "y1", "x2", "y2"], function(x){
+ gradient.setAttribute(x, f[x].toFixed(8));
+ });
+ break;
+ case "radial":
+ var f = dojo.gfx.makeParameters(dojo.gfx.defaultRadialGradient, fill);
+ var gradient = this._setFillObject(f, "radialGradient");
+ dojo.lang.forEach(["cx", "cy", "r"], function(x){
+ gradient.setAttribute(x, f[x].toFixed(8));
+ });
+ break;
+ case "pattern":
+ var f = dojo.gfx.makeParameters(dojo.gfx.defaultPattern, fill);
+ var pattern = this._setFillObject(f, "pattern");
+ dojo.lang.forEach(["x", "y", "width", "height"], function(x){
+ pattern.setAttribute(x, f[x].toFixed(8));
+ });
+ break;
+ }
+ return this;
+ }
+ // color object
+ var f = dojo.gfx.normalizeColor(fill);
+ this.fillStyle = f;
+ this.rawNode.setAttribute("fill", f.toCss());
+ this.rawNode.setAttribute("fill-opacity", f.a);
+ return this;
+ },
+
+ _setFillObject: function(/*Object*/f, /*String*/nodeType){
+ var def_elems = this.rawNode.parentNode.getElementsByTagName("defs");
+ if(def_elems.length == 0){ return this; }
+ this.fillStyle = f;
+ var defs = def_elems[0];
+ var fill = this.rawNode.getAttribute("fill");
+ if(fill && fill.match(/^url\(#.+\)$/)){
+ fill = dojo.byId(fill.slice(5, -1));
+ if(fill.tagName.toLowerCase() != nodeType.toLowerCase()){
+ var id = fill.id;
+ fill.parentNode.removeChild(fill);
+ fill = document.createElementNS(dojo.svg.xmlns.svg, nodeType);
+ fill.setAttribute("id", id);
+ defs.appendChild(fill);
+ }else{
+ while(fill.childNodes.length){
+ fill.removeChild(fill.lastChild);
+ }
+ }
+ }else{
+ fill = document.createElementNS(dojo.svg.xmlns.svg, nodeType);
+ fill.setAttribute("id", dojo.gfx.guid());
+ defs.appendChild(fill);
+ }
+ if(nodeType == "pattern"){
+ fill.setAttribute("patternUnits", "userSpaceOnUse");
+ var img = document.createElementNS(dojo.svg.xmlns.svg, "image");
+ img.setAttribute("x", 0);
+ img.setAttribute("y", 0);
+ img.setAttribute("width", f.width .toFixed(8));
+ img.setAttribute("height", f.height.toFixed(8));
+ img.setAttributeNS(dojo.svg.xmlns.xlink, "href", f.src);
+ fill.appendChild(img);
+ }else{
+ fill.setAttribute("gradientUnits", "userSpaceOnUse");
+ for(var i = 0; i < f.colors.length; ++i){
+ f.colors[i].color = dojo.gfx.normalizeColor(f.colors[i].color);
+ var t = document.createElementNS(dojo.svg.xmlns.svg, "stop");
+ t.setAttribute("offset", f.colors[i].offset.toFixed(8));
+ t.setAttribute("stop-color", f.colors[i].color.toCss());
+ fill.appendChild(t);
+ }
+ }
+ this.rawNode.setAttribute("fill", "url(#" + fill.getAttribute("id") +")");
+ this.rawNode.removeAttribute("fill-opacity");
+ return fill;
+ },
+
+ _applyTransform: function() {
+ var matrix = this._getRealMatrix();
+ if(matrix){
+ var tm = this.matrix;
+ this.rawNode.setAttribute("transform", "matrix(" +
+ tm.xx.toFixed(8) + "," + tm.yx.toFixed(8) + "," +
+ tm.xy.toFixed(8) + "," + tm.yy.toFixed(8) + "," +
+ tm.dx.toFixed(8) + "," + tm.dy.toFixed(8) + ")");
+ }else{
+ this.rawNode.removeAttribute("transform");
+ }
+ return this;
+ },
+
+ setRawNode: function(rawNode){
+ // summary:
+ // assigns and clears the underlying node that will represent this
+ // shape. Once set, transforms, gradients, etc, can be applied.
+ // no fill & stroke by default
+ with(rawNode){
+ setAttribute("fill", "none");
+ setAttribute("fill-opacity", 0);
+ setAttribute("stroke", "none");
+ setAttribute("stroke-opacity", 0);
+ setAttribute("stroke-width", 1);
+ setAttribute("stroke-linecap", "butt");
+ setAttribute("stroke-linejoin", "miter");
+ setAttribute("stroke-miterlimit", 4);
+ }
+ this.rawNode = rawNode;
+ },
+
+ moveToFront: function(){
+ this.rawNode.parentNode.appendChild(this.rawNode);
+ return this;
+ },
+ moveToBack: function(){
+ this.rawNode.parentNode.insertBefore(this.rawNode, this.rawNode.parentNode.firstChild);
+ return this;
+ },
+
+ setShape: function(newShape){
+ this.shape = dojo.gfx.makeParameters(this.shape, newShape);
+ for(var i in this.shape){
+ if(i != "type"){ this.rawNode.setAttribute(i, this.shape[i]); }
+ }
+ return this;
+ },
+
+ attachFill: function(rawNode){
+ var fillStyle = null;
+ if(rawNode){
+ var fill = rawNode.getAttribute("fill");
+ if(fill == "none"){ return; }
+ if(fill && fill.match(/^url\(#.+\)$/)){
+ var gradient = dojo.byId(fill.slice(5, -1));
+ switch(gradient.tagName.toLowerCase()){
+ case "lineargradient":
+ fillStyle = this._getGradient(dojo.gfx.defaultLinearGradient, gradient);
+ dojo.lang.forEach(["x1", "y1", "x2", "y2"], function(x){
+ fillStyle[x] = gradient.getAttribute(x);
+ });
+ break;
+ case "radialgradient":
+ fillStyle = this._getGradient(dojo.gfx.defaultRadialGradient, gradient);
+ dojo.lang.forEach(["cx", "cy", "r"], function(x){
+ fillStyle[x] = gradient.getAttribute(x);
+ });
+ fillStyle.cx = gradient.getAttribute("cx");
+ fillStyle.cy = gradient.getAttribute("cy");
+ fillStyle.r = gradient.getAttribute("r");
+ break;
+ case "pattern":
+ fillStyle = dojo.lang.shallowCopy(dojo.gfx.defaultPattern, true);
+ dojo.lang.forEach(["x", "y", "width", "height"], function(x){
+ fillStyle[x] = gradient.getAttribute(x);
+ });
+ fillStyle.src = gradient.firstChild.getAttributeNS(dojo.svg.xmlns.xlink, "href");
+ break;
+ }
+ }else{
+ fillStyle = new dojo.gfx.color.Color(fill);
+ var opacity = rawNode.getAttribute("fill-opacity");
+ if(opacity != null) fillStyle.a = opacity;
+ }
+ }
+ return fillStyle;
+ },
+
+ _getGradient: function(defaultGradient, gradient){
+ var fillStyle = dojo.lang.shallowCopy(defaultGradient, true);
+ fillStyle.colors = [];
+ for(var i = 0; i < gradient.childNodes.length; ++i){
+ fillStyle.colors.push({
+ offset: gradient.childNodes[i].getAttribute("offset"),
+ color: new dojo.gfx.color.Color(gradient.childNodes[i].getAttribute("stop-color"))
+ });
+ }
+ return fillStyle;
+ },
+
+ attachStroke: function(rawNode){
+ if(!rawNode){ return; }
+ var stroke = rawNode.getAttribute("stroke");
+ if(stroke == null || stroke == "none") return null;
+ var strokeStyle = dojo.lang.shallowCopy(dojo.gfx.defaultStroke, true);
+ var color = new dojo.gfx.color.Color(stroke);
+ if(color){
+ strokeStyle.color = color;
+ strokeStyle.color.a = rawNode.getAttribute("stroke-opacity");
+ strokeStyle.width = rawNode.getAttribute("stroke-width");
+ strokeStyle.cap = rawNode.getAttribute("stroke-linecap");
+ strokeStyle.join = rawNode.getAttribute("stroke-linejoin");
+ if(strokeStyle.join == "miter"){
+ strokeStyle.join = rawNode.getAttribute("stroke-miterlimit");
+ }
+ }
+ return strokeStyle;
+ },
+
+ attachTransform: function(rawNode){
+ var matrix = null;
+ if(rawNode){
+ matrix = rawNode.getAttribute("transform");
+ if(matrix.match(/^matrix\(.+\)$/)){
+ var t = matrix.slice(7, -1).split(",");
+ matrix = dojo.gfx.matrix.normalize({
+ xx: parseFloat(t[0]), xy: parseFloat(t[2]),
+ yx: parseFloat(t[1]), yy: parseFloat(t[3]),
+ dx: parseFloat(t[4]), dy: parseFloat(t[5])
+ });
+ }
+ }
+ return matrix;
+ },
+
+ attachShape: function(rawNode){
+ var shape = null;
+ if(rawNode){
+ shape = dojo.lang.shallowCopy(this.shape, true);
+ for(var i in shape) {
+ shape[i] = rawNode.getAttribute(i);
+ }
+ }
+ return shape;
+ },
+
+ attach: function(rawNode){
+ if(rawNode) {
+ this.rawNode = rawNode;
+ this.fillStyle = this.attachFill(rawNode);
+ this.strokeStyle = this.attachStroke(rawNode);
+ this.matrix = this.attachTransform(rawNode);
+ this.shape = this.attachShape(rawNode);
+ }
+ }
+});
+
+dojo.declare("dojo.gfx.Group", dojo.gfx.Shape, {
+ setRawNode: function(rawNode){
+ this.rawNode = rawNode;
+ }
+});
+dojo.gfx.Group.nodeType = "g";
+
+dojo.declare("dojo.gfx.Rect", dojo.gfx.Shape, {
+ initializer: function(rawNode) {
+ this.shape = dojo.lang.shallowCopy(dojo.gfx.defaultRect, true);
+ this.attach(rawNode);
+ },
+ setShape: function(newShape){
+ this.shape = dojo.gfx.makeParameters(this.shape, newShape);
+ for(var i in this.shape){
+ if(i != "type" && i != "r"){ this.rawNode.setAttribute(i, this.shape[i]); }
+ }
+ this.rawNode.setAttribute("rx", this.shape.r);
+ this.rawNode.setAttribute("ry", this.shape.r);
+ return this;
+ },
+ attachShape: function(rawNode){
+ var shape = null;
+ if(rawNode){
+ shape = this.inherited("attachShape", [rawNode]);
+ shape.r = Math.min(rawNode.getAttribute("rx"), rawNode.getAttribute("ry"));
+ }
+ return shape;
+ }
+});
+dojo.gfx.Rect.nodeType = "rect";
+
+dojo.declare("dojo.gfx.Ellipse", dojo.gfx.Shape, {
+ initializer: function(rawNode) {
+ this.shape = dojo.lang.shallowCopy(dojo.gfx.defaultEllipse, true);
+ this.attach(rawNode);
+ }
+});
+dojo.gfx.Ellipse.nodeType = "ellipse";
+
+dojo.declare("dojo.gfx.Circle", dojo.gfx.Shape, {
+ initializer: function(rawNode) {
+ this.shape = dojo.lang.shallowCopy(dojo.gfx.defaultCircle, true);
+ this.attach(rawNode);
+ }
+});
+dojo.gfx.Circle.nodeType = "circle";
+
+dojo.declare("dojo.gfx.Line", dojo.gfx.Shape, {
+ initializer: function(rawNode) {
+ this.shape = dojo.lang.shallowCopy(dojo.gfx.defaultLine, true);
+ this.attach(rawNode);
+ }
+});
+dojo.gfx.Line.nodeType = "line";
+
+dojo.declare("dojo.gfx.Polyline", dojo.gfx.Shape, {
+ initializer: function(rawNode) {
+ this.shape = dojo.lang.shallowCopy(dojo.gfx.defaultPolyline, true);
+ this.attach(rawNode);
+ },
+ setShape: function(points){
+ if(points && points instanceof Array){
+ this.shape = dojo.gfx.makeParameters(this.shape, { points: points });
+ if(closed && this.shape.points.length){
+ this.shape.points.push(this.shape.points[0]);
+ }
+ }else{
+ this.shape = dojo.gfx.makeParameters(this.shape, points);
+ }
+ attr = "";
+ for(var i = 0; i< this.shape.points.length; ++i){
+ attr += this.shape.points[i].x.toFixed(8) + " " + this.shape.points[i].y.toFixed(8) + " ";
+ }
+ this.rawNode.setAttribute("points", attr);
+ return this;
+ }
+});
+dojo.gfx.Polyline.nodeType = "polyline";
+
+dojo.lang.extend(dojo.gfx.Path, {
+ _extraDrawTo: function(action){
+ this.rawNode.setAttribute("d", this.shape.path);
+ return this;
+ },
+ _update: function(x,y){
+ if(this.shape.absolute){
+ this.lastPos = {x: x, y: y};
+ }else{
+ this.lastPos.x += x;
+ this.lastPos.y += y;
+ }
+ },
+ _drawTo: function(action, args){
+ this.shape.path += this.shape.absolute ? action.toUpperCase() : action.toLowerCase();
+ for(var i = 0; i < args.length; ++i){
+ var t = args[i];
+ this.shape.path += (typeof(t) == "number" ? t.toFixed(8) : t) + " ";
+ }
+ this._extraDrawTo(action);
+ return this;
+ },
+ setShape: function(newShape){
+ this.shape = dojo.gfx.makeParameters(this.shape, typeof(newShape) == "string" ? {path: newShape} : newShape);
+ this.setAbsoluteMode(this.shape.absolute);
+ this.rawNode.setAttribute("d", this.shape.path);
+ return this;
+ },
+ smoothCurveTo: function(x2, y2, x, y){
+ this._update(x, y);
+ return this._drawTo("s", [x2, y2, x, y]);
+ },
+ arcTo: function(endAngle, cx, cy, rx, ry, xRotate, isCCW) {
+ var startAngle = Math.atan2(cy - this.lastPos.y, this.lastPos.x - cx) - xRotate;
+ if(!this.shape.absolute) {
+ // calculate the startAngle
+ endAngle = startAngle + endAngle;
+ }
+ // calculate the endpoint
+ var eta = Math.atan2(Math.sin(endAngle) / ry, Math.cos(endAngle) / rx);
+ var endPoint = dojo.gfx.matrix.multiplyPoint(
+ [
+ dojo.gfx.matrix.translate(cx, cy),
+ dojo.gfx.matrix.rotate(xRotate),
+ dojo.gfx.matrix.scale(rx, ry)
+ ],
+ Math.cos(-eta),
+ Math.sin(-eta)
+ );
+ var sweepflag = isCCW ? "0" : "1";
+ var theta = isCCW ? endAngle - startAngle : startAngle - endAngle;
+ if(theta < 0){
+ theta += this._2PI;
+ }else if(theta > this._2PI){
+ theta = this._2PI;
+ }
+ var largearc = theta > Math.PI ? "1" : "0";
+ this._update(endPoint.x, endPoint.y);
+ return this._drawTo("a", [rx, ry, dojo.math.radToDeg(-xRotate), largearc, sweepflag, endPoint.x, endPoint.y] );
+ }
+});
+dojo.gfx.Path.nodeType = "path";
+
+dojo.declare("dojo.gfx.Image", dojo.gfx.Shape, {
+ initializer: function(rawNode) {
+ this.shape = dojo.lang.shallowCopy(dojo.gfx.defaultImage, true);
+ this.attach(rawNode);
+ },
+ setShape: function(newShape){
+ this.shape = dojo.gfx.makeParameters(this.shape, newShape);
+ for(var i in this.shape){
+ if(i != "type" && i != "src"){ this.rawNode.setAttribute(i, this.shape[i]); }
+ }
+ this.rawNode.setAttributeNS(dojo.svg.xmlns.xlink, "href", this.shape.src);
+ return this;
+ },
+ setStroke: function() { return this; },
+ setFill: function() { return this; },
+ attachStroke: function(rawNode){ return null; },
+ attachFill: function(rawNode){ return null; }
+});
+dojo.gfx.Image.nodeType = "image";
+
+dojo.gfx._creators = {
+ // creators
+ createPath: function(path){
+ return this.createObject(dojo.gfx.Path, path);
+ },
+ createRect: function(rect){
+ return this.createObject(dojo.gfx.Rect, rect);
+ },
+ createCircle: function(circle){
+ return this.createObject(dojo.gfx.Circle, circle);
+ },
+ createEllipse: function(ellipse){
+ return this.createObject(dojo.gfx.Ellipse, ellipse);
+ },
+ createLine: function(line){
+ return this.createObject(dojo.gfx.Line, line);
+ },
+ createPolyline: function(points){
+ return this.createObject(dojo.gfx.Polyline, points);
+ },
+ createImage: function(image){
+ return this.createObject(dojo.gfx.Image, image);
+ },
+ createGroup: function(){
+ return this.createObject(dojo.gfx.Group);
+ },
+ createObject: function(/*Function*/shapeType, /*Object*/rawShape){
+ // summary: creates an instance of the passed shapeType class
+ // shapeType: a class constructor to create an instance of
+ // rawShape: properties to be passed in to the classes "setShape" method
+
+ if(!this.rawNode){ return null; }
+ var shape = new shapeType();
+ var node = document.createElementNS(dojo.svg.xmlns.svg, shapeType.nodeType);
+ shape.setRawNode(node);
+ this.rawNode.appendChild(node);
+ shape.setShape(rawShape);
+ this.add(shape);
+ return shape;
+ },
+ // group control
+ add: function(shape){
+ var oldParent = shape.getParent();
+ if(oldParent){
+ oldParent.remove(shape, true);
+ }
+ shape._setParent(this, null);
+ this.rawNode.appendChild(shape.rawNode);
+ return this;
+ },
+ remove: function(shape, silently){
+ if(this.rawNode == shape.rawNode.parentNode){
+ this.rawNode.removeChild(shape.rawNode);
+ }
+ shape._setParent(null, null);
+ return this;
+ }
+};
+
+dojo.gfx.attachNode = function(node){
+ if(!node) return null;
+ var s = null;
+ switch(node.tagName.toLowerCase()){
+ case dojo.gfx.Rect.nodeType:
+ s = new dojo.gfx.Rect();
+ break;
+ case dojo.gfx.Ellipse.nodeType:
+ s = new dojo.gfx.Ellipse();
+ break;
+ case dojo.gfx.Polyline.nodeType:
+ s = new dojo.gfx.Polyline();
+ break;
+ case dojo.gfx.Path.nodeType:
+ s = new dojo.gfx.Path();
+ break;
+ case dojo.gfx.Circle.nodeType:
+ s = new dojo.gfx.Circle();
+ break;
+ case dojo.gfx.Line.nodeType:
+ s = new dojo.gfx.Line();
+ break;
+ case dojo.gfx.Image.nodeType:
+ s = new dojo.gfx.Image();
+ break;
+ default:
+ dojo.debug("FATAL ERROR! tagName = " + node.tagName);
+ }
+ s.attach(node);
+ return s;
+};
+
+dojo.lang.extend(dojo.gfx.Surface, {
+ setDimensions: function(/*String*/width, /*String*/height){
+ // summary: sets the width and height of the rawNode
+ if(!this.rawNode){ return this; }
+ this.rawNode.setAttribute("width", width);
+ this.rawNode.setAttribute("height", height);
+ return this; // dojo.gfx.Surface
+ },
+ getDimensions: function(){
+ // summary: returns an object with properties "width" and "height"
+ return this.rawNode ? {width: this.rawNode.getAttribute("width"), height: this.rawNode.getAttribute("height")} : null; // Object
+ }
+});
+
+dojo.gfx.createSurface = function(parentNode, width, height){
+ var s = new dojo.gfx.Surface();
+ s.rawNode = document.createElementNS(dojo.svg.xmlns.svg, "svg");
+ s.rawNode.setAttribute("width", width);
+ s.rawNode.setAttribute("height", height);
+
+ var defs = new dojo.gfx.svg.Defines();
+ var node = document.createElementNS(dojo.svg.xmlns.svg, dojo.gfx.svg.Defines.nodeType);
+ defs.setRawNode(node);
+ s.rawNode.appendChild(node);
+
+ dojo.byId(parentNode).appendChild(s.rawNode);
+ return s;
+};
+
+dojo.gfx.attachSurface = function(node){
+ var s = new dojo.gfx.Surface();
+ s.rawNode = node;
+ return s;
+};
+
+dojo.lang.extend(dojo.gfx.Group, dojo.gfx._creators);
+dojo.lang.extend(dojo.gfx.Surface, dojo.gfx._creators);
+
+delete dojo.gfx._creators;
+
+// Gradient and pattern
+dojo.gfx.svg.Defines = function(){
+ this.rawNode = null;
+};
+dojo.lang.extend(dojo.gfx.svg.Defines, {
+ setRawNode: function(rawNode){
+ this.rawNode = rawNode;
+ }
+});
+dojo.gfx.svg.Defines.nodeType = "defs";
Propchange: tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/gfx/svg.js
------------------------------------------------------------------------------
svn:eol-style = native