Ero sivun ”Widget:JwObsCharts” versioiden välillä
Järvi-meriwikistä
| Rivi 799: | Rivi 799: | ||
s = obs.seriesId; | s = obs.seriesId; | ||
if (typeof memo.seriesO[s] == 'undefined' ) { | if (typeof memo.seriesO[s] == 'undefined' ) { | ||
| − | memo.seriesO[ s ] = { 'id': s, 'order': s, 'title': s, 'type': 'scatter', 'color': '#ff9999', 'obses': [] }; | + | memo.seriesO[ s ] = { 'id': s, 'order': s, 'title': s, 'type': 'scatter', 'color': '#ff9999', 'trendline': 'none', 'obses': [] }; |
} | } | ||
obs.xvalue = obs.compareDate; | obs.xvalue = obs.compareDate; | ||
| Rivi 824: | Rivi 824: | ||
memo.options.series.push( { type: 'scatter', pointType: 'circle', pointSize: 9, color: memo.seriesA[ s ].color } ); | memo.options.series.push( { type: 'scatter', pointType: 'circle', pointSize: 9, color: memo.seriesA[ s ].color } ); | ||
| − | if ( memo.seriesA[ s ].obses.length > 1 ) { | + | if ( memo.seriesA[ s ].trendline != 'none' && memo.seriesA[ s ].obses.length > 1 ) { |
memo.options.trendlines[ memo.options.series.length - 1 ] = { type: 'linear', title: i18n.trendline, lineWidth: 2.33, visibleInLegend: false, tooltip: false }; | memo.options.trendlines[ memo.options.series.length - 1 ] = { type: 'linear', title: i18n.trendline, lineWidth: 2.33, visibleInLegend: false, tooltip: false }; | ||
} else { | } else { | ||
