Ei muokkausyhteenvetoa |
Ei muokkausyhteenvetoa |
||
| Rivi 548: | Rivi 548: | ||
} | } | ||
} else if ( memo.divide == 'bottomsurface' ) { | } else if ( memo.divide == 'bottomsurface' ) { | ||
if ( obs.data.depthR == 'bottom' ) { | |||
if ( obs.data ) { | |||
obs.seriesId = 'bottom'; | obs.seriesId = 'bottom'; | ||
} else if ( | } else if ( bs.data.depthR == 'surface' ) { | ||
obs.seriesId = 'surface'; | obs.seriesId = 'surface'; | ||
} else { | } else { | ||
| Rivi 1 091: | Rivi 1 090: | ||
memo.data.addColumn( 'number', 'Talvi (tammi-huhtikuu)' ); | memo.data.addColumn( 'number', 'Talvi (tammi-huhtikuu)' ); | ||
memo.data.addColumn( {'type': 'string', 'role': 'style' } ); | |||
memo.data.addColumn( { type: 'string', role: 'annotation' } ); | |||
memo.data.addColumn( { type: 'string', role: 'tooltip', 'p': { 'html': true } } ); | |||
} else if ( memo.divide == 'bottomssurface' ) { | |||
memo.options.series[0] = { type: 'scatter', pointSize: 10, color: colors[ 'spring-autumn' ] }; | |||
memo.options.series[1] = { type: 'scatter', pointSize: 10, color: colors[ 'summer' ] }; | |||
memo.options.series[2] = { type: 'scatter', pointSize: 10, color: colors[ 'winter' ] }; | |||
memo.data.addColumn( 'number', 'Välivesi/Ei tietoa' ); | |||
memo.data.addColumn( {'type': 'string', 'role': 'style' } ); | |||
memo.data.addColumn( { type: 'string', role: 'annotation' } ); | |||
memo.data.addColumn( { type: 'string', role: 'tooltip', 'p': { 'html': true } } ); | |||
memo.data.addColumn( 'number', 'Pohja' ); | |||
memo.data.addColumn( {'type': 'string', 'role': 'style' } ); | |||
memo.data.addColumn( { type: 'string', role: 'annotation' } ); | |||
memo.data.addColumn( { type: 'string', role: 'tooltip', 'p': { 'html': true } } ); | |||
memo.data.addColumn( 'number', 'Pinta' ); | |||
memo.data.addColumn( {'type': 'string', 'role': 'style' } ); | memo.data.addColumn( {'type': 'string', 'role': 'style' } ); | ||
memo.data.addColumn( { type: 'string', role: 'annotation' } ); | memo.data.addColumn( { type: 'string', role: 'annotation' } ); | ||
| Rivi 1 113: | Rivi 1 133: | ||
memo.options.trendlines[1] = { labelInLegend: i18n['trendline'][memo.lang], tooltip: false, color: colors['summer'], lineWidth: 3, originalLineWidth: 3, opacity: 1, type: memo.trendType, 'degree': 2, visibleInLegend: false }; | memo.options.trendlines[1] = { labelInLegend: i18n['trendline'][memo.lang], tooltip: false, color: colors['summer'], lineWidth: 3, originalLineWidth: 3, opacity: 1, type: memo.trendType, 'degree': 2, visibleInLegend: false }; | ||
memo.options.trendlines[2] = { labelInLegend: i18n['trendline'][memo.lang], tooltip: false, color: colors['winter'], lineWidth: 3, originalLineWidth: 3, opacity: 1, type: memo.trendType, 'degree': 2, visibleInLegend: false }; | memo.options.trendlines[2] = { labelInLegend: i18n['trendline'][memo.lang], tooltip: false, color: colors['winter'], lineWidth: 3, originalLineWidth: 3, opacity: 1, type: memo.trendType, 'degree': 2, visibleInLegend: false }; | ||
} else if ( memo.divide == 'bottomsurface' ) { | |||
memo.options.trendlines[0] = { 'lineWidth': 0, 'opacity': 0, tooltip: false, visibleInLegend: false }; | |||
memo.options.trendlines[1] = { labelInLegend: i18n['trendline'][memo.lang], tooltip: false, color: colors['summer'], lineWidth: 3, originalLineWidth: 3, opacity: 1, type: memo.trendType, 'degree': 2, visibleInLegend: false }; | |||
memo.options.trendlines[2] = { labelInLegend: i18n['trendline'][memo.lang], tooltip: false, color: colors['winter'], lineWidth: 3, originalLineWidth: 3, opacity: 1, type: memo.trendType, 'degree': 2, visibleInLegend: false }; | |||
} else { | } else { | ||
memo.options.trendlines[0] = { labelInLegend: i18n['trendline'][memo.lang], tooltip: false, color: colors['allyear'], lineWidth: 3, originalLineWidth: 3, opacity: 1, type: memo.trendType, 'degree': 2, visibleInLegend: memo.trendType!='moving' }; | memo.options.trendlines[0] = { labelInLegend: i18n['trendline'][memo.lang], tooltip: false, color: colors['allyear'], lineWidth: 3, originalLineWidth: 3, opacity: 1, type: memo.trendType, 'degree': 2, visibleInLegend: memo.trendType!='moving' }; | ||
| Rivi 1 138: | Rivi 1 162: | ||
memo.dataA.push( [ memo.obsesA[o].obsdatetime, null, null, null, null, memo.obsesA[o].value, memo.obsesA[o].style, null, memo.obsesA[o].popup, null, null, null, null ] ); | memo.dataA.push( [ memo.obsesA[o].obsdatetime, null, null, null, null, memo.obsesA[o].value, memo.obsesA[o].style, null, memo.obsesA[o].popup, null, null, null, null ] ); | ||
} else if ( memo.obsesA[o].seriesId == 'winter' ) { | } else if ( memo.obsesA[o].seriesId == 'winter' ) { | ||
memo.dataA.push( [ memo.obsesA[o].obsdatetime, null, null, null, null, null, null, null, null, memo.obsesA[o].value, memo.obsesA[o].style, null, memo.obsesA[o].popup ] ); | |||
} else { | |||
memo.dataA.push( [ memo.obsesA[o].obsdatetime, memo.obsesA[o].value, memo.obsesA[o].style, null, memo.obsesA[o].popup, null, null, null, null, null, null, null, null ] ); | |||
} | |||
} else if ( memo.divide == 'bottomsurface' ) { | |||
if ( memo.obsesA[o].seriesId == 'bottom' ) { | |||
memo.dataA.push( [ memo.obsesA[o].obsdatetime, null, null, null, null, memo.obsesA[o].value, memo.obsesA[o].style, null, memo.obsesA[o].popup, null, null, null, null ] ); | |||
} else if ( memo.obsesA[o].seriesId == 'surface' ) { | |||
memo.dataA.push( [ memo.obsesA[o].obsdatetime, null, null, null, null, null, null, null, null, memo.obsesA[o].value, memo.obsesA[o].style, null, memo.obsesA[o].popup ] ); | memo.dataA.push( [ memo.obsesA[o].obsdatetime, null, null, null, null, null, null, null, null, memo.obsesA[o].value, memo.obsesA[o].style, null, memo.obsesA[o].popup ] ); | ||
} else { | } else { | ||


