Skip to content

Commit 568326a

Browse files
author
ignacio vazquez
committed
Merge branch 'master' of github.com:streamlinesocial/highcharts-regression
2 parents 4ff4142 + eb751f6 commit 568326a

File tree

2 files changed

+25
-17
lines changed

2 files changed

+25
-17
lines changed

README.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -80,6 +80,10 @@ Format expected for dataLabel objects:
8080
}
8181
```
8282

83+
##### `regressionSeriesOptions` (Object)
84+
Standard Highcharts [series object](https://api.highcharts.com/highcharts/series).
85+
Customize the options for the generated regression series. Default: `undefined`
86+
8387
### Exposed properties:
8488
The plugin exposes properties to `series[regressionSeries].options.regressionOutputs (Object)`
8589
* `equation` (Array[Int]) individual parts of the regression equation

highcharts-regression.js

Lines changed: 21 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -26,26 +26,30 @@
2626
s.regressionSettings.dashStyle = s.regressionSettings.dashStyle || 'solid';
2727
s.regressionSettings.decimalPlaces = s.regressionSettings.decimalPlaces || 2;
2828
s.regressionSettings.useAllSeries = s.regressionSettings.useAllSeries || false;
29+
s.regressionSettings.regressionSeriesOptions = s.regressionSettings.regressionSeriesOptions || {};
2930

3031
var regressionType = s.regressionSettings.type || "linear";
3132
var regression;
32-
var extraSerie = {
33-
data: [],
34-
color: s.regressionSettings.color || '',
35-
yAxis: s.yAxis,
36-
lineWidth: s.regressionSettings.lineWidth || 2,
37-
marker: {enabled: false},
38-
isRegressionLine: true,
39-
visible: s.regressionSettings.visible,
40-
type: s.regressionSettings.linetype || 'spline',
41-
name: s.regressionSettings.name || "Equation: %eq",
42-
id: s.regressionSettings.id,
43-
dashStyle: s.regressionSettings.dashStyle || 'solid',
44-
showInLegend: !s.regressionSettings.hideInLegend,
45-
tooltip: {
46-
valueSuffix: s.regressionSettings.tooltip.valueSuffix || ' '
47-
}
48-
};
33+
var extraSerie = s.regressionSettings.regressionSeriesOptions;
34+
35+
// Set default values
36+
extraSerie.data = [];
37+
extraSerie.isRegressionLine = true;
38+
if (extraSerie.color === undefined) extraSerie.color = s.regressionSettings.color || '';
39+
if (extraSerie.yAxis === undefined) extraSerie.yAxis = s.yAxis;
40+
if (extraSerie.lineWidth === undefined) extraSerie.lineWidth = s.regressionSettings.lineWidth || 2;
41+
if (extraSerie.marker === undefined) extraSerie.marker = { enabled: false };
42+
if (extraSerie.visible === undefined) extraSerie.visible = s.regressionSettings.visible;
43+
if (extraSerie.type === undefined) extraSerie.type = s.regressionSettings.linetype || 'spline';
44+
if (extraSerie.name === undefined) extraSerie.name = s.regressionSettings.name || "Equation = %eq";
45+
if (extraSerie.id === undefined) extraSerie.id = s.regressionSettings.id;
46+
if (extraSerie.dashStyle === undefined) extraSerie.dashStyle = s.regressionSettings.dashStyle || 'solid';
47+
if (extraSerie.showInLegend === undefined) extraSerie.showInLegend = !s.regressionSettings.hideInLegend;
48+
if (extraSerie.tooltip === undefined) extraSerie.tooltip = s.regressionSettings.tooltip;
49+
50+
if (s.regressionSettings.tooltip.valueSuffix === undefined) {
51+
extraSerie.tooltip.valueSuffix = ' ';
52+
}
4953

5054
if (typeof s.regressionSettings.index !== 'undefined') {
5155
extraSerie.index = s.regressionSettings.index;

0 commit comments

Comments
 (0)