Changeset 7

Show
Ignore:
Timestamp:
17/03/06 01:20:42 (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:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • plotkit/trunk/tests/basic.js

    r1 r7  
    33var opts = { 
    44    "IECanvasHTC": "../plotkit/iecanvas.htc", 
     5    "enableEvents": true, 
    56    "strokeColor": null 
    67}; 
    …… 
    7273     
    7374    return DIV({"class": "unit"}, [table, canvas, ending]); 
    74      
    7575} 
    7676 

  • plotkit/trunk/tests/demo-svg.html

    r1 r7  
    1111   <link href="tests.css" media="screen" rel="Stylesheet" type="text/css" /> 
    1212    
    13 <script src="/js/mochi/Base.js" type="text/javascript"></script> 
    14 <script src="/js/mochi/Iter.js" type="text/javascript"></script> 
    15 <script src="/js/mochi/DOM.js" type="text/javascript"></script> 
    16 <script src="/js/mochi/Color.js" type="text/javascript"></script> 
    17 <script src="/js/mochi/Format.js" type="text/javascript"></script> 
    18 <script src="/js/mochi/Logging.js" type="text/javascript"></script> 
    19 <script src="/js/mochi/LoggingPane.js" type="text/javascript"></script> 
     13<script src="/js/mochi/MochiKit.js" type="text/javascript"></script> 
    2014<script src="/js/plotkit/Base.js" type="text/javascript"></script> 
    2115<script src="/js/plotkit/Layout.js" type="text/javascript"></script> 

  • plotkit/trunk/tests/demo-svg.js

    r1 r7  
    3434        "drawXAxis": true, 
    3535        "drawYAxis": true, 
    36         "padding": {left: 40, right: 10, top: 10, bottom: 20} 
     36        "padding": {left: 40, right: 10, top: 10, bottom: 20}, 
     37        "axisLabelUseDiv": false 
    3738    }; 
    3839 
    …… 
    7071    drawDemo($('test7'),  layout, options); 
    7172    options["drawBackground"] = true; 
    72     options["backgroundColor"] = Color.blueColor().lighterColor(0.9); 
     73    options["backgroundColor"] = Color.blueColor().lighterColorWithLevel(0.45); 
    7374    drawDemo($('test8'),  layout, options); 
    7475    options["drawBackground"] = false; 

  • plotkit/trunk/tests/svg.html

    r5 r7  
    99<script src="/js/mochi/MochiKit.js" type="text/javascript"></script> 
    1010<script src="/js/plotkit/Base.js" type="text/javascript"></script> 
     11<script src="/js/plotkit/Styles.js" type="text/javascript"></script> 
    1112<script src="/js/plotkit/Layout.js" type="text/javascript"></script> 
    1213<script src="/js/plotkit/SVG.js" type="text/javascript"></script> 

  • plotkit/trunk/tests/sweet.html

    r1 r7  
    88   <link href="tests.css" media="screen" rel="Stylesheet" type="text/css" /> 
    99   <script src="/js/mochi/MochiKit.js" type="text/javascript"></script> 
    10   <script src="/js/plotkit/Base.js" type="text/javascript"></script> 
     10  <script src="/js/plotkit/Base.js" type="text/javascript"></script> 
    1111   <script src="/js/plotkit/Layout.js" type="text/javascript"></script> 
    1212   <script src="/js/plotkit/Canvas.js" type="text/javascript"></script> 

  • plotkit/trunk/tests/sweet.js

    r1 r7  
    11/* actual tests */ 
    22 
    3 var options = { 
    4     "axisLineWidth": 2.0, 
    5     "axisLabelColor": Color.grayColor(), 
    6     "axisLineColor": Color.whiteColor(), 
    7     "colorScheme": [Color.fromHexString('#4b6b94'), 
    8                     Color.fromHexString('#5d81b4'), 
    9                     Color.fromHexString('#acbad2')], 
    10     "padding": {top: 5, bottom: 20, left: 40, right: 10}, 
    11     "IECanvasHTC":"../PlotKit/iecanvas.htc" 
    12 }; 
    13  
     3var options = {"IECanvasHTC":"../PlotKit/iecanvas.htc"}; 
     4MochiKit.Base.update(options, PlotKit.Base.officePurple()); 
    145 
    156function genericTest(num, plotStyle) { 
    16  
    177        var l = new PlotKit.Layout(plotStyle, {}); 
    188        var success = l.addDatasetFromTable("data" + num, $("test" + num)); 
    199        l.evaluate(); 
    2010        var c = $("test" + num + "canvas"); 
    21         var g = new PlotKit.SweetRenderer(c, l, options); 
     11        var g = new PlotKit.SweetCanvasRenderer(c, l, options); 
    2212        g.render(); 
    2313} 
    …… 
    2717        l.addDatasetFromTable("data1." + num, $("test" + num), 0, 1);    
    2818        l.addDatasetFromTable("data2." + num, $("test" + num), 0, 2);    
     19        l.addDatasetFromTable("data3." + num, $("test" + num), 0, 1);    
     20        l.addDatasetFromTable("data4." + num, $("test" + num), 0, 2);    
     21        l.addDatasetFromTable("data5." + num, $("test" + num), 0, 1);    
     22        l.addDatasetFromTable("data6." + num, $("test" + num), 0, 2);    
    2923        l.evaluate(); 
    3024        var c = $("test" + num + "canvas"); 
    31         var g = new PlotKit.SweetRenderer(c, l, options); 
     25        var g = new PlotKit.SweetCanvasRenderer(c, l, options); 
    3226        g.render(); 
    3327} 
    …… 
    7771    var missingData = [[0, 1], [1, 4], [3, 16], [5, 17]]; 
    7872     
    79     var dualData = [[0,0,0], [1,2,1], [2,4,4], [3,8,9], [4,16,16], [5,32,25], [6, 64, 36], [7, 128, 49]]; 
     73    var dualData = [[0,0,0], [1,2,1], [2,4,4], [3,8,9]]; // , [4,16,16], [5,32,25], [6, 64, 36], [7, 128, 49]]; 
    8074 
    8175    tests.appendChild(H2(null, "Simple Tests")); 
    …… 
    9084    tests.appendChild(generateUnitTest(4, dualDataSet, dualData, 
    9185    "line", "")); 
     86     
     87    tests.appendChild(generateUnitTest(5, genericTest, simpleData1, 
     88    "pie", "")); 
    9289} 
    9390