Changeset 32

Timestamp:

04/06/06 19:50:02 (2 years ago)

Author:

al

Message:

Prototype.js awareness. People everywhere rejoice\!

Files:

• plotkit/trunk/PlotKit/Base.js (modified) (5 diffs)
• plotkit/trunk/PlotKit/Canvas.js (modified) (3 diffs)
• plotkit/trunk/PlotKit/EasyPlot.js (modified) (5 diffs)
• plotkit/trunk/PlotKit/Layout.js (modified) (12 diffs)
• plotkit/trunk/PlotKit/PlotKit_Packed.js (modified) (47 diffs)
• plotkit/trunk/PlotKit/SweetCanvas.js (modified) (2 diffs)
• plotkit/trunk/doc/PlotKit.Base.html (modified) (1 diff)
• plotkit/trunk/doc/PlotKit.Base.txt (modified) (1 diff)
• plotkit/trunk/doc/PlotKit.html (modified) (1 diff)
• plotkit/trunk/doc/PlotKit.txt (modified) (1 diff)
• plotkit/trunk/tests/basic.js (modified) (2 diffs)
• plotkit/trunk/tests/svg.html (modified) (1 diff)

plotkit/trunk/PlotKit/Base.js

@@ -86 +86 @@
-}
-
+
+// Detect whether we are using prototype.js
+PlotKit.Base.usingPrototype =  function() {
+    return (typeof(Object.extend) == 'function');
+}
+
+
-MochiKit.Base.update(PlotKit.Base, {
-    roundInterval: function(range, intervals, precision) {
@@ -100 +107 @@
-            biggerList = m.concat(biggerList, lst[i]);
-        }
+        if (PlotKit.Base.usingPrototype()) {
+            delete biggerList.extend;
+            delete biggerList.from;
+            delete biggerList.inspect;
+        }
+        
-        return biggerList;
-    },
@@ -191 +204 @@
-    findPosX: function(obj) {
-        var curleft = 0;
-
-
-
-
-
-
-
+
+
+
+
-            }
+        }
-        else if (obj.x)
-            curleft += obj.x;
@@ -206 +217 @@
-   findPosY: function(obj) {
-       var curtop = 0;
-
-
-
-
-
-
-
+
+
+
+
-           }
+       }
-       else if (obj.y)
-           curtop += obj.y;
-       return curtop;
+   },
+   
+   isFuncLike: function(obj) {
+       return (typeof(obj) == 'function');
-   }
-});    
+
+//
+// Prototype.js aware (crippled) versions of map and items.
+//
+
+PlotKit.Base.map = function(fn, lst) {
+    if (PlotKit.Base.usingPrototype()) {
+        var rval = [];
+        for (var x in lst) {
+            if (typeof(lst[x]) == 'function') continue;
+            rval.push(fn(lst[x]));
+        }
+        return rval;
+    }
+    else {
+        return MochiKit.Base.map(fn, lst);
+    }
+};
+
+PlotKit.Base.items = function(lst) {
+    if (PlotKit.Base.usingPrototype()) {
+        var rval = [];
+         for (var x in lst) {
+             if (typeof(lst[x]) == 'function') continue;
+             rval.push([x, lst[x]]);
+         }
+         return rval;
+    }
+    else {
+        return MochiKit.Base.items(lst);
+    }
+};
+
+PlotKit.Base.keys = function(lst) {
+    if (PlotKit.Base.usingPrototype()) {
+        var rval = [];
+         for (var x in lst) {
+             if (typeof(lst[x]) == 'function') continue;
+             rval.push(x);
+         }
+         return rval;
+    }
+    else {
+        return MochiKit.Base.items(lst);
+    }
+};
+
+// 
+// colour schemes
+//
-
-PlotKit.Base.baseColors = function () {
@@ -317 +380 @@
-   "roundInterval",
-   "uniq",
+   "isFuncLike",
-   "excanvasSupported"
-];

plotkit/trunk/PlotKit/Canvas.js

@@ -256 +256 @@
-            ctx.moveTo(this.area.x, this.area.y + this.area.h);
-            var addPoint = function(ctx_, point) {
-
-
-
+    
+    
+    
-            };
-            MochiKit.Iter.forEach(this.layout.points, partial(addPoint, ctx), this);
@@ -370 +370 @@
-        if (this.layout.yticks) {
-            var drawTick = function(tick) {
+                if (typeof(tick) == "function") return;
-                var x = this.area.x;
-                var y = this.area.y + tick[0] * this.area.h;
@@ -400 +401 @@
-        if (this.layout.xticks) {
-            var drawTick = function(tick) {
+                if (typeof(dataset) == "function") return;
+                
-                var x = this.area.x + tick[0] * this.area.w;
-                var y = this.area.y + this.area.h;

plotkit/trunk/PlotKit/EasyPlot.js

@@ -5 +5 @@
-    User friendly wrapper around the common plotting functions.
-
-    
-    Copyright
-    ---------
@@ -62 +61 @@
-    }
-    
-
-    // load data sources
-    if (isArrayLike(datasources)) {
@@ -77 +75 @@
-        }
-    }
-
+
+
+
-
-    // setup canvas to render
@@ -98 +98 @@
-    }
-    
-this.deferredCount == 0
+(this.deferredCount == 0) && (this.layout.datasets.length > 0)
-        this.layout.evaluate();
-        this.renderer.clear();
@@ -121 +121 @@
-    this.deferredCount--;
-    
-this.deferredCount == 0
+(this.deferredCount == 0) && (this.layout.datasets.length > 0)
-        this.layout.evaluate();
-        this.renderer.clear();

plotkit/trunk/PlotKit/Layout.js

@@ -266 +266 @@
-PlotKit.Layout.prototype._evaluateLimits = function() {
-    // take all values from all datasets and find max and min
-Mochi
-Mochi
+Plot
+Plot
-    var itemgetter = MochiKit.Base.itemgetter;
-    var collapse = PlotKit.Base.collapse;
@@ -274 +274 @@
-    var isNil = MochiKit.Base.isUndefinedOrNull;
-
+
-    var all = collapse(map(itemgetter(1), items(this.datasets)));
-
-    if (isNil(this.options.xAxis)) {
-        if (this.options.xOriginIsZero)
@@ -292 +292 @@
-    this.maxxval = listMax(map(parseFloat, map(itemgetter(0), all)));
-    this.maxyval = listMax(map(parseFloat, map(itemgetter(1), all)));
+    
-};
-
@@ -312 +313 @@
-PlotKit.Layout.prototype._uniqueXValues = function() {
-    var collapse = PlotKit.Base.collapse;
-Mochi
+Plot
-    var uniq = PlotKit.Base.uniq;
-    var getter = MochiKit.Base.itemgetter;
-
+
+
-    var xvalues = map(parseFloat, map(getter(0), collapse(map(getter(1), items(this.datasets)))));
-    xvalues.sort(MochiKit.Base.compare);
@@ -323 +325 @@
-// Create the bars
-PlotKit.Layout.prototype._evaluateBarCharts = function() {
-
-
-
-
+
+
+
-
-    // work out how far separated values are
@@ -354 +355 @@
-        barMargin = xdelta * this.xscale * (1.0 - this.options.barWidthFillFraction)/2;
-    }
-
+
-    this.minxdelta = xdelta; // need this for tick positions
-
@@ -362 +363 @@
-    for (var setName in this.datasets) {
-        var dataset = this.datasets[setName];
+        if (PlotKit.Base.isFuncLike(dataset)) continue;
-        for (var j = 0; j < dataset.length; j++) {
-            var item = dataset[j];
@@ -381 +383 @@
-// Create the horizontal bars
-PlotKit.Layout.prototype._evaluateHorizBarCharts = function() {
-
-
-
-
+
+
+
-
-    // work out how far separated values are
@@ -422 +423 @@
-    for (var setName in this.datasets) {
-        var dataset = this.datasets[setName];
+        if (PlotKit.Base.isFuncLike(dataset)) continue;
-        for (var j = 0; j < dataset.length; j++) {
-            var item = dataset[j];
@@ -442 +444 @@
-// Create the line charts
-PlotKit.Layout.prototype._evaluateLineCharts = function() {
-
-
-
-
+
+
+
-
-    // add all the rects
@@ -452 +453 @@
-    for (var setName in this.datasets) {
-        var dataset = this.datasets[setName];
+        if (PlotKit.Base.isFuncLike(dataset)) continue;
-        dataset.sort(function(a, b) { return compare(parseFloat(a[0]), parseFloat(b[0])); });
-        for (var j = 0; j < dataset.length; j++) {
@@ -470 +472 @@
-// Create the pie charts
-PlotKit.Layout.prototype._evaluatePieCharts = function() {
-Mochi
+Plot
-    var sum = MochiKit.Iter.sum;
-    var getter = MochiKit.Base.itemgetter;
-
-key
+item
-
-    // we plot the y values of the first dataset

plotkit/trunk/PlotKit/PlotKit_Packed.js

@@ -49 +49 @@
-return this.__repr__();
-};
+PlotKit.Base.usingPrototype=function(){
+return (typeof (Object.extend)=="function");
+};
-MochiKit.Base.update(PlotKit.Base,{roundInterval:function(_1,_2,_3){
-var _4=MochiKit.Format.roundToFixed;
@@ -58 +61 @@
-for(var i=0;i<_6.length;i++){
-_8=m.concat(_8,_6[i]);
+}
+if(PlotKit.Base.usingPrototype()){
+delete _8.extend;
+delete _8.from;
+delete _8.inspect;
-}
-return _8;
@@ -144 +152 @@
-}
-return _33;
+},isFuncLike:function(obj){
+return (typeof (obj)=="function");
-}});
+PlotKit.Base.map=function(fn,lst){
+if(PlotKit.Base.usingPrototype()){
+var _36=[];
+for(var x in lst){
+if(typeof (lst[x])=="function"){
+continue;
+}
+_36.push(fn(lst[x]));
+}
+return _36;
+}else{
+return MochiKit.Base.map(fn,lst);
+}
+};
+PlotKit.Base.items=function(lst){
+if(PlotKit.Base.usingPrototype()){
+var _38=[];
+for(var x in lst){
+if(typeof (lst[x])=="function"){
+continue;
+}
+_38.push([x,lst[x]]);
+}
+return _38;
+}else{
+return MochiKit.Base.items(lst);
+}
+};
+PlotKit.Base.keys=function(lst){
+if(PlotKit.Base.usingPrototype()){
+var _39=[];
+for(var x in lst){
+if(typeof (lst[x])=="function"){
+continue;
+}
+_39.push(x);
+}
+return _39;
+}else{
+return MochiKit.Base.items(lst);
+}
+};
-PlotKit.Base.baseColors=function(){
-34
-34("#476fb2"),_34("#be2c2b"),_34("#85b730"),_34("#734a99"),_34("#26a1c5"),_34("#fb8707"),_34
+40
+40("#476fb2"),_40("#be2c2b"),_40("#85b730"),_40("#734a99"),_40("#26a1c5"),_40("#fb8707"),_40
-};
-PlotKit.Base.officeBaseStyle={"axisLineWidth":2,"axisLabelColor":Color.grayColor(),"axisLineColor":Color.whiteColor(),"padding":{top:5,bottom:10,left:30,right:30}};
@@ -179 +231 @@
-return r;
-}});
-
+isFuncLike","
-PlotKit.Base.EXPORT_OK=[];
-PlotKit.Base.__new__=function(){
@@ -208 +260 @@
-};
-PlotKit.Layout.valid_styles=["bar","line","pie","point"];
-36,_37
+42,_43
-this.options={"barWidthFillFraction":0.75,"barOrientation":"vertical","xOriginIsZero":true,"yOriginIsZero":true,"xAxis":null,"yAxis":null,"xTicks":null,"yTicks":null,"xNumberOfTicks":10,"yNumberOfTicks":5,"xTickPrecision":1,"yTickPrecision":3,"pieRadius":0.4};
-36
-37?_37
+42
+43?_43
-if(!MochiKit.Base.isUndefinedOrNull(this.options.xAxis)){
-this.minxval=this.options.xAxis[0];
@@ -241 +293 @@
-this.hitTestCache={x2maxy:null};
-};
-38,_39
-38]=_39
-
-0,_41
-0
-
-2,_43,_44,_45
-46
-47
-48
-46(_44
-44
-
-46(_45
-45
-
-49=_43
-0
-46(_49
-49
-0.push([parseFloat(_48(_47(_49[i].cells[_44]))),parseFloat(_48(_47(_49[i].cells[_45
-
-2,_50
+44,_45
+44]=_45
+
+6,_47
+6
+
+8,_49,_50,_51
+52
+53
+54
+52(_50
+50
+
+52(_51
+51
+
+55=_49
+6
+52(_55
+55
+6.push([parseFloat(_54(_53(_55[i].cells[_50]))),parseFloat(_54(_53(_55[i].cells[_51
+
+8,_56
-return true;
-}
@@ -304 +356 @@
-this._regenerateHitTestCache();
-}
-55
-56
-57
-58
-56
-56[i]>_55
-57=_56
-58=_56
+60
+61
+62
+63
+61
+61[i]>_60
+62=_61
+63=_61
-break;
-}
-}
-57
-59=this.hitTestCache.x2maxy[_57
-0=this.hitTestCache.x2maxy[_58
-1
-2=(_60-_59)/(_58-_57
-3=_59+_62*(_55-_57
-3>=_61
-55,yval:_61,xafter:_58,yafter:_60,xbefore:_57,ybefore:_59,yprojected:_63
+62
+64=this.hitTestCache.x2maxy[_62
+5=this.hitTestCache.x2maxy[_63
+6
+7=(_65-_64)/(_63-_62
+8=_64+_67*(_60-_62
+8>=_66
+60,yval:_66,xafter:_63,yafter:_65,xbefore:_62,ybefore:_64,yprojected:_68
-return obj;
-}
@@ -328 +380 @@
-}else{
-if(this.style=="pie"){
-4
-4
+9
+9
-return null;
-}
-65
+70
-for(var i=0;i<this.slices.length;i++){
-66
-66.startAngle<_65&&_66.endAngle>=_65
-66
+71
+71.startAngle<_70&&_71.endAngle>=_70
+71
-}
-}
@@ -351 +403 @@
-};
-PlotKit.Layout.prototype._evaluateLimits=function(){
-Mochi
-68=Mochi
-69
-0
-1
-2
-3
-0(map(_69(1),_68
-3
+Plot
+73=Plot
+74
+5
+6
+7
+8
+5(map(_74(1),_73
+8
-if(this.options.xOriginIsZero){
-this.minxval=0;
-}else{
-1(map(parseFloat,map(_69
-
-
-3
+6(map(parseFloat,map(_74
+
+
+8
-if(this.options.yOriginIsZero){
-this.minyval=0;
-}else{
-1(map(parseFloat,map(_69
-
-
-2(map(parseFloat,map(_69
-2(map(parseFloat,map(_69
+6(map(parseFloat,map(_74
+
+
+7(map(parseFloat,map(_74
+7(map(parseFloat,map(_74
-};
-PlotKit.Layout.prototype._evaluateScales=function(){
-75
+80
-this.xrange=this.maxxval-this.minxval;
-if(this.xrange==0){
@@ -392 +444 @@
-};
-PlotKit.Layout.prototype._uniqueXValues=function(){
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-};
-PlotKit.Layout.prototype._evaluateBarCharts=function(){
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-this.xscale=1;
-4
-85
-86=_85/_82
-87
-
-3
-85=_83
-86=_85/_82
-87=_83
-
-3
+9
+90
+91=_90/_87
+92
+
+8
+90=_88
+91=_90/_87
+92=_88
+
+8
-this.bars=new Array();
-var i=0;
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-}
-i++;
@@ -439 +494 @@
-};
-PlotKit.Layout.prototype._evaluateHorizBarCharts=function(){
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-this.xscale=1;
-97
-98
-99=_98/_95
-0
-
-96
-98=_96
-99=_98/_95
-0=_96
-
-96
+101
+102
+103=_102/_99
+4
+
+100
+102=_100
+103=_102/_99
+4=_100
+
+100
-this.bars=new Array();
-var i=0;
-
-
-
-
-
+
+
+
+
+
+
+
+
-this.bars.push(rect);
-}
@@ -477 +534 @@
-};
-PlotKit.Layout.prototype._evaluateLineCharts=function(){
-
-
-
+
+
-this.points=new Array();
-var i=0;
-
-
-
+
+
+
+
+
+
-return compare(parseFloat(a[0]),parseFloat(b[0]));
-});
-09
-09
-2={x:((parseFloat(item[0])-this.minxval)*this.xscale),y:1-((parseFloat(item[1])-this.minyval)*this.yscale),xval:parseFloat(item[0]),yval:parseFloat(item[1]),name:_108
-2
+12
+12
+5={x:((parseFloat(item[0])-this.minxval)*this.xscale),y:1-((parseFloat(item[1])-this.minyval)*this.yscale),xval:parseFloat(item[0]),yval:parseFloat(item[1]),name:_111
+5
-}
-i++;
@@ -496 +555 @@
-};
-PlotKit.Layout.prototype._evaluatePieCharts=function(){
-3=Mochi
+6=Plot
-var sum=MochiKit.Iter.sum;
-5
-6=keys
-17=_113
-18=sum(map(_115(1),_117
+8
+9=_116
+20=_116
+21=sum(map(_118(1),_120
-this.slices=new Array();
-19
-17
-0=_117[i][1]/_118
-1=_119
-2=(_119+_120
-3={fraction:_120,xval:_117[i][0],yval:_117[i][1],startAngle:_121,endAngle:_122
-3
-19+=_120
+22
+20
+3=_120[i][1]/_121
+4=_122
+5=(_122+_123
+6={fraction:_123,xval:_120[i][0],yval:_120[i][1],startAngle:_124,endAngle:_125
+6
+22+=_123
-}
-};
-PlotKit.Layout.prototype._evaluateLineTicksForXAxis=function(){
-4
+7
-if(this.options.xTicks){
-this.xticks=new Array();
-5
-27
-4(_127
-27
+8
+30
+7(_130
+30
-}
-var pos=this.xscale*(tick.v-this.minxval);
-27
-
-5
+30
+
+8
-}else{
-if(this.options.xNumberOfTicks){
-29
-0
-1
+32
+3
+4
-this.xticks=new Array();
-29
-29[i]>=(_131)*_130
-29
+32
+32[i]>=(_134)*_133
+32
-if((pos>1)||(pos<0)){
-return;
-}
-29
-1
-
-1
+32
+4
+
+4
-break;
-}
@@ -549 +608 @@
-};
-PlotKit.Layout.prototype._evaluateLineTicksForYAxis=function(){
-2
+5
-if(this.options.yTicks){
-this.yticks=new Array();
-3
-4
-2(_134
-4
+6
+7
+5(_137
+7
-}
-var pos=1-(this.yscale*(tick.v+this.minxval));
@@ -561 +620 @@
-return;
-}
-4
-
-3
+7
+
+6
-}else{
-if(this.options.yNumberOfTicks){
-this.yticks=new Array();
-5
+8
-var prec=this.options.yTickPrecision;
-37=_135
+40=_138
-for(var i=0;i<=this.options.yNumberOfTicks;i++){
-37
+40
-var pos=1-((yval-this.minyval)*this.yscale);
-this.yticks.push([pos,MochiKit.Format.roundToFixed(yval,1)]);
@@ -584 +643 @@
-PlotKit.Layout.prototype._evaluateBarTicks=function(){
-this._evaluateLineTicks();
-39
+42
-return [tick[0]+(this.minxdelta*this.xscale)/2,tick[1]];
-};
-39
+42
-if(this.options.barOrientation=="horizontal"){
-0
+3
-this.xticks=this.yticks;
-0
-1
+3
+4
-return [1-tick[0],tick[1]];
-};
-1
+4
-}
-};
-PlotKit.Layout.prototype._evaluatePieTicks=function(){
-2
-3
+5
+6
-this.xticks=new Array();
-if(this.options.xTicks){
-4
+7
-for(var i=0;i<this.slices.length;i++){
-4
+7
-}
-for(var i=0;i<this.options.xTicks.length;i++){
-var tick=this.options.xTicks[i];
-5=_144
-6
-5
-2(_146
-6
-
-6+=" ("+_143(_145
-6
+8=_147
+9
+8
+5(_149
+9
+
+9+=" ("+_146(_148
+9
-}
-}
-}else{
-for(var i=0;i<this.slices.length;i++){
-5
-6=_145.xval+" ("+_143(_145
-5.xval,_146
+8
+9=_148.xval+" ("+_146(_148
+8.xval,_149
-}
-}
@@ -631 +690 @@
-this.hitTestCache.xlookup=new Array();
-this.hitTestCache.x2maxy=new Array();
-47
-48
+50
+51
-var map=MochiKit.Base.map;
-49
-49
-0=this.datasets[_149
-0
-0
-0
+52
+52
+3=this.datasets[_152
+3
+3
+3
-if(this.hitTestCache.xlookup[xval]){
-49
-
-49
+52
+
+52
-}
-}
-}
-for(var x in this.hitTestCache.xlookup){
-2
-47(map(_148(0),_152
+5
+50(map(_151(0),_155
-}
-};
@@ -682 +741 @@
-return this.__repr__();
-};
-3,_154,_155
+6,_157,_158
-if(arguments.length>0){
-3,_154,_155
-
-
-6,_157,_158
-59
-0
-0.whiteColor(),"padding":{left:30,right:30,top:5,bottom:10},"colorScheme":PlotKit.Base.palette(PlotKit.Base.baseColors()[0]),"strokeColor":_160.whiteColor(),"strokeColorTransform":"asStrokeColor","strokeWidth":0.5,"shouldFill":true,"shouldStroke":true,"drawXAxis":true,"drawYAxis":true,"axisLineColor":_160.blackColor(),"axisLineWidth":0.5,"axisTickSize":3,"axisLabelColor":_160
-58?_158
-57
-57
-6
+6,_157,_158
+
+
+9,_160,_161
+62
+3
+3.whiteColor(),"padding":{left:30,right:30,top:5,bottom:10},"colorScheme":PlotKit.Base.palette(PlotKit.Base.baseColors()[0]),"strokeColor":_163.whiteColor(),"strokeColorTransform":"asStrokeColor","strokeWidth":0.5,"shouldFill":true,"shouldStroke":true,"drawXAxis":true,"drawYAxis":true,"axisLineColor":_163.blackColor(),"axisLineWidth":0.5,"axisTickSize":3,"axisLabelColor":_163
+61?_161
+60
+60
+9
-this.container=this.element.parentNode;
-this.isIE=PlotKit.Base.excanvasSupported();
-59
+62
-this.IEDelay=0.5;
-this.maxTries=5;
@@ -706 +765 @@
-this.height=this.element.height;
-this.width=this.element.width;
-59
+62
-throw "CanvasRenderer() - passed canvas is not found";
-}
@@ -712 +771 @@
-throw "CanvasRenderer() - Canvas is not supported.";
-}
-59
+62
-throw "CanvasRenderer() - <canvas> needs to be enclosed in <div>";
-}
@@ -736 +795 @@
-this.renderDelay=null;
-}
-1
+4
-}
-catch(e){
@@ -765 +824 @@
-}
-};
-3
-4
-5
-6
-67
-68=_167
-68
-69=_167
-0=_166[i%_165
-4
-4.fillStyle=_170
+6
+7
+8
+9
+70
+71=_170
+71
+72=_170
+3=_169[i%_168
+7
+7.fillStyle=_173
-if(this.options.strokeColor){
-4
+7
-}else{
-if(this.options.strokeColorTransform){
-4.strokeStyle=_170