Changeset 52

Timestamp:

28/07/06 18:04:23 (2 years ago)

Author:

al

Message:

Make sure xTicks do not exceed the bounds of the chart

Files:

• plotkit/trunk/PlotKit/Layout.js (modified) (3 diffs)
• plotkit/trunk/PlotKit/PlotKit_Packed.js (modified) (3 diffs)
• plotkit/trunk/tests/debug.html (modified) (1 diff)

plotkit/trunk/PlotKit/Layout.js

@@ -546 +546 @@
-                label = tick.v.toString();
-            var pos = this.xscale * (tick.v - this.minxval);
-
+
+
+
-        };
-        MochiKit.Iter.forEach(this.options.xTicks, bind(makeTicks, this));
@@ -582 +584 @@
-                label = tick.v.toString();
-            var pos = 1.0 - (this.yscale * (tick.v - this.minyval));
-< 0.0) || (pos > 1.0))
-return
-this.yticks.push([pos, label]);
+>= 0.0) && (pos <= 1.0)) {
+this.yticks.push([pos, label])
+}
-        };
-        MochiKit.Iter.forEach(this.options.yTicks, bind(makeTicks, this));
@@ -603 +605 @@
-            var yval = this.minyval + (i * roughSeparation);
-            var pos = 1.0 - ((yval - this.minyval) * this.yscale);
+            if ((pos > 1.0) || (pos < 0.0))
+                continue;
-            this.yticks.push([pos, MochiKit.Format.roundToFixed(yval, prec)]);
-        }

plotkit/trunk/PlotKit/PlotKit_Packed.js

@@ -613 +613 @@
-}
-var pos=this.xscale*(tick.v-this.minxval);
+if((pos>=0)&&(pos<=1)){
-this.xticks.push([pos,_130]);
+}
-};
-MochiKit.Iter.forEach(this.options.xTicks,bind(_128,this));
@@ -648 +650 @@
-}
-var pos=1-(this.yscale*(tick.v-this.minyval));
-
-
-
+
-this.yticks.push([pos,_137]);
+}
-};
-MochiKit.Iter.forEach(this.options.yTicks,bind(_136,this));
@@ -663 +664 @@
-var yval=this.minyval+(i*_140);
-var pos=1-((yval-this.minyval)*this.yscale);
+if((pos>1)||(pos<0)){
+continue;
+}
-this.yticks.push([pos,MochiKit.Format.roundToFixed(yval,prec)]);
-}

plotkit/trunk/tests/debug.html

@@ -31 +31 @@
-
-    function drawGraph() {
-
-
+
+
+
+
+
+
+
+
+
+
-        layout.evaluate();
+
-        var canvas = MochiKit.DOM.getElement("chart");
-        var plotter = new PlotKit.SweetCanvasRenderer(canvas, layout, options);