Changeset 63

Timestamp:

02/05/07 09:44:55 (1 year ago)

Author:

al

Message:

Fix shouldFill respect, various bugs and documentation.

Files:

• plotkit/trunk/PlotKit/Canvas.js (modified) (1 diff)
• plotkit/trunk/PlotKit/Layout.js (modified) (1 diff)
• plotkit/trunk/PlotKit/PlotKit_Packed.js (modified) (1 diff)
• plotkit/trunk/doc/PlotKit.Base.html (modified) (2 diffs)
• plotkit/trunk/doc/PlotKit.Canvas.html (modified) (2 diffs)
• plotkit/trunk/doc/PlotKit.EasyPlot.html (modified) (2 diffs)
• plotkit/trunk/doc/PlotKit.Layout.html (modified) (2 diffs)
• plotkit/trunk/doc/PlotKit.QuickStart.html (modified) (2 diffs)
• plotkit/trunk/doc/PlotKit.Renderer.html (modified) (2 diffs)
• plotkit/trunk/doc/PlotKit.SVG.html (modified) (2 diffs)
• plotkit/trunk/doc/PlotKit.SweetCanvas.html (modified) (2 diffs)
• plotkit/trunk/doc/PlotKit.SweetSVG.html (modified) (2 diffs)
• plotkit/trunk/doc/PlotKit.html (modified) (3 diffs)
• plotkit/trunk/doc/PlotKit.txt (modified) (1 diff)
• plotkit/trunk/doc/SVGCanvasCompat.html (modified) (2 diffs)
• plotkit/trunk/doc/generate.py (modified) (2 diffs)
• plotkit/trunk/tests/basic.js (modified) (4 diffs)

plotkit/trunk/PlotKit/Canvas.js

@@ -260 +260 @@
-            };
-            MochiKit.Iter.forEach(this.layout.points, partial(addPoint, ctx), this);
+            if (this.options.shouldFill) {
-            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);
-            ctx.closePath();
+            }
-        };
-

plotkit/trunk/PlotKit/Layout.js

@@ -287 +287 @@
-
-    var all = collapse(map(itemgetter(1), items(this.datasets)));
-
+ // calc minxval, maxxval from dataset
-        if (this.options.xOriginIsZero)
-            this.minxval = 0;

plotkit/trunk/PlotKit/PlotKit_Packed.js

@@ -956 +956 @@
-};
-MochiKit.Iter.forEach(this.layout.points,_187(_193,ctx),this);
+if(this.options.shouldFill){
-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);
-ctx.closePath();
+}
-};
-if(this.options.shouldFill){

plotkit/trunk/doc/PlotKit.Base.html

@@ -5 +5 @@
-        <title>PlotKit.Base | liquidx</title>
-        <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-        <link href="http://media.liquidx.net/css/x_general.css" media="screen" rel="Stylesheet" type="text/css" />
-        <link href="http://media.liquidx.net/css/x_header.css" media="screen" rel="Stylesheet" type="text/css" />
-        <link href="http://media.liquidx.net/css/x_layout.css" media="screen" rel="Stylesheet" type="text/css" />       
-        <link href="http://media.liquidx.net/css/x_blocks.css" media="screen" rel="Stylesheet" type="text/css" />
-        <link rel="icon" href="/favicon.png" type="image/x-png">
-
-
-
-
+
+
+
+
+
+
-        
-<link href="doc.css" media="screen" rel="stylesheet" type="text/css" />
@@ -33 +31 @@
-                        <li class="tab" id="links"><a href="http://www.liquidx.net/links/" title="my bookmarks">linkblog</a></li>
-                        <li class="tab" id="stats"><a href="http://stats.liquidx.net/" title="stats for various parts of my website">stats</a></li>
-www.liquidx.net/status
+flists.com/life/liquidx
-                        <li class="tab" id="about"><a href="http://al.tse.id.au/" title="about alastair tse">aboutme</a></li>
-                        </ul>

plotkit/trunk/doc/PlotKit.Canvas.html

@@ -5 +5 @@
-        <title>PlotKit.Canvas | liquidx</title>
-        <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-        <link href="http://media.liquidx.net/css/x_general.css" media="screen" rel="Stylesheet" type="text/css" />
-        <link href="http://media.liquidx.net/css/x_header.css" media="screen" rel="Stylesheet" type="text/css" />
-        <link href="http://media.liquidx.net/css/x_layout.css" media="screen" rel="Stylesheet" type="text/css" />       
-        <link href="http://media.liquidx.net/css/x_blocks.css" media="screen" rel="Stylesheet" type="text/css" />
-        <link rel="icon" href="/favicon.png" type="image/x-png">
-
-
-
-
+
+
+
+
+
+
-        
-<link href="doc.css" media="screen" rel="stylesheet" type="text/css" />
@@ -33 +31 @@
-                        <li class="tab" id="links"><a href="http://www.liquidx.net/links/" title="my bookmarks">linkblog</a></li>
-                        <li class="tab" id="stats"><a href="http://stats.liquidx.net/" title="stats for various parts of my website">stats</a></li>
-www.liquidx.net/status
+flists.com/life/liquidx
-                        <li class="tab" id="about"><a href="http://al.tse.id.au/" title="about alastair tse">aboutme</a></li>
-                        </ul>

plotkit/trunk/doc/PlotKit.EasyPlot.html

@@ -5 +5 @@
-        <title>PlotKit.Canvas | liquidx</title>
-        <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-        <link href="http://media.liquidx.net/css/x_general.css" media="screen" rel="Stylesheet" type="text/css" />
-        <link href="http://media.liquidx.net/css/x_header.css" media="screen" rel="Stylesheet" type="text/css" />
-        <link href="http://media.liquidx.net/css/x_layout.css" media="screen" rel="Stylesheet" type="text/css" />       
-        <link href="http://media.liquidx.net/css/x_blocks.css" media="screen" rel="Stylesheet" type="text/css" />
-        <link rel="icon" href="/favicon.png" type="image/x-png">
-
-
-
-
+
+
+
+
+
+
-        
-<link href="doc.css" media="screen" rel="stylesheet" type="text/css" />
@@ -33 +31 @@
-                        <li class="tab" id="links"><a href="http://www.liquidx.net/links/" title="my bookmarks">linkblog</a></li>
-                        <li class="tab" id="stats"><a href="http://stats.liquidx.net/" title="stats for various parts of my website">stats</a></li>
-www.liquidx.net/status
+flists.com/life/liquidx
-                        <li class="tab" id="about"><a href="http://al.tse.id.au/" title="about alastair tse">aboutme</a></li>
-                        </ul>

plotkit/trunk/doc/PlotKit.Layout.html

@@ -5 +5 @@
-        <title>PlotKit.Layout | liquidx</title>
-        <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-        <link href="http://media.liquidx.net/css/x_general.css" media="screen" rel="Stylesheet" type="text/css" />
-        <link href="http://media.liquidx.net/css/x_header.css" media="screen" rel="Stylesheet" type="text/css" />
-        <link href="http://media.liquidx.net/css/x_layout.css" media="screen" rel="Stylesheet" type="text/css" />       
-        <link href="http://media.liquidx.net/css/x_blocks.css" media="screen" rel="Stylesheet" type="text/css" />
-        <link rel="icon" href="/favicon.png" type="image/x-png">
-
-
-
-
+
+
+
+
+
+
-        
-<link href="doc.css" media="screen" rel="stylesheet" type="text/css" />
@@ -33 +31 @@
-                        <li class="tab" id="links"><a href="http://www.liquidx.net/links/" title="my bookmarks">linkblog</a></li>
-                        <li class="tab" id="stats"><a href="http://stats.liquidx.net/" title="stats for various parts of my website">stats</a></li>
-www.liquidx.net/status
+flists.com/life/liquidx
-                        <li class="tab" id="about"><a href="http://al.tse.id.au/" title="about alastair tse">aboutme</a></li>
-                        </ul>

plotkit/trunk/doc/PlotKit.QuickStart.html

@@ -5 +5 @@
-        <title>PlotKit Quick Start | liquidx</title>
-        <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-        <link href="http://media.liquidx.net/css/x_general.css" media="screen" rel="Stylesheet" type="text/css" />
-        <link href="http://media.liquidx.net/css/x_header.css" media="screen" rel="Stylesheet" type="text/css" />
-        <link href="http://media.liquidx.net/css/x_layout.css" media="screen" rel="Stylesheet" type="text/css" />       
-        <link href="http://media.liquidx.net/css/x_blocks.css" media="screen" rel="Stylesheet" type="text/css" />
-        <link rel="icon" href="/favicon.png" type="image/x-png">
-
-
-
-
+
+
+
+
+
+
-        
-<script type="text/javascript" src="/js/mochi/MochiKit.js"></script>
@@ -38 +36 @@
-                        <li class="tab" id="links"><a href="http://www.liquidx.net/links/" title="my bookmarks">linkblog</a></li>
-                        <li class="tab" id="stats"><a href="http://stats.liquidx.net/" title="stats for various parts of my website">stats</a></li>
-www.liquidx.net/status
+flists.com/life/liquidx
-                        <li class="tab" id="about"><a href="http://al.tse.id.au/" title="about alastair tse">aboutme</a></li>
-                        </ul>

plotkit/trunk/doc/PlotKit.Renderer.html

@@ -5 +5 @@
-        <title>PlotKit.Renderer | liquidx</title>
-        <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-        <link href="http://media.liquidx.net/css/x_general.css" media="screen" rel="Stylesheet" type="text/css" />
-        <link href="http://media.liquidx.net/css/x_header.css" media="screen" rel="Stylesheet" type="text/css" />
-        <link href="http://media.liquidx.net/css/x_layout.css" media="screen" rel="Stylesheet" type="text/css" />       
-        <link href="http://media.liquidx.net/css/x_blocks.css" media="screen" rel="Stylesheet" type="text/css" />
-        <link rel="icon" href="/favicon.png" type="image/x-png">
-
-
-
-
+
+
+
+
+
+
-        
-<link href="doc.css" media="screen" rel="stylesheet" type="text/css" />
@@ -33 +31 @@
-                        <li class="tab" id="links"><a href="http://www.liquidx.net/links/" title="my bookmarks">linkblog</a></li>
-                        <li class="tab" id="stats"><a href="http://stats.liquidx.net/" title="stats for various parts of my website">stats</a></li>
-www.liquidx.net/status
+flists.com/life/liquidx
-                        <li class="tab" id="about"><a href="http://al.tse.id.au/" title="about alastair tse">aboutme</a></li>
-                        </ul>

plotkit/trunk/doc/PlotKit.SVG.html

@@ -5 +5 @@
-        <title>PlotKit.SVG | liquidx</title>
-        <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-        <link href="http://media.liquidx.net/css/x_general.css" media="screen" rel="Stylesheet" type="text/css" />
-        <link href="http://media.liquidx.net/css/x_header.css" media="screen" rel="Stylesheet" type="text/css" />
-        <link href="http://media.liquidx.net/css/x_layout.css" media="screen" rel="Stylesheet" type="text/css" />       
-        <link href="http://media.liquidx.net/css/x_blocks.css" media="screen" rel="Stylesheet" type="text/css" />
-        <link rel="icon" href="/favicon.png" type="image/x-png">
-
-
-
-
+
+
+
+
+
+
-        
-<link href="doc.css" media="screen" rel="stylesheet" type="text/css" />
@@ -33 +31 @@
-                        <li class="tab" id="links"><a href="http://www.liquidx.net/links/" title="my bookmarks">linkblog</a></li>
-                        <li class="tab" id="stats"><a href="http://stats.liquidx.net/" title="stats for various parts of my website">stats</a></li>
-www.liquidx.net/status
+flists.com/life/liquidx
-                        <li class="tab" id="about"><a href="http://al.tse.id.au/" title="about alastair tse">aboutme</a></li>
-                        </ul>

plotkit/trunk/doc/PlotKit.SweetCanvas.html

@@ -5 +5 @@
-        <title>PlotKit.SweetCanvas | liquidx</title>
-        <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-        <link href="http://media.liquidx.net/css/x_general.css" media="screen" rel="Stylesheet" type="text/css" />
-        <link href="http://media.liquidx.net/css/x_header.css" media="screen" rel="Stylesheet" type="text/css" />
-        <link href="http://media.liquidx.net/css/x_layout.css" media="screen" rel="Stylesheet" type="text/css" />       
-        <link href="http://media.liquidx.net/css/x_blocks.css" media="screen" rel="Stylesheet" type="text/css" />
-        <link rel="icon" href="/favicon.png" type="image/x-png">
-
-
-
-
+
+
+
+
+
+
-        
-<link href="doc.css" media="screen" rel="stylesheet" type="text/css" />
@@ -33 +31 @@
-                        <li class="tab" id="links"><a href="http://www.liquidx.net/links/" title="my bookmarks">linkblog</a></li>
-                        <li class="tab" id="stats"><a href="http://stats.liquidx.net/" title="stats for various parts of my website">stats</a></li>
-www.liquidx.net/status
+flists.com/life/liquidx
-                        <li class="tab" id="about"><a href="http://al.tse.id.au/" title="about alastair tse">aboutme</a></li>
-                        </ul>

plotkit/trunk/doc/PlotKit.SweetSVG.html

@@ -5 +5 @@
-        <title>PlotKit.SweetSVG | liquidx</title>
-        <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-        <link href="http://media.liquidx.net/css/x_general.css" media="screen" rel="Stylesheet" type="text/css" />
-        <link href="http://media.liquidx.net/css/x_header.css" media="screen" rel="Stylesheet" type="text/css" />
-        <link href="http://media.liquidx.net/css/x_layout.css" media="screen" rel="Stylesheet" type="text/css" />       
-        <link href="http://media.liquidx.net/css/x_blocks.css" media="screen" rel="Stylesheet" type="text/css" />
-        <link rel="icon" href="/favicon.png" type="image/x-png">
-
-
-
-
+
+
+
+
+
+
-        
-<link href="doc.css" media="screen" rel="stylesheet" type="text/css" />
@@ -33 +31 @@
-                        <li class="tab" id="links"><a href="http://www.liquidx.net/links/" title="my bookmarks">linkblog</a></li>
-                        <li class="tab" id="stats"><a href="http://stats.liquidx.net/" title="stats for various parts of my website">stats</a></li>
-www.liquidx.net/status
+flists.com/life/liquidx
-                        <li class="tab" id="about"><a href="http://al.tse.id.au/" title="about alastair tse">aboutme</a></li>
-                        </ul>

plotkit/trunk/doc/PlotKit.html

@@ -5 +5 @@
-        <title>PlotKit Documentation | liquidx</title>
-        <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-        <link href="http://media.liquidx.net/css/x_general.css" media="screen" rel="Stylesheet" type="text/css" />
-        <link href="http://media.liquidx.net/css/x_header.css" media="screen" rel="Stylesheet" type="text/css" />
-        <link href="http://media.liquidx.net/css/x_layout.css" media="screen" rel="Stylesheet" type="text/css" />       
-        <link href="http://media.liquidx.net/css/x_blocks.css" media="screen" rel="Stylesheet" type="text/css" />
-        <link rel="icon" href="/favicon.png" type="image/x-png">
-
-
-
-
+
+
+
+
+
+
-        
-<link href="doc.css" media="screen" rel="stylesheet" type="text/css" />
@@ -33 +31 @@
-                        <li class="tab" id="links"><a href="http://www.liquidx.net/links/" title="my bookmarks">linkblog</a></li>
-                        <li class="tab" id="stats"><a href="http://stats.liquidx.net/" title="stats for various parts of my website">stats</a></li>
-www.liquidx.net/status
+flists.com/life/liquidx
-                        <li class="tab" id="about"><a href="http://al.tse.id.au/" title="about alastair tse">aboutme</a></li>
-                        </ul>
@@ -243 +241 @@
- <li>
-     Updated excanvas.js version to fix possible printing issues.
+ </li>
+</ul>
+
+<h3>PlotKit SVN</h3>
+<ul>
+ <li>
+     Allow DOM elements into pie chart labels just like bar and line
+      charts. (Thanks to cho45).
+ </li>
+
+ <li>
+     Fix respecting shouldFill option for Canvas renderer. (Thanks to Dan Vanderkam)
- </li>
-</ul>

plotkit/trunk/doc/PlotKit.txt

@@ -108 +108 @@
-* Updated excanvas.js version to fix possible printing issues.
-
+###PlotKit SVN
+
+* Allow DOM elements into pie chart labels just like bar and line
+     charts. (Thanks to cho45).
+* Fix respecting shouldFill option for Canvas renderer. (Thanks to Dan Vanderkam)
+
-Road Map
-========

plotkit/trunk/doc/SVGCanvasCompat.html

@@ -5 +5 @@
-        <title>SVG and Canvas Support Status in Various Browsers. | liquidx</title>
-        <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-        <link href="http://media.liquidx.net/css/x_general.css" media="screen" rel="Stylesheet" type="text/css" />
-        <link href="http://media.liquidx.net/css/x_header.css" media="screen" rel="Stylesheet" type="text/css" />
-        <link href="http://media.liquidx.net/css/x_layout.css" media="screen" rel="Stylesheet" type="text/css" />       
-        <link href="http://media.liquidx.net/css/x_blocks.css" media="screen" rel="Stylesheet" type="text/css" />
-        <link rel="icon" href="/favicon.png" type="image/x-png">
-
-
-
-
+
+
+
+
+
+
-        
-<link href="doc.css" media="screen" rel="stylesheet" type="text/css" />
@@ -33 +31 @@
-                        <li class="tab" id="links"><a href="http://www.liquidx.net/links/" title="my bookmarks">linkblog</a></li>
-                        <li class="tab" id="stats"><a href="http://stats.liquidx.net/" title="stats for various parts of my website">stats</a></li>
-www.liquidx.net/status
+flists.com/life/liquidx
-                        <li class="tab" id="about"><a href="http://al.tse.id.au/" title="about alastair tse">aboutme</a></li>
-                        </ul>

plotkit/trunk/doc/generate.py

@@ -5 +5 @@
-import re
-sys.path.append('/home/al/sites')
+
-os.environ['DJANGO_SETTINGS_MODULE'] = '__main__'
-
@@ -13 +14 @@
-INSTALLED_APPS = (
-    'django.contrib.markup',
+    'liquidx.custom',
-)    
-

plotkit/trunk/tests/basic.js

@@ -2 +2 @@
-
-var opts = {
-    "IECanvasHTC": "../plotkit/iecanvas.htc",
-    "enableEvents": true,
-    "strokeColor": null
@@ -37 +36 @@
-        l.addDatasetFromTable("data1." + num, $("test" + num), 0, 1);   
-        l.addDatasetFromTable("data2." + num, $("test" + num), 0, 2);   
+        l.evaluate();
+        var c = $("test" + num + "canvas");
+        var g = new PlotKit.CanvasRenderer(c, l, opts);
+        g.render();
+}
+
+function twoValues(num, plotStyle) {
+    plotStyle['xTicks'] = [{"v":1, "label":"first"}, {"v":2, "label":"second"}];
+    plotStyle['xAxis'] = [1,2];
+    var l = new PlotKit.Layout(plotStyle, {});
+    var success = l.addDatasetFromTable("data" + num, $("test" + num));
-        l.evaluate();
-        var c = $("test" + num + "canvas");
@@ -84 +94 @@
-
-    var ninety = [[1, 9], [2, 1]];
+    var twoValuesData = [[1, 1], [2, 2]];
-    
-    var floatData1 = [[0, 0.5], [1, 0.4], [2, 0.3]];
@@ -100 +111 @@
-    tests.appendChild(generateUnitTest(3, genericTest, simpleData2,
-    "pie", ""));
+    
+    tests.appendChild(generateUnitTest(30, twoValues, twoValuesData,
+    "bar", ""));
-
-    tests.appendChild(H2(null, "One Value Set"));