diff options
| -rw-r--r-- | js/RrdJson.js | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/js/RrdJson.js b/js/RrdJson.js index eef555c..de16682 100644 --- a/js/RrdJson.js +++ b/js/RrdJson.js | |||
| @@ -251,7 +251,7 @@ RrdJson.prototype = { | |||
| 251 | break; | 251 | break; |
| 252 | // LINE[width]:value[#color][:[legend][:STACK]][:dashes[=on_s[,off_s[,on_s,off_s]...]][:dash-offset=offset]] | 252 | // LINE[width]:value[#color][:[legend][:STACK]][:dashes[=on_s[,off_s[,on_s,off_s]...]][:dash-offset=offset]] |
| 253 | case 'LINE': | 253 | case 'LINE': |
| 254 | this.graph.gdes_add_line(gdes[i].width, gdes[i].value, gdes[i].color, gdes[i].legend, gdes[i].stack); | 254 | this.graph.gdes_add_line(gdes[i].width, gdes[i].value, gdes[i].color, gdes[i].legend, gdes[i].stack, gdes[i].dashes, gdes[i].dash_offset); |
| 255 | break; | 255 | break; |
| 256 | // AREA:value[#color][:[legend][:STACK]] | 256 | // AREA:value[#color][:[legend][:STACK]] |
| 257 | case 'AREA': | 257 | case 'AREA': |
| @@ -263,11 +263,11 @@ RrdJson.prototype = { | |||
| 263 | break; | 263 | break; |
| 264 | // HRULE:value#color[:legend][:dashes[=on_s[,off_s[,on_s,off_s]...]][:dash-offset=offset]] | 264 | // HRULE:value#color[:legend][:dashes[=on_s[,off_s[,on_s,off_s]...]][:dash-offset=offset]] |
| 265 | case 'HRULE': | 265 | case 'HRULE': |
| 266 | this.graph.gdes_add_hrule(gdes[i].value, gdes[i].color, gdes[i].legend); | 266 | this.graph.gdes_add_hrule(gdes[i].value, gdes[i].color, gdes[i].legend, gdes[i].dashes, gdes[i].dash_offset); |
| 267 | break; | 267 | break; |
| 268 | // VRULE:time#color[:legend][:dashes[=on_s[,off_s[,on_s,off_s]...]][:dash-offset=offset]] | 268 | // VRULE:time#color[:legend][:dashes[=on_s[,off_s[,on_s,off_s]...]][:dash-offset=offset]] |
| 269 | case 'VRULE': | 269 | case 'VRULE': |
| 270 | this.graph.gdes_add_vrule(gdes[i].time, gdes[i].color, gdes[i].legend); | 270 | this.graph.gdes_add_vrule(gdes[i].time, gdes[i].color, gdes[i].legend, gdes[i].dashes, gdes[i].dash_offset); |
| 271 | break; | 271 | break; |
| 272 | // COMMENT:text | 272 | // COMMENT:text |
| 273 | case 'COMMENT': | 273 | case 'COMMENT': |
| @@ -484,7 +484,9 @@ RrdJson.prototype = { | |||
| 484 | value: this.graph.gdes[i].vname, | 484 | value: this.graph.gdes[i].vname, |
| 485 | color: this.graph.gdes[i].col, | 485 | color: this.graph.gdes[i].col, |
| 486 | legend: (this.graph.gdes[i].legend === '' ? undefined : this.graph.gdes[i].legend.substr(2)), | 486 | legend: (this.graph.gdes[i].legend === '' ? undefined : this.graph.gdes[i].legend.substr(2)), |
| 487 | stack: (this.graph.gdes[i].stack === false ? undefined : this.graph.gdes[i].stack) }); | 487 | stack: (this.graph.gdes[i].stack === false ? undefined : this.graph.gdes[i].stack), |
| 488 | dashes: (this.graph.gdes[i].dash === false ? undefined : this.graph.gdes[i].p_dashes), | ||
| 489 | dash_offset: this.graph.gdes[i].offset }); | ||
| 488 | break; | 490 | break; |
| 489 | // AREA:value[#color][:[legend][:STACK]] | 491 | // AREA:value[#color][:[legend][:STACK]] |
| 490 | case RrdGraphDesc.GF_AREA: | 492 | case RrdGraphDesc.GF_AREA: |
| @@ -510,7 +512,9 @@ RrdJson.prototype = { | |||
| 510 | type: 'HRULE', | 512 | type: 'HRULE', |
| 511 | value: this.graph.gdes[i].yrule, | 513 | value: this.graph.gdes[i].yrule, |
| 512 | color: this.graph.gdes[i].col, | 514 | color: this.graph.gdes[i].col, |
| 513 | legend: (this.graph.gdes[i].legend === '' ? undefined : this.graph.gdes[i].legend.substr(2)) }); | 515 | legend: (this.graph.gdes[i].legend === '' ? undefined : this.graph.gdes[i].legend.substr(2)), |
| 516 | dashes: (this.graph.gdes[i].dash === false ? undefined : this.graph.gdes[i].p_dashes), | ||
| 517 | dash_offset: this.graph.gdes[i].offset }); | ||
| 514 | break; | 518 | break; |
| 515 | // VRULE:time#color[:legend][:dashes[=on_s[,off_s[,on_s,off_s]...]][:dash-offset=offset]] | 519 | // VRULE:time#color[:legend][:dashes[=on_s[,off_s[,on_s,off_s]...]][:dash-offset=offset]] |
| 516 | case RrdGraphDesc.GF_VRULE: | 520 | case RrdGraphDesc.GF_VRULE: |
| @@ -518,7 +522,9 @@ RrdJson.prototype = { | |||
| 518 | type: 'VRULE', | 522 | type: 'VRULE', |
| 519 | time: this.graph.gdes[i].xrule, | 523 | time: this.graph.gdes[i].xrule, |
| 520 | color: this.graph.gdes[i].col, | 524 | color: this.graph.gdes[i].col, |
| 521 | legend: (this.graph.gdes[i].legend === '' ? undefined : this.graph.gdes[i].legend.substr(2)) }); | 525 | legend: (this.graph.gdes[i].legend === '' ? undefined : this.graph.gdes[i].legend.substr(2)), |
| 526 | dashes: (this.graph.gdes[i].dash === false ? undefined : this.graph.gdes[i].p_dashes), | ||
| 527 | dash_offset: this.graph.gdes[i].offset }); | ||
| 522 | break; | 528 | break; |
| 523 | // COMMENT:text | 529 | // COMMENT:text |
| 524 | case RrdGraphDesc.GF_COMMENT: | 530 | case RrdGraphDesc.GF_COMMENT: |
