This repository has been archived by the owner. It is now read-only.
Permalink
Browse files

Merge remote branch 'palewire/master'

Conflicts:
	templatetags/charts.py
  • Loading branch information...
2 parents 0487520 + 7bebea1 commit 8f2457ed6ff8663bffe1d2bd97f3d90a0c726e9d @jacobian committed Nov 30, 2009
Showing with 546 additions and 379 deletions.
  1. +0 −1 .gitignore
  2. +39 −11 docs/examples.html
  3. +30 −0 docs/examples.txt
  4. +2 −0 docs/render-examples.py
  5. +475 −367 templatetags/charts.py
View
@@ -1 +0,0 @@
-*.pyc
View
@@ -38,7 +38,7 @@ <h2>Chart tag examples</h2>
{% endchart %}
&lt;img src=&quot;{{ c.url }}&quot; width=&quot;300&quot; height=&quot;200&quot; /&gt;</pre></td>
<td>
-<img src="http://chart.apis.google.com/chart?cht=lc&amp;chs=300x200&amp;chco=CC0000&amp;chf=c,s,EEEEEE&amp;chdl=Sweet&amp;chd=e:ALAtBmC1EcGYIsLWOXRuVdZhd9ivn4tYzO5b.." width="300" height="200" /></td>
+<img src="http://chart.apis.google.com/chart?cht=lc&amp;chs=300x200&amp;chco=CC0000&amp;chf=c,s,EEEEEE&amp;chdl=Sweet&amp;chd=e:AAALAtBmC1EcGYIsLWOXRuVdZhd9ivn4tYzO5b.." width="300" height="200" /></td>
</tr>
<tr>
@@ -52,7 +52,7 @@ <h2>Chart tag examples</h2>
{% chart-colors &quot;CC0000&quot; &quot;00CC00&quot; %}
{% chart-background &quot;EEEEEE&quot; %}
{% endchart %}</pre></td>
- <td><img src="http://chart.apis.google.com/chart?chtt=Hello,+World%21&amp;cht=lc&amp;chs=300x200&amp;chco=CC0000,00CC00&amp;chf=bg,s,EEEEEE&amp;chd=e:AKApBcCkEAFxH2KPM9QATXXCbCfXj.o9uPz15w,..5wz1uPo9j.fXbCXCTXQAM9KPH2FxEACkBcApAK" width="300" height="200" /></td>
+ <td><img src="http://chart.apis.google.com/chart?chtt=Hello,+World%21&amp;cht=lc&amp;chs=300x200&amp;chco=CC0000,00CC00&amp;chf=bg,s,EEEEEE&amp;chd=e:AAAKApBcCkEAFxH2KPM9QATXXCbCfXj.o9uPz15w,..5wz1uPo9j.fXbCXCTXQAM9KPH2FxEACkBcApAK" width="300" height="200" /></td>
</tr>
<tr>
@@ -128,6 +128,22 @@ <h2>Chart tag examples</h2>
<td><img src="http://chart.apis.google.com/chart?chs=300x200&amp;cht=bvs&amp;chds=-10,250&amp;chco=CC0000,0000CC&amp;chd=t:36.0,49.0,64.0,81.0|196.0,169.0,144.0,121.0" width="300" height="200" /></td>
</tr>
+ <tr>
+ <th colspan="2">Fake grid lines drawn on top of data</th>
+ <tr>
+ <td><pre>{% chart %}
+ {% chart-size &quot;300x200&quot; %}
+ {% chart-type &quot;column&quot; %}
+ {% chart-data &quot;0.001,2,6,14,18,0.001&quot; %}
+ {% chart-data-scale &quot;0,20&quot; %}
+ {% chart-colors &quot;CC0000&quot; %}
+ {% chart-grid-lines %}
+ {% chart-grid-lines-data grid_lines_data %}
+ {% chart-grid-lines-style grid_lines_style %}
+{% endchart %}</pre></td>
+ <td><img src="http://chart.apis.google.com/chart?chs=300x200&amp;cht=bvg&amp;chds=0,20&amp;chco=CC0000&amp;chm=D,FFFFFF,1,0,1,1|D,FFFFFF,2,0,1,1|D,FFFFFF,3,0,1,1&amp;chd=t1:0.001,2.0,6.0,14.0,18.0,0.001|5.0,5.0,5.0,5.0,5.0,5.0|10.0,10.0,10.0,10.0,10.0,10.0|15.0,15.0,15.0,15.0,15.0,15.0" width="300" height="200" /></td>
+ </tr>
+
<tr>
<th colspan="2">Scatter chart</th>
<tr>
@@ -137,7 +153,7 @@ <h2>Chart tag examples</h2>
{% chart-size &quot;300x200&quot; %}
{% chart-type &quot;scatter&quot; %}
{% endchart %}</pre></td>
- <td><img src="http://chart.apis.google.com/chart?chs=300x200&amp;cht=s&amp;chd=e:AKApBcCkEAFxH2KPM9QATXXCbCfXj.o9uPz15w,..5wz1uPo9j.fXbCXCTXQAM9KPH2FxEACkBcApAK" width="300" height="200" /></td>
+ <td><img src="http://chart.apis.google.com/chart?chs=300x200&amp;cht=s&amp;chd=e:AAAKApBcCkEAFxH2KPM9QATXXCbCfXj.o9uPz15w,..5wz1uPo9j.fXbCXCTXQAM9KPH2FxEACkBcApAK" width="300" height="200" /></td>
</tr>
<tr>
@@ -152,7 +168,7 @@ <h2>Chart tag examples</h2>
{% chart-line-style 1 1 2 %}
{% chart-grid 15 15 1 1 %}
{% endchart %}</pre></td>
- <td><img src="http://chart.apis.google.com/chart?cht=lc&amp;chs=300x200&amp;chco=CC0000,00CC00&amp;chls=3,6,3|1,1,2&amp;chg=15,15,1,1&amp;chd=e:AKApBcCkEAFxH2KPM9QATXXCbCfXj.o9uPz15w,..5wz1uPo9j.fXbCXCTXQAM9KPH2FxEACkBcApAK" width="300" height="200" /></td>
+ <td><img src="http://chart.apis.google.com/chart?cht=lc&amp;chs=300x200&amp;chco=CC0000,00CC00&amp;chls=3,6,3|1,1,2&amp;chg=15,15,1,1&amp;chd=e:AAAKApBcCkEAFxH2KPM9QATXXCbCfXj.o9uPz15w,..5wz1uPo9j.fXbCXCTXQAM9KPH2FxEACkBcApAK" width="300" height="200" /></td>
</tr>
<tr>
@@ -170,7 +186,7 @@ <h2>Chart tag examples</h2>
{% endchart %}</pre></td>
<td>
-<img src="http://chart.apis.google.com/chart?cht=lc&amp;chs=300x200&amp;chm=R,E5ECF9,0,.75,.25|B,76A4FB,0,0,0&amp;chd=e:ALAtBmC1EcGYIsLWOXRuVdZhd9ivn4tYzO5b.." width="300" height="200" /></td>
+<img src="http://chart.apis.google.com/chart?cht=lc&amp;chs=300x200&amp;chm=R,E5ECF9,0,.75,.25|B,76A4FB,0,0,0&amp;chd=e:AAALAtBmC1EcGYIsLWOXRuVdZhd9ivn4tYzO5b.." width="300" height="200" /></td>
</tr>
<tr>
@@ -184,7 +200,7 @@ <h2>Chart tag examples</h2>
{% chart-marker &quot;circle&quot; &quot;cccc0077&quot; 1 4 90 %}
{% chart-marker &quot;x&quot; &quot;0000CC&quot; 0 9.3 20 %}
{% endchart %}</pre></td>
- <td><img src="http://chart.apis.google.com/chart?cht=lc&amp;chs=300x200&amp;chco=CC0000,00CC00&amp;chm=o,cccc0077,1,4,90|x,0000CC,0,9.3,20&amp;chd=e:AKApBcCkEAFxH2KPM9QATXXCbCfXj.o9uPz15w,..5wz1uPo9j.fXbCXCTXQAM9KPH2FxEACkBcApAK" width="300" height="200" /></td>
+ <td><img src="http://chart.apis.google.com/chart?cht=lc&amp;chs=300x200&amp;chco=CC0000,00CC00&amp;chm=o,cccc0077,1,4,90|x,0000CC,0,9.3,20&amp;chd=e:AAAKApBcCkEAFxH2KPM9QATXXCbCfXj.o9uPz15w,..5wz1uPo9j.fXbCXCTXQAM9KPH2FxEACkBcApAK" width="300" height="200" /></td>
</tr>
<tr>
@@ -193,7 +209,7 @@ <h2>Chart tag examples</h2>
<td><pre>{% chart %}
{% chart-data data2 data3 %}
{% endchart %}</pre></td>
- <td><img src="http://chart.apis.google.com/chart?chs=200x200&amp;cht=lc&amp;chd=e:AKApBcCkEAFxH2KPM9QATXXCbCfXj.o9uPz15w,..5wz1uPo9j.fXbCXCTXQAM9KPH2FxEACkBcApAK" width="200" height="200" /></td>
+ <td><img src="http://chart.apis.google.com/chart?chs=200x200&amp;cht=lc&amp;chd=e:AAAKApBcCkEAFxH2KPM9QATXXCbCfXj.o9uPz15w,..5wz1uPo9j.fXbCXCTXQAM9KPH2FxEACkBcApAK" width="200" height="200" /></td>
</tr>
<tr>
@@ -212,7 +228,7 @@ <h2>Chart tag examples</h2>
{% axis-labels &quot;Jan&quot; &quot;Feb&quot; &quot;Mar&quot; &quot;Apr&quot; %}
{% endaxis %}
{% endchart %}</pre></td>
- <td><img src="http://chart.apis.google.com/chart?cht=lc&amp;chs=300x200&amp;chm=R,E5ECF9,0,.75,.25|B,76A4FB,0,0,0&amp;chd=e:..5bzOtYn4ivd9ZhVdRuOXLWIsGYEcC1BmAtAL&amp;chxt=y,x&amp;chxr=0,0,100&amp;chxl=1:|Jan|Feb|Mar|Apr" width="300" height="200" /></td>
+ <td><img src="http://chart.apis.google.com/chart?cht=lc&amp;chs=300x200&amp;chm=R,E5ECF9,0,.75,.25|B,76A4FB,0,0,0&amp;chd=e:..5bzOtYn4ivd9ZhVdRuOXLWIsGYEcC1BmAtALAA&amp;chxt=y,x&amp;chxr=0,0,100&amp;chxl=1:|Jan|Feb|Mar|Apr" width="300" height="200" /></td>
</tr>
<tr>
@@ -260,7 +276,7 @@ <h2>Chart tag examples</h2>
{% axis-labels 5 0 -5 %}
{% endaxis %}
{% endchart %}</pre></td>
- <td><img src="http://chart.apis.google.com/chart?chs=300x200&amp;cht=lc&amp;chm=r,000000,0,.499,.501&amp;chd=e:mXsdyE296791.i...K9G541nwgqukheIX1R2MbHyEHBjANAIBUDvHRLzRIXEdWjvp-v01B5Z8w--.9.q-G7W3gyutMnIgzabUROmJnFhCeAnAAArClFrJ0O1UiathFnatcy83s7f-N.t.8-68o5O00vkptjddEWyQ4LlHGDmBPAGAPBpEQH-MpSGYGeakzq.wv116C&amp;chxt=x,y&amp;chxs=0,000000,11,0,_&amp;chxl=0:|||1:|5|0|-5" width="300" height="200" /></td>
+ <td><img src="http://chart.apis.google.com/chart?chs=300x200&amp;cht=lc&amp;chm=r,000000,0,.499,.501&amp;chd=e:gAmXsdyE296791.i...K9G541nwgqukheIX1R2MbHyEHBjANAIBUDvHRLzRIXEdWjvp-v01B5Z8w--.9.q-G7W3gyutMnIgzabUROmJnFhCeAnAAArClFrJ0O1UiathFnatcy83s7f-N.t.8-68o5O00vkptjddEWyQ4LlHGDmBPAGAPBpEQH-MpSGYGeakzq.wv116C&amp;chxt=x,y&amp;chxs=0,000000,11,0,_&amp;chxl=0:|||1:|5|0|-5" width="300" height="200" /></td>
</tr>
<tr>
@@ -295,7 +311,7 @@ <h2>Chart tag examples</h2>
{% axis-labels 10 0 -10 %}
{% endaxis %}
{% endchart %}</pre></td>
- <td><img src="http://chart.apis.google.com/chart?chs=300x200&amp;cht=lc&amp;chco=00cc00&amp;chls=4&amp;chm=r,000000,0,.499,.501&amp;chd=e:jLmOpCretdu6vwv.vkuis7qzoPlWiQfEb6Y6WNT5SDQxQGQEQqR3ToV5Ykbheqh3k-n5qgssuYvev-v0vDtqrvpWmljkgZdNaIXTUzSwRPQTQAQVRSS1U6XaaRdWgijtmuper1tvvGv2v9vcuUsmqZnxk2huehbZYcVyTjRzQnQDQHQ0SIT.WUZDcDfNiZlfoXq6tA&amp;chxt=x,y&amp;chxs=0,000000,11,0,_&amp;chxl=0:|||1:|10|0|-10" width="300" height="200" /></td>
+ <td><img src="http://chart.apis.google.com/chart?chs=300x200&amp;cht=lc&amp;chco=00cc00&amp;chls=4&amp;chm=r,000000,0,.499,.501&amp;chd=e:gAjLmOpCretdu6vwv.vkuis7qzoPlWiQfEb6Y6WNT5SDQxQGQEQqR3ToV5Ykbheqh3k-n5qgssuYvev-v0vDtqrvpWmljkgZdNaIXTUzSwRPQTQAQVRSS1U6XaaRdWgijtmuper1tvvGv2v9vcuUsmqZnxk2huehbZYcVyTjRzQnQDQHQ0SIT.WUZDcDfNiZlfoXq6tA&amp;chxt=x,y&amp;chxs=0,000000,11,0,_&amp;chxl=0:|||1:|10|0|-10" width="300" height="200" /></td>
</tr>
<tr>
@@ -317,7 +333,7 @@ <h2>Chart tag examples</h2>
{% endchart %}</pre></td>
<td>
-<img src="http://chart.apis.google.com/chart?chs=300x200&amp;cht=lc&amp;chco=0000cc&amp;chls=2,2,2&amp;chm=r,000000,0,.499,.501&amp;chd=e:6C11wvq.kzeaYGSGMpH-EQBpAPAGBPDmHGLlQ4WydEjdptvk005O8o-6.8.t-N7f3sy8tcnahFatUiO1J0FrClArAAAnCeFhJnOmURabgznItMyu3g7W-G.q.9--8w5Z1Bv0p-jvdWXERILzHRDvBUAIANBjEHHyMbR2X1eIkhquwg1n549G.K...i916729yEsdmX&amp;chxt=x&amp;chxs=0,000000,11,0,_&amp;chxl=0:||" width="300" height="200" /></td>
+<img src="http://chart.apis.google.com/chart?chs=300x200&amp;cht=lc&amp;chco=0000cc&amp;chls=2,2,2&amp;chm=r,000000,0,.499,.501&amp;chd=e:6C11wvq.kzeaYGSGMpH-EQBpAPAGBPDmHGLlQ4WydEjdptvk005O8o-6.8.t-N7f3sy8tcnahFatUiO1J0FrClArAAAnCeFhJnOmURabgznItMyu3g7W-G.q.9--8w5Z1Bv0p-jvdWXERILzHRDvBUAIANBjEHHyMbR2X1eIkhquwg1n549G.K...i916729yEsdmXgA&amp;chxt=x&amp;chxs=0,000000,11,0,_&amp;chxl=0:||" width="300" height="200" /></td>
</tr>
<tr>
@@ -344,6 +360,18 @@ <h2>Chart tag examples</h2>
<td><img src="http://chart.apis.google.com/chart?chs=300x200&amp;cht=p&amp;chts=cc0000,18&amp;chtt=Pie%21&amp;chd=e:VVqq.." width="300" height="200" /></td>
</tr>
+ <tr>
+ <th colspan="2">Custom pie orientation</th>
+ <tr>
+ <td><pre>{% chart %}
+ {% chart-data data1 %}
+ {% chart-size &quot;300x200&quot; %}
+ {% chart-type &quot;pie&quot; %}
+ {% chart-pie-orientation &quot;4.7&quot; %}
+{% endchart %}</pre></td>
+ <td><img src="http://chart.apis.google.com/chart?chs=300x200&amp;cht=p&amp;chp=4.7&amp;chd=e:VVqq.." width="300" height="200" /></td>
+ </tr>
+
<tr>
<th colspan="2">Google-o-meter chart, with data scaling</th>
<tr>
View
@@ -113,6 +113,24 @@ Data scaling to avoid truncation
{% chart-colors "CC0000" "0000CC" %}
{% endchart %}
+
+Fake grid lines drawn on top of data
+------------------------------------
+
+::
+
+ {% chart %}
+ {% chart-size "300x200" %}
+ {% chart-type "column" %}
+ {% chart-data "0.001,2,6,14,18,0.001" %}
+ {% chart-data-scale "0,20" %}
+ {% chart-colors "CC0000" %}
+ {% chart-grid-lines %}
+ {% chart-grid-lines-data grid_lines_data %}
+ {% chart-grid-lines-style grid_lines_style %}
+ {% endchart %}
+
+
Scatter chart
-------------
@@ -325,6 +343,18 @@ Custom title sizes, colors
{% chart-title "Pie!" 18 "cc0000" %}
{% endchart %}
+Custom pie orientation
+--------------------------
+
+::
+
+ {% chart %}
+ {% chart-data data1 %}
+ {% chart-size "300x200" %}
+ {% chart-type "pie" %}
+ {% chart-pie-orientation "4.7" %}
+ {% endchart %}
+
Google-o-meter chart, with data scaling
---------------------------------------
View
@@ -20,6 +20,8 @@ def render_examples():
'data4' : [sin(i/5.0)*5 for i in range(100)],
'venn' : [100, 80, 60, 30, 30, 30, 10],
'mapdata': {'KS': 0, 'CA': 100, "MN": 50},
+ 'grid_lines_data': [(6,5), (6,10), (6,15)],
+ 'grid_lines_style': [('FFFFFF','1','1'), ('FFFFFF','2','1'), ('FFFFFF','3','1'),]
}
examples = []
source = Path(__file__).parent.child("examples.txt").read_file()
Oops, something went wrong.

0 comments on commit 8f2457e

Please sign in to comment.