|
128 | 128 | var vlinex = $th.data('graph-vline-x'); |
129 | 129 | if (typeof vlinex == 'undefined') { |
130 | 130 | thGraphConfig.scale = typeof columnScale != 'undefined' ? parseFloat(columnScale) : 1; |
131 | | - thGraphConfig.graphType = serieGraphType == 'column' && isGraphInverted ? 'bar' : serieGraphType;; |
| 131 | + thGraphConfig.graphType = serieGraphType == 'column' && isGraphInverted ? 'bar' : serieGraphType; |
132 | 132 | thGraphConfig.stack = serieStackGroup; |
133 | 133 | thGraphConfig.unit = $th.data('graph-unit'); |
134 | 134 | columns[indexTh] = thGraphConfig; |
|
284 | 284 | endOnTick: $table.data('graph-yaxis-'+yAxisNum+'-end-on-tick') !== "0", |
285 | 285 | stackLabels : { |
286 | 286 | enabled: $table.data('graph-yaxis-'+yAxisNum+'-stacklabels-enabled') == '1' |
287 | | - } |
| 287 | + }, |
| 288 | + gridLineInterpolation: $table.data('graph-yaxis-'+yAxisNum+'-grid-line-interpolation') || null |
288 | 289 | }; |
289 | 290 |
|
290 | 291 | var callableYAxisFormatter = getCallable(table, 'graph-yaxis-'+yAxisNum+'-formatter-callback'); |
|
345 | 346 | marginLeft: typeof marginLeft != 'undefined' ? marginLeft : null, |
346 | 347 | spacingTop: $table.data('graph-spacing-top') || 10, |
347 | 348 | height: $table.data('graph-height') || null, |
348 | | - zoomType: $table.data('graph-zoom-type') || null |
| 349 | + zoomType: $table.data('graph-zoom-type') || null, |
| 350 | + polar: $table.data('graph-polar') || null |
349 | 351 | }, |
350 | 352 | title: { |
351 | 353 | text: graphTitle |
|
365 | 367 | type: ($table.data('graph-xaxis-type') == 'datetime') ? 'datetime' : undefined, |
366 | 368 | reversed: $table.data('graph-xaxis-reversed') == '1', |
367 | 369 | opposite: $table.data('graph-xaxis-opposite') == '1', |
368 | | - showLastLabel: true, |
| 370 | + showLastLabel: typeof $table.data('graph-xaxis-show-last-label') != 'undefined' ? $table.data('graph-xaxis-show-last-label') : true, |
369 | 371 | tickInterval: $table.data('graph-xaxis-tick-interval') || null, |
370 | 372 | dateTimeLabelFormats: { //by default, we display the day and month on the datetime graphs |
371 | 373 | second: '%e. %b', |
|
392 | 394 | text: $table.data('graph-xaxis-title-text') || null |
393 | 395 | }, |
394 | 396 | gridLineWidth: $table.data('graph-xaxis-gridLine-width') || 0, |
395 | | - gridLineDashStyle: $table.data('graph-xaxis-gridLine-style') || 'ShortDot' |
| 397 | + gridLineDashStyle: $table.data('graph-xaxis-gridLine-style') || 'ShortDot', |
| 398 | + tickmarkPlacement: $table.data('graph-xaxis-tickmark-placement') || 'between', |
| 399 | + lineWidth: $table.data('graph-xaxis-line-width') || 0 |
396 | 400 | }, |
397 | 401 | yAxis: yAxisConfig, |
398 | 402 | tooltip: { |
|
0 commit comments