|
26 | 26 | s.regressionSettings.dashStyle = s.regressionSettings.dashStyle || 'solid'; |
27 | 27 | s.regressionSettings.decimalPlaces = s.regressionSettings.decimalPlaces || 2; |
28 | 28 | s.regressionSettings.useAllSeries = s.regressionSettings.useAllSeries || false; |
| 29 | + s.regressionSettings.regressionSeriesOptions = s.regressionSettings.regressionSeriesOptions || {}; |
29 | 30 |
|
30 | 31 | var regressionType = s.regressionSettings.type || "linear"; |
31 | 32 | 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 | + } |
49 | 53 |
|
50 | 54 | if (typeof s.regressionSettings.index !== 'undefined') { |
51 | 55 | extraSerie.index = s.regressionSettings.index; |
|
0 commit comments