Ei muokkausyhteenvetoa |
Ei muokkausyhteenvetoa |
||
| Rivi 1 024: | Rivi 1 024: | ||
memo.data.addColumn( { type: 'string', role: 'annotation' } ); | memo.data.addColumn( { type: 'string', role: 'annotation' } ); | ||
memo.data.addColumn( { type: 'string', role: 'tooltip', 'p': { 'html': true } } ); | memo.data.addColumn( { type: 'string', role: 'tooltip', 'p': { 'html': true } } ); | ||
} else { | } else { | ||
| Rivi 1 037: | Rivi 1 033: | ||
memo.data.addColumn( { type: 'string', role: 'annotation' } ); | memo.data.addColumn( { type: 'string', role: 'annotation' } ); | ||
memo.data.addColumn( { type: 'string', role: 'tooltip', 'p': { 'html': true } } ); | memo.data.addColumn( { type: 'string', role: 'tooltip', 'p': { 'html': true } } ); | ||
} | |||
// series for trend line | |||
memo.options.trendlines[0] = { labelInLegend: i18n['trendline'][memo.lang], tooltip: false, color: colors['trend'], lineWidth: 3, originalLineWidth: 3, opacity: 1, type: ' | if ( memo.showTrend ) { | ||
if ( memo.summerwinter ) { | |||
memo.options.trendlines[0] = { labelInLegend: i18n['trendline'][memo.lang], tooltip: false, color: colors['summer'], lineWidth: 3, originalLineWidth: 3, opacity: 1, type: 'gussian', 'degree': 2, visibleInLegend: false }; | |||
memo.options.trendlines[1] = { labelInLegend: i18n['trendline'][memo.lang], tooltip: false, color: colors['winter'], lineWidth: 3, originalLineWidth: 3, opacity: 1, type: 'gaussian', 'degree': 2, visibleInLegend: false }; | |||
} else { | |||
memo.options.trendlines[0] = { labelInLegend: i18n['trendline'][memo.lang], tooltip: false, color: colors['trend'], lineWidth: 3, originalLineWidth: 3, opacity: 1, type: 'gaussian', 'degree': 2, visibleInLegend: memo.trendType!='moving' }; | |||
} | |||
} | |||
for (var o in memo.obsesA) { | for (var o in memo.obsesA) { | ||


