Skip to content

Commit b90908b

Browse files
johnkiernanderjohnkiernander
committed
Merge pull request #46 from PMSI-AlignAlytics/pr/45
Extended David's idea to cover unlinked datasets
2 parents 8c68517 + 38d7fde commit b90908b

7 files changed

Lines changed: 84 additions & 31 deletions

File tree

‎dist/dimple.v1.1.4.js‎

Lines changed: 42 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -228,14 +228,17 @@ var dimple = {
228228
origin,
229229
getOrderedCategories = function (self, axPos, oppPos) {
230230
var category = self.categoryFields[0],
231+
chartData = self.chart._getAllData(),
231232
sortBy = category,
232233
desc = false,
233234
isDate = true,
235+
currentValue = null,
234236
i,
235237
definitions = [];
236238
// Check whether this field is a date
237-
for (i = 0; i < self.chart.data.length; i += 1) {
238-
if (isNaN(self._parseDate(self.chart.data[i][category]))) {
239+
for (i = 0; i < chartData.length; i += 1) {
240+
currentValue = self._parseDate(chartData[i][category]);
241+
if (currentValue !== null && currentValue !== undefined && isNaN(currentValue)) {
239242
isDate = false;
240243
break;
241244
}
@@ -250,7 +253,7 @@ var dimple = {
250253
}, this);
251254
}
252255
definitions = self._orderRules.concat({ ordering : sortBy, desc : desc });
253-
return dimple._getOrderedList(self.chart.data, category, definitions);
256+
return dimple._getOrderedList(chartData, category, definitions);
254257
};
255258

256259
// If the axis is a percentage type axis the bounds must be between -1 and 1. Sometimes
@@ -495,6 +498,30 @@ var dimple = {
495498
};
496499

497500

501+
// Copyright: 2013 PMSI-AlignAlytics
502+
// License: "https://github.com/PMSI-AlignAlytics/dimple/blob/master/MIT-LICENSE.txt"
503+
// Source: /src/objects/chart/methods/_getAllData.js
504+
// Mash together all of the datasets
505+
this._getAllData = function () {
506+
// The return array will include all data for chart as well as an series
507+
var returnData = [];
508+
// If there is data at the chart level
509+
if (this.data !== null && this.data !== undefined && this.data.length > 0) {
510+
returnData = returnData.concat(this.data);
511+
}
512+
// If there are series defined
513+
if (this.series !== null && this.series !== undefined && this.series.length > 0) {
514+
this.series.forEach(function (s) {
515+
if (s.data !== null && s.data !== undefined && s.data.length > 0) {
516+
returnData = returnData.concat(s.data);
517+
}
518+
});
519+
}
520+
// Return the final dataset
521+
return returnData;
522+
};
523+
524+
498525
// Copyright: 2013 PMSI-AlignAlytics
499526
// License: "https://github.com/PMSI-AlignAlytics/dimple/blob/master/MIT-LICENSE.txt"
500527
// Source: /src/objects/chart/methods/_getSeriesData.js
@@ -544,22 +571,22 @@ var dimple = {
544571
yCat = "",
545572
ySortArray = [],
546573
rules = [],
547-
sortedData =series.data || this.data,
574+
sortedData = series.data || this.data,
548575
groupRules = [];
549576

550577
if (this.storyboard !== null && this.storyboard !== undefined && this.storyboard.categoryFields.length > 0) {
551578
storyCat = this.storyboard.categoryFields[0];
552-
orderedStoryboardArray = dimple._getOrderedList(this.data, storyCat, this.storyboard._orderRules);
579+
orderedStoryboardArray = dimple._getOrderedList(sortedData, storyCat, this.storyboard._orderRules);
553580
}
554581

555582
// Deal with mekkos
556583
if (series.x._hasCategories() && series.x._hasMeasure()) {
557584
xCat = series.x.categoryFields[0];
558-
xSortArray = dimple._getOrderedList(this.data, xCat, series.x._orderRules.concat([{ ordering : series.x.measure, desc : true }]));
585+
xSortArray = dimple._getOrderedList(sortedData, xCat, series.x._orderRules.concat([{ ordering : series.x.measure, desc : true }]));
559586
}
560587
if (series.y._hasCategories() && series.y._hasMeasure()) {
561588
yCat = series.y.categoryFields[0];
562-
ySortArray = dimple._getOrderedList(this.data, yCat, series.y._orderRules.concat([{ ordering : series.y.measure, desc : true }]));
589+
ySortArray = dimple._getOrderedList(sortedData, yCat, series.y._orderRules.concat([{ ordering : series.y.measure, desc : true }]));
563590
}
564591

565592
if (series.categoryFields !== null && series.categoryFields !== undefined && series.categoryFields.length > 0) {
@@ -576,7 +603,7 @@ var dimple = {
576603
} else if (series.y._hasMeasure()) {
577604
rules.push({ ordering : series.y.measure, desc : true });
578605
}
579-
orderedSeriesArray = dimple._getOrderedList(this.data, seriesCat, rules);
606+
orderedSeriesArray = dimple._getOrderedList(sortedData, seriesCat, rules);
580607
}
581608

582609
sortedData.sort(function (a, b) {
@@ -721,14 +748,14 @@ var dimple = {
721748
if (series.y._hasMeasure()) {
722749
groupRules.push({ ordering : series.y.measure, desc : true });
723750
}
724-
secondaryElements.x = dimple._getOrderedList(this.data, series.x.categoryFields[1], series.x._groupOrderRules.concat(groupRules));
751+
secondaryElements.x = dimple._getOrderedList(sortedData, series.x.categoryFields[1], series.x._groupOrderRules.concat(groupRules));
725752
}
726753
if (series.y !== null && series.y !== undefined && series.y._hasCategories() && series.y.categoryFields.length > 1 && secondaryElements.y !== undefined) {
727754
groupRules = [];
728755
if (series.x._hasMeasure()) {
729756
groupRules.push({ ordering : series.x.measure, desc : true });
730757
}
731-
secondaryElements.y = dimple._getOrderedList(this.data, series.y.categoryFields[1], series.y._groupOrderRules.concat(groupRules));
758+
secondaryElements.y = dimple._getOrderedList(sortedData, series.y.categoryFields[1], series.y._groupOrderRules.concat(groupRules));
732759
secondaryElements.y.reverse();
733760
}
734761
returnData.forEach(function (ret) {
@@ -1147,7 +1174,7 @@ var dimple = {
11471174
// in a real context, but when developing it is nice to see axes before any series have
11481175
// been added.
11491176
if (!linked) {
1150-
this.data.forEach(function (d) {
1177+
this._getAllData().forEach(function (d) {
11511178
if (axis._min > d[axis.measure]) { axis._min = d[axis.measure]; }
11521179
if (axis._max < d[axis.measure]) { axis._max = d[axis.measure]; }
11531180
}, this);
@@ -1156,7 +1183,7 @@ var dimple = {
11561183
// Parse the dates and assign the min and max
11571184
axis._min = null;
11581185
axis._max = null;
1159-
this.data.forEach(function (d) {
1186+
this._getAllData().forEach(function (d) {
11601187
var dt = axis._parseDate(d[axis.timeField]);
11611188
if (axis._min === null || dt < axis._min) {
11621189
axis._min = dt;
@@ -1169,7 +1196,7 @@ var dimple = {
11691196
// A category axis is just set to show the number of categories
11701197
axis._min = 0;
11711198
distinctCats = [];
1172-
this.data.forEach(function (d) {
1199+
this._getAllData().forEach(function (d) {
11731200
if (distinctCats.indexOf(d[axis.categoryFields[0]]) === -1) {
11741201
distinctCats.push(d[axis.categoryFields[0]]);
11751202
}
@@ -2122,7 +2149,7 @@ var dimple = {
21222149
// Clear the array
21232150
this._categories = [];
21242151
// Iterate every row in the data
2125-
this.chart.data.forEach(function (d) {
2152+
this.chart._getAllData().forEach(function (d) {
21262153
// Initialise the index of the categories array matching the current row
21272154
var index = -1,
21282155
field = "";
@@ -4260,4 +4287,4 @@ var dimple = {
42604287

42614288

42624289
}());
4263-
// End dimple
4290+
// End dimple

‎dist/dimple.v1.1.4.min.js‎

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎src/objects/axis/methods/_update.js‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,17 @@
1010
origin,
1111
getOrderedCategories = function (self, axPos, oppPos) {
1212
var category = self.categoryFields[0],
13+
chartData = self.chart._getAllData(),
1314
sortBy = category,
1415
desc = false,
1516
isDate = true,
17+
currentValue = null,
1618
i,
1719
definitions = [];
1820
// Check whether this field is a date
19-
for (i = 0; i < self.chart.data.length; i += 1) {
20-
if (isNaN(self._parseDate(self.chart.data[i][category]))) {
21+
for (i = 0; i < chartData.length; i += 1) {
22+
currentValue = self._parseDate(chartData[i][category]);
23+
if (currentValue !== null && currentValue !== undefined && isNaN(currentValue)) {
2124
isDate = false;
2225
break;
2326
}
@@ -32,7 +35,7 @@
3235
}, this);
3336
}
3437
definitions = self._orderRules.concat({ ordering : sortBy, desc : desc });
35-
return dimple._getOrderedList(self.chart.data, category, definitions);
38+
return dimple._getOrderedList(chartData, category, definitions);
3639
};
3740

3841
// If the axis is a percentage type axis the bounds must be between -1 and 1. Sometimes

‎src/objects/chart/methods/_getAllData.js‎

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
// Copyright: 2013 PMSI-AlignAlytics
2+
// License: "https://github.com/PMSI-AlignAlytics/dimple/blob/master/MIT-LICENSE.txt"
3+
// Source: /src/objects/chart/methods/_getAllData.js
4+
// Mash together all of the datasets
5+
this._getAllData = function () {
6+
// The return array will include all data for chart as well as an series
7+
var returnData = [];
8+
// If there is data at the chart level
9+
if (this.data !== null && this.data !== undefined && this.data.length > 0) {
10+
returnData = returnData.concat(this.data);
11+
}
12+
// If there are series defined
13+
if (this.series !== null && this.series !== undefined && this.series.length > 0) {
14+
this.series.forEach(function (s) {
15+
if (s.data !== null && s.data !== undefined && s.data.length > 0) {
16+
returnData = returnData.concat(s.data);
17+
}
18+
});
19+
}
20+
// Return the final dataset
21+
return returnData;
22+
};
23+

‎src/objects/chart/methods/_getSeriesData.js‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -47,22 +47,22 @@
4747
yCat = "",
4848
ySortArray = [],
4949
rules = [],
50-
sortedData = this.data,
50+
sortedData = series.data || this.data,
5151
groupRules = [];
5252

5353
if (this.storyboard !== null && this.storyboard !== undefined && this.storyboard.categoryFields.length > 0) {
5454
storyCat = this.storyboard.categoryFields[0];
55-
orderedStoryboardArray = dimple._getOrderedList(this.data, storyCat, this.storyboard._orderRules);
55+
orderedStoryboardArray = dimple._getOrderedList(sortedData, storyCat, this.storyboard._orderRules);
5656
}
5757

5858
// Deal with mekkos
5959
if (series.x._hasCategories() && series.x._hasMeasure()) {
6060
xCat = series.x.categoryFields[0];
61-
xSortArray = dimple._getOrderedList(this.data, xCat, series.x._orderRules.concat([{ ordering : series.x.measure, desc : true }]));
61+
xSortArray = dimple._getOrderedList(sortedData, xCat, series.x._orderRules.concat([{ ordering : series.x.measure, desc : true }]));
6262
}
6363
if (series.y._hasCategories() && series.y._hasMeasure()) {
6464
yCat = series.y.categoryFields[0];
65-
ySortArray = dimple._getOrderedList(this.data, yCat, series.y._orderRules.concat([{ ordering : series.y.measure, desc : true }]));
65+
ySortArray = dimple._getOrderedList(sortedData, yCat, series.y._orderRules.concat([{ ordering : series.y.measure, desc : true }]));
6666
}
6767

6868
if (series.categoryFields !== null && series.categoryFields !== undefined && series.categoryFields.length > 0) {
@@ -79,7 +79,7 @@
7979
} else if (series.y._hasMeasure()) {
8080
rules.push({ ordering : series.y.measure, desc : true });
8181
}
82-
orderedSeriesArray = dimple._getOrderedList(this.data, seriesCat, rules);
82+
orderedSeriesArray = dimple._getOrderedList(sortedData, seriesCat, rules);
8383
}
8484

8585
sortedData.sort(function (a, b) {
@@ -224,14 +224,14 @@
224224
if (series.y._hasMeasure()) {
225225
groupRules.push({ ordering : series.y.measure, desc : true });
226226
}
227-
secondaryElements.x = dimple._getOrderedList(this.data, series.x.categoryFields[1], series.x._groupOrderRules.concat(groupRules));
227+
secondaryElements.x = dimple._getOrderedList(sortedData, series.x.categoryFields[1], series.x._groupOrderRules.concat(groupRules));
228228
}
229229
if (series.y !== null && series.y !== undefined && series.y._hasCategories() && series.y.categoryFields.length > 1 && secondaryElements.y !== undefined) {
230230
groupRules = [];
231231
if (series.x._hasMeasure()) {
232232
groupRules.push({ ordering : series.x.measure, desc : true });
233233
}
234-
secondaryElements.y = dimple._getOrderedList(this.data, series.y.categoryFields[1], series.y._groupOrderRules.concat(groupRules));
234+
secondaryElements.y = dimple._getOrderedList(sortedData, series.y.categoryFields[1], series.y._groupOrderRules.concat(groupRules));
235235
secondaryElements.y.reverse();
236236
}
237237
returnData.forEach(function (ret) {

‎src/objects/chart/methods/draw.js‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@
4646
// in a real context, but when developing it is nice to see axes before any series have
4747
// been added.
4848
if (!linked) {
49-
this.data.forEach(function (d) {
49+
this._getAllData().forEach(function (d) {
5050
if (axis._min > d[axis.measure]) { axis._min = d[axis.measure]; }
5151
if (axis._max < d[axis.measure]) { axis._max = d[axis.measure]; }
5252
}, this);
@@ -55,7 +55,7 @@
5555
// Parse the dates and assign the min and max
5656
axis._min = null;
5757
axis._max = null;
58-
this.data.forEach(function (d) {
58+
this._getAllData().forEach(function (d) {
5959
var dt = axis._parseDate(d[axis.timeField]);
6060
if (axis._min === null || dt < axis._min) {
6161
axis._min = dt;
@@ -68,7 +68,7 @@
6868
// A category axis is just set to show the number of categories
6969
axis._min = 0;
7070
distinctCats = [];
71-
this.data.forEach(function (d) {
71+
this._getAllData().forEach(function (d) {
7272
if (distinctCats.indexOf(d[axis.categoryFields[0]]) === -1) {
7373
distinctCats.push(d[axis.categoryFields[0]]);
7474
}

‎src/objects/storyboard/methods/_getCategories.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
// Clear the array
77
this._categories = [];
88
// Iterate every row in the data
9-
this.chart.data.forEach(function (d) {
9+
this.chart._getAllData().forEach(function (d) {
1010
// Initialise the index of the categories array matching the current row
1111
var index = -1,
1212
field = "";

0 commit comments

Comments
 (0)