This fix missing horizontal axis in scatter chart with negative values (qax-os#1953)

pjh591029530 · Simmons · web-flow · commit 68a1704900e0 · 2024-07-17T08:44:16.000+08:00
Co-authored-by: Simmons &lt;1815481@qq.com&gt;
diff --git a/drawing.go b/drawing.go
@@ -598,8 +598,7 @@ func (f *File) drawScatterChart(pa *cPlotArea, opts *Chart) *cPlotArea {
 			DLbls: f.drawChartDLbls(opts),
 			AxID:  f.genAxID(opts),
 		},
-		CatAx: f.drawPlotAreaCatAx(pa, opts),
-		ValAx: f.drawPlotAreaValAx(pa, opts),
+		ValAx: append(f.drawPlotAreaCatAx(pa, opts), f.drawPlotAreaValAx(pa, opts)...),
 	}
 }
 
@@ -659,7 +658,7 @@ func (f *File) drawBubbleChart(pa *cPlotArea, opts *Chart) *cPlotArea {
 			DLbls: f.drawChartDLbls(opts),
 			AxID:  f.genAxID(opts),
 		},
-		ValAx: []*cAxs{f.drawPlotAreaCatAx(pa, opts)[0], f.drawPlotAreaValAx(pa, opts)[0]},
+		ValAx: append(f.drawPlotAreaCatAx(pa, opts), f.drawPlotAreaValAx(pa, opts)...),
 	}
 	if opts.BubbleSize > 0 && opts.BubbleSize <= 300 {
 		plotArea.BubbleChart.BubbleScale = &attrValFloat{Val: float64Ptr(float64(opts.BubbleSize))}

Original file line number	Diff line number	Diff line change
`@@ -598,8 +598,7 @@ func (f File) drawScatterChart(pa cPlotArea, opts Chart) cPlotArea {`
`598`	`598`	`DLbls: f.drawChartDLbls(opts),`
`599`	`599`	`AxID: f.genAxID(opts),`
`600`	`600`	`},`
`601`		`- CatAx: f.drawPlotAreaCatAx(pa, opts),`
`602`		`- ValAx: f.drawPlotAreaValAx(pa, opts),`
	`601`	`+ ValAx: append(f.drawPlotAreaCatAx(pa, opts), f.drawPlotAreaValAx(pa, opts)...),`
`603`	`602`	`}`
`604`	`603`	`}`
`605`	`604`
`@@ -659,7 +658,7 @@ func (f File) drawBubbleChart(pa cPlotArea, opts Chart) cPlotArea {`
`659`	`658`	`DLbls: f.drawChartDLbls(opts),`
`660`	`659`	`AxID: f.genAxID(opts),`
`661`	`660`	`},`
`662`		`- ValAx: []*cAxs{f.drawPlotAreaCatAx(pa, opts)[0], f.drawPlotAreaValAx(pa, opts)[0]},`
	`661`	`+ ValAx: append(f.drawPlotAreaCatAx(pa, opts), f.drawPlotAreaValAx(pa, opts)...),`
`663`	`662`	`}`
`664`	`663`	`if opts.BubbleSize > 0 && opts.BubbleSize <= 300 {`
`665`	`664`	`plotArea.BubbleChart.BubbleScale = &attrValFloat{Val: float64Ptr(float64(opts.BubbleSize))}`