|
460 | 460 | > |
461 | 461 | <Shape |
462 | 462 | :data-cy="`xy-plot-${i}-${j}`" |
463 | | - v-if="canShowValue(plot.value)" |
| 463 | + v-if="plot && canShowValue(plot.value)" |
464 | 464 | :shape="['triangle', 'square', 'diamond', 'pentagon', 'hexagon', 'star'].includes(serie.shape) ? serie.shape : 'circle'" |
465 | | - :color="FINAL_CONFIG.plot.useGradient ? `url(#plotGradient_${i}_${uniqueId})` : serie.color" |
| 465 | + :color="FINAL_CONFIG.plot.useGradient ? `url(#plotGradient_${i}_${uniqueId})` : FINAL_CONFIG.plot.dot.useSerieColor ? serie.color : FINAL_CONFIG.plot.dot.fill" |
466 | 466 | :plot="{ x: checkNaN(plot.x), y: checkNaN(plot.y) }" |
467 | 467 | :radius="((selectedSerieIndex !== null && selectedSerieIndex === j) || (selectedMinimapIndex !== null && selectedMinimapIndex === j)) ? (plotRadii.plot || 6) * 1.5 : plotRadii.plot || 6" |
468 | | - :stroke="FINAL_CONFIG.chart.backgroundColor" |
469 | | - :strokeWidth="0.5" |
| 468 | + :stroke="FINAL_CONFIG.plot.dot.useSerieColor ? FINAL_CONFIG.chart.backgroundColor : serie.color" |
| 469 | + :strokeWidth="FINAL_CONFIG.plot.dot.strokeWidth" |
470 | 470 | /> |
471 | 471 |
|
472 | 472 | <template v-if="plot.comment && FINAL_CONFIG.chart.comments.show"> |
|
589 | 589 | :data-cy="`xy-plot-${i}-${j}`" |
590 | 590 | v-if="plot && canShowValue(plot.value)" |
591 | 591 | :shape="['triangle', 'square', 'diamond', 'pentagon', 'hexagon', 'star'].includes(serie.shape) ? serie.shape : 'circle'" |
592 | | - :color="FINAL_CONFIG.line.useGradient ? `url(#lineGradient_${i}_${uniqueId})` : serie.color" |
| 592 | + :color="FINAL_CONFIG.line.useGradient ? `url(#lineGradient_${i}_${uniqueId})` : FINAL_CONFIG.line.dot.useSerieColor ? serie.color : FINAL_CONFIG.line.dot.fill" |
593 | 593 | :plot="{ x: checkNaN(plot.x), y: checkNaN(plot.y) }" |
594 | 594 | :radius="((selectedSerieIndex !== null && selectedSerieIndex === j) || (selectedMinimapIndex !== null && selectedMinimapIndex === j)) ? (plotRadii.line || 6) * 1.5 : plotRadii.line || 6" |
595 | | - :stroke="FINAL_CONFIG.chart.backgroundColor" |
596 | | - :strokeWidth="0.5" |
| 595 | + :stroke="FINAL_CONFIG.line.dot.useSerieColor ? FINAL_CONFIG.chart.backgroundColor : serie.color" |
| 596 | + :strokeWidth="FINAL_CONFIG.line.dot.strokeWidth" |
597 | 597 | /> |
598 | 598 |
|
599 | 599 | <template v-if="plot.comment && FINAL_CONFIG.chart.comments.show"> |
@@ -1748,6 +1748,13 @@ export default { |
1748 | 1748 | value: datapoint.absoluteValues[j], |
1749 | 1749 | comment: datapoint.comments ? datapoint.comments.slice(this.slicer.start, this.slicer.end)[j] || '' : '' |
1750 | 1750 | } |
| 1751 | + } else { |
| 1752 | + return { |
| 1753 | + x: this.checkNaN((this.drawingArea.left + (this.slot.line/2)) + (this.slot.line * j)), |
| 1754 | + y: zeroPosition, |
| 1755 | + value: datapoint.absoluteValues[j], |
| 1756 | + comment: datapoint.comments ? datapoint.comments.slice(this.slicer.start, this.slicer.end)[j] || '' : '' |
| 1757 | + } |
1751 | 1758 | } |
1752 | 1759 | }) |
1753 | 1760 | const curve = this.createSmoothPath(plots); |
|
0 commit comments