You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@struts.apache.org by he...@apache.org on 2006/11/13 23:55:14 UTC
svn commit: r474551 [16/49] - in
/struts/struts2/trunk/core/src/main/resources/org/apache/struts2/static/dojo:
./ src/ src/alg/ src/animation/ src/cal/ src/charting/ src/charting/svg/
src/charting/vml/ src/collections/ src/crypto/ src/data/ src/data/cs...
Added: struts/struts2/trunk/core/src/main/resources/org/apache/struts2/static/dojo/src/gfx/svg.js
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/resources/org/apache/struts2/static/dojo/src/gfx/svg.js?view=auto&rev=474551
==============================================================================
--- struts/struts2/trunk/core/src/main/resources/org/apache/struts2/static/dojo/src/gfx/svg.js (added)
+++ struts/struts2/trunk/core/src/main/resources/org/apache/struts2/static/dojo/src/gfx/svg.js Mon Nov 13 14:54:45 2006
@@ -0,0 +1,553 @@
+/*
+ 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.gfx.shape");
+dojo.require("dojo.gfx.path");
+
+dojo.require("dojo.experimental");
+dojo.experimental("dojo.gfx.svg");
+
+dojo.gfx.svg.getRef = function(fill){
+ if(!fill || fill == "none") return null;
+ if(fill.match(/^url\(#.+\)$/)){
+ return dojo.byId(fill.slice(5, -1));
+ }
+ // Opera's bug: incorrect representation of a reference
+ if(dojo.render.html.opera && fill.match(/^#dj_unique_.+$/)){
+ // we assume here that a reference was generated by dojo.gfx
+ return dojo.byId(fill.slice(1));
+ }
+ return null;
+};
+
+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");
+ var ref = dojo.gfx.svg.getRef(fill);
+ if(ref){
+ fill = ref;
+ 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.dom.getUniqueId());
+ 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; }
+ var ref = dojo.gfx.svg.getRef(fill);
+ if(ref){
+ var gradient = ref;
+ 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.Rect, {
+ attachShape: function(rawNode){
+ var shape = null;
+ if(rawNode){
+ shape = dojo.gfx.Rect.superclass.attachShape.apply(this, arguments);
+ shape.r = Math.min(rawNode.getAttribute("rx"), rawNode.getAttribute("ry"));
+ }
+ return shape;
+ },
+ setShape: function(newShape){
+ this.shape = dojo.gfx.makeParameters(this.shape, newShape);
+ this.bbox = null;
+ 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;
+ }
+});
+dojo.gfx.Rect.nodeType = "rect";
+
+dojo.gfx.Ellipse = dojo.gfx.shape.Ellipse;
+dojo.gfx.Ellipse.nodeType = "ellipse";
+
+dojo.gfx.Circle = dojo.gfx.shape.Circle;
+dojo.gfx.Circle.nodeType = "circle";
+
+dojo.gfx.Line = dojo.gfx.shape.Line;
+dojo.gfx.Line.nodeType = "line";
+
+dojo.declare("dojo.gfx.Polyline", dojo.gfx.shape.Polyline, {
+ 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);
+ }
+ this.box = null;
+ var attr = [];
+ var p = this.shape.points;
+ for(var i = 0; i < p.length; ++i){
+ attr.push(p[i].x.toFixed(8));
+ attr.push(p[i].y.toFixed(8));
+ }
+ this.rawNode.setAttribute("points", attr.join(" "));
+ return this;
+ }
+});
+dojo.gfx.Polyline.nodeType = "polyline";
+
+dojo.declare("dojo.gfx.Image", dojo.gfx.shape.Image, {
+ setShape: function(newShape){
+ this.shape = dojo.gfx.makeParameters(this.shape, newShape);
+ this.bbox = null;
+ var rawNode = this.rawNode;
+ for(var i in this.shape){
+ if(i != "type" && i != "src"){ rawNode.setAttribute(i, this.shape[i]); }
+ }
+ 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.declare("dojo.gfx.Path", dojo.gfx.path.Path,
+{
+ _updateWithSegment: function(segment){
+ dojo.gfx.Path.superclass._updateWithSegment.apply(this, arguments);
+ if(typeof(this.shape.path) == "string"){
+ this.rawNode.setAttribute("d", this.shape.path);
+ }
+ },
+ setShape: function(newShape){
+ dojo.gfx.Path.superclass.setShape.apply(this, arguments);
+ this.rawNode.setAttribute("d", this.shape.path);
+ return this;
+ }
+});
+dojo.gfx.Path.nodeType = "path";
+
+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: struts/struts2/trunk/core/src/main/resources/org/apache/struts2/static/dojo/src/gfx/svg.js
------------------------------------------------------------------------------
svn:eol-style = native
Added: struts/struts2/trunk/core/src/main/resources/org/apache/struts2/static/dojo/src/gfx/vml.js
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/resources/org/apache/struts2/static/dojo/src/gfx/vml.js?view=auto&rev=474551
==============================================================================
--- struts/struts2/trunk/core/src/main/resources/org/apache/struts2/static/dojo/src/gfx/vml.js (added)
+++ struts/struts2/trunk/core/src/main/resources/org/apache/struts2/static/dojo/src/gfx/vml.js Mon Nov 13 14:54:45 2006
@@ -0,0 +1,1157 @@
+/*
+ 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.vml");
+
+dojo.require("dojo.dom");
+dojo.require("dojo.math");
+dojo.require("dojo.lang.declare");
+dojo.require("dojo.lang.extras");
+dojo.require("dojo.string.*");
+dojo.require("dojo.html.metrics");
+
+dojo.require("dojo.gfx.color");
+dojo.require("dojo.gfx.common");
+dojo.require("dojo.gfx.shape");
+dojo.require("dojo.gfx.path");
+
+dojo.require("dojo.experimental");
+dojo.experimental("dojo.gfx.vml");
+
+dojo.gfx.vml.xmlns = "urn:schemas-microsoft-com:vml";
+
+dojo.gfx.vml._parseFloat = function(str) {
+ return str.match(/^\d+f$/i) ? parseInt(str) / 65536 : parseFloat(str);
+};
+
+dojo.gfx.vml.cm_in_pt = 72 / 2.54;
+dojo.gfx.vml.mm_in_pt = 7.2 / 2.54;
+
+dojo.gfx.vml.px_in_pt = function(){ return dojo.html.getCachedFontMeasurements()["12pt"] / 12; };
+
+dojo.gfx.vml.pt2px = function(len){ return len * this.px_in_pt(); };
+dojo.gfx.vml.px2pt = function(len){ return len / this.px_in_pt(); };
+
+dojo.gfx.vml.normalizedLength = function(len) {
+ if(len.length == 0) return 0;
+ if(len.length > 2){
+ var px_in_pt = this.px_in_pt();
+ var val = parseFloat(len);
+ switch(len.slice(-2)){
+ case "px": return val;
+ case "pt": return val * px_in_pt;
+ case "in": return val * 72 * px_in_pt;
+ case "pc": return val * 12 * px_in_pt;
+ case "mm": return val / this.mm_in_pt * px_in_pt;
+ case "cm": return val / this.cm_in_pt * px_in_pt;
+ }
+ }
+ return parseFloat(len);
+};
+
+dojo.lang.extend(dojo.gfx.Shape, {
+ setStroke: function(stroke){
+ if(!stroke){
+ // don't stroke
+ this.strokeStyle = null;
+ this.rawNode.stroked = false;
+ 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;
+ this.rawNode.stroked = true;
+ this.rawNode.strokecolor = s.color.toCss();
+ this.rawNode.strokeweight = s.width + "px"; // TODO: should we assume that the width is always in pixels?
+ if(this.rawNode.stroke) {
+ this.rawNode.stroke.opacity = s.color.a;
+ this.rawNode.stroke.endcap = this._translate(this._capMap, s.cap);
+ if(typeof(s.join) == "number") {
+ this.rawNode.stroke.joinstyle = "miter";
+ this.rawNode.stroke.miterlimit = s.join;
+ }else{
+ this.rawNode.stroke.joinstyle = s.join;
+ // this.rawNode.stroke.miterlimit = s.width;
+ }
+ }
+ return this;
+ },
+
+ _capMap: { butt: 'flat' },
+ _capMapReversed: { flat: 'butt' },
+
+ _translate: function(dict, value) {
+ return (value in dict) ? dict[value] : value;
+ },
+
+ setFill: function(fill){
+ if(!fill){
+ // don't fill
+ this.fillStyle = null;
+ this.rawNode.filled = false;
+ return this;
+ }
+ if(typeof(fill) == "object" && "type" in fill){
+ // gradient
+ switch(fill.type){
+ case "linear":
+ var f = dojo.gfx.makeParameters(dojo.gfx.defaultLinearGradient, fill);
+ this.fillStyle = f;
+ var s = "";
+ for(var i = 0; i < f.colors.length; ++i){
+ f.colors[i].color = dojo.gfx.normalizeColor(f.colors[i].color);
+ s += f.colors[i].offset.toFixed(8) + " " + f.colors[i].color.toHex() + ";";
+ }
+ var fo = this.rawNode.fill;
+ fo.colors.value = s;
+ fo.method = "sigma";
+ fo.type = "gradient";
+ fo.angle = (dojo.math.radToDeg(Math.atan2(f.x2 - f.x1, f.y2 - f.y1)) + 180) % 360;
+ fo.on = true;
+ break;
+ case "radial":
+ var f = dojo.gfx.makeParameters(dojo.gfx.defaultRadialGradient, fill);
+ this.fillStyle = f;
+ var w = parseFloat(this.rawNode.style.width);
+ var h = parseFloat(this.rawNode.style.height);
+ var c = isNaN(w) ? 1 : 2 * f.r / w;
+ var i = f.colors.length - 1;
+ f.colors[i].color = dojo.gfx.normalizeColor(f.colors[i].color);
+ var s = "0 " + f.colors[i].color.toHex();
+ for(; i >= 0; --i){
+ f.colors[i].color = dojo.gfx.normalizeColor(f.colors[i].color);
+ s += (1 - c * f.colors[i].offset).toFixed(8) + " " + f.colors[i].color.toHex() + ";";
+ }
+ var fo = this.rawNode.fill;
+ fo.colors.value = s;
+ fo.method = "sigma";
+ fo.type = "gradientradial";
+ if(isNaN(w) || isNaN(h)){
+ fo.focusposition = "0.5 0.5";
+ }else{
+ fo.focusposition = (f.cx / w).toFixed(8) + " " + (f.cy / h).toFixed(8);
+ }
+ fo.focussize = "0 0";
+ fo.on = true;
+ break;
+ case "pattern":
+ var f = dojo.gfx.makeParameters(dojo.gfx.defaultPattern, fill);
+ this.fillStyle = f;
+ var fo = this.rawNode.fill;
+ fo.type = "tile";
+ fo.src = f.src;
+ if(f.width && f.height){
+ // in points
+ fo.size.x = dojo.gfx.vml.px2pt(f.width);
+ fo.size.y = dojo.gfx.vml.px2pt(f.height);
+ }
+ fo.alignShape = false;
+ fo.position.x = 0;
+ fo.position.y = 0;
+ fo.origin.x = f.width ? f.x / f.width : 0;
+ fo.origin.y = f.height ? f.y / f.height : 0;
+ fo.on = true;
+ break;
+ }
+ this.rawNode.fill.opacity = 1;
+ return this;
+ }
+ // color object
+ this.fillStyle = dojo.gfx.normalizeColor(fill);
+ this.rawNode.fillcolor = this.fillStyle.toHex();
+ this.rawNode.fill.opacity = this.fillStyle.a;
+ this.rawNode.filled = true;
+ return this;
+ },
+
+ _applyTransform: function() {
+ var matrix = this._getRealMatrix();
+ if(!matrix) return this;
+ var skew = this.rawNode.skew;
+ if(typeof(skew) == "undefined"){
+ for(var i = 0; i < this.rawNode.childNodes.length; ++i){
+ if(this.rawNode.childNodes[i].tagName == "skew"){
+ skew = this.rawNode.childNodes[i];
+ break;
+ }
+ }
+ }
+ if(skew){
+ skew.on = false;
+ var mt = matrix.xx.toFixed(8) + " " + matrix.xy.toFixed(8) + " " +
+ matrix.yx.toFixed(8) + " " + matrix.yy.toFixed(8) + " 0 0";
+ var offset = Math.floor(matrix.dx).toFixed() + "px " + Math.floor(matrix.dy).toFixed() + "px";
+ var l = parseFloat(this.rawNode.style.left);
+ var t = parseFloat(this.rawNode.style.top);
+ var w = parseFloat(this.rawNode.style.width);
+ var h = parseFloat(this.rawNode.style.height);
+ if(isNaN(l)) l = 0;
+ if(isNaN(t)) t = 0;
+ if(isNaN(w)) w = 1;
+ if(isNaN(h)) h = 1;
+ var origin = (-l / w - 0.5).toFixed(8) + " " + (-t / h - 0.5).toFixed(8);
+ skew.matrix = mt;
+ skew.origin = origin;
+ skew.offset = offset;
+ skew.on = true;
+ }
+ return this;
+ },
+
+ setRawNode: function(rawNode){
+ rawNode.stroked = false;
+ rawNode.filled = false;
+ this.rawNode = rawNode;
+ },
+
+ // Attach family
+ attachStroke: function(rawNode) {
+ var strokeStyle = dojo.lang.shallowCopy(dojo.gfx.defaultStroke, true);
+ if(rawNode && rawNode.stroked){
+ strokeStyle.color = new dojo.gfx.color.Color(rawNode.strokecolor.value);
+ dojo.debug("We are expecting an .75pt here, instead of strokeweight = " + rawNode.strokeweight );
+ strokeStyle.width = dojo.gfx.vml.normalizedLength(rawNode.strokeweight+"");
+ strokeStyle.color.a = rawNode.stroke.opacity;
+ strokeStyle.cap = this._translate(this._capMapReversed, rawNode.stroke.endcap);
+ strokeStyle.join = rawNode.stroke.joinstyle == "miter" ? rawNode.stroke.miterlimit : rawNode.stroke.joinstyle;
+ }else{
+ return null;
+ }
+ return strokeStyle;
+ },
+
+ attachFill: function(rawNode){
+ var fillStyle = null;
+ var fo = rawNode.fill;
+ if(rawNode) {
+ if(fo.on && fo.type == "gradient"){
+ var fillStyle = dojo.lang.shallowCopy(dojo.gfx.defaultLinearGradient, true);
+ var rad = dojo.math.degToRad(fo.angle);
+ fillStyle.x2 = Math.cos(rad);
+ fillStyle.y2 = Math.sin(rad);
+ fillStyle.colors = [];
+ var stops = fo.colors.value.split(";");
+ for(var i = 0; i < stops.length; ++i){
+ var t = stops[i].match(/\S+/g);
+ if(!t || t.length != 2) continue;
+ fillStyle.colors.push({offset: dojo.gfx.vml._parseFloat(t[0]), color: new dojo.gfx.color.Color(t[1])});
+ }
+ }else if(fo.on && fo.type == "gradientradial"){
+ var fillStyle = dojo.lang.shallowCopy(dojo.gfx.defaultRadialGradient, true);
+ var w = parseFloat(rawNode.style.width);
+ var h = parseFloat(rawNode.style.height);
+ fillStyle.cx = isNaN(w) ? 0 : fo.focusposition.x * w;
+ fillStyle.cy = isNaN(h) ? 0 : fo.focusposition.y * h;
+ fillStyle.r = isNaN(w) ? 1 : w / 2;
+ fillStyle.colors = [];
+ var stops = fo.colors.value.split(";");
+ for(var i = stops.length - 1; i >= 0; --i){
+ var t = stops[i].match(/\S+/g);
+ if(!t || t.length != 2) continue;
+ fillStyle.colors.push({offset: dojo.gfx.vml._parseFloat(t[0]), color: new dojo.gfx.color.Color(t[1])});
+ }
+ }else if(fo.on && fo.type == "tile"){
+ var fillStyle = dojo.lang.shallowCopy(dojo.gfx.defaultPattern, true);
+ fillStyle.width = dojo.gfx.vml.pt2px(fo.size.x); // from pt
+ fillStyle.height = dojo.gfx.vml.pt2px(fo.size.y); // from pt
+ fillStyle.x = fo.origin.x * fillStyle.width;
+ fillStyle.y = fo.origin.y * fillStyle.height;
+ fillStyle.src = fo.src;
+ }else if(fo.on && rawNode.fillcolor){
+ // a color object !
+ fillStyle = new dojo.gfx.color.Color(rawNode.fillcolor+"");
+ fillStyle.a = fo.opacity;
+ }
+ }
+ return fillStyle;
+ },
+
+ attachTransform: function(rawNode) {
+ var matrix = {};
+ if(rawNode){
+ var s = rawNode.skew;
+ matrix.xx = s.matrix.xtox;
+ matrix.xy = s.matrix.ytox;
+ matrix.yx = s.matrix.xtoy;
+ matrix.yy = s.matrix.ytoy;
+ matrix.dx = dojo.gfx.vml.pt2px(s.offset.x);
+ matrix.dy = dojo.gfx.vml.pt2px(s.offset.y);
+ }
+ return dojo.gfx.matrix.normalize(matrix);
+ },
+
+ attach: function(rawNode){
+ if(rawNode){
+ this.rawNode = rawNode;
+ this.shape = this.attachShape(rawNode);
+ this.fillStyle = this.attachFill(rawNode);
+ this.strokeStyle = this.attachStroke(rawNode);
+ this.matrix = this.attachTransform(rawNode);
+ }
+ }
+});
+
+dojo.declare("dojo.gfx.Group", dojo.gfx.shape.VirtualGroup, {
+ add: function(shape){
+ if(this != shape.getParent()){
+ this.rawNode.appendChild(shape.rawNode);
+ dojo.gfx.Group.superclass.add.apply(this, arguments);
+ }
+ return this;
+ },
+ remove: function(shape, silently){
+ if(this == shape.getParent()){
+ if(this.rawNode == shape.rawNode.parentNode){
+ this.rawNode.removeChild(shape.rawNode);
+ }
+ dojo.gfx.Group.superclass.remove.apply(this, arguments);
+ }
+ return this;
+ },
+ attach: function(rawNode){
+ if(rawNode){
+ this.rawNode = rawNode;
+ this.shape = null;
+ this.fillStyle = null;
+ this.strokeStyle = null;
+ this.matrix = null;
+ }
+ }
+});
+dojo.gfx.Group.nodeType = "group";
+
+var zIndex = {
+ moveToFront: function(){
+ this.rawNode.parentNode.appendChild(this.rawNode);
+ return this;
+ },
+ moveToBack: function(){
+ this.rawNode.parentNode.insertBefore(this.rawNode, this.rawNode.parentNode.firstChild);
+ return this;
+ }
+};
+dojo.lang.extend(dojo.gfx.Shape, zIndex);
+dojo.lang.extend(dojo.gfx.Group, zIndex);
+delete zIndex;
+
+dojo.declare("dojo.gfx.Rect", dojo.gfx.shape.Rect, {
+ setShape: function(newShape){
+ var shape = this.shape = dojo.gfx.makeParameters(this.shape, newShape);
+ this.bbox = null;
+ var style = this.rawNode.style;
+ style.left = shape.x.toFixed();
+ style.top = shape.y.toFixed();
+ style.width = (typeof(shape.width) == "string" && shape.width.indexOf("%") >= 0) ? shape.width : shape.width.toFixed();
+ style.height = (typeof(shape.width) == "string" && shape.height.indexOf("%") >= 0) ? shape.height : shape.height.toFixed();
+ var r = Math.min(1, (shape.r / Math.min(parseFloat(shape.width), parseFloat(shape.height)))).toFixed(8);
+ // a workaround for the VML's arcsize bug: cannot read arcsize of an instantiated node
+ var parent = this.rawNode.parentNode;
+ var before = null;
+ if(parent){
+ if(parent.lastChild != this.rawNode){
+ for(var i = 0; i < parent.childNodes.length; ++i){
+ if(parent.childNodes[i] == this.rawNode){
+ before = parent.childNodes[i+1];
+ break;
+ }
+ }
+ }
+ parent.removeChild(this.rawNode);
+ }
+ this.rawNode.arcsize = r;
+ if(parent){
+ if(before){
+ parent.insertBefore(this.rawNode, before);
+ }else{
+ parent.appendChild(this.rawNode);
+ }
+ }
+ return this.setTransform(this.matrix);
+ },
+ attachShape: function(rawNode){
+ // a workaround for the VML's arcsize bug: cannot read arcsize of an instantiated node
+ var arcsize = rawNode.outerHTML.match(/arcsize = \"(\d*\.?\d+[%f]?)\"/)[1];
+ arcsize = (arcsize.indexOf("%") >= 0) ? parseFloat(arcsize) / 100 : dojo.gfx.vml._parseFloat(arcsize);
+ var style = rawNode.style;
+ var width = parseFloat(style.width);
+ var height = parseFloat(style.height);
+ // make an object
+ return dojo.gfx.makeParameters(dojo.gfx.defaultRect, {
+ x: parseInt(style.left),
+ y: parseInt(style.top),
+ width: width,
+ height: height,
+ r: Math.min(width, height) * arcsize
+ });
+ }
+});
+dojo.gfx.Rect.nodeType = "roundrect"; // use a roundrect so the stroke join type is respected
+
+dojo.declare("dojo.gfx.Ellipse", dojo.gfx.shape.Ellipse, {
+ setShape: function(newShape){
+ var shape = this.shape = dojo.gfx.makeParameters(this.shape, newShape);
+ this.bbox = null;
+ var style = this.rawNode.style;
+ style.left = (shape.cx - shape.rx).toFixed();
+ style.top = (shape.cy - shape.ry).toFixed();
+ style.width = (shape.rx * 2).toFixed();
+ style.height = (shape.ry * 2).toFixed();
+ return this.setTransform(this.matrix);
+ },
+ attachShape: function(rawNode){
+ var style = this.rawNode.style;
+ var rx = parseInt(style.width ) / 2;
+ var ry = parseInt(style.height) / 2;
+ return dojo.gfx.makeParameters(dojo.gfx.defaultEllipse, {
+ cx: parseInt(style.left) + rx,
+ cy: parseInt(style.top ) + ry,
+ rx: rx,
+ ry: ry
+ });
+ }
+});
+dojo.gfx.Ellipse.nodeType = "oval";
+
+dojo.declare("dojo.gfx.Circle", dojo.gfx.shape.Circle, {
+ setShape: function(newShape){
+ var shape = this.shape = dojo.gfx.makeParameters(this.shape, newShape);
+ this.bbox = null;
+ var style = this.rawNode.style;
+ style.left = (shape.cx - shape.r).toFixed();
+ style.top = (shape.cy - shape.r).toFixed();
+ style.width = (shape.r * 2).toFixed();
+ style.height = (shape.r * 2).toFixed();
+ return this;
+ },
+ attachShape: function(rawNode){
+ var style = this.rawNode.style;
+ var r = parseInt(style.width) / 2;
+ return dojo.gfx.makeParameters(dojo.gfx.defaultCircle, {
+ cx: parseInt(style.left) + r,
+ cy: parseInt(style.top) + r,
+ r: r
+ });
+ }
+});
+dojo.gfx.Circle.nodeType = "oval";
+
+dojo.declare("dojo.gfx.Line", dojo.gfx.shape.Line,
+ function(rawNode){
+ if(rawNode) rawNode.setAttribute("dojoGfxType", "line");
+ }, {
+ setShape: function(newShape){
+ var shape = this.shape = dojo.gfx.makeParameters(this.shape, newShape);
+ this.bbox = null;
+ this.rawNode.path.v = "m" + shape.x1.toFixed() + " " + shape.y1.toFixed() +
+ "l" + shape.x2.toFixed() + " " + shape.y2.toFixed() + "e";
+ return this.setTransform(this.matrix);
+ },
+ attachShape: function(rawNode){
+ var p = rawNode.path.v.match(dojo.gfx.pathRegExp);
+ var shape = {};
+ do{
+ if(p.length < 7 || p[0] != "m" || p[3] != "l" || p[6] != "e") break;
+ shape.x1 = parseInt(p[1]);
+ shape.y1 = parseInt(p[2]);
+ shape.x2 = parseInt(p[4]);
+ shape.y2 = parseInt(p[5]);
+ }while(false);
+ return dojo.gfx.makeParameters(dojo.gfx.defaultLine, shape);
+ }
+});
+dojo.gfx.Line.nodeType = "shape";
+
+dojo.declare("dojo.gfx.Polyline", dojo.gfx.shape.Polyline,
+ function(rawNode){
+ if(rawNode) rawNode.setAttribute("dojoGfxType", "polyline");
+ }, {
+ setShape: function(points, closed){
+ 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);
+ }
+ this.bbox = null;
+ var attr = [];
+ var p = this.shape.points;
+ if(p.length > 0){
+ attr.push("m");
+ attr.push(p[0].x.toFixed());
+ attr.push(p[0].y.toFixed());
+ if(p.length > 1){
+ attr.push("l");
+ for(var i = 1; i < p.length; ++i){
+ attr.push(p[i].x.toFixed());
+ attr.push(p[i].y.toFixed());
+ }
+ }
+ }
+ attr.push("e");
+ this.rawNode.path.v = attr.join(" ");
+ return this.setTransform(this.matrix);
+ },
+ attachShape: function(rawNode){
+ var shape = dojo.lang.shallowCopy(dojo.gfx.defaultPolyline, true);
+ var p = rawNode.path.v.match(dojo.gfx.pathRegExp);
+ do{
+ if(p.length < 3 || p[0] != "m") break;
+ var x = parseInt(p[0]);
+ var y = parseInt(p[1]);
+ if(isNaN(x) || isNaN(y)) break;
+ shape.points.push({x: x, y: y});
+ if(p.length < 6 || p[3] != "l") break;
+ for(var i = 4; i < p.length; i += 2){
+ x = parseInt(p[i]);
+ y = parseInt(p[i + 1]);
+ if(isNaN(x) || isNaN(y)) break;
+ shape.points.push({x: x, y: y});
+ }
+ }while(false);
+ return shape;
+ }
+});
+dojo.gfx.Polyline.nodeType = "shape";
+
+dojo.declare("dojo.gfx.Image", dojo.gfx.shape.Image, {
+ getEventSource: function() {
+ return this.rawNode ? this.rawNode.firstChild : null;
+ },
+ setShape: function(newShape){
+ var shape = this.shape = dojo.gfx.makeParameters(this.shape, newShape);
+ this.bbox = null;
+ var firstChild = this.rawNode.firstChild;
+ firstChild.src = shape.src;
+ if(shape.width || shape.height){
+ firstChild.style.width = shape.width;
+ firstChild.style.height = shape.height;
+ }
+ return this.setTransform(this.matrix);
+ },
+ setStroke: function() { return this; },
+ setFill: function() { return this; },
+ attachShape: function(rawNode){
+ var shape = dojo.lang.shallowCopy(dojo.gfx.defaultImage, true);
+ shape.src = rawNode.firstChild.src;
+ return shape;
+ },
+ attachStroke: function(rawNode){ return null; },
+ attachFill: function(rawNode){ return null; },
+ attachTransform: function(rawNode) {
+ var matrix = {};
+ if(rawNode){
+ var m = rawNode.filters["DXImageTransform.Microsoft.Matrix"];
+ matrix.xx = m.M11;
+ matrix.xy = m.M12;
+ matrix.yx = m.M21;
+ matrix.yy = m.M22;
+ matrix.dx = m.Dx;
+ matrix.dy = m.Dy;
+ }
+ return dojo.gfx.matrix.normalize(matrix);
+ },
+ _applyTransform: function() {
+ var matrix = this._getRealMatrix();
+ if(!matrix) return this;
+ with(this.rawNode.filters["DXImageTransform.Microsoft.Matrix"]){
+ M11 = matrix.xx;
+ M12 = matrix.xy;
+ M21 = matrix.yx;
+ M22 = matrix.yy;
+ Dx = matrix.dx;
+ Dy = matrix.dy;
+ }
+ return this;
+ }
+});
+dojo.gfx.Image.nodeType = "image";
+
+dojo.gfx.path._calcArc = function(alpha){
+ var cosa = Math.cos(alpha);
+ var sina = Math.sin(alpha);
+ // return a start point, 1st and 2nd control points, and an end point
+ var p2 = {x: cosa + (4 / 3) * (1 - cosa), y: sina - (4 / 3) * cosa * (1 - cosa) / sina};
+ return {
+ s: {x: cosa, y: sina},
+ c1: p2,
+ c2: {x: p2.x, y: -p2.y},
+ e: {x: cosa, y: -sina}
+ };
+};
+
+dojo.declare("dojo.gfx.Path", dojo.gfx.path.Path,
+ function(rawNode){
+ if(rawNode) rawNode.setAttribute("dojoGfxType", "path");
+ this.vmlPath = "";
+ this.lastControl = {};
+ }, {
+ _updateWithSegment: function(segment){
+ var last = dojo.lang.shallowCopy(this.last);
+ dojo.gfx.Path.superclass._updateWithSegment.apply(this, arguments);
+ // add a VML path segment
+ var path = this[this.renderers[segment.action]](segment, last);
+ if(typeof(this.vmlPath) == "string"){
+ this.vmlPath += path.join("");
+ }else{
+ this.vmlPath = this.vmlPath.concat(path);
+ }
+ if(typeof(this.vmlPath) == "string"){
+ this.rawNode.path.v = this.vmlPath + " e";
+ }
+ },
+ setShape: function(newShape){
+ this.vmlPath = [];
+ this.lastControl = {};
+ dojo.gfx.Path.superclass.setShape.apply(this, arguments);
+ this.vmlPath = this.vmlPath.join("");
+ this.rawNode.path.v = this.vmlPath + " e";
+ return this;
+ },
+ _pathVmlToSvgMap: {m: "M", l: "L", t: "m", r: "l", c: "C", v: "c", qb: "Q", x: "z", e: ""},
+ attachShape: function(rawNode){
+ var shape = dojo.lang.shallowCopy(dojo.gfx.defaultPath, true);
+ var p = rawNode.path.v.match(dojo.gfx.pathRegExp);
+ var t = [], skip = false;
+ for(var i = 0; i < p.length; ++p){
+ var s = p[i];
+ if(s in this._pathVmlToSvgMap) {
+ skip = false;
+ t.push(this._pathVmlToSvgMap[s]);
+ } else if(!skip){
+ var n = parseInt(s);
+ if(isNaN(n)){
+ skip = true;
+ }else{
+ t.push(n);
+ }
+ }
+ }
+ if(t.length) shape.path = t.join(" ");
+ return shape;
+ },
+ // VML-specific segment renderers
+ renderers: {
+ M: "_moveToA", m: "_moveToR",
+ L: "_lineToA", l: "_lineToR",
+ H: "_hLineToA", h: "_hLineToR",
+ V: "_vLineToA", v: "_vLineToR",
+ C: "_curveToA", c: "_curveToR",
+ S: "_smoothCurveToA", s: "_smoothCurveToR",
+ Q: "_qCurveToA", q: "_qCurveToR",
+ T: "_qSmoothCurveToA", t: "_qSmoothCurveToR",
+ A: "_arcTo", a: "_arcTo",
+ Z: "_closePath", z: "_closePath"
+ },
+ _addArgs: function(path, args, from, upto){
+ if(typeof(upto) == "undefined"){
+ upto = args.length;
+ }
+ if(typeof(from) == "undefined"){
+ from = 0;
+ }
+ for(var i = from; i < upto; ++i){
+ path.push(" ");
+ path.push(args[i].toFixed());
+ }
+ },
+ _addArgsAdjusted: function(path, last, args, from, upto){
+ if(typeof(upto) == "undefined"){
+ upto = args.length;
+ }
+ if(typeof(from) == "undefined"){
+ from = 0;
+ }
+ for(var i = from; i < upto; i += 2){
+ path.push(" ");
+ path.push((last.x + args[i]).toFixed());
+ path.push(" ");
+ path.push((last.y + args[i + 1]).toFixed());
+ }
+ },
+ _moveToA: function(segment){
+ var p = [" m"];
+ var n = segment.args;
+ var l = n.length;
+ if(l == 2){
+ this._addArgs(p, n);
+ }else{
+ this._addArgs(p, n, 0, 2);
+ p.push(" l");
+ this._addArgs(p, n, 2);
+ }
+ this.lastControl = {};
+ return p;
+ },
+ _moveToR: function(segment, last){
+ var p = ["x" in last ? " t" : " m"];
+ var n = segment.args;
+ var l = n.length;
+ if(l == 2){
+ this._addArgs(p, n);
+ }else{
+ this._addArgs(p, n, 0, 2);
+ p.push(" r");
+ this._addArgs(p, n, 2);
+ }
+ this.lastControl = {};
+ return p;
+ },
+ _lineToA: function(segment){
+ var p = [" l"];
+ this._addArgs(p, segment.args);
+ this.lastControl = {};
+ return p;
+ },
+ _lineToR: function(segment){
+ var p = [" r"];
+ this._addArgs(p, segment.args);
+ this.lastControl = {};
+ return p;
+ },
+ _hLineToA: function(segment, last){
+ var p = [" l"];
+ var n = segment.args;
+ var l = n.length;
+ var y = " " + last.y.toFixed();
+ for(var i = 0; i < l; ++i){
+ p.push(" ");
+ p.push(n[i].toFixed());
+ p.push(y);
+ }
+ this.lastControl = {};
+ return p;
+ },
+ _hLineToR: function(segment){
+ var p = [" r"];
+ var n = segment.args;
+ var l = n.length;
+ for(var i = 0; i < l; ++i){
+ p.push(" ");
+ p.push(n[i].toFixed());
+ p.push(" 0");
+ }
+ this.lastControl = {};
+ return p;
+ },
+ _vLineToA: function(segment, last){
+ var p = [" l"];
+ var n = segment.args;
+ var l = n.length;
+ var x = " " + last.x.toFixed();
+ for(var i = 0; i < l; ++i){
+ p.push(x);
+ p.push(" ");
+ p.push(n[i].toFixed());
+ }
+ this.lastControl = {};
+ return p;
+ },
+ _vLineToR: function(segment){
+ var p = [" r"];
+ var n = segment.args;
+ var l = n.length;
+ for(var i = 0; i < l; ++i){
+ p.push(" 0 ");
+ p.push(n[i].toFixed());
+ }
+ this.lastControl = {};
+ return p;
+ },
+ _curveToA: function(segment){
+ var p = [];
+ var n = segment.args;
+ var l = n.length;
+ for(var i = 0; i < l; i += 6){
+ p.push(" c");
+ this._addArgs(p, n, i, i + 6);
+ }
+ this.lastControl = {x: n[l - 4], y: n[l - 3], type: "C"};
+ return p;
+ },
+ _curveToR: function(segment, last){
+ var p = [];
+ var n = segment.args;
+ var l = n.length;
+ for(var i = 0; i < l; i += 6){
+ p.push(" v");
+ this._addArgs(p, n, i, i + 6);
+ this.lastControl = {x: last.x + n[i + 2], y: last.y + n[i + 3]};
+ last.x += n[i + 4];
+ last.y += n[i + 5];
+ }
+ this.lastControl.type = "C";
+ return p;
+ },
+ _smoothCurveToA: function(segment, last){
+ var p = [];
+ var n = segment.args;
+ var l = n.length;
+ for(var i = 0; i < l; i += 4){
+ p.push(" c");
+ if(this.lastControl.type == "C"){
+ this._addArgs(p, [
+ 2 * last.x - this.lastControl.x,
+ 2 * last.y - this.lastControl.y
+ ]);
+ }else{
+ this._addArgs(p, [last.x, last.y]);
+ }
+ this._addArgs(p, n, i, i + 4);
+ }
+ this.lastControl = {x: n[l - 4], y: n[l - 3], type: "C"};
+ return p;
+ },
+ _smoothCurveToR: function(segment, last){
+ var p = [];
+ var n = segment.args;
+ var l = n.length;
+ for(var i = 0; i < l; i += 4){
+ p.push(" v");
+ if(this.lastControl.type == "C"){
+ this._addArgs(p, [
+ last.x - this.lastControl.x,
+ last.y - this.lastControl.y
+ ]);
+ }else{
+ this._addArgs(p, [0, 0]);
+ }
+ this._addArgs(p, n, i, i + 4);
+ this.lastControl = {x: last.x + n[i], y: last.y + n[i + 1]};
+ last.x += n[i + 2];
+ last.y += n[i + 3];
+ }
+ this.lastControl.type = "C";
+ return p;
+ },
+ _qCurveToA: function(segment){
+ var p = [];
+ var n = segment.args;
+ var l = n.length;
+ for(var i = 0; i < l; i += 4){
+ p.push(" qb");
+ this._addArgs(p, n, i, i + 4);
+ }
+ this.lastControl = {x: n[l - 4], y: n[l - 3], type: "Q"};
+ return p;
+ },
+ _qCurveToR: function(segment, last){
+ var p = [];
+ var n = segment.args;
+ var l = n.length;
+ for(var i = 0; i < l; i += 4){
+ p.push(" qb");
+ this._addArgsAdjusted(p, last, n, i, i + 4);
+ this.lastControl = {x: last.x + n[i], y: last.y + n[i + 1]};
+ last.x += n[i + 2];
+ last.y += n[i + 3];
+ }
+ this.lastControl.type = "Q";
+ return p;
+ },
+ _qSmoothCurveToA: function(segment, last){
+ var p = [];
+ var n = segment.args;
+ var l = n.length;
+ for(var i = 0; i < l; i += 2){
+ p.push(" qb");
+ if(this.lastControl.type == "Q"){
+ this._addArgs(p, [
+ this.lastControl.x = 2 * last.x - this.lastControl.x,
+ this.lastControl.y = 2 * last.y - this.lastControl.y
+ ]);
+ }else{
+ this._addArgs(p, [
+ this.lastControl.x = last.x,
+ this.lastControl.y = last.y
+ ]);
+ }
+ this._addArgs(p, n, i, i + 2);
+ }
+ this.lastControl.type = "Q";
+ return p;
+ },
+ _qSmoothCurveToR: function(segment, last){
+ var p = [];
+ var n = segment.args;
+ var l = n.length;
+ for(var i = 0; i < l; i += 2){
+ p.push(" qb");
+ if(this.lastControl.type == "Q"){
+ this._addArgs(p, [
+ this.lastControl.x = 2 * last.x - this.lastControl.x,
+ this.lastControl.y = 2 * last.y - this.lastControl.y
+ ]);
+ }else{
+ this._addArgs(p, [
+ this.lastControl.x = last.x,
+ this.lastControl.y = last.y
+ ]);
+ }
+ this._addArgsAdjusted(p, last, n, i, i + 2);
+ }
+ this.lastControl.type = "Q";
+ return p;
+ },
+ _PI4: Math.PI / 4,
+ _curvePI4: dojo.gfx.path._calcArc(Math.PI / 8),
+ _calcArcTo: function(path, last, rx, ry, xRotg, large, cw, x, y){
+ var m = dojo.gfx.matrix;
+ // calculate parameters
+ var xRot = -dojo.math.degToRad(xRotg);
+ var rx2 = rx * rx;
+ var ry2 = ry * ry;
+ var pa = m.multiplyPoint(
+ m.rotate(-xRot),
+ {x: (last.x - x) / 2, y: (last.y - y) / 2}
+ );
+ var pax2 = pa.x * pa.x;
+ var pay2 = pa.y * pa.y;
+ var c1 = Math.sqrt((rx2 * ry2 - rx2 * pay2 - ry2 * pax2) / (rx2 * pay2 + ry2 * pax2));
+ var ca = {
+ x: c1 * rx * pa.y / ry,
+ y: -c1 * ry * pa.x / rx
+ };
+ if(large == cw){
+ ca = {x: -ca.x, y: -ca.y};
+ }
+ // our center
+ var c = m.multiplyPoint(
+ [
+ m.translate(
+ (last.x + x) / 2,
+ (last.y + y) / 2
+ ),
+ m.rotate(xRot)
+ ],
+ ca
+ );
+ // start of our arc
+ var startAngle = Math.atan2(c.y - last.y, last.x - c.x) - xRot;
+ var endAngle = Math.atan2(c.y - y, x - c.x) - xRot;
+ // size of our arc in radians
+ var theta = cw ? startAngle - endAngle : endAngle - startAngle;
+ if(theta < 0){
+ theta += this._2PI;
+ }else if(theta > this._2PI){
+ theta = this._2PI;
+ }
+ // calculate our elliptic transformation
+ var elliptic_transform = m.normalize([
+ m.translate(c.x, c.y),
+ m.rotate(xRot),
+ m.scale(rx, ry)
+ ]);
+ // draw curve chunks
+ var alpha = this._PI4 / 2;
+ var curve = this._curvePI4;
+ var step = cw ? -alpha : alpha;
+ for(var angle = theta; angle > 0; angle -= this._PI4){
+ if(angle < this._PI4){
+ alpha = angle / 2;
+ curve = dojo.gfx.path._calcArc(alpha);
+ step = cw ? -alpha : alpha;
+ }
+ var c1, c2, e;
+ var M = m.normalize([elliptic_transform, m.rotate(startAngle + step)]);
+ if(cw){
+ c1 = m.multiplyPoint(M, curve.c2);
+ c2 = m.multiplyPoint(M, curve.c1);
+ e = m.multiplyPoint(M, curve.s );
+ }else{
+ c1 = m.multiplyPoint(M, curve.c1);
+ c2 = m.multiplyPoint(M, curve.c2);
+ e = m.multiplyPoint(M, curve.e );
+ }
+ // draw the curve
+ path.push(" c");
+ this._addArgs(path, [c1.x, c1.y, c2.x, c2.y, e.x, e.y]);
+ startAngle += 2 * step;
+ }
+ },
+ _arcTo: function(segment, last){
+ var p = [];
+ var n = segment.args;
+ var l = n.length;
+ var relative = segment.action == "a";
+ for(var i = 0; i < l; i += 7){
+ var x1 = n[i + 5];
+ var y1 = n[i + 6];
+ if(relative){
+ x1 += last.x;
+ y1 += last.y;
+ }
+ this._calcArcTo(
+ p, last, n[i], n[i + 1], n[i + 2],
+ n[i + 3] ? 1 : 0, n[i + 4] ? 1 : 0,
+ x1, y1
+ );
+ last = {x: x1, y: y1};
+ }
+ this.lastControl = {};
+ return p;
+ },
+ _closePath: function(){
+ this.lastControl = {};
+ return ["x"];
+ }
+});
+dojo.gfx.Path.nodeType = "shape";
+
+
+dojo.gfx._creators = {
+ createRect: function(rect){
+ return this.createObject(dojo.gfx.Rect, rect);
+ },
+ createEllipse: function(ellipse){
+ return this.createObject(dojo.gfx.Ellipse, ellipse);
+ },
+ createCircle: function(circle){
+ return this.createObject(dojo.gfx.Circle, circle);
+ },
+ createLine: function(line){
+ return this.createObject(dojo.gfx.Line, line, true);
+ },
+ createPolyline: function(points){
+ return this.createObject(dojo.gfx.Polyline, points, true);
+ },
+ createPath: function(path){
+ return this.createObject(dojo.gfx.Path, path, true);
+ },
+ createGroup: function(path){
+ return this.createObject(dojo.gfx.Group, null, true);
+ },
+ createImage: function(image){
+ if(!this.rawNode) return null;
+ var shape = new dojo.gfx.Image();
+ var node = document.createElement('div');
+ node.style.position = "relative";
+ node.style.width = this.rawNode.style.width;
+ node.style.height = this.rawNode.style.height;
+ node.style.filter = "progid:DXImageTransform.Microsoft.Matrix(M11=1, M12=0, M21=0, M22=1, Dx=0, Dy=0)";
+ var img = document.createElement('img');
+ node.appendChild(img);
+ shape.setRawNode(node);
+ this.rawNode.appendChild(node);
+ shape.setShape(image);
+ this.add(shape);
+ return shape;
+ },
+ createObject: function(shapeType, rawShape, overrideSize) {
+ if(!this.rawNode) return null;
+ var shape = new shapeType();
+ var node = document.createElement('v:' + shapeType.nodeType);
+ shape.setRawNode(node);
+ this.rawNode.appendChild(node);
+ if(overrideSize) this._overrideSize(node);
+ shape.setShape(rawShape);
+ this.add(shape);
+ return shape;
+ },
+ _overrideSize: function(node){
+ node.style.width = this.rawNode.style.width;
+ node.style.height = this.rawNode.style.height;
+ node.coordsize = parseFloat(node.style.width) + " " + parseFloat(node.style.height);
+ }
+};
+
+dojo.lang.extend(dojo.gfx.Group, dojo.gfx._creators);
+dojo.lang.extend(dojo.gfx.Surface, dojo.gfx._creators);
+
+delete dojo.gfx._creators;
+
+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 = (node.style.width == node.style.height)
+ ? new dojo.gfx.Circle()
+ : new dojo.gfx.Ellipse();
+ break;
+ case dojo.gfx.Path.nodeType:
+ switch(node.getAttribute("dojoGfxType")){
+ case "line":
+ s = new dojo.gfx.Line();
+ break;
+ case "polyline":
+ s = new dojo.gfx.Polyline();
+ break;
+ case "path":
+ s = new dojo.gfx.Path();
+ break;
+ }
+ 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(width, height){
+ if(!this.rawNode) return this;
+ this.rawNode.style.width = width;
+ this.rawNode.style.height = height;
+ this.rawNode.coordsize = width + " " + height;
+ return this;
+ },
+ getDimensions: function(){
+ return this.rawNode ? { width: this.rawNode.style.width, height: this.rawNode.style.height } : null;
+ },
+ // group control
+ add: function(shape){
+ var oldParent = shape.getParent();
+ if(this != oldParent){
+ this.rawNode.appendChild(shape.rawNode);
+ if(oldParent){
+ oldParent.remove(shape, true);
+ }
+ shape._setParent(this, null);
+ }
+ return this;
+ },
+ remove: function(shape, silently){
+ if(this == shape.getParent()){
+ if(this.rawNode == shape.rawNode.parentNode){
+ this.rawNode.removeChild(shape.rawNode);
+ }
+ shape._setParent(null, null);
+ }
+ return this;
+ }
+});
+
+dojo.gfx.createSurface = function(parentNode, width, height){
+ var s = new dojo.gfx.Surface();
+ s.rawNode = document.createElement("v:group");
+ s.rawNode.style.width = width ? width : "100%";
+ s.rawNode.style.height = height ? height : "100%";
+ s.rawNode.coordsize = (width && height)
+ ? (parseFloat(width) + " " + parseFloat(height))
+ : "100% 100%";
+ s.rawNode.coordorigin = "0 0";
+ dojo.byId(parentNode).appendChild(s.rawNode);
+ return s;
+};
+
+dojo.gfx.attachSurface = function(node){
+ var s = new dojo.gfx.Surface();
+ s.rawNode = node;
+ return s;
+};
Propchange: struts/struts2/trunk/core/src/main/resources/org/apache/struts2/static/dojo/src/gfx/vml.js
------------------------------------------------------------------------------
svn:eol-style = native
Modified: struts/struts2/trunk/core/src/main/resources/org/apache/struts2/static/dojo/src/graphics/Colorspace.js
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/resources/org/apache/struts2/static/dojo/src/graphics/Colorspace.js?view=diff&rev=474551&r1=474550&r2=474551
==============================================================================
--- struts/struts2/trunk/core/src/main/resources/org/apache/struts2/static/dojo/src/graphics/Colorspace.js (original)
+++ struts/struts2/trunk/core/src/main/resources/org/apache/struts2/static/dojo/src/graphics/Colorspace.js Mon Nov 13 14:54:45 2006
@@ -1,5 +1,5 @@
/*
- Copyright (c) 2004-2005, The Dojo Foundation
+ Copyright (c) 2004-2006, The Dojo Foundation
All Rights Reserved.
Licensed under the Academic Free License version 2.1 or above OR the
@@ -9,936 +9,7 @@
*/
dojo.provide("dojo.graphics.Colorspace");
+dojo.require("dojo.gfx.Colorspace");
-dojo.require("dojo.lang");
-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.graphics.Colorspace =function(){
-
- 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.graphics.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.graphics.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.graphics.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.graphics.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 = {};
-
- p.name = this.RGBWorkingSpace;
- p.gamma = m[0];
- p.wp = m[1];
-
- p.xr = m[2];
- p.yr = m[3];
- p.Yr = m[4];
-
- p.xg = m[5];
- p.yg = m[6];
- p.Yg = m[7];
-
- p.xb = m[8];
- p.yb = m[9];
- p.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.graphics.Colorspace.prototype.epsilon = function(){
-
- return this.useApproxCIELabMapping ? 0.008856 : 216 / 24289;
-}
-
-dojo.graphics.Colorspace.prototype.kappa = function(){
-
- return this.useApproxCIELabMapping ? 903.3 : 24389 / 27;
-}
-
-dojo.graphics.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.graphics.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.graphics.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.graphics.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.graphics.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.graphics.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.graphics.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.graphics.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.graphics.Colorspace.prototype.chromaticAdaptation = function(col, src_w, dst_w){
-
- col = this.munge('XYZ', [col]);
-
- //
- // gather white point data for the source and dest
- //
-
- 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;
-
-
- //
- // get a transformation matricies
- //
-
- 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");
- }
-
-
- //
- // calculate the cone response domains
- //
-
- 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);
-
-
- //
- // construct the centre matrix
- //
-
- 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]]
- ];
-
-
- //
- // caclulate 'm'
- //
-
- var m = dojo.math.matrix.multiply( dojo.math.matrix.multiply( ma, centre ), mai );
-
-
- //
- // construct source color matrix
- //
-
- var dst = dojo.math.matrix.multiply( [[ col.X, col.Y, col.Z ]], m );
-
- return dst[0];
-}
-
-//////////////////////////////////////////////////////////////////////////////////////////////////////
-
-dojo.graphics.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.graphics.Colorspace.prototype.getXYZ_RGB_Matrix = function(){
-
- var m = this.getRGB_XYZ_Matrix();
-
- return dojo.math.matrix.inverse(m);
-}
-
-dojo.graphics.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.graphics.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.graphics.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.graphics.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.graphics.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.graphics.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.graphics.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.graphics.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.graphics.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.graphics.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.graphics.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.graphics.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.graphics.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
- R = src.V;
- G = src.V;
- 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.graphics.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.graphics.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];
-}
+dojo.deprecated("dojo.graphics.Colorspace: use dojo.gfx.Colorspace instead.", "0.5");
+dojo.graphics.Colorspace = dojo.gfx.Colorspace;
Modified: struts/struts2/trunk/core/src/main/resources/org/apache/struts2/static/dojo/src/graphics/__package__.js
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/resources/org/apache/struts2/static/dojo/src/graphics/__package__.js?view=diff&rev=474551&r1=474550&r2=474551
==============================================================================
--- struts/struts2/trunk/core/src/main/resources/org/apache/struts2/static/dojo/src/graphics/__package__.js (original)
+++ struts/struts2/trunk/core/src/main/resources/org/apache/struts2/static/dojo/src/graphics/__package__.js Mon Nov 13 14:54:45 2006
@@ -1,5 +1,5 @@
/*
- Copyright (c) 2004-2005, The Dojo Foundation
+ Copyright (c) 2004-2006, The Dojo Foundation
All Rights Reserved.
Licensed under the Academic Free License version 2.1 or above OR the
@@ -8,7 +8,5 @@
http://dojotoolkit.org/community/licensing.shtml
*/
-dojo.hostenv.conditionalLoadModule({
- browser: ["dojo.graphics.htmlEffects"]
-});
-dojo.hostenv.moduleLoaded("dojo.graphics.*");
+// By default... don't pull in anything? (todo: figure out what should be in list)
+dojo.provide("dojo.graphics.*");