Permalink
Browse files

finally get rid of remaining tabs, almost done cleaning up the exampl…

…es and also made the opacity of bars and fills configurable
  • Loading branch information...
1 parent e9c516f commit 9d55735e50051fb9cd75f8cbd45bce37e1741cbe @rfunduk rfunduk committed Nov 17, 2008
Showing with 259 additions and 278 deletions.
  1. +16 −21 examples/graph-types.html
  2. +3 −1 examples/index.html
  3. +22 −29 examples/mini-graph.html
  4. +78 −78 examples/real-data.html
  5. +81 −89 examples/selection.html
  6. +52 −54 examples/setting-options.html
  7. +7 −6 jquery.flot.js
View
@@ -1,4 +1,5 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
+ "http://www.w3.org/TR/html4/loose.dtd">
<html>
<head>
@@ -20,36 +21,30 @@
var d4 = [];
for( var i = 0; i < 14; i += 0.5 ) { d4.push( [ i, Math.sqrt( i * 10 ) ] ); }
-
+
var d5 = [];
for( var i = 0; i < 14; i += 0.5 ) { d5.push( [ i, Math.sqrt( i ) ] ); }
-
+
var d6 = [];
for( var i = 0; i < 14; i += 0.5 ) {
d6.push( { x: i,
y: Math.round( Math.sin( i ) + 5.5 ),
delta: ( i % 2 + 6 ) } );
}
d6.push( { x: 14, y: 6, delta: 2 } );
-
+
$.plot( $("#placeholder" ),
- [ { data: d1,
- lines: { show: true, fill: true } },
- { data: d2,
- bars: { show: true } },
- { data: d3,
- points: { show: true } },
- { data: d4,
- lines: { show: true } },
- { data: d5,
- lines: { show: false },
- points: { show: true, radius: 7 } },
- { data: d6,
- deltas: { show: true,
- markerWidth: 4,
- color: { above: "black",
- below: "transparent",
- equal: "blue" } } } ]
+ [ { data: d1, lines: { show: true, fill: true } },
+ { data: d2, bars: { show: true, fillOpacity: 0.8 } },
+ { data: d3, points: { show: true } },
+ { data: d4, lines: { show: true } },
+ { data: d5, lines: { show: false }, points: { show: true, radius: 7 } },
+ { data: d6, deltas:
+ { show: true,
+ markerWidth: 4,
+ color: { above: "black",
+ below: "transparent",
+ equal: "blue" } } } ]
);
} );
</script>
View
@@ -1,4 +1,6 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
+ "http://www.w3.org/TR/html4/loose.dtd">
+
<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
View
@@ -1,14 +1,27 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
+ "http://www.w3.org/TR/html4/loose.dtd">
+
<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
<title>Flot Examples</title>
<link href="layout.css" rel="stylesheet" type="text/css"></link>
- <!--[if IE]><script language="javascript" type="text/javascript" src="../excanvas.pack.js"></script><![endif]-->
- <script language="javascript" type="text/javascript" src="http://ajax.googleapis.com/ajax/libs/jquery/1.2.6/jquery.min.js"></script>
- <script language="javascript" type="text/javascript" src="../jquery.flot.js"></script>
- </head>
- <body>
+ <!--[if IE]><script type="text/javascript" src="../excanvas.pack.js"></script><![endif]-->
+ <script type="text/javascript" src="http://ajax.googleapis.com/ajax/libs/jquery/1.2.6/jquery.min.js"></script>
+ <script type="text/javascript" src="../jquery.flot.js"></script>
+ <script type="text/javascript">
+ $(document).ready( function() {
+ $.plot( $('#placeholder'),
+ [ { data: [[1,5],[2,6],[3,3],[4,3],[5,9],[6,1],[7,6]], color: "#34E" } ],
+ { points: { show: true },
+ lines: { show: true },
+ xaxis: { showLabels: false },
+ yaxis: { showLabels: false },
+ grid: { showLines: false, showBorder: false } } );
+ } );
+ </script>
+ </head>
+ <body>
<h1>Flot Examples</h1>
<div id="placeholder" style="padding-right: 10px;float:left;width:100px;height:25px;"></div>
@@ -18,28 +31,8 @@
easily by disabling the axes and grid drawing. This can be handy
in tables or just as a visual cue when you don't need the graph
to be precisely readable. This is also similar in a way to
- '<a title="Seems that Edward Tufte popularized the idea." href="https://www.edwardtufte.com/bboard/q-and-a-fetch-msg?msg_id=0001OR&topic_id=1">sparklines</a>'
- but not as <a href="http://ejohn.org/projects/jspark/" title="John Resig's JavaScript Sparklines">lightweight</a>.
+ '<a title="Seems that Edward Tufte popularized the idea." href="https://www.edwardtufte.com/bboard/q-and-a-fetch-msg?msg_id=0001OR&amp;topic_id=1">sparklines</a>'
+ but not as <a title="John Resig's JavaScript Sparklines" href="http://ejohn.org/projects/jspark/">lightweight</a>.
</p>
-
-<script id="source" language="javascript" type="text/javascript">
-$(function () {
- var data = [ {
- data: [[1,5], [2,6], [3,3], [4,3], [5,9], [6,1], [7,6]],
- color: "#34E"
- } ];
-
- var options = {
- points: { show: true },
- lines: { show: true },
- xaxis: { showLabels: false },
- yaxis: { showLabels: false },
- grid: { showLines: false, showBorder: false }
- };
-
- $.plot($("#placeholder"), data, options);
-});
-</script>
-
- </body>
+ </body>
</html>
View
@@ -1,96 +1,96 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
+ "http://www.w3.org/TR/html4/loose.dtd">
+
<html>
- <head>
+ <head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
<title>Flot Examples</title>
<link href="layout.css" rel="stylesheet" type="text/css"></link>
- <!--[if IE]><script language="javascript" type="text/javascript" src="../excanvas.pack.js"></script><![endif]-->
- <script language="javascript" type="text/javascript" src="http://ajax.googleapis.com/ajax/libs/jquery/1.2.6/jquery.min.js"></script>
- <script language="javascript" type="text/javascript" src="../jquery.flot.js"></script>
- </head>
- <body>
- <h1>Flot Examples</h1>
-
- <div id="placeholder" style="width:600px;height:300px;"></div>
-
- <p>Here is an example with real data: military budgets for
- various countries in constant (2005) million US dollars (source: <a href="http://www.sipri.org/">SIPRI</a>).</p>
-
- <p>Since all data is available client-side, it's pretty easy to
- make the plot interactive. Try turning countries on/off with the
- checkboxes below.</p>
-
- <p id="choices">Show:</p>
-
-<script id="source" language="javascript" type="text/javascript">
-$(function () {
- var datasets = {
- "usa": {
- label: "USA",
+ <!--[if IE]><script type="text/javascript" src="../excanvas.pack.js"></script><![endif]-->
+ <script type="text/javascript" src="http://ajax.googleapis.com/ajax/libs/jquery/1.2.6/jquery.min.js"></script>
+ <script type="text/javascript" src="../jquery.flot.js"></script>
+ <script type="text/javascript">
+ $(document).ready( function() {
+ var datasets = {
+ 'usa': {
+ label: 'USA',
data: [[1988, 483994], [1989, 479060], [1990, 457648], [1991, 401949], [1992, 424705], [1993, 402375], [1994, 377867], [1995, 357382], [1996, 337946], [1997, 336185], [1998, 328611], [1999, 329421], [2000, 342172], [2001, 344932], [2002, 387303], [2003, 440813], [2004, 480451], [2005, 504638], [2006, 528692]]
- },
- "russia": {
- label: "Russia",
+ },
+ 'russia': {
+ label: 'Russia',
data: [[1988, 218000], [1989, 203000], [1990, 171000], [1992, 42500], [1993, 37600], [1994, 36600], [1995, 21700], [1996, 19200], [1997, 21300], [1998, 13600], [1999, 14000], [2000, 19100], [2001, 21300], [2002, 23600], [2003, 25100], [2004, 26100], [2005, 31100], [2006, 34700]]
- },
- "uk": {
- label: "UK",
+ },
+ 'uk': {
+ label: 'UK',
data: [[1988, 62982], [1989, 62027], [1990, 60696], [1991, 62348], [1992, 58560], [1993, 56393], [1994, 54579], [1995, 50818], [1996, 50554], [1997, 48276], [1998, 47691], [1999, 47529], [2000, 47778], [2001, 48760], [2002, 50949], [2003, 57452], [2004, 60234], [2005, 60076], [2006, 59213]]
- },
- "germany": {
- label: "Germany",
+ },
+ 'germany': {
+ label: 'Germany',
data: [[1988, 55627], [1989, 55475], [1990, 58464], [1991, 55134], [1992, 52436], [1993, 47139], [1994, 43962], [1995, 43238], [1996, 42395], [1997, 40854], [1998, 40993], [1999, 41822], [2000, 41147], [2001, 40474], [2002, 40604], [2003, 40044], [2004, 38816], [2005, 38060], [2006, 36984]]
- },
- "denmark": {
- label: "Denmark",
+ },
+ 'denmark': {
+ label: 'Denmark',
data: [[1988, 3813], [1989, 3719], [1990, 3722], [1991, 3789], [1992, 3720], [1993, 3730], [1994, 3636], [1995, 3598], [1996, 3610], [1997, 3655], [1998, 3695], [1999, 3673], [2000, 3553], [2001, 3774], [2002, 3728], [2003, 3618], [2004, 3638], [2005, 3467], [2006, 3770]]
- },
- "sweden": {
- label: "Sweden",
+ },
+ 'sweden': {
+ label: 'Sweden',
data: [[1988, 6402], [1989, 6474], [1990, 6605], [1991, 6209], [1992, 6035], [1993, 6020], [1994, 6000], [1995, 6018], [1996, 3958], [1997, 5780], [1998, 5954], [1999, 6178], [2000, 6411], [2001, 5993], [2002, 5833], [2003, 5791], [2004, 5450], [2005, 5521], [2006, 5271]]
- },
- "norway": {
- label: "Norway",
+ },
+ 'norway': {
+ label: 'Norway',
data: [[1988, 4382], [1989, 4498], [1990, 4535], [1991, 4398], [1992, 4766], [1993, 4441], [1994, 4670], [1995, 4217], [1996, 4275], [1997, 4203], [1998, 4482], [1999, 4506], [2000, 4358], [2001, 4385], [2002, 5269], [2003, 5066], [2004, 5194], [2005, 4887], [2006, 4891]]
- }
- };
+ }
+ };
+
+ // hard-code color indices to prevent them from shifting as
+ // countries are turned on/off
+ var i = 0;
+ $.each( datasets, function( key, val ) { val.color = i++; } );
- // hard-code color indices to prevent them from shifting as
- // countries are turned on/off
- var i = 0;
- $.each(datasets, function(key, val) {
- val.color = i;
- ++i;
- });
-
- // insert checkboxes
- var choiceContainer = $("#choices");
- $.each(datasets, function(key, val) {
- choiceContainer.append('<br/><input type="checkbox" name="' + key +
- '" checked="checked" >' + val.label + '</input>');
- });
- choiceContainer.find("input").click(plotAccordingToChoices);
+ // insert checkboxes
+ var choiceContainer = $(document).append( '<p id="choices">Show:</p>' );
+ $.each( datasets, function( key, val ) {
+ choiceContainer.append( '<br/><input type="checkbox" name="' + key +
+ '" checked="checked" >' + val.label + '</input>' );
+ } );
+ choiceContainer.find('input').click( plotAccordingToChoices );
-
- function plotAccordingToChoices() {
- var data = [];
+ function plotAccordingToChoices() {
+ var data = [];
- choiceContainer.find("input:checked").each(function () {
- var key = $(this).attr("name");
- if (key && datasets[key])
- data.push(datasets[key]);
- });
+ choiceContainer.find('input:checked').each( function() {
+ var key = $(this).attr( 'name' );
+ if( key && datasets[key] ) data.push( datasets[key] );
+ } );
+
+ if( data.length > 0 ) {
+ $.plot( $('#placeholder'), data, {
+ yaxis: { min: 0, label: 'Budget' },
+ xaxis: { tickDecimals: 0, label: 'Year' }
+ } );
+ }
+ }
- if (data.length > 0)
- $.plot($("#placeholder"), data, {
- yaxis: { min: 0, label: "Budget" },
- xaxis: { tickDecimals: 0, label: "Year" }
- });
- }
+ // do initial drawing (all choices selected)
+ plotAccordingToChoices();
+ } );
+ </script>
+ </head>
+ <body>
+ <h1>Flot Examples</h1>
+
+ <div id="placeholder" style="width:600px;height:300px;"></div>
- plotAccordingToChoices();
-});
-</script>
+ <p>
+ Here is an example with real data: military budgets for
+ various countries in constant (2005) million US dollars
+ (source: <a href="http://www.sipri.org/">SIPRI</a>).
+ </p>
- </body>
+ <p>
+ Since all data is available client-side, it's pretty easy to
+ make the plot interactive. Try turning countries on/off with the
+ checkboxes below.
+ </p>
+ </body>
</html>
Oops, something went wrong.

0 comments on commit 9d55735

Please sign in to comment.