Skip to content

Commit dbf6550

Browse files
johnkiernanderjohnkiernander
committed
Fixed adhoc charts
1 parent 7d5cf26 commit dbf6550

7 files changed

Lines changed: 57 additions & 44 deletions

‎adhoc/adhoc_bar_custom_tooltips.html‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
1+
<!DOCTYPE html>
2+
<meta charset="utf-8">
3+
<html>
14
<div id="chartContainer">
2-
<script src="/lib/d3.v3.4.8.min.js"></script>
3-
<script src="/dist/dimple.v2.2.0.js"></script>
5+
<script src="/lib/d3.v3.min.js"></script>
6+
<script src="/dist/dimple.v2.0.0.js"></script>
47
<script type="text/javascript">
58
var svg = dimple.newSvg("#chartContainer", 590, 400);
69
d3.tsv("/data/example_data.tsv", function (data) {
@@ -19,4 +22,5 @@
1922
myChart.draw();
2023
});
2124
</script>
22-
</div>
25+
</div>
26+
</html>

‎adhoc/adhoc_bar_labels.html‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
1+
<!DOCTYPE html>
2+
<meta charset="utf-8">
3+
<html>
14
<div id="chartContainer">
2-
<script src="/lib/d3.v3.4.8.min.js"></script>
3-
<script src="/dist/dimple.v2.2.0.js"></script>
5+
<script src="/lib/d3.v3.min.js"></script>
6+
<script src="/dist/dimple.v2.0.0.js"></script>
47
<script type="text/javascript">
58
// This is the simple vertical grouped stacked 100% bar example
69
var svg = dimple.newSvg("#chartContainer", 590, 400);
@@ -44,4 +47,5 @@
4447
myChart.draw(2000);
4548
});
4649
</script>
47-
</div>
50+
</div>
51+
</html>

‎adhoc/adhoc_bar_scroll.html‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
1+
<!DOCTYPE html>
2+
<meta charset="utf-8">
3+
<html>
14
<div id="chartContainer">
2-
<script src="/lib/d3.v3.4.8.min.js"></script>
3-
<script src="/dist/dimple.v2.2.0.js"></script>
5+
<script src="/lib/d3.v3.min.js"></script>
6+
<script src="/dist/dimple.v2.0.0.js"></script>
47
<script type="text/javascript">
58
// Start off with a couple of rows of data
69
var data = [
@@ -29,4 +32,5 @@
2932
myChart.draw(1000);
3033
}, 500);
3134
</script>
32-
</div>
35+
</div>
36+
</html>

‎adhoc/adhoc_bounce_stagger.html‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
1+
<!DOCTYPE html>
2+
<meta charset="utf-8">
3+
<html>
14
<div id="chartContainer">
2-
<script src="/lib/d3.v3.4.8.min.js"></script>
3-
<script src="/dist/dimple.v2.2.0.js"></script>
5+
<script src="/lib/d3.v3.min.js"></script>
6+
<script src="/dist/dimple.v2.0.0.js"></script>
47
<script type="text/javascript">
58
var svg = dimple.newSvg("#chartContainer", 590, 400);
69
d3.tsv("/data/example_data.tsv", function (data) {
@@ -17,4 +20,5 @@
1720
myChart.draw(800);
1821
});
1922
</script>
20-
</div>
23+
</div>
24+
</html>

‎adhoc/adhoc_composite_axis_category.html‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
1+
<!DOCTYPE html>
2+
<meta charset="utf-8">
3+
<html>
14
<div id="chartContainer">
2-
<script src="/lib/d3.v3.4.8.min.js"></script>
3-
<script src="/dist/dimple.v2.2.0.js"></script>
5+
<script src="/lib/d3.v3.min.js"></script>
6+
<script src="/dist/dimple.v2.0.0.js"></script>
47
<script type="text/javascript">
58
var svg = dimple.newSvg("#chartContainer", 590, 400);
69
d3.tsv("/data/example_data.tsv", function (data) {
@@ -19,4 +22,5 @@
1922
myChart.draw();
2023
});
2124
</script>
22-
</div>
25+
</div>
26+
</html>

‎adhoc/adhoc_composite_axis_measure.html‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
1+
<!DOCTYPE html>
2+
<meta charset="utf-8">
3+
<html>
14
<div id="chartContainer">
2-
<script src="/lib/d3.v3.4.8.min.js"></script>
3-
<script src="/dist/dimple.v2.2.0.js"></script>
5+
<script src="/lib/d3.v3.min.js"></script>
6+
<script src="/dist/dimple.v2.0.0.js"></script>
47
<script type="text/javascript">
58
var svg = dimple.newSvg("#chartContainer", 590, 400);
69
d3.tsv("/data/example_data.tsv", function (data) {
@@ -17,4 +20,5 @@
1720
myChart.draw();
1821
});
1922
</script>
20-
</div>
23+
</div>
24+
</html>

‎adhoc/adhoc_dual_axis.html‎

Lines changed: 15 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,34 +1,23 @@
1+
<!DOCTYPE html>
2+
<meta charset="utf-8">
3+
<html>
14
<div id="chartContainer">
2-
<script src="/lib/d3.v3.4.8.min.js"></script>
3-
<script src="/dist/dimple.v2.2.0.js"></script>
5+
<script src="/lib/d3.v3.min.js"></script>
6+
<script src="/dist/dimple.v2.0.0.js"></script>
47
<script type="text/javascript">
58
var svg = dimple.newSvg("#chartContainer", 590, 400);
69
d3.tsv("/data/example_data.tsv", function (data) {
710
var myChart = new dimple.chart(svg, data);
811
myChart.setBounds(60, 50, 460, 280);
9-
10-
data = [
11-
{ "Int": 1, "Float": 234, "Text": "XFBGR", "Date": "12/5/99", "Group": "A"},
12-
{ "Int": 2, "Float": 54.35, "Text": "YTREB", "Date": "1/1/00", "Group": "A"},
13-
{ "Int": 3, "Float": -453, "Text": "XGFDY", "Date": "2 February 2007", "Group": "B"},
14-
{ "Int": 4, "Float": 5436546, "Text": "XGFDE", "Date": "2000-03-01", "Group": "B"},
15-
{ "Int": 5, "Float": 4323, "Text": "YTREB", "Date": "10/10/2000", "Group": "C"},
16-
{ "Int": 6, "Float": 0, "Text": "GFDHN", "Date": "11/10/2000", "Group": "C"},
17-
{ "Int": 7, "Float": -453, "Text": "TRET", "Date": "10/9/2000", "Group": "D"},
18-
{ "Int": 1, "Float": 5436546, "Text": "GFDGFDHG", "Date": "10/10/2000", "Group": "E"}
19-
];
20-
var s = dimple._getOrderedList(data, "Int", { ordering : "Text" });
21-
console.log(s);
22-
//
23-
//
24-
// var monthAxis = myChart.addCategoryAxis("x", "Owner");
25-
// monthAxis.addOrderRule("Brand");
26-
// var volumeAxis = myChart.addMeasureAxis("y", "Unit Sales");
27-
// var profitAxis = myChart.addMeasureAxis("y", "Operating Profit");
28-
// myChart.addSeries("Quantity", dimple.plot.line, [monthAxis, volumeAxis]);
29-
// myChart.addSeries("Op. Profit", dimple.plot.line, [monthAxis, profitAxis]);
30-
// myChart.addLegend(200, 10, 380, 20, "right");
31-
// myChart.draw();
12+
var monthAxis = myChart.addCategoryAxis("x", "Month");
13+
monthAxis.addOrderRule("Date");
14+
var volumeAxis = myChart.addMeasureAxis("y", "Unit Sales");
15+
var profitAxis = myChart.addMeasureAxis("y", "Operating Profit");
16+
myChart.addSeries("Quantity", dimple.plot.line, [monthAxis, volumeAxis]);
17+
myChart.addSeries("Op. Profit", dimple.plot.line, [monthAxis, profitAxis]);
18+
myChart.addLegend(200, 10, 380, 20, "right");
19+
myChart.draw();
3220
});
3321
</script>
34-
</div>
22+
</div>
23+
</html>

0 commit comments

Comments
 (0)