Ei muokkausyhteenvetoa |
Ei muokkausyhteenvetoa |
||
| Rivi 806: | Rivi 806: | ||
memo.data.addColumn( { type: 'string', role: 'annotation' } ); | memo.data.addColumn( { type: 'string', role: 'annotation' } ); | ||
memo.options.series.push( { type: 'scatter', pointType: 'circle', pointSize: | memo.options.series.push( { type: 'scatter', pointType: 'circle', pointSize: 10, color: memo.seriesA[ s ].color, XstrokeWidth: 2, Xstroke: '#000000' } ); | ||
if ( memo.seriesA[ s ].obses.length > 1 ) { | if ( memo.seriesA[ s ].obses.length > 1 ) { | ||
| Rivi 949: | Rivi 949: | ||
memo.options.curveType = 'function'; | memo.options.curveType = 'function'; | ||
//memo.options.intervals = { 'style': 'area', 'color': colors['averageare'] }; | //memo.options.intervals = { 'style': 'area', 'color': colors['averageare'] }; | ||
memo.options.series[1] = { type: 'line', pointSize: | memo.options.series[1] = { type: 'line', pointSize: 10, color: colors.curObses, lineWidth: 5 }; | ||
//memo.options.vAxis.viewWindow.min = 80.5; | //memo.options.vAxis.viewWindow.min = 80.5; | ||
| Rivi 994: | Rivi 994: | ||
memo.options.seriesType = 'line'; | memo.options.seriesType = 'line'; | ||
memo.options.series[0] = { type: 'line', pointSize: | memo.options.series[0] = { type: 'line', pointSize: 10, color: colors['curObses'] }; | ||
memo.options.curveType = 'function'; | memo.options.curveType = 'function'; | ||
//memo.options.intervals = { 'style': 'area', 'color': colors['averageare'] }; | //memo.options.intervals = { 'style': 'area', 'color': colors['averageare'] }; | ||
| Rivi 1 022: | Rivi 1 022: | ||
if ( memo.summerwinter ) { | if ( memo.summerwinter ) { | ||
memo.options.series[0] = { type: 'scatter', pointSize: | memo.options.series[0] = { type: 'scatter', pointSize: 10, color: colors[ 'spring-autumn' ] }; | ||
memo.options.series[1] = { type: 'scatter', pointSize: | memo.options.series[1] = { type: 'scatter', pointSize: 10, color: colors[ 'summer' ] }; | ||
memo.options.series[2] = { type: 'scatter', pointSize: | memo.options.series[2] = { type: 'scatter', pointSize: 10, color: colors[ 'winter' ] }; | ||
memo.data.addColumn( 'number', 'Kevät/syksy' ); | memo.data.addColumn( 'number', 'Kevät/syksy' ); | ||
| Rivi 1 043: | Rivi 1 043: | ||
} else { | } else { | ||
memo.options.series[0] = { type: 'scatter', pointSize: | memo.options.series[0] = { type: 'scatter', pointSize: 10, color: colors[ 'allyear' ] }; | ||
memo.data.addColumn( 'number', memo.obsMinYear + '-' + memo.obsMaxYear ); | memo.data.addColumn( 'number', memo.obsMinYear + '-' + memo.obsMaxYear ); | ||
| Rivi 1 157: | Rivi 1 157: | ||
if ( memo.seasonsA[s] == memo.curSeason ) { | if ( memo.seasonsA[s] == memo.curSeason ) { | ||
if ( memo.type == 'cat' ) { | if ( memo.type == 'cat' ) { | ||
memo.options.series[sc++] = { type: 'scatter', curveType: 'function', color: colors['curObses'], XpointSize: | memo.options.series[sc++] = { type: 'scatter', curveType: 'function', color: colors['curObses'], XpointSize: 10, lineWidth: 0, visibleInLegend: true, hideThis: false, XorigSize: 10 }; | ||
} else { | } else { | ||
//if ( memo.obscode == 'secchi' ) { | //if ( memo.obscode == 'secchi' ) { | ||
// memo.options.series[sc++] = { type: 'area', curveType: 'function', color: colors['curObses'], pointSize: | // memo.options.series[sc++] = { type: 'area', curveType: 'function', color: colors['curObses'], pointSize: 10, lineWidth: 4, visibleInLegend: true, hideThis: false, XorigSize: 10 }; | ||
//} else { | //} else { | ||
memo.options.series[sc++] = { type: 'scatter', curveType: 'function', color: colors['curObses'], pointSize: | memo.options.series[sc++] = { type: 'scatter', curveType: 'function', color: colors['curObses'], pointSize: 10, lineWidth: 4, visibleInLegend: true, hideThis: false, XorigSize: 10 }; | ||
//} | //} | ||
} | } | ||
} else { | } else { | ||
memo.options.series[sc++] = { type: 'scatter', curveType: 'function', color: colors['obses'], pointSize: | memo.options.series[sc++] = { type: 'scatter', curveType: 'function', color: colors['obses'], pointSize: 10, lineWidth: 0, visibleInLegend: false, hideThis: true, XorigSize: 5 }; | ||
} | } | ||
} | } | ||
| Rivi 1 172: | Rivi 1 172: | ||
// legend entry for timespan | // legend entry for timespan | ||
memo.data.addColumn( 'number', memo.obsMinDate.getFullYear() + '-' + memo.obsMaxDate.getFullYear() ); | memo.data.addColumn( 'number', memo.obsMinDate.getFullYear() + '-' + memo.obsMaxDate.getFullYear() ); | ||
memo.options.series[sc++] = { type: 'scatter', color: colors['obses'], pointSize: | memo.options.series[sc++] = { type: 'scatter', color: colors['obses'], pointSize: 10, visibleInLegend: true, hideThis: false }; | ||
// series for average | // series for average | ||


