Merge pull request #805 from gucio321/implement-plot-2nd-and-3rd-axis

Implement plot 2nd and 3rd axis
AllenDang · Jun 25, 2024 · 6f51d85 · 6f51d85
2 parents c7c4a64 + 8415b2c
commit 6f51d85
Show file tree

Hide file tree

Showing 2 changed files with 62 additions and 12 deletions.
diff --git a/Plot.go b/Plot.go
@@ -6,6 +6,20 @@ import (
 	imgui "github.com/AllenDang/cimgui-go"
 )
 
+type (
+	PlotXAxis = imgui.PlotAxisEnum
+	PlotYAxis = imgui.PlotAxisEnum
+)
+
+const (
+	AxisX1 = imgui.AxisX1
+	AxisX2 = imgui.AxisX2
+	AxisX3 = imgui.AxisX3
+	AxisY1 = imgui.AxisY1
+	AxisY2 = imgui.AxisY2
+	AxisY3 = imgui.AxisY3
+)
+
 // PlotWidget is implemented by all the particular plots, which can be used
 // in (*PlotCanvasWidget).Plots.
 type PlotWidget interface {
@@ -75,6 +89,32 @@ func Plot(title string) *PlotCanvasWidget {
 	}
 }
 
+func (p *PlotCanvasWidget) SetXAxisLabel(axis PlotXAxis, label string) *PlotCanvasWidget {
+	switch axis {
+	case AxisX1:
+		p.xLabel = label
+	case AxisX2:
+		p.y2Label = label
+	case AxisX3:
+		p.y3Label = label
+	}
+
+	return p
+}
+
+func (p *PlotCanvasWidget) SetYAxisLabel(axis PlotYAxis, label string) *PlotCanvasWidget {
+	switch axis {
+	case AxisY1:
+		p.yLabel = label
+	case AxisY2:
+		p.y2Label = label
+	case AxisY3:
+		p.y3Label = label
+	}
+
+	return p
+}
+
 // AxisLimits sets X and Y axis limits.
 func (p *PlotCanvasWidget) AxisLimits(xmin, xmax, ymin, ymax float64, cond ExecCondition) *PlotCanvasWidget {
 	p.xMin = xmin
@@ -222,17 +262,21 @@ func (p *PlotCanvasWidget) Build() {
 			imgui.PlotAxisFlags(p.yFlags),
 		)
 
-		imgui.PlotSetupAxisV(
-			imgui.AxisY2,
-			Context.FontAtlas.RegisterString(p.y2Label),
-			imgui.PlotAxisFlags(p.y2Flags),
-		)
+		if p.y2Label != "" {
+			imgui.PlotSetupAxisV(
+				imgui.AxisY2,
+				Context.FontAtlas.RegisterString(p.y2Label),
+				imgui.PlotAxisFlags(p.y2Flags),
+			)
+		}
 
-		imgui.PlotSetupAxisV(
-			imgui.AxisY3,
-			Context.FontAtlas.RegisterString(p.y3Label),
-			imgui.PlotAxisFlags(p.y3Flags),
-		)
+		if p.y3Label != "" {
+			imgui.PlotSetupAxisV(
+				imgui.AxisY3,
+				Context.FontAtlas.RegisterString(p.y3Label),
+				imgui.PlotAxisFlags(p.y3Flags),
+			)
+		}
 
 		for _, plot := range p.plots {
 			plot.Plot()
@@ -242,6 +286,12 @@ func (p *PlotCanvasWidget) Build() {
 	}
 }
 
+func SwitchPlotAxes(x PlotXAxis, y PlotYAxis) PlotWidget {
+	return Custom(func() {
+		imgui.PlotSetAxes(x, y)
+	})
+}
+
 // BarPlot adds bar plot (column chart) to the canvas.
 type BarPlot struct {
 	title  string
@@ -251,7 +301,6 @@ type BarPlot struct {
 	offset int
 }
 
-// Bar adds a plot bar (column chart).
 func Bar(title string, data []float64) *BarPlot {
 	return &BarPlot{
 		title:  title,

diff --git a/examples/plot/main.go b/examples/plot/main.go
@@ -29,8 +29,9 @@ func loop() {
 		g.Plot("Plot 基本图表").AxisLimits(0, 100, -1.2, 1.2, g.ConditionOnce).XTicks(lineTicks, false).Plots(
 			g.Line("Plot Line 线图", linedata),
 			g.Line("Plot Line2", linedata2),
+			g.SwitchPlotAxes(g.AxisX1, g.AxisY2),
 			g.Scatter("Scatter 散点图", scatterdata),
-		),
+		).SetYAxisLabel(g.AxisY2, "secondary axis"),
 		g.Plot("Plot Time Axe 时间线").AxisLimits(timeDataMin, timeDataMax, 0, 1, g.ConditionOnce).Plots(
 			g.LineXY("Time Line 时间线", timeDataX, timeDataY),
 			g.ScatterXY("Time Scatter 时间散点图", timeDataX, timeScatterY),