Changeset 8

Timestamp:

17/03/06 01:20:44 (2 years ago)

Author:

al

Message:

sweet svg code, more docs improvement. removed BSD license text to reduce file size. replaced with a one-liner

Files:

• plotkit/trunk/PlotKit/Base.js (modified) (7 diffs)
• plotkit/trunk/PlotKit/Canvas.js (modified) (8 diffs)
• plotkit/trunk/PlotKit/Layout.js (modified) (1 diff)
• plotkit/trunk/PlotKit/SVG.js (modified) (10 diffs)
• plotkit/trunk/PlotKit/SweetCanvas.js (modified) (9 diffs)
• plotkit/trunk/PlotKit/SweetSVG.js (added)
• plotkit/trunk/doc/PlotKit.QuickStart.html (added)
• plotkit/trunk/doc/PlotKit.QuickStart.txt (added)
• plotkit/trunk/doc/PlotKit.html (modified) (1 diff)
• plotkit/trunk/doc/PlotKit.txt (modified) (2 diffs)
• plotkit/trunk/doc/barsample.png (added)
• plotkit/trunk/doc/doc.css (added)
• plotkit/trunk/doc/piesample.png (added)

plotkit/trunk/PlotKit/Base.js

@@ -1 +1 @@
-/*
-
-
-
-
-
+
+
+
-    you to quickly visualise data using different types of charts.
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-
-    Copyright
-    ---------
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-*/
-
@@ -79 +27 @@
-} 
-catch (e) {    
-canvasGraph
+PlotKit
-}
-
@@ -186 +134 @@
-    },
-
-    baseColors: function () {
-        var hexColor = MochiKit.Color.Color.fromHexString;
-        return [hexColor("#123474"),
-                hexColor("#476fb2"),
-                hexColor("#be2c2b"),
-                hexColor("#85b730"),
-                hexColor("#734a99"),
-                hexColor("#26a1c5"),
-                hexColor("#fb8707"),
-                hexColor("#000000"),
-                hexColor("#ffffff")];
-    },
-
-    baseDarkPrimaryColors: function () {
-        var hexColor = MochiKit.Color.Color.fromHexString;
@@ -216 +151 @@
-                hexColor("#78a15d")];
-    },
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        var makeColor = function(color, fraction) {
-            return color.lighterColorWithLevel(fraction);
@@ -224 +178 @@
-        return MochiKit.Base.map(partial(makeColor, baseColor), fractions);
-    },
+    
+
-                       
-
@@ -260 +216 @@
-});    
-
+PlotKit.Base.baseColors = function () {
+   var hexColor = MochiKit.Color.Color.fromHexString;
+   return [hexColor("#476fb2"),
+           hexColor("#be2c2b"),
+           hexColor("#85b730"),
+           hexColor("#734a99"),
+           hexColor("#26a1c5"),
+           hexColor("#fb8707"),
+           hexColor("#000000")];
+};
+
+PlotKit.Base.officeBaseStyle = {
+    "axisLineWidth": 2.0,
+    "axisLabelColor": Color.grayColor(),
+    "axisLineColor": Color.whiteColor(),
+    "padding": {top: 5, bottom: 20, left: 40, right: 10},
+    "shouldStroke": true
+};    
+
+MochiKit.Base.update(PlotKit.Base,{
+    officeBlue: function() {
+        var r = {
+        "colorScheme": PlotKit.Base.palette(PlotKit.Base.baseColors()[0]),
+        "backgroundColor": PlotKit.Base.baseColors()[0].lighterColorWithLevel(0.45)
+        };
+        MochiKit.Base.update(r, PlotKit.Base.officeBaseStyle);
+        return r;
+    },
+    officeRed: function() {
+        var r = {
+        "colorScheme": PlotKit.Base.palette(PlotKit.Base.baseColors()[1]),
+        "backgroundColor": PlotKit.Base.baseColors()[1].lighterColorWithLevel(0.5)
+        };
+        MochiKit.Base.update(r, PlotKit.Base.officeBaseStyle);
+        return r;
+    },
+    officeGreen: function() {
+        var r = {
+        "colorScheme": PlotKit.Base.palette(PlotKit.Base.baseColors()[2]),
+        "backgroundColor": PlotKit.Base.baseColors()[2].lighterColorWithLevel(0.5)
+        };
+        MochiKit.Base.update(r, PlotKit.Base.officeBaseStyle);
+        return r;
+    },
+    officePurple: function() {
+        var r = {
+        "colorScheme": PlotKit.Base.palette(PlotKit.Base.baseColors()[3]),
+        "backgroundColor": PlotKit.Base.baseColors()[3].lighterColorWithLevel(0.5)
+        };
+        MochiKit.Base.update(r, PlotKit.Base.officeBaseStyle);
+        return r;
+    },
+    
+    officeCyan: function() {
+        var r = {
+            "colorScheme": PlotKit.Base.palette(PlotKit.Base.baseColors()[4]),
+            "backgroundColor": PlotKit.Base.baseColors()[4].lighterColorWithLevel(0.5)
+            };
+        MochiKit.Base.update(r, PlotKit.Base.officeBaseStyle);
+        return r;
+    },
+    
+    officeOrange: function() {
+        var r = {
+            "colorScheme": PlotKit.Base.palette(PlotKit.Base.baseColors()[5]),
+            "backgroundColor": PlotKit.Base.baseColors()[5].lighterColorWithLevel(0.4)
+            };
+        MochiKit.Base.update(r, PlotKit.Base.officeBaseStyle);
+        return r;
+    },
+    
+    officeBlack: function() {
+        var r = {
+        "colorScheme": PlotKit.Base.palette(PlotKit.Base.baseColors()[6], 0.0, 0.6),
+        "backgroundColor": PlotKit.Base.baseColors()[6].lighterColorWithLevel(0.9)
+        };
+        MochiKit.Base.update(r, PlotKit.Base.officeBaseStyle);
+        return r;
+    }
+});
+
+
-PlotKit.Base.EXPORT = [
-roundInterval
+baseColors
-   "collapse",
-   "uniq",
-   "colorScheme",
-   "findPosX",
-
+
+
+
+
+
+
+
+
+
+
+
-];
-
@@ -285 +332 @@
-MochiKit.Base._exportSymbols(this, PlotKit.Base);
-
-/*
-
- Copyright (c) 2005, 2006 Alastair Tse <alastair@tse.id.au>
-
- All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
-* Redistributions of source code must retain the above copyright notice,
-  this list of conditions and the following disclaimer. 
-
-* Redistributions in binary form must reproduce the above copyright
-  notice, this list of conditions and the following disclaimer in the
-  documentation and/or other materials provided with the distribution.
-
-* Neither the name of Alastair Tse nor the names of its contributors may
-  be used to endorse or promote products derived from this software
-  without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
-IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
-THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
-CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
-PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
-LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- 
-*/ 

plotkit/trunk/PlotKit/Canvas.js

@@ -30 +30 @@
-    Copyright
-    ---------
-tse.id.au
-See end of file.
+liquidx.net
+<http://www.liquidx.net/plotkit>
-    
-*/
@@ -82 +82 @@
-        "backgroundColor": Color.whiteColor(),
-        "padding": {left: 30, right: 20, top: 10, bottom: 10},
-1
+0
-        "strokeColor": Color.whiteColor(),
-        "strokeColorTransform": "asStrokeColor",
@@ -97 +97 @@
-        "axisLabelFontSize": 9,
-                "axisLabelWidth": 50,
+                "pieRadius": 0.4,
-        "enableEvents": true,
-        "IECanvasHTC": "PlotKit/iecanvas.htc"
@@ -309 +310 @@
-    var centerx = this.area.x + this.area.w * 0.5;
-    var centery = this.area.y + this.area.h * 0.5;
-
+
+
-
-        // NOTE NOTE!! Canvas Tag draws the circle clockwise from the y = 0, x = 1
@@ -456 +458 @@
-                var centerx = this.area.x + this.area.w * 0.5;
-            var centery = this.area.y + this.area.h * 0.5;
-
+
+
-                var labelWidth = this.options.axisLabelWidth;
-                
@@ -560 +563 @@
-    var connect = MochiKit.Signal.connect;
-    var bind = MochiKit.Base.bind;
-_s
+S
-    //connect(this.element, 'onmouseover', bind(this.onmouseover, this));
-    //connect(this.element, 'onmouseout', bind(this.onmouseout, this));
@@ -568 +571 @@
-
-PlotKit.CanvasRenderer.prototype._resolveObject = function(e) {
-
-
+
+
+
+
+
+
-        
+    log(x, y);
+
-    var isHit = this.layout.hitTest(x, y);
-    if (isHit)
@@ -647 +656 @@
-    return true;
-};
-
-
-
-/*
-
- Copyright (c) 2005, 2006 Alastair Tse <alastair@tse.id.au>
-
- All rights reserved.
-
- Redistribution and use in source and binary forms, with or without modification, are
- permitted provided that the following conditions are met:
- 
-  * Redistributions of source code must retain the above copyright notice, this list of
- conditions and the following disclaimer. * Redistributions in binary form must reproduce
- the above copyright notice, this list of conditions and the following disclaimer in the
- documentation and/or other materials provided with the distribution. * Neither the name
- of the <ORGANIZATION> nor the names of its contributors may be used to endorse or
- promote products derived from this software without specific prior written permission.
- 
-  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY
- EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
- MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL
- THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT
- OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- 
-*/ 

plotkit/trunk/PlotKit/Layout.js

@@ -9 +9 @@
-    Copyright
-    ---------
-tse.id.au
-See end of file.
+liquidx.net
+<http://www.liquidx.net/plotkit>
-    
-*/

plotkit/trunk/PlotKit/SVG.js

@@ +1 @@
+/*
+    PlotKit SVG
+    ===========
+    SVG Renderer for PlotKit
+
+    Copyright
+    ---------
+    Copyright 2005,2006 (c) Alastair Tse <alastair^liquidx.net>
+    For use under the BSD license. <http://www.liquidx.net/plotkit>
+*/
+
-// -------------------------------------------------------------------------
-// NOTES: - If you use XHTML1.1 strict, then you must include each MochiKit
@@ -22 +33 @@
-// ---------------------------------------------------------------------------
-//  SVG Renderer
-//   * Draws the graph on a HTML Canvas with labels using DIVs
-// ---------------------------------------------------------------------------
-
@@ -70 +80 @@
-        "axisLabelWidth": 50,
-        "axisLabelUseDiv": true,
+        "pieRadius": 0.4,
-        "enableEvents": true
-    };
@@ -103 +114 @@
-    this.ylabels = new Array();
-
+    // initialise some meta structures in SVG
+    this.defs = this.createSVGElement("defs");
+
-    this.area = {
-        x: this.options.padding.left,
@@ -221 +235 @@
-    var centerx = this.area.x + this.area.w * 0.5;
-    var centery = this.area.y + this.area.h * 0.5;
-
+
+
-
-    // NOTE NOTE!! Canvas Tag draws the circle clockwise from the y = 0, x = 1
@@ -241 +256 @@
-            else if (this.options.strokeColorTransform)
-                attrs["stroke"] = color[this.options.strokeColorTransform]().toRGBString();
-
-
+
+
+
-        this.root.appendChild(this.createSVGElement("circle", attrs));
-        return;
@@ -261 +277 @@
-            else if (this.options.strokeColorTransform)
-                attrs["stroke"] = color[this.options.strokeColorTransform]().toRGBString();
-rokeWidth"] =
+yle"] = "stroke-width:" +
-        }
-
@@ -343 +359 @@
-                        fill: this.options.axisLabelColor.toRGBString()
-                    };
+                    
+                    /* we can do clipping just like DIVs
+                    http://www.xml.com/pub/a/2004/06/02/svgtype.html */
+                    /*
+                    var mask = this.createSVGElement("mask", {id: "mask" + tick[0]});
+                    var maskShape = this.createSVGElement("rect",
+                        {y: y + 3,
+                         x: (x - this.options.padding.left + 3),
+                         width: (this.options.padding.left - this.options.axisTickSize) + "px",
+                         height: (this.options.axisLabelFontSize + 3) + "px",
+                         style: {"fill": "#ffffff", "stroke": "#000000"}});
+                    mask.appendChild(maskShape);
+                    this.defs.appendChild(mask);
+                    
+                    attrs["filter"] = "url(#mask" + tick[0] + ")";
+                    */
+                    
-                    var label = this.createSVGElement("text", attrs);
-                    label.appendChild(this.document.createTextNode(tick[1]));
@@ -426 +459 @@
-            var labely = centery - Math.cos(normalisedAngle) * (radius + 10);
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-            };
-
@@ -604 +639 @@
-    }
-};
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

plotkit/trunk/PlotKit/SweetCanvas.js

@@ +1 @@
+/*
+    PlotKit Sweet Canvas Renderer
+    =============================
+    Canvas Renderer for PlotKit which looks pretty!
+
+    Copyright
+    ---------
+    Copyright 2005,2006 (c) Alastair Tse <alastair^liquidx.net>
+    For use under the BSD license. <http://www.liquidx.net/plotkit>
+*/
+
-// -------------------------------------------------------------------------
-// Check required components
@@ -14 +25 @@
-
-
-
-
+Canvas
+Canvas
-}
-
-
+Canvas
-    if (arguments.length > 0) {
-        this.__init__(element, layout, options);
@@ -24 +35 @@
-};
-
-Renderer.NAME = "PlotKit.Sweet
-
-
-
+CanvasRenderer.NAME = "PlotKit.SweetCanvas
+Canvas
+
+Canvas
-    return "[" + this.NAME + " " + this.VERSION + "]";
-};
-
-
+Canvas
-    return this.__repr__();
-};
@@ -39 +50 @@
-// ---------------------------------------------------------------------
-
-
-Renderer.prototype.constructor = PlotKit.Sweet
-
+Canvas
+CanvasRenderer.prototype.constructor = PlotKit.SweetCanvas
+Canvas
-
-// ---------------------------------------------------------------------
@@ -47 +58 @@
-// ---------------------------------------------------------------------
-
-
-
+
+
+
+
-};
-
@@ -55 +68 @@
-// ---------------------------------------------------------------------
-
-
+Canvas
-    var bind = MochiKit.Base.bind;
-
-
-
-
-
-
+
-
-    var prepareFakeShadow = function(context, x, y, w, h) {
-Gradient[0]
+Color
-        context.fillRect(x-2, y-2, w+4, h+2); 
-Gradient[0]
+Color
-        context.fillRect(x-1, y-1, w+2, h+1); 
-    };
@@ -171 +179 @@
-
-
-
-
-
+
-    var context = this.element.getContext("2d");
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    context.fillRect(this.area.x, this.area.y, this.area.w, this.area.h);
-
@@ -184 +249 @@
-        context.save();
-        context.strokeStyle = Color.whiteColor().toRGBString();
-0.5
+1.0
-        for (var i = 0; i < this.layout.yticks.length; i++) {
-            var y = this.layout.yticks[i][0] * this.area.h + this.area.y;
@@ -196 +261 @@
-        context.restore();
-    }
-
+
+
+
+
+

plotkit/trunk/doc/PlotKit.html

@@ -94 +94 @@
-<ul>
- <li>
-PlotKit quick start.
+ <a href="PlotKit.QuickStart.html">PlotKit Quick Start</a> 
- </li>
-
- <li>
-
+
+
+
+
+
- </li>
-</ul>
-
-<h1> Version History</h1>
+
+<h3>PlotKit 0.8</h3>
-<ul>
- <li>
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
- </li>
-
- <li>
-Total rewrite from CanvasGraph 0.7
+Animation support.
- </li>
-</ul>

plotkit/trunk/doc/PlotKit.txt

@@ -54 +54 @@
-===================
-
-
-
+
+
+
-
-Version History
-===============
-
-
-
+
-
+* Total rewrite from [CanvasGraph 0.7][CanvasGraph]
+
+Road Map
+========
+###Version 0.9
+
+* AutoSelectRenderer, automatically choose Canvas or SVG by auto detecting browser support.
+
+###Version 0.10
+
+* Defined Event System Support
+* Animation support.
+
+[QuickStart]: PlotKit.QuickStart.html
+[CanvasGraph]: http://www.liquidx.net/canvasgraph/
-[PlotKit]: http://www.liquidx.net/plotkit/
-[MochiKit]: http://mochikit.com/
@@ -74 +89 @@
-[SweetSVGRenderer]: PlotKit.SweetSVG.html
-[Browser]: SVGCanvasCompat.html
+[CanvasTest]: http://media.liquidx.net/js/plotkit-tests/basic.html
+[SVGTest]: http://media.liquidx.net/js/plotkit-tests/svg.html
+[SCanvasTest]: http://media.liquidx.net/js/plotkit-tests/sweet.html
+[SSVGTest]: http://media.liquidx.net/js/plotkit-tests/sweet-svg.html
-
-{% endfilter %}