projects
/
dygraphs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
clipping rectangles for interaction layer
[dygraphs.git]
/
tests
/
numeric-axis.html
diff --git
a/tests/numeric-axis.html
b/tests/numeric-axis.html
index
ad8d9e6
..
57352ee
100644
(file)
--- a/
tests/numeric-axis.html
+++ b/
tests/numeric-axis.html
@@
-2,34
+2,32
@@
<head>
<title>numeric axis</title>
<!--[if IE]>
<head>
<title>numeric axis</title>
<!--[if IE]>
- <script type="text/javascript" src="excanvas.js"></script>
+ <script type="text/javascript" src="
../
excanvas.js"></script>
<![endif]-->
<![endif]-->
- <script type="text/javascript" src="../dygraph-combined.js"></script>
+ <script type="text/javascript" src="../strftime/strftime-min.js"></script>
+ <script type="text/javascript" src="../rgbcolor/rgbcolor.js"></script>
+ <script type="text/javascript" src="../dygraph-canvas.js"></script>
<script type="text/javascript" src="../dygraph.js"></script>
<script type="text/javascript" src="http://www.google.com/jsapi"></script>
</head>
<body>
<p>CSV data source:</p>
<script type="text/javascript" src="../dygraph.js"></script>
<script type="text/javascript" src="http://www.google.com/jsapi"></script>
</head>
<body>
<p>CSV data source:</p>
- <div id="g" style="width:600px; height:300px;"></div>
+ <div id="
div_
g" style="width:600px; height:300px;"></div>
<p>GViz data source:</p>
<div id="gviz" style="width:600px; height:300px;"></div>
<script type="text/javascript">
<p>GViz data source:</p>
<div id="gviz" style="width:600px; height:300px;"></div>
<script type="text/javascript">
- g = new D
ateG
raph(
- document.getElementById("g"),
+ g = new D
yg
raph(
+ document.getElementById("
div_
g"),
function() {
var ret = "X,Y1,Y2\n";
for (var i = 0; i < 100; i++) {
ret += i + "," + i + "," + (i * (100-i) * 100/(50*50)) + "\n";
}
return ret;
function() {
var ret = "X,Y1,Y2\n";
for (var i = 0; i < 100; i++) {
ret += i + "," + i + "," + (i * (100-i) * 100/(50*50)) + "\n";
}
return ret;
- }, null,
- {
- xValueParser: function(x) { return parseFloat(x); },
- xValueFormatter: function(x) { return x; },
- xTicker: DateGraph.prototype.numericTicks
- }
+ },
+ { }
);
google.load('visualization', '1', {packages: ['linechart']});
);
google.load('visualization', '1', {packages: ['linechart']});
@@
-45,12
+43,9
@@
data.setCell(i, 2, i * (100-i) * 100/(50*50));
}
data.setCell(i, 2, i * (100-i) * 100/(50*50));
}
- new D
ateG
raph.GVizChart(
+ new D
yg
raph.GVizChart(
document.getElementById('gviz')).draw(data,
{
document.getElementById('gviz')).draw(data,
{
- xValueParser: function(x) { return parseFloat(x); },
- xValueFormatter: function(x) { return x; },
- xTicker: DateGraph.prototype.numericTicks
});
}
});
}