Changeset 51

Timestamp:

28/07/06 14:42:51 (2 years ago)

Author:

al

Message:

made evaluateLimits check options.xAxis and options.yAxis on evaluate()

Files:

• plotkit/trunk/PlotKit/Layout.js (modified) (2 diffs)
• plotkit/trunk/PlotKit/PlotKit_Packed.js (modified) (3 diffs)

plotkit/trunk/PlotKit/Layout.js

@@ -284 +284 @@
-        this.maxxval = listMax(map(parseFloat, map(itemgetter(0), all)));
-    }
+    else {
+        this.minxval = this.options.xAxis[0];
+        this.maxxval = this.options.xAxis[1];
+        this.xscale = this.maxval - this.minxval;
+    }
-    
-    if (isNil(this.options.yAxis)) {
@@ -293 +298 @@
-        this.maxyval = listMax(map(parseFloat, map(itemgetter(1), all)));
-    }
+    else {
+        this.minyval = this.options.yAxis[0];
+        this.maxyval = this.options.yAxis[1];
+        this.yscale = this.maxyval - this.minyval;
+    }
+
-};
-

plotkit/trunk/PlotKit/PlotKit_Packed.js

@@ -423 +423 @@
-}
-this.maxxval=_77(map(parseFloat,map(_74(0),all)));
+}else{
+this.minxval=this.options.xAxis[0];
+this.maxxval=this.options.xAxis[1];
+this.xscale=this.maxval-this.minxval;
-}
-if(_78(this.options.yAxis)){
@@ -431 +435 @@
-}
-this.maxyval=_77(map(parseFloat,map(_74(1),all)));
+}else{
+this.minyval=this.options.yAxis[0];
+this.maxyval=this.options.yAxis[1];
+this.yscale=this.maxyval-this.minyval;
-}
-};
@@ -615 +623 @@
-this.xticks=new Array();
-for(var i=0;i<=_132.length;i++){
-_132[i]>=(_134)*_133
+(_132[i]-this.minxval)>=(_134*_133)
-var pos=this.xscale*(_132[i]-this.minxval);
-if((pos>1)||(pos<0)){