Changeset 57

Timestamp:

29/08/06 21:05:59 (2 years ago)

Author:

al

Message:

Added optional argument to addDatasetFromTable to extract labels from the columns. Inspired by Attiks in http://projects.liquidx.net/js/wiki/addDatasetFromTableWithLabels

Files:

• plotkit/trunk/PlotKit/Layout.js (modified) (2 diffs)
• plotkit/trunk/PlotKit/PlotKit_Packed.js (modified) (51 diffs)
• plotkit/trunk/doc/PlotKit.Layout.html (modified) (1 diff)
• plotkit/trunk/doc/PlotKit.Layout.txt (modified) (1 diff)

plotkit/trunk/PlotKit/Layout.js

@@ -125 +125 @@
-};
-
-
+,  lcol
-        var isNil = MochiKit.Base.isUndefinedOrNull;
-        var scrapeText = MochiKit.DOM.scrapeText;
@@ -134 +134 @@
-        if (isNil(ycol))
-                ycol = 1;
+        if (isNil(lcol))
+            lcol = -1;
-        
-    var rows = tableElement.tBodies[0].rows;
-    var data = new Array();
+    var labels = new Array();
+    
-    if (!isNil(rows)) {
-        for (var i = 0; i < rows.length; i++) {
-            data.push([parseFloat(strip(scrapeText(rows[i].cells[xcol]))),
-                       parseFloat(strip(scrapeText(rows[i].cells[ycol])))]);
+            if (lcol >= 0){
+               labels.push({v: parseFloat(strip(scrapeText(rows[i].cells[xcol]))),
+                            label:  strip(scrapeText(rows[i].cells[lcol]))});
+            }
-        }
-        this.addDataset(name, data);
+        if (lcol >= 0) {
+            this.options.xTicks = labels;
+        }
-        return true;
-    }

plotkit/trunk/PlotKit/PlotKit_Packed.js

@@ -304 +304 @@
-delete this.datasets[_46];
-};
-
-2
-3
-4
-2
+,_52
+3
+4
+5
+3
-_50=0;
-}
-2
+3
-_51=1;
-}
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-return true;
-}
@@ -361 +371 @@
-this._regenerateHitTestCache();
-}
-0
-1
-2
-3
-1
-1[i]>_60
-2=_61
-3=_61
+2
+3
+4
+5
+3
+3[i]>_62
+4=_63
+5=_63
-break;
-}
-}
-2
-4=this.hitTestCache.x2maxy[_62
-5=this.hitTestCache.x2maxy[_63
-6
-7=(_65-_64)/(_63-_62
-68=_64+_67*(_60-_62
-68>=_66
-0,yval:_66,xafter:_63,yafter:_65,xbefore:_62,ybefore:_64,yprojected:_68
+4
+6=this.hitTestCache.x2maxy[_64
+7=this.hitTestCache.x2maxy[_65
+8
+9=(_67-_66)/(_65-_64
+70=_66+_69*(_62-_64
+70>=_68
+2,yval:_68,xafter:_65,yafter:_67,xbefore:_64,ybefore:_66,yprojected:_70
-return obj;
-}
@@ -385 +395 @@
-}else{
-if(this.style=="pie"){
-69
-69
+71
+71
-return null;
-}
-0
+2
-for(var i=0;i<this.slices.length;i++){
-1
-1.startAngle<_70&&_71.endAngle>=_70
-1
+3
+3.startAngle<_72&&_73.endAngle>=_72
+3
-}
-}
@@ -409 +419 @@
-PlotKit.Layout.prototype._evaluateLimits=function(){
-var map=PlotKit.Base.map;
-3
-4
-5
-6
-7
-78
-5(map(_74(1),_73
-78
+5
+6
+7
+8
+9
+80
+7(map(_76(1),_75
+80
-if(this.options.xOriginIsZero){
-this.minxval=0;
-}else{
-6(map(parseFloat,map(_74
-
-7(map(parseFloat,map(_74
+8(map(parseFloat,map(_76
+
+9(map(parseFloat,map(_76
-}else{
-this.minxval=this.options.xAxis[0];
@@ -428 +438 @@
-this.xscale=this.maxval-this.minxval;
-}
-78
+80
-if(this.options.yOriginIsZero){
-this.minyval=0;
-}else{
-6(map(parseFloat,map(_74
-
-7(map(parseFloat,map(_74
+8(map(parseFloat,map(_76
+
+9(map(parseFloat,map(_76
-}else{
-this.minyval=this.options.yAxis[0];
@@ -442 +452 @@
-};
-PlotKit.Layout.prototype._evaluateScales=function(){
-0
+2
-this.xrange=this.maxxval-this.minxval;
-if(this.xrange==0){
@@ -457 +467 @@
-};
-PlotKit.Layout.prototype._uniqueXValues=function(){
-1
+3
-var map=PlotKit.Base.map;
-2
-3
-4
-5=map(parseFloat,map(_83(0),_81(map(_83(1),_84
-5
-2(_85
+4
+5
+6
+7=map(parseFloat,map(_85(0),_83(map(_85(1),_86
+7
+4(_87
-};
-PlotKit.Layout.prototype._evaluateBarCharts=function(){
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-var _92=0;
-
-
+
+
+
+
-this.xscale=1;
-89
-0
-1=_90/_87
-2
+91
+2
+3=_92/_89
+4
-}else{
-if(this.xrange==1){
@@ -491 +501 @@
-this.xscale=1/3;
-}else{
-88
-
-
-0=_88
-1=_90/_87
-2=_88
-
-88
+90
+
+
+2=_90
+3=_92/_89
+4=_90
+
+90
-this.bars=new Array();
-var i=0;
-3
-4=this.datasets[_93
-4
+5
+6=this.datasets[_95
+6
-continue;
-}
-4
-6=_94
-7={x:((parseFloat(_96[0])-this.minxval)*this.xscale)+(i*_91)+_92,y:1-((parseFloat(_96[1])-this.minyval)*this.yscale),w:_91,h:((parseFloat(_96[1])-this.minyval)*this.yscale),xval:parseFloat(_96[0]),yval:parseFloat(_96[1]),name:_93
-7.x>=0)&&(_97.x<=1)&&(_97.y>=0)&&(_97
-7
+6
+8=_96
+9={x:((parseFloat(_98[0])-this.minxval)*this.xscale)+(i*_93)+_94,y:1-((parseFloat(_98[1])-this.minyval)*this.yscale),w:_93,h:((parseFloat(_98[1])-this.minyval)*this.yscale),xval:parseFloat(_98[0]),yval:parseFloat(_98[1]),name:_95
+9.x>=0)&&(_99.x<=1)&&(_99.y>=0)&&(_99
+9
-}
-}
@@ -517 +527 @@
-};
-PlotKit.Layout.prototype._evaluateHorizBarCharts=function(){
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-var _104=0;
-
-
+
+
+
+
-this.xscale=1;
-1
-2
-3=_102/_99
-4
-
-0
-2=_100
-3=_102/_99
-4=_100
-
-0
+3
+4
+5=_104/_101
+6
+
+2
+4=_102
+5=_104/_101
+6=_102
+
+2
-this.bars=new Array();
-var i=0;
-5
-6=this.datasets[_105
-6
+7
+8=this.datasets[_107
+8
-continue;
-}
-6
-6
-3)+_104,x:0,h:_103,w:((parseFloat(item[1])-this.minyval)*this.yscale),xval:parseFloat(item[0]),yval:parseFloat(item[1]),name:_105
+8
+8
+5)+_106,x:0,h:_105,w:((parseFloat(item[1])-this.minyval)*this.yscale),xval:parseFloat(item[0]),yval:parseFloat(item[1]),name:_107
-if(rect.y<=0){
-rect.y=0;
@@ -565 +575 @@
-};
-PlotKit.Layout.prototype._evaluateLineCharts=function(){
-09
-0=_109
+11
+2=_111
-this.points=new Array();
-var i=0;
-1
-2=this.datasets[_111
-2
+3
+4=this.datasets[_113
+4
-continue;
-}
-2
+4
-return compare(parseFloat(a[0]),parseFloat(b[0]));
-});
-2
-2
-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
-5
-
-5
-5
-
-5.x>=0)&&(_115
-5
+4
+4
+7={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:_113
+7
+7
+
+7
+7
+
+7.x>=0)&&(_117
+7
-}
-}
@@ -594 +604 @@
-};
-PlotKit.Layout.prototype._evaluatePieCharts=function(){
-6
+8
-var sum=MochiKit.Iter.sum;
-18
-19=_116
-0=_116
-1=sum(map(_118(1),_120
+20
+21=_118
+2=_118
+3=sum(map(_120(1),_122
-this.slices=new Array();
-2
-0
-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
-0
-6
-
-2+=_123
+4
+2
+5=_122[i][1]/_123
+6=_124
+7=(_124+_125
+8={fraction:_125,xval:_122[i][0],yval:_122[i][1],startAngle:_126,endAngle:_127
+2
+8
+
+4+=_125
-}
-};
-PlotKit.Layout.prototype._evaluateLineTicksForXAxis=function(){
-7
+9
-if(this.options.xTicks){
-this.xticks=new Array();
-28
-0
-7(_130
-0
+30
+2
+9(_132
+2
-}
-var pos=this.xscale*(tick.v-this.minxval);
-if((pos>=0)&&(pos<=1)){
-0
-
-
-28
+2
+
+
+30
-}else{
-if(this.options.xNumberOfTicks){
-2
-3
-4
+4
+5
+6
-this.xticks=new Array();
-2
-2[i]-this.minxval)>=(_134*_133
-2
+4
+4[i]-this.minxval)>=(_136*_135
+4
-if((pos>1)||(pos<0)){
-continue;
-}
-2
-4
-
-4
+4
+6
+
+6
-break;
-}
@@ -651 +661 @@
-};
-PlotKit.Layout.prototype._evaluateLineTicksForYAxis=function(){
-5
+7
-if(this.options.yTicks){
-this.yticks=new Array();
-6
-7
-5(_137
-7
+8
+9
+7(_139
+9
-}
-var pos=1-(this.yscale*(tick.v-this.minyval));
-if((pos>=0)&&(pos<=1)){
-7
-
-
-6
+9
+
+
+8
-}else{
-if(this.options.yNumberOfTicks){
-this.yticks=new Array();
-38
+40
-var prec=this.options.yTickPrecision;
-0=_138
+2=_140
-for(var i=0;i<=this.options.yNumberOfTicks;i++){
-0
+2
-var pos=1-((yval-this.minyval)*this.yscale);
-if((pos>1)||(pos<0)){
@@ -688 +698 @@
-PlotKit.Layout.prototype._evaluateBarTicks=function(){
-this._evaluateLineTicks();
-2
+4
-return [tick[0]+(this.minxdelta*this.xscale)/2,tick[1]];
-};
-2
+4
-if(this.options.barOrientation=="horizontal"){
-3
+5
-this.xticks=this.yticks;
-3
-4
+5
+6
-return [1-tick[0],tick[1]];
-};
-4
+6
-}
-};
-PlotKit.Layout.prototype._evaluatePieTicks=function(){
-5
-6
+7
+8
-this.xticks=new Array();
-if(this.options.xTicks){
-7
+9
-for(var i=0;i<this.slices.length;i++){
-7
+9
-}
-for(var i=0;i<this.options.xTicks.length;i++){
-var tick=this.options.xTicks[i];
-48=_147
-49
-48
-5(_149
-49
-
-49+=" ("+_146(_148
-49
+50=_149
+51
+50
+7(_151
+51
+
+51+=" ("+_148(_150
+51
-}
-}
-}else{
-for(var i=0;i<this.slices.length;i++){
-48
-49=_148.xval+" ("+_146(_148
-48.xval,_149
+50
+51=_150.xval+" ("+_148(_150
+50.xval,_151
-}
-}
@@ -735 +745 @@
-this.hitTestCache.xlookup=new Array();
-this.hitTestCache.x2maxy=new Array();
-0
-1
+2
+3
-var map=MochiKit.Base.map;
-2
-2
-3=this.datasets[_152
-3
-3
-3
+4
+4
+5=this.datasets[_154
+5
+5
+5
-if(this.hitTestCache.xlookup[xval]){
-2
-
-2
+4
+
+4
-}
-}
-}
-for(var x in this.hitTestCache.xlookup){
-5
-0(map(_151(0),_155
+7
+2(map(_153(0),_157
-}
-};
@@ -786 +796 @@
-return this.__repr__();
-};
-6,_157,_158
+8,_159,_160
-if(arguments.length>0){
-6,_157,_158
-
-
-59,_160,_161
-2
-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
-1?_161
-0
-59
+8,_159,_160
+
+
+61,_162,_163
+4
+5
+5.whiteColor(),"padding":{left:30,right:30,top:5,bottom:10},"colorScheme":PlotKit.Base.palette(PlotKit.Base.baseColors()[0]),"strokeColor":_165.whiteColor(),"strokeColorTransform":"asStrokeColor","strokeWidth":0.5,"shouldFill":true,"shouldStroke":true,"drawXAxis":true,"drawYAxis":true,"axisLineColor":_165.blackColor(),"axisLineWidth":0.5,"axisTickSize":3,"axisLabelColor":_165
+3?_163
+2
+61
-this.container=this.element.parentNode;
-this.isIE=PlotKit.Base.excanvasSupported();
-2
+4
-this.IEDelay=0.5;
-this.maxTries=5;
@@ -809 +819 @@
-this.height=this.element.height;
-this.width=this.element.width;
-2
+4
-throw "CanvasRenderer() - passed canvas is not found";
-}
@@ -815 +825 @@
-throw "CanvasRenderer() - Canvas is not supported.";
-}
-2
+4
-throw "CanvasRenderer() - <canvas> needs to be enclosed in <div>";
-}
@@ -839 +849 @@
-this.renderDelay=null;
-}
-4
+6
-}
-catch(e){
@@ -868 +878 @@
-}
-};
-6
-7
-68
-69
-0
-1=_170
-1
-2=_170
-3=_169[i%_168
-7
-7.fillStyle=_173
+8
+9
+70
+71
+2
+3=_172
+3
+4=_172
+5=_171[i%_170
+9
+9.fillStyle=_175
-if(this.options.strokeColor){
-7
+9
-}else{
-if(this.options.strokeColorTransform){
-7.strokeStyle=_173
-
-
-7
-4
-2
-6(_167
-
-
-4
-7
+9.strokeStyle=_175
+
+
+9
+6
+4
+8(_169
+
+
+6
+9
-}
-};
-PlotKit.CanvasRenderer.prototype._renderBarChart=function(){
-var bind=MochiKit.Base.bind;
-6=function(_177
+8=function(_179
-var x=this.area.w*bar.x+this.area.x;
-var y=this.area.h*bar.y+this.area.y;
@@ -907 +917 @@
-}
-if(this.options.shouldFill){
-7
+9
-}
-if(this.options.shouldStroke){
-7
-
-
-6
+9
+
+
+8
-};
-PlotKit.CanvasRenderer.prototype._renderLineChart=function(){
-0
-1
-2
-3
-4=_183
+2
+3
+4
+5
+6=_185
-var bind=MochiKit.Base.bind;
-5
-4
-6=_183
-7=_182[i%_181
-88
-0
-0.fillStyle=_187
+7
+6
+8=_185
+9=_184[i%_183
+90
+2
+2.fillStyle=_189
-if(this.options.strokeColor){
-0
+2
-}else{
-if(this.options.strokeColorTransform){
-0.strokeStyle=_187[_188
-
-
-0
-89
+2.strokeStyle=_189[_190
+
+
+2
+91
-ctx.beginPath();
-ctx.moveTo(this.area.x,this.area.y+this.area.h);
-1=function(ctx_,_193
-3.name==_186
-3.x+this.area.x,this.area.h*_193
-
-
-5(_191
+3=function(ctx_,_195
+5.name==_188
+5.x+this.area.x,this.area.h*_195
+
+
+7(_193
-ctx.lineTo(this.area.w+this.area.x,this.area.h+this.area.y);
-ctx.lineTo(this.area.x,this.area.y+this.area.h);
@@ -951 +961 @@
-};
-if(this.options.shouldFill){
-89,this)(_180
-0
+91,this)(_182
+2
-}
-if(this.options.shouldStroke){
-89,this)(_180
-0
-
-0
+91,this)(_182
+2
+
+2
-}
-};
-PlotKit.CanvasRenderer.prototype._renderPieChart=function(){
-4
-5
-6
-7
-198
-199
+6
+7
+8
+9
+200
+201
-if(this.isIE){
-_197=parseInt(_197);
-_198=parseInt(_198);
-_199=parseInt(_199);
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-if(this.options.shouldFill){
-1
-4
+3
+6
-}
-if(this.options.shouldStroke){
-1
-4
+3
+6
-if(this.options.strokeColor){
-4
+6
-}else{
-if(this.options.strokeColorTransform){
-4.strokeStyle=_200
-
-
-4
-
-
-4
+6.strokeStyle=_202
+
+
+6
+
+
+6
-}
-};
@@ -1015 +1025 @@
-return;
-}
-2
-3
-2
-2
-2
+4
+5
+4
+4
+4
-if(this.options.drawYAxis){
-if(this.layout.yticks){
-4
+6
-if(typeof (tick)=="function"){
-return;
@@ -1028 +1038 @@
-var x=this.area.x;
-var y=this.area.y+tick[0]*this.area.h;
-2
-2
-2
-2
-2
-5=DIV(_203
-5
-5
-5
-5
-5
-5
-
-4
-
-2
-2
-2
-2
-2
+4
+4
+4
+4
+4
+7=DIV(_205
+7
+7
+7
+7
+7
+7
+
+6
+
+4
+4
+4
+4
+4
-}
-if(this.options.drawXAxis){
-if(this.layout.xticks){
-4
+6
-if(typeof (dataset)=="function"){
-return;
@@ -1057 +1067 @@
-var x=this.area.x+tick[0]*this.area.w;
-var y=this.area.y+this.area.h;
-2
-2
-2
-2
-2
-6=DIV(_203
-6
-6
-6
-6
-6
-6
-
-4
-
-2
-2
-2
-2
-2
-
-2
+4
+4
+4
+4
+4
+8=DIV(_205
+8
+8
+8
+8
+8
+8
+
+6
+
+4
+4
+4
+4
+4
+
+4
-};
-PlotKit.CanvasRenderer.prototype._renderPieAxis=function(){
@@ -1085 +1095 @@
-}
-if(this.layout.xticks){
-7
+9
-for(var i=0;i<this.layout.slices.length;i++){
-7
-
-08
-09
-0
-1
+9
+
+10
+11
+2
+3
-for(var i=0;i<this.layout.xticks.length;i++){
-2=_207
-2
+4=_209
+4
-continue;
-}
-3=(_212.startAngle+_212
-4=_213
-4
-4=_214
-
-4
-4=_214
-
-
-5=_208+Math.sin(_214)*(_210
-6=_209-Math.cos(_214)*(_210
-7={"position":"absolute","zIndex":11,"width":_211
-4
-7
-7
-7["left"]=_215
-7["top"]=(_216
-
-4>Math.PI*0.5)&&(_214
-7
-7
-7["left"]=_215
-7["top"]=_216
-
-4>Math.PI)&&(_214
-7
-7
-7["left"]=(_215-_211
-7["top"]=_216
-
-7
-7
-7["left"]=(_215-_211
-7["top"]=(_216
-
-
-
-18=DIV({"style":_217
-18
-18
+5=(_214.startAngle+_214
+6=_215
+6
+6=_216
+
+6
+6=_216
+
+
+7=_210+Math.sin(_216)*(_212
+8=_211-Math.cos(_216)*(_212
+9={"position":"absolute","zIndex":11,"width":_213
+6
+9
+9
+9["left"]=_217
+9["top"]=(_218