changed condition on which axis labels are centered

This commit is contained in:
Hans Blankenhaus
2023-09-21 10:55:09 +02:00
parent 5c39e99e32
commit d7591fbeda

View File

@@ -283,14 +283,17 @@ export class QuadrantBuilder {
quadrantTop, quadrantTop,
quadrantWidth, quadrantWidth,
} = quadrantSpace; } = quadrantSpace;
const drawAxisLabelInMiddle = this.data.points.length === 0;
const drawXAxisLabelsInMiddle = this.data.xAxisRightText ? true : false;
const drawYAxisLabelsInMiddle = this.data.yAxisTopText ? true : false;
const axisLabels: QuadrantTextType[] = []; const axisLabels: QuadrantTextType[] = [];
if (this.data.xAxisLeftText && showXAxis) { if (this.data.xAxisLeftText && showXAxis) {
axisLabels.push({ axisLabels.push({
text: this.data.xAxisLeftText, text: this.data.xAxisLeftText,
fill: this.themeConfig.quadrantXAxisTextFill, fill: this.themeConfig.quadrantXAxisTextFill,
x: quadrantLeft + (drawAxisLabelInMiddle ? quadrantHalfWidth / 2 : 0), x: quadrantLeft + (drawXAxisLabelsInMiddle ? quadrantHalfWidth / 2 : 0),
y: y:
xAxisPosition === 'top' xAxisPosition === 'top'
? this.config.xAxisLabelPadding + titleSpace.top ? this.config.xAxisLabelPadding + titleSpace.top
@@ -299,7 +302,7 @@ export class QuadrantBuilder {
quadrantHeight + quadrantHeight +
this.config.quadrantPadding, this.config.quadrantPadding,
fontSize: this.config.xAxisLabelFontSize, fontSize: this.config.xAxisLabelFontSize,
verticalPos: drawAxisLabelInMiddle ? 'center' : 'left', verticalPos: drawXAxisLabelsInMiddle ? 'center' : 'left',
horizontalPos: 'top', horizontalPos: 'top',
rotation: 0, rotation: 0,
}); });
@@ -308,7 +311,7 @@ export class QuadrantBuilder {
axisLabels.push({ axisLabels.push({
text: this.data.xAxisRightText, text: this.data.xAxisRightText,
fill: this.themeConfig.quadrantXAxisTextFill, fill: this.themeConfig.quadrantXAxisTextFill,
x: quadrantLeft + quadrantHalfWidth + (drawAxisLabelInMiddle ? quadrantHalfWidth / 2 : 0), x: quadrantLeft + quadrantHalfWidth + (drawXAxisLabelsInMiddle ? quadrantHalfWidth / 2 : 0),
y: y:
xAxisPosition === 'top' xAxisPosition === 'top'
? this.config.xAxisLabelPadding + titleSpace.top ? this.config.xAxisLabelPadding + titleSpace.top
@@ -317,7 +320,7 @@ export class QuadrantBuilder {
quadrantHeight + quadrantHeight +
this.config.quadrantPadding, this.config.quadrantPadding,
fontSize: this.config.xAxisLabelFontSize, fontSize: this.config.xAxisLabelFontSize,
verticalPos: drawAxisLabelInMiddle ? 'center' : 'left', verticalPos: drawXAxisLabelsInMiddle ? 'center' : 'left',
horizontalPos: 'top', horizontalPos: 'top',
rotation: 0, rotation: 0,
}); });
@@ -334,9 +337,9 @@ export class QuadrantBuilder {
quadrantLeft + quadrantLeft +
quadrantWidth + quadrantWidth +
this.config.quadrantPadding, this.config.quadrantPadding,
y: quadrantTop + quadrantHeight - (drawAxisLabelInMiddle ? quadrantHalfHeight / 2 : 0), y: quadrantTop + quadrantHeight - (drawYAxisLabelsInMiddle ? quadrantHalfHeight / 2 : 0),
fontSize: this.config.yAxisLabelFontSize, fontSize: this.config.yAxisLabelFontSize,
verticalPos: drawAxisLabelInMiddle ? 'center' : 'left', verticalPos: drawYAxisLabelsInMiddle ? 'center' : 'left',
horizontalPos: 'top', horizontalPos: 'top',
rotation: -90, rotation: -90,
}); });
@@ -352,9 +355,10 @@ export class QuadrantBuilder {
quadrantLeft + quadrantLeft +
quadrantWidth + quadrantWidth +
this.config.quadrantPadding, this.config.quadrantPadding,
y: quadrantTop + quadrantHalfHeight - (drawAxisLabelInMiddle ? quadrantHalfHeight / 2 : 0), y:
quadrantTop + quadrantHalfHeight - (drawYAxisLabelsInMiddle ? quadrantHalfHeight / 2 : 0),
fontSize: this.config.yAxisLabelFontSize, fontSize: this.config.yAxisLabelFontSize,
verticalPos: drawAxisLabelInMiddle ? 'center' : 'left', verticalPos: drawYAxisLabelsInMiddle ? 'center' : 'left',
horizontalPos: 'top', horizontalPos: 'top',
rotation: -90, rotation: -90,
}); });