From xap-commits-return-1224-apmail-incubator-xap-commits-archive=incubator.apache.org@incubator.apache.org Wed Mar 14 20:39:04 2007 Return-Path: Delivered-To: apmail-incubator-xap-commits-archive@locus.apache.org Received: (qmail 1239 invoked from network); 14 Mar 2007 20:39:02 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 14 Mar 2007 20:39:02 -0000 Received: (qmail 62357 invoked by uid 500); 14 Mar 2007 20:39:10 -0000 Delivered-To: apmail-incubator-xap-commits-archive@incubator.apache.org Received: (qmail 62336 invoked by uid 500); 14 Mar 2007 20:39:10 -0000 Mailing-List: contact xap-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: xap-dev@incubator.apache.org Delivered-To: mailing list xap-commits@incubator.apache.org Received: (qmail 62318 invoked by uid 99); 14 Mar 2007 20:39:09 -0000 Received: from herse.apache.org (HELO herse.apache.org) (140.211.11.133) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 14 Mar 2007 13:39:09 -0700 X-ASF-Spam-Status: No, hits=-99.5 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 14 Mar 2007 13:38:51 -0700 Received: by eris.apache.org (Postfix, from userid 65534) id 87D791A9875; Wed, 14 Mar 2007 13:38:04 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r518313 [13/43] - in /incubator/xap/trunk/codebase/src/dojo: ./ src/ src/animation/ src/cal/ src/charting/ src/charting/svg/ src/charting/vml/ src/collections/ src/crypto/ src/data/ src/data/core/ src/data/old/ src/data/old/format/ src/data... Date: Wed, 14 Mar 2007 20:37:27 -0000 To: xap-commits@incubator.apache.org From: mturyn@apache.org X-Mailer: svnmailer-1.1.0 Message-Id: <20070314203804.87D791A9875@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Added: incubator/xap/trunk/codebase/src/dojo/src/flash/flash6/DojoExternalInterface.as URL: http://svn.apache.org/viewvc/incubator/xap/trunk/codebase/src/dojo/src/flash/flash6/DojoExternalInterface.as?view=auto&rev=518313 ============================================================================== --- incubator/xap/trunk/codebase/src/dojo/src/flash/flash6/DojoExternalInterface.as (added) +++ incubator/xap/trunk/codebase/src/dojo/src/flash/flash6/DojoExternalInterface.as Wed Mar 14 13:36:44 2007 @@ -0,0 +1,215 @@ +/* + 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 +*/ + +/** + An implementation of Flash 8's ExternalInterface that works with Flash 6 + and which is source-compatible with Flash 8. + + @author Brad Neuberg, bkn3@columbia.edu +*/ + +class DojoExternalInterface{ + public static var available:Boolean; + public static var dojoPath = ""; + + public static var _fscommandReady = false; + public static var _callbacks = new Array(); + + public static function initialize(){ + //getURL("javascript:dojo.debug('FLASH:DojoExternalInterface initialize')"); + // FIXME: Set available variable by testing for capabilities + DojoExternalInterface.available = true; + + // extract the dojo base path + DojoExternalInterface.dojoPath = DojoExternalInterface.getDojoPath(); + //getURL("javascript:dojo.debug('FLASH:dojoPath="+DojoExternalInterface.dojoPath+"')"); + + // Sometimes, on IE, the fscommand infrastructure can take a few hundred + // milliseconds the first time a page loads. Set a timer to keep checking + // to make sure we can issue fscommands; otherwise, our calls to fscommand + // for setCallback() and loaded() will just "disappear" + _root.fscommandReady = false; + var fsChecker = function(){ + // issue a test fscommand + fscommand("fscommandReady"); + + // JavaScript should set _root.fscommandReady if it got the call + if(_root.fscommandReady == "true"){ + DojoExternalInterface._fscommandReady = true; + clearInterval(_root.fsTimer); + } + }; + _root.fsTimer = setInterval(fsChecker, 100); + } + + public static function addCallback(methodName:String, instance:Object, + method:Function) : Boolean{ + // A variable that indicates whether the call below succeeded + _root._succeeded = null; + + // Callbacks are registered with the JavaScript side as follows. + // On the Flash side, we maintain a lookup table that associates + // the methodName with the actual instance and method that are + // associated with this method. + // Using fscommand, we send over the action "addCallback", with the + // argument being the methodName to add, such as "foobar". + // The JavaScript takes these values and registers the existence of + // this callback point. + + // precede the method name with a _ character in case it starts + // with a number + _callbacks["_" + methodName] = {_instance: instance, _method: method}; + _callbacks[_callbacks.length] = methodName; + + // The API for ExternalInterface says we have to make sure the call + // succeeded; check to see if there is a value + // for _succeeded, which is set by the JavaScript side + if(_root._succeeded == null){ + return false; + }else{ + return true; + } + } + + public static function call(methodName:String, + resultsCallback:Function) : Void{ + // FIXME: support full JSON serialization + + // First, we pack up all of the arguments to this call and set them + // as Flash variables, which the JavaScript side will unpack using + // plugin.GetVariable(). We set the number of arguments as "_numArgs", + // and add each argument as a variable, such as "_1", "_2", etc., starting + // from 0. + // We then execute an fscommand with the action "call" and the + // argument being the method name. JavaScript takes the method name, + // retrieves the arguments using GetVariable, executes the method, + // and then places the return result in a Flash variable + // named "_returnResult". + _root._numArgs = arguments.length - 2; + for(var i = 2; i < arguments.length; i++){ + var argIndex = i - 2; + _root["_" + argIndex] = arguments[i]; + } + + _root._returnResult = undefined; + fscommand("call", methodName); + + // immediately return if the caller is not waiting for return results + if(resultsCallback == undefined || resultsCallback == null){ + return; + } + + // check at regular intervals for return results + var resultsChecker = function(){ + if((typeof _root._returnResult != "undefined")&& + (_root._returnResult != "undefined")){ + clearInterval(_root._callbackID); + resultsCallback.call(null, _root._returnResult); + } + }; + _root._callbackID = setInterval(resultsChecker, 100); + } + + /** + Called by Flash to indicate to JavaScript that we are ready to have + our Flash functions called. Calling loaded() + will fire the dojo.flash.loaded() event, so that JavaScript can know that + Flash has finished loading and adding its callbacks, and can begin to + interact with the Flash file. + */ + public static function loaded(){ + //getURL("javascript:dojo.debug('FLASH:loaded')"); + + // one more step: see if fscommands are ready to be executed; if not, + // set an interval that will keep running until fscommands are ready; + // make sure the gateway is loaded as well + var execLoaded = function(){ + if(DojoExternalInterface._fscommandReady == true){ + clearInterval(_root.loadedInterval); + + // initialize the small Flash file that helps gateway JS to Flash + // calls + DojoExternalInterface._initializeFlashRunner(); + } + }; + + if(_fscommandReady == true){ + execLoaded(); + }else{ + _root.loadedInterval = setInterval(execLoaded, 50); + } + } + + /** + Handles and executes a JavaScript to Flash method call. Used by + initializeFlashRunner. + */ + public static function _handleJSCall(){ + // get our parameters + var numArgs = parseInt(_root._numArgs); + var jsArgs = new Array(); + for(var i = 0; i < numArgs; i++){ + var currentValue = _root["_" + i]; + jsArgs.push(currentValue); + } + + // get our function name + var functionName = _root._functionName; + + // now get the actual instance and method object to execute on, + // using our lookup table that was constructed by calls to + // addCallback on initialization + var instance = _callbacks["_" + functionName]._instance; + var method = _callbacks["_" + functionName]._method; + + // execute it + var results = method.apply(instance, jsArgs); + + // return the results + _root._returnResult = results; + } + + /** Called by the flash6_gateway.swf to indicate that it is loaded. */ + public static function _gatewayReady(){ + for(var i = 0; i < _callbacks.length; i++){ + fscommand("addCallback", _callbacks[i]); + } + call("dojo.flash.loaded"); + } + + /** + When JavaScript wants to communicate with Flash it simply sets + the Flash variable "_execute" to true; this method creates the + internal Movie Clip, called the Flash Runner, that makes this + magic happen. + */ + public static function _initializeFlashRunner(){ + // figure out where our Flash movie is + var swfLoc = DojoExternalInterface.dojoPath + "flash6_gateway.swf"; + + // load our gateway helper file + _root.createEmptyMovieClip("_flashRunner", 5000); + _root._flashRunner._lockroot = true; + _root._flashRunner.loadMovie(swfLoc); + } + + private static function getDojoPath(){ + var url = _root._url; + var start = url.indexOf("baseRelativePath=") + "baseRelativePath=".length; + var path = url.substring(start); + var end = path.indexOf("&"); + if(end != -1){ + path = path.substring(0, end); + } + return path; + } +} + +// vim:ts=4:noet:tw=0: Added: incubator/xap/trunk/codebase/src/dojo/src/flash/flash6/flash6_gateway.fla URL: http://svn.apache.org/viewvc/incubator/xap/trunk/codebase/src/dojo/src/flash/flash6/flash6_gateway.fla?view=auto&rev=518313 ============================================================================== Binary file - no diff available. Propchange: incubator/xap/trunk/codebase/src/dojo/src/flash/flash6/flash6_gateway.fla ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: incubator/xap/trunk/codebase/src/dojo/src/flash/flash8/DojoExternalInterface.as URL: http://svn.apache.org/viewvc/incubator/xap/trunk/codebase/src/dojo/src/flash/flash8/DojoExternalInterface.as?view=auto&rev=518313 ============================================================================== --- incubator/xap/trunk/codebase/src/dojo/src/flash/flash8/DojoExternalInterface.as (added) +++ incubator/xap/trunk/codebase/src/dojo/src/flash/flash8/DojoExternalInterface.as Wed Mar 14 13:36:44 2007 @@ -0,0 +1,234 @@ +/* + 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 +*/ + +/** + A wrapper around Flash 8's ExternalInterface; DojoExternalInterface is needed so that we + can do a Flash 6 implementation of ExternalInterface, and be able + to support having a single codebase that uses DojoExternalInterface + across Flash versions rather than having two seperate source bases, + where one uses ExternalInterface and the other uses DojoExternalInterface. + + DojoExternalInterface class does a variety of optimizations to bypass ExternalInterface's + unbelievably bad performance so that we can have good performance + on Safari; see the blog post + http://codinginparadise.org/weblog/2006/02/how-to-speed-up-flash-8s.html + for details. + + @author Brad Neuberg, bkn3@columbia.edu +*/ +import flash.external.ExternalInterface; + +class DojoExternalInterface{ + public static var available:Boolean; + public static var dojoPath = ""; + + private static var flashMethods:Array = new Array(); + private static var numArgs:Number; + private static var argData:Array; + private static var resultData = null; + + public static function initialize(){ + // extract the dojo base path + DojoExternalInterface.dojoPath = DojoExternalInterface.getDojoPath(); + + // see if we need to do an express install + var install:ExpressInstall = new ExpressInstall(); + if(install.needsUpdate){ + install.init(); + } + + // register our callback functions + ExternalInterface.addCallback("startExec", DojoExternalInterface, startExec); + ExternalInterface.addCallback("setNumberArguments", DojoExternalInterface, + setNumberArguments); + ExternalInterface.addCallback("chunkArgumentData", DojoExternalInterface, + chunkArgumentData); + ExternalInterface.addCallback("exec", DojoExternalInterface, exec); + ExternalInterface.addCallback("getReturnLength", DojoExternalInterface, + getReturnLength); + ExternalInterface.addCallback("chunkReturnData", DojoExternalInterface, + chunkReturnData); + ExternalInterface.addCallback("endExec", DojoExternalInterface, endExec); + + // set whether communication is available + DojoExternalInterface.available = ExternalInterface.available; + DojoExternalInterface.call("loaded"); + } + + public static function addCallback(methodName:String, instance:Object, + method:Function) : Boolean{ + // register DojoExternalInterface methodName with it's instance + DojoExternalInterface.flashMethods[methodName] = instance; + + // tell JavaScript about DojoExternalInterface new method so we can create a proxy + ExternalInterface.call("dojo.flash.comm._addExternalInterfaceCallback", + methodName); + + return true; + } + + public static function call(methodName:String, + resultsCallback:Function) : Void{ + // we might have any number of optional arguments, so we have to + // pass them in dynamically; strip out the results callback + var parameters = new Array(); + for(var i = 0; i < arguments.length; i++){ + if(i != 1){ // skip the callback + parameters.push(arguments[i]); + } + } + + var results = ExternalInterface.call.apply(ExternalInterface, parameters); + + // immediately give the results back, since ExternalInterface is + // synchronous + if(resultsCallback != null && typeof resultsCallback != "undefined"){ + resultsCallback.call(null, results); + } + } + + /** + Called by Flash to indicate to JavaScript that we are ready to have + our Flash functions called. Calling loaded() + will fire the dojo.flash.loaded() event, so that JavaScript can know that + Flash has finished loading and adding its callbacks, and can begin to + interact with the Flash file. + */ + public static function loaded(){ + DojoExternalInterface.call("dojo.flash.loaded"); + } + + public static function startExec():Void{ + DojoExternalInterface.numArgs = null; + DojoExternalInterface.argData = null; + DojoExternalInterface.resultData = null; + } + + public static function setNumberArguments(numArgs):Void{ + DojoExternalInterface.numArgs = numArgs; + DojoExternalInterface.argData = new Array(DojoExternalInterface.numArgs); + } + + public static function chunkArgumentData(value, argIndex:Number):Void{ + //getURL("javascript:dojo.debug('FLASH: chunkArgumentData, value="+value+", argIndex="+argIndex+"')"); + var currentValue = DojoExternalInterface.argData[argIndex]; + if(currentValue == null || typeof currentValue == "undefined"){ + DojoExternalInterface.argData[argIndex] = value; + }else{ + DojoExternalInterface.argData[argIndex] += value; + } + } + + public static function exec(methodName):Void{ + // decode all of the arguments that were passed in + for(var i = 0; i < DojoExternalInterface.argData.length; i++){ + DojoExternalInterface.argData[i] = + DojoExternalInterface.decodeData(DojoExternalInterface.argData[i]); + } + + var instance = DojoExternalInterface.flashMethods[methodName]; + DojoExternalInterface.resultData = instance[methodName].apply( + instance, DojoExternalInterface.argData); + // encode the result data + DojoExternalInterface.resultData = + DojoExternalInterface.encodeData(DojoExternalInterface.resultData); + + //getURL("javascript:dojo.debug('FLASH: encoded result data="+DojoExternalInterface.resultData+"')"); + } + + public static function getReturnLength():Number{ + if(DojoExternalInterface.resultData == null || + typeof DojoExternalInterface.resultData == "undefined"){ + return 0; + } + var segments = Math.ceil(DojoExternalInterface.resultData.length / 1024); + return segments; + } + + public static function chunkReturnData(segment:Number):String{ + var numSegments = DojoExternalInterface.getReturnLength(); + var startCut = segment * 1024; + var endCut = segment * 1024 + 1024; + if(segment == (numSegments - 1)){ + endCut = segment * 1024 + DojoExternalInterface.resultData.length; + } + + var piece = DojoExternalInterface.resultData.substring(startCut, endCut); + + //getURL("javascript:dojo.debug('FLASH: chunking return piece="+piece+"')"); + + return piece; + } + + public static function endExec():Void{ + } + + private static function decodeData(data):String{ + // we have to use custom encodings for certain characters when passing + // them over; for example, passing a backslash over as //// from JavaScript + // to Flash doesn't work + data = DojoExternalInterface.replaceStr(data, "&custom_backslash;", "\\"); + + data = DojoExternalInterface.replaceStr(data, "\\\'", "\'"); + data = DojoExternalInterface.replaceStr(data, "\\\"", "\""); + + return data; + } + + private static function encodeData(data){ + //getURL("javascript:dojo.debug('inside flash, data before="+data+"')"); + + // double encode all entity values, or they will be mis-decoded + // by Flash when returned + data = DojoExternalInterface.replaceStr(data, "&", "&"); + + // certain XMLish characters break Flash's wire serialization for + // ExternalInterface; encode these into a custom encoding, rather than + // the standard entity encoding, because otherwise we won't be able to + // differentiate between our own encoding and any entity characters + // that are being used in the string itself + data = DojoExternalInterface.replaceStr(data, '<', '&custom_lt;'); + data = DojoExternalInterface.replaceStr(data, '>', '&custom_gt;'); + + // encode control characters and JavaScript delimiters + data = DojoExternalInterface.replaceStr(data, "\n", "\\n"); + data = DojoExternalInterface.replaceStr(data, "\r", "\\r"); + data = DojoExternalInterface.replaceStr(data, "\f", "\\f"); + data = DojoExternalInterface.replaceStr(data, "'", "\\'"); + data = DojoExternalInterface.replaceStr(data, '"', '\"'); + + //getURL("javascript:dojo.debug('inside flash, data after="+data+"')"); + return data; + } + + /** + Flash ActionScript has no String.replace method or support for + Regular Expressions! We roll our own very simple one. + */ + private static function replaceStr(inputStr:String, replaceThis:String, + withThis:String):String { + var splitStr = inputStr.split(replaceThis) + inputStr = splitStr.join(withThis) + return inputStr; + } + + private static function getDojoPath(){ + var url = _root._url; + var start = url.indexOf("baseRelativePath=") + "baseRelativePath=".length; + var path = url.substring(start); + var end = path.indexOf("&"); + if(end != -1){ + path = path.substring(0, end); + } + return path; + } +} + +// vim:ts=4:noet:tw=0: Added: incubator/xap/trunk/codebase/src/dojo/src/flash/flash8/ExpressInstall.as URL: http://svn.apache.org/viewvc/incubator/xap/trunk/codebase/src/dojo/src/flash/flash8/ExpressInstall.as?view=auto&rev=518313 ============================================================================== --- incubator/xap/trunk/codebase/src/dojo/src/flash/flash8/ExpressInstall.as (added) +++ incubator/xap/trunk/codebase/src/dojo/src/flash/flash8/ExpressInstall.as Wed Mar 14 13:36:44 2007 @@ -0,0 +1,81 @@ +/* + 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 +*/ + +/** + * Based on the expressinstall.as class created by Geoff Stearns as part + * of the FlashObject library. + * + * Use this file to invoke the Macromedia Flash Player Express Install functionality + * This file is intended for use with the FlashObject embed script. You can download FlashObject + * and this file at the following URL: http://blog.deconcept.com/flashobject/ + * + * Usage: + * var ExpressInstall = new ExpressInstall(); + * + * // test to see if install is needed: + * if (ExpressInstall.needsUpdate) { // returns true if update is needed + * ExpressInstall.init(); // starts the update + * } + * + * NOTE: Your Flash movie must be at least 214px by 137px in order to use ExpressInstall. + * + */ + +class ExpressInstall { + public var needsUpdate:Boolean; + private var updater:MovieClip; + private var hold:MovieClip; + + public function ExpressInstall(){ + // does the user need to update? + this.needsUpdate = (_root.MMplayerType == undefined) ? false : true; + } + + public function init():Void{ + this.loadUpdater(); + } + + public function loadUpdater():Void { + System.security.allowDomain("fpdownload.macromedia.com"); + + // hope that nothing is at a depth of 10000000, you can change this depth if needed, but you want + // it to be on top of your content if you have any stuff on the first frame + this.updater = _root.createEmptyMovieClip("expressInstallHolder", 10000000); + + // register the callback so we know if they cancel or there is an error + var _self = this; + this.updater.installStatus = _self.onInstallStatus; + this.hold = this.updater.createEmptyMovieClip("hold", 1); + + // can't use movieClipLoader because it has to work in 6.0.65 + this.updater.onEnterFrame = function():Void { + if(typeof this.hold.startUpdate == 'function'){ + _self.initUpdater(); + this.onEnterFrame = null; + } + } + + var cacheBuster:Number = Math.random(); + + this.hold.loadMovie("http://fpdownload.macromedia.com/pub/flashplayer/" + +"update/current/swf/autoUpdater.swf?"+ cacheBuster); + } + + private function initUpdater():Void{ + this.hold.redirectURL = _root.MMredirectURL; + this.hold.MMplayerType = _root.MMplayerType; + this.hold.MMdoctitle = _root.MMdoctitle; + this.hold.startUpdate(); + } + + public function onInstallStatus(msg):Void{ + getURL("javascript:dojo.flash.install._onInstallStatus('"+msg+"')"); + } +} Added: incubator/xap/trunk/codebase/src/dojo/src/gfx/Colorspace.js URL: http://svn.apache.org/viewvc/incubator/xap/trunk/codebase/src/dojo/src/gfx/Colorspace.js?view=auto&rev=518313 ============================================================================== --- incubator/xap/trunk/codebase/src/dojo/src/gfx/Colorspace.js (added) +++ incubator/xap/trunk/codebase/src/dojo/src/gfx/Colorspace.js Wed Mar 14 13:36:44 2007 @@ -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 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]; +} Added: incubator/xap/trunk/codebase/src/dojo/src/gfx/__package__.js URL: http://svn.apache.org/viewvc/incubator/xap/trunk/codebase/src/dojo/src/gfx/__package__.js?view=auto&rev=518313 ============================================================================== --- incubator/xap/trunk/codebase/src/dojo/src/gfx/__package__.js (added) +++ incubator/xap/trunk/codebase/src/dojo/src/gfx/__package__.js Wed Mar 14 13:36:44 2007 @@ -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.vml.capable, "dojo.gfx.vml"); + +dojo.provide("dojo.gfx.*"); \ No newline at end of file Added: incubator/xap/trunk/codebase/src/dojo/src/gfx/color.js URL: http://svn.apache.org/viewvc/incubator/xap/trunk/codebase/src/dojo/src/gfx/color.js?view=auto&rev=518313 ============================================================================== --- incubator/xap/trunk/codebase/src/dojo/src/gfx/color.js (added) +++ incubator/xap/trunk/codebase/src/dojo/src/gfx/color.js Wed Mar 14 13:36:44 2007 @@ -0,0 +1,183 @@ +/* + 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], + lime: [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(""); +} Added: incubator/xap/trunk/codebase/src/dojo/src/gfx/color/hsl.js URL: http://svn.apache.org/viewvc/incubator/xap/trunk/codebase/src/dojo/src/gfx/color/hsl.js?view=auto&rev=518313 ============================================================================== --- incubator/xap/trunk/codebase/src/dojo/src/gfx/color/hsl.js (added) +++ incubator/xap/trunk/codebase/src/dojo/src/gfx/color/hsl.js Wed Mar 14 13:36:44 2007 @@ -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]); +} Added: incubator/xap/trunk/codebase/src/dojo/src/gfx/color/hsv.js URL: http://svn.apache.org/viewvc/incubator/xap/trunk/codebase/src/dojo/src/gfx/color/hsv.js?view=auto&rev=518313 ============================================================================== --- incubator/xap/trunk/codebase/src/dojo/src/gfx/color/hsv.js (added) +++ incubator/xap/trunk/codebase/src/dojo/src/gfx/color/hsv.js Wed Mar 14 13:36:44 2007 @@ -0,0 +1,246 @@ +/* + 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()); + } + +}); + +// Default input range for RBG values is 0-255 +dojo.gfx.color.rgb2hsv = function(/* int || Array */r, /* int */g, /* int */b, /* Object? */options){ + // summary + // converts an RGB value set to HSV, ranges depending on optional options object. + // patch for options by Matthew Eernisse + if (dojo.lang.isArray(r)) { + if(g) { + options = g; + } + b = r[2] || 0; + g = r[1] || 0; + r = r[0] || 0; + } + + var opt = { + inputRange: (options && options.inputRange) ? options.inputRange : 255, + outputRange: (options && options.outputRange) ? options.outputRange : [255, 255, 255] + }; + + // 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; + + switch(opt.inputRange) { + // 0.0-1.0 + case 1: + r = (r * 255); + g = (g * 255); + b = (b * 255); + break; + // 0-100 + case 100: + r = (r / 100) * 255; + g = (g / 100) * 255; + b = (b / 100) * 255; + break; + // 0-255 + default: + // Do nothing + break; + } + + 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; + } + } + // Hue + switch (opt.outputRange[0]) { + case 360: + // Do nothing + break; + case 100: + h = (h / 360) * 100; + break; + case 1: + h = (h / 360); + break; + default: // 255 + h = (h / 360) * 255; + break; + } + // Saturation + switch (opt.outputRange[1]) { + case 100: + s = s * 100; + case 1: + // Do nothing + break; + default: // 255 + s = s * 255; + break; + } + // Value + switch (opt.outputRange[2]) { + case 100: + v = (v / 255) * 100; + break; + case 1: + v = (v / 255); + break; + default: // 255 + // Do nothing + break; + } + h = dojo.math.round(h); + s = dojo.math.round(s); + v = dojo.math.round(v); + return [h, s, v]; +} + +// Based on C Code in "Computer Graphics -- Principles and Practice," +// Foley et al, 1996, p. 593. +// +// H = 0 to 255 (corresponding to 0..360 degrees around hexcone) 0 for S = 0 +// S = 0 (shade of gray) to 255 (pure color) +// V = 0 (black) to 255 (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.round(r * 100); + g = Math.round(g * 100); + b = Math.round(b * 100); + break; + default: + r = Math.round(r * 255); + g = Math.round(g * 255); + b = Math.round(b * 255); + } + + return [r, g, b]; +} Added: incubator/xap/trunk/codebase/src/dojo/src/gfx/common.js URL: http://svn.apache.org/viewvc/incubator/xap/trunk/codebase/src/dojo/src/gfx/common.js?view=auto&rev=518313 ============================================================================== --- incubator/xap/trunk/codebase/src/dojo/src/gfx/common.js (added) +++ incubator/xap/trunk/codebase/src/dojo/src/gfx/common.js Wed Mar 14 13:36:44 2007 @@ -0,0 +1,118 @@ +/* + 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.require("dojo.dom"); + +dojo.lang.mixin(dojo.gfx, { + // summary: defines constants, prototypes, and utility functions + + // default shapes, which is used to fill in missing parameters + defaultPath: {type: "path", path: ""}, + 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: 200, ry: 100}, + 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: ""}, + + // default geometric attributes (a stroke, and fills) + 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*/ color){ + // summary: converts any legal color representation to normalized dojo.gfx.color.Color object + return (color instanceof dojo.gfx.color.Color) ? color : new dojo.gfx.color.Color(color); // dojo.gfx.color.Color + }, + normalizeParameters: function(existed, update){ + // summary: updates an existing object with properties from an "update" object + // existed: Object: the "target" object to be updated + // update: Object: the "update" object, whose properties will be used to update the existed object + if(update){ + var empty = {}; + for(var x in existed){ + if(x in update && !(x in empty)){ + existed[x] = update[x]; + } + } + } + return existed; // Object + }, + makeParameters: function(defaults, update){ + // summary: copies the original object, and all copied properties from the "update" object + // defaults: Object: the object to be cloned before updating + // update: Object: the object, which properties are to be cloned during updating + 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; // Object + }, + formatNumber: function(x, addSpace){ + // summary: converts a number to a string using a fixed notation + // x: Number: number to be converted + // addSpace: Boolean?: if it is true, add a space before a positive number + var val = x.toString(); + if(val.indexOf("e") >= 0){ + val = x.toFixed(4); + }else{ + var point = val.indexOf("."); + if(point >= 0 && val.length - point > 5){ + val = x.toFixed(4); + } + } + if(x < 0){ + return val; // String + } + return addSpace ? " " + val : val; // String + }, + + // a constant used to split a SVG/VML path into primitive components + pathRegExp: /([A-Za-z]+)|(\d+(\.\d+)?)|(\.\d+)|(-\d+(\.\d+)?)|(-\.\d+)/g +}); + +dojo.declare("dojo.gfx.Surface", null, { + // summary: a surface object to be used for drawings + + initializer: function(){ + // summary: a constructor + + // underlying node + this.rawNode = null; + }, + getEventSource: function(){ + // summary: returns a node, which can be used to attach event listeners + + return this.rawNode; // Node + } +}); + +dojo.declare("dojo.gfx.Point", null, { + // summary: a hypothetical 2D point to be used for drawings - {x, y} + // description: This object is defined for documentation purposes. + // You should use a naked object instead: {x: 1, y: 2}. +}); + +dojo.declare("dojo.gfx.Rectangle", null, { + // summary: a hypothetical rectangle - {x, y, width, height} + // description: This object is defined for documentation purposes. + // You should use a naked object instead: {x: 1, y: 2, width: 100, height: 200}. +}); Added: incubator/xap/trunk/codebase/src/dojo/src/gfx/matrix.js URL: http://svn.apache.org/viewvc/incubator/xap/trunk/codebase/src/dojo/src/gfx/matrix.js?view=auto&rev=518313 ============================================================================== --- incubator/xap/trunk/codebase/src/dojo/src/gfx/matrix.js (added) +++ incubator/xap/trunk/codebase/src/dojo/src/gfx/matrix.js Wed Mar 14 13:36:44 2007 @@ -0,0 +1,406 @@ +/* + 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){ + // summary: a 2D matrix object + // description: Normalizes a 2D matrix-like object. If arrays is passed, + // all objects of the array are normalized and multiplied sequentially. + // arg: Object + // a 2D matrix-like object, or an array of such objects + 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); + } + } +}; + +// the default (identity) matrix, which is used to fill in missing values +dojo.extend(dojo.gfx.matrix.Matrix2D, {xx: 1, xy: 0, yx: 0, yy: 1, dx: 0, dy: 0}); + +dojo.mixin(dojo.gfx.matrix, { + // summary: class constants, and methods of dojo.gfx.matrix + + // matrix constants + + // identity: dojo.gfx.matrix.Matrix2D + // an identity matrix constant: identity * (x, y) == (x, y) + identity: new dojo.gfx.matrix.Matrix2D(), + + // flipX: dojo.gfx.matrix.Matrix2D + // a matrix, which reflects points at x = 0 line: flipX * (x, y) == (-x, y) + flipX: new dojo.gfx.matrix.Matrix2D({xx: -1}), + + // flipY: dojo.gfx.matrix.Matrix2D + // a matrix, which reflects points at y = 0 line: flipY * (x, y) == (x, -y) + flipY: new dojo.gfx.matrix.Matrix2D({yy: -1}), + + // flipXY: dojo.gfx.matrix.Matrix2D + // a matrix, which reflects points at the origin of coordinates: flipXY * (x, y) == (-x, -y) + flipXY: new dojo.gfx.matrix.Matrix2D({xx: -1, yy: -1}), + + // matrix creators + + translate: function(a, b){ + // summary: forms a translation matrix + // description: The resulting matrix is used to translate (move) points by specified offsets. + // a: Number: an x coordinate value + // b: Number: a y coordinate value + if(arguments.length > 1){ + return new dojo.gfx.matrix.Matrix2D({dx: a, dy: b}); // dojo.gfx.matrix.Matrix2D + } + // branch + // a: dojo.gfx.Point: a point-like object, which specifies offsets for both dimensions + // b: null + return new dojo.gfx.matrix.Matrix2D({dx: a.x, dy: a.y}); // dojo.gfx.matrix.Matrix2D + }, + scale: function(a, b){ + // summary: forms a scaling matrix + // description: The resulting matrix is used to scale (magnify) points by specified offsets. + // a: Number: a scaling factor used for the x coordinate + // b: Number: a scaling factor used for the y coordinate + if(arguments.length > 1){ + return new dojo.gfx.matrix.Matrix2D({xx: a, yy: b}); // dojo.gfx.matrix.Matrix2D + } + if(typeof a == "number"){ + // branch + // a: Number: a uniform scaling factor used for the both coordinates + // b: null + return new dojo.gfx.matrix.Matrix2D({xx: a, yy: a}); // dojo.gfx.matrix.Matrix2D + } + // branch + // a: dojo.gfx.Point: a point-like object, which specifies scale factors for both dimensions + // b: null + return new dojo.gfx.matrix.Matrix2D({xx: a.x, yy: a.y}); // dojo.gfx.matrix.Matrix2D + }, + rotate: function(angle){ + // summary: forms a rotating matrix + // description: The resulting matrix is used to rotate points + // around the origin of coordinates (0, 0) by specified angle. + // angle: Number: an angle of rotation in radians (>0 for CCW) + var c = Math.cos(angle); + var s = Math.sin(angle); + return new dojo.gfx.matrix.Matrix2D({xx: c, xy: s, yx: -s, yy: c}); // dojo.gfx.matrix.Matrix2D + }, + rotateg: function(degree){ + // summary: forms a rotating matrix + // description: The resulting matrix is used to rotate points + // around the origin of coordinates (0, 0) by specified degree. + // See dojo.gfx.matrix.rotate() for comparison. + // degree: Number: an angle of rotation in degrees (>0 for CCW) + return dojo.gfx.matrix.rotate(dojo.math.degToRad(degree)); // dojo.gfx.matrix.Matrix2D + }, + skewX: function(angle) { + // summary: forms an x skewing matrix + // description: The resulting matrix is used to skew points in the x dimension + // around the origin of coordinates (0, 0) by specified angle. + // angle: Number: an skewing angle in radians + return new dojo.gfx.matrix.Matrix2D({xy: Math.tan(angle)}); // dojo.gfx.matrix.Matrix2D + }, + skewXg: function(degree){ + // summary: forms an x skewing matrix + // description: The resulting matrix is used to skew points in the x dimension + // around the origin of coordinates (0, 0) by specified degree. + // See dojo.gfx.matrix.skewX() for comparison. + // degree: Number: an skewing angle in degrees + return dojo.gfx.matrix.skewX(dojo.math.degToRad(degree)); // dojo.gfx.matrix.Matrix2D + }, + skewY: function(angle){ + // summary: forms a y skewing matrix + // description: The resulting matrix is used to skew points in the y dimension + // around the origin of coordinates (0, 0) by specified angle. + // angle: Number: an skewing angle in radians + return new dojo.gfx.matrix.Matrix2D({yx: -Math.tan(angle)}); // dojo.gfx.matrix.Matrix2D + }, + skewYg: function(degree){ + // summary: forms a y skewing matrix + // description: The resulting matrix is used to skew points in the y dimension + // around the origin of coordinates (0, 0) by specified degree. + // See dojo.gfx.matrix.skewY() for comparison. + // degree: Number: an skewing angle in degrees + return dojo.gfx.matrix.skewY(dojo.math.degToRad(degree)); // dojo.gfx.matrix.Matrix2D + }, + + // ensure matrix 2D conformance + normalize: function(matrix){ + // summary: converts an object to a matrix, if necessary + // description: Converts any 2D matrix-like object or an array of + // such objects to a valid dojo.gfx.matrix.Matrix2D object. + // matrix: Object: an object, which is converted to a matrix, if necessary + return (matrix instanceof dojo.gfx.matrix.Matrix2D) ? matrix : new dojo.gfx.matrix.Matrix2D(matrix); // dojo.gfx.matrix.Matrix2D + }, + + // common operations + + clone: function(matrix){ + // summary: creates a copy of a 2D matrix + // matrix: dojo.gfx.matrix.Matrix2D: a 2D matrix-like object to be cloned + 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; // dojo.gfx.matrix.Matrix2D + }, + invert: function(matrix){ + // summary: inverts a 2D matrix + // matrix: dojo.gfx.matrix.Matrix2D: a 2D matrix-like object to be inverted + var m = dojo.gfx.matrix.normalize(matrix); + var D = m.xx * m.yy - m.xy * m.yx; + var M = 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 + }); + return M; // dojo.gfx.matrix.Matrix2D + }, + _multiplyPoint: function(m, x, y){ + // summary: applies a matrix to a point + // matrix: dojo.gfx.matrix.Matrix2D: a 2D matrix object to be applied + // x: Number: an x coordinate of a point + // y: Number: a y coordinate of a point + return {x: m.xx * x + m.xy * y + m.dx, y: m.yx * x + m.yy * y + m.dy}; // dojo.gfx.Point + }, + multiplyPoint: function(matrix, /* Number||Point */ a, /* Number, optional */ b){ + // summary: applies a matrix to a point + // matrix: dojo.gfx.matrix.Matrix2D: a 2D matrix object to be applied + // a: Number: an x coordinate of a point + // b: Number: a y coordinate of a point + var m = dojo.gfx.matrix.normalize(matrix); + if(typeof a == "number" && typeof b == "number"){ + return dojo.gfx.matrix._multiplyPoint(m, a, b); // dojo.gfx.Point + } + // branch + // matrix: dojo.gfx.matrix.Matrix2D: a 2D matrix object to be applied + // a: dojo.gfx.Point: a point + // b: null + return dojo.gfx.matrix._multiplyPoint(m, a.x, a.y); // dojo.gfx.Point + }, + multiply: function(matrix){ + // summary: combines matrices by multiplying them sequentially in the given order + // matrix: dojo.gfx.matrix.Matrix2D...: a 2D matrix-like object, + // all subsequent arguments are matrix-like objects too + var m = dojo.gfx.matrix.normalize(matrix); + // combine matrices + for(var i = 1; i < arguments.length; ++i){ + var l = m; + var r = dojo.gfx.matrix.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; // dojo.gfx.matrix.Matrix2D + }, + + // high level operations + + _sandwich: function(m, x, y){ + // summary: applies a matrix at a centrtal point + // m: dojo.gfx.matrix.Matrix2D: a 2D matrix-like object, which is applied at a central point + // x: Number: an x component of the central point + // y: Number: a y component of the central point + return dojo.gfx.matrix.multiply(dojo.gfx.matrix.translate(x, y), m, dojo.gfx.matrix.translate(-x, -y)); // dojo.gfx.matrix.Matrix2D + }, + scaleAt: function(a, b, c, d){ + // summary: scales a picture using a specified point as a center of scaling + // description: Compare with dojo.gfx.matrix.scale(). + // a: Number: a scaling factor used for the x coordinate + // b: Number: a scaling factor used for the y coordinate + // c: Number: an x component of a central point + // d: Number: a y component of a central point + + // accepts several signatures: + // 1) uniform scale factor, Point + // 2) uniform scale factor, x, y + // 3) x scale, y scale, Point + // 4) x scale, y scale, x, y + + switch(arguments.length){ + case 4: + // a and b are scale factor components, c and d are components of a point + return dojo.gfx.matrix._sandwich(dojo.gfx.matrix.scale(a, b), c, d); // dojo.gfx.matrix.Matrix2D + case 3: + if(typeof c == "number"){ + // branch + // a: Number: a uniform scaling factor used for both coordinates + // b: Number: an x component of a central point + // c: Number: a y component of a central point + // d: null + return dojo.gfx.matrix._sandwich(dojo.gfx.matrix.scale(a), b, c); // dojo.gfx.matrix.Matrix2D + } + // branch + // a: Number: a scaling factor used for the x coordinate + // b: Number: a scaling factor used for the y coordinate + // c: dojo.gfx.Point: a central point + // d: null + return dojo.gfx.matrix._sandwich(dojo.gfx.matrix.scale(a, b), c.x, c.y); // dojo.gfx.matrix.Matrix2D + } + // branch + // a: Number: a uniform scaling factor used for both coordinates + // b: dojo.gfx.Point: a central point + // c: null + // d: null + return dojo.gfx.matrix._sandwich(dojo.gfx.matrix.scale(a), b.x, b.y); // dojo.gfx.matrix.Matrix2D + }, + rotateAt: function(angle, a, b){ + // summary: rotates a picture using a specified point as a center of rotation + // description: Compare with dojo.gfx.matrix.rotate(). + // angle: Number: an angle of rotation in radians (>0 for CCW) + // a: Number: an x component of a central point + // b: Number: a y component of a central point + + // accepts several signatures: + // 1) rotation angle in radians, Point + // 2) rotation angle in radians, x, y + + if(arguments.length > 2){ + return dojo.gfx.matrix._sandwich(dojo.gfx.matrix.rotate(angle), a, b); // dojo.gfx.matrix.Matrix2D + } + + // branch + // angle: Number: an angle of rotation in radians (>0 for CCW) + // a: dojo.gfx.Point: a central point + // b: null + return dojo.gfx.matrix._sandwich(dojo.gfx.matrix.rotate(angle), a.x, a.y); // dojo.gfx.matrix.Matrix2D + }, + rotategAt: function(degree, a, b){ + // summary: rotates a picture using a specified point as a center of rotation + // description: Compare with dojo.gfx.matrix.rotateg(). + // degree: Number: an angle of rotation in degrees (>0 for CCW) + // a: Number: an x component of a central point + // b: Number: a y component of a central point + + // accepts several signatures: + // 1) rotation angle in degrees, Point + // 2) rotation angle in degrees, x, y + + if(arguments.length > 2){ + return dojo.gfx.matrix._sandwich(dojo.gfx.matrix.rotateg(degree), a, b); // dojo.gfx.matrix.Matrix2D + } + + // branch + // degree: Number: an angle of rotation in degrees (>0 for CCW) + // a: dojo.gfx.Point: a central point + // b: null + return dojo.gfx.matrix._sandwich(dojo.gfx.matrix.rotateg(degree), a.x, a.y); // dojo.gfx.matrix.Matrix2D + }, + skewXAt: function(angle, a, b){ + // summary: skews a picture along the x axis using a specified point as a center of skewing + // description: Compare with dojo.gfx.matrix.skewX(). + // angle: Number: an skewing angle in radians + // a: Number: an x component of a central point + // b: Number: a y component of a central point + + // accepts several signatures: + // 1) skew angle in radians, Point + // 2) skew angle in radians, x, y + + if(arguments.length > 2){ + return dojo.gfx.matrix._sandwich(dojo.gfx.matrix.skewX(angle), a, b); // dojo.gfx.matrix.Matrix2D + } + + // branch + // angle: Number: an skewing angle in radians + // a: dojo.gfx.Point: a central point + // b: null + return dojo.gfx.matrix._sandwich(dojo.gfx.matrix.skewX(angle), a.x, a.y); // dojo.gfx.matrix.Matrix2D + }, + skewXgAt: function(degree, a, b){ + // summary: skews a picture along the x axis using a specified point as a center of skewing + // description: Compare with dojo.gfx.matrix.skewXg(). + // degree: Number: an skewing angle in degrees + // a: Number: an x component of a central point + // b: Number: a y component of a central point + + // accepts several signatures: + // 1) skew angle in degrees, Point + // 2) skew angle in degrees, x, y + + if(arguments.length > 2){ + return dojo.gfx.matrix._sandwich(dojo.gfx.matrix.skewXg(degree), a, b); // dojo.gfx.matrix.Matrix2D + } + + // branch + // degree: Number: an skewing angle in degrees + // a: dojo.gfx.Point: a central point + // b: null + return dojo.gfx.matrix._sandwich(dojo.gfx.matrix.skewXg(degree), a.x, a.y); // dojo.gfx.matrix.Matrix2D + }, + skewYAt: function(angle, a, b){ + // summary: skews a picture along the y axis using a specified point as a center of skewing + // description: Compare with dojo.gfx.matrix.skewY(). + // angle: Number: an skewing angle in radians + // a: Number: an x component of a central point + // b: Number: a y component of a central point + + // accepts several signatures: + // 1) skew angle in radians, Point + // 2) skew angle in radians, x, y + + if(arguments.length > 2){ + return dojo.gfx.matrix._sandwich(dojo.gfx.matrix.skewY(angle), a, b); // dojo.gfx.matrix.Matrix2D + } + + // branch + // angle: Number: an skewing angle in radians + // a: dojo.gfx.Point: a central point + // b: null + return dojo.gfx.matrix._sandwich(dojo.gfx.matrix.skewY(angle), a.x, a.y); // dojo.gfx.matrix.Matrix2D + }, + skewYgAt: function(/* Number */ degree, /* Number||Point */ a, /* Number, optional */ b){ + // summary: skews a picture along the y axis using a specified point as a center of skewing + // description: Compare with dojo.gfx.matrix.skewYg(). + // degree: Number: an skewing angle in degrees + // a: Number: an x component of a central point + // b: Number: a y component of a central point + + // accepts several signatures: + // 1) skew angle in degrees, Point + // 2) skew angle in degrees, x, y + + if(arguments.length > 2){ + return dojo.gfx.matrix._sandwich(dojo.gfx.matrix.skewYg(degree), a, b); // dojo.gfx.matrix.Matrix2D + } + + // branch + // degree: Number: an skewing angle in degrees + // a: dojo.gfx.Point: a central point + // b: null + return dojo.gfx.matrix._sandwich(dojo.gfx.matrix.skewYg(degree), a.x, a.y); // dojo.gfx.matrix.Matrix2D + } + + // TODO: rect-to-rect mapping, scale-to-fit (isotropic and anisotropic versions) + +});