Skip to content

Commit

Permalink
plot: change naming convention
Browse files Browse the repository at this point in the history 
The following Regular Expressions applied:
193,467s/Plot\([A-z]\+\)Widget/\1Plot/g
193,467s/\(\/\/ \|func \)Plot\([A-z]\+\)\( \|(\)/\1\2\3/g
(executed in vim)
  • Loading branch information
@gucio321
gucio321 committed Nov 17, 2022
1 parent ad30257 commit 3b519d9
Show file tree
Hide file tree
Showing 2 changed files with 67 additions and 67 deletions.
114 changes: 57 additions & 57 deletions Plot.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -190,18 +190,18 @@ func (p *PlotCanvasWidget) Build() {
}
}

// PlotBarWidget adds bar plot (column chart) to the canvas.
type PlotBarWidget struct {
// BarPlot adds bar plot (column chart) to the canvas.
type BarPlot struct {
title string
data []float64
width float64
shift float64
offset int
}

// PlotBar adds a plot bar (column chart).
func PlotBar(title string, data []float64) *PlotBarWidget {
return &PlotBarWidget{
// Bar adds a plot bar (column chart).
func Bar(title string, data []float64) *BarPlot {
return &BarPlot{
title: title,
data: data,
width: 0.2,
Expand All @@ -211,40 +211,40 @@ func PlotBar(title string, data []float64) *PlotBarWidget {
}

// Width sets bar width.
func (p *PlotBarWidget) Width(width float64) *PlotBarWidget {
func (p *BarPlot) Width(width float64) *BarPlot {
p.width = width
return p
}

// Shift sets shift of the bar.
func (p *PlotBarWidget) Shift(shift float64) *PlotBarWidget {
func (p *BarPlot) Shift(shift float64) *BarPlot {
p.shift = shift
return p
}

// Offset sets bar's offset.
func (p *PlotBarWidget) Offset(offset int) *PlotBarWidget {
func (p *BarPlot) Offset(offset int) *BarPlot {
p.offset = offset
return p
}

// Plot implements Plot interface.
func (p *PlotBarWidget) Plot() {
func (p *BarPlot) Plot() {
imgui.ImPlotBars(p.title, p.data, p.width, p.shift, p.offset)
}

// PlotBarHWidget represents a column chart on Y axis.
type PlotBarHWidget struct {
// BarHPlot represents a column chart on Y axis.
type BarHPlot struct {
title string
data []float64
height float64
shift float64
offset int
}

// PlotBarH adds plot bars on y axis.
func PlotBarH(title string, data []float64) *PlotBarHWidget {
return &PlotBarHWidget{
// BarH adds plot bars on y axis.
func BarH(title string, data []float64) *BarHPlot {
return &BarHPlot{
title: title,
data: data,
height: 0.2,
Expand All @@ -254,40 +254,40 @@ func PlotBarH(title string, data []float64) *PlotBarHWidget {
}

// Height sets bar height (in fact bars' width).
func (p *PlotBarHWidget) Height(height float64) *PlotBarHWidget {
func (p *BarHPlot) Height(height float64) *BarHPlot {
p.height = height
return p
}

// Shift sets shift.
func (p *PlotBarHWidget) Shift(shift float64) *PlotBarHWidget {
func (p *BarHPlot) Shift(shift float64) *BarHPlot {
p.shift = shift
return p
}

// Offset sets offset.
func (p *PlotBarHWidget) Offset(offset int) *PlotBarHWidget {
func (p *BarHPlot) Offset(offset int) *BarHPlot {
p.offset = offset
return p
}

// Plot implements plot interface.
func (p *PlotBarHWidget) Plot() {
func (p *BarHPlot) Plot() {
imgui.ImPlotBarsH(Context.FontAtlas.RegisterString(p.title), p.data, p.height, p.shift, p.offset)
}

// PlotLineWidget represents a plot line (linear chart).
type PlotLineWidget struct {
// LinePlot represents a plot line (linear chart).
type LinePlot struct {
title string
values []float64
xScale, x0 float64
offset int
yAxis ImPlotYAxis
}

// PlotLine adds a new plot line to the canvas.
func PlotLine(title string, values []float64) *PlotLineWidget {
return &PlotLineWidget{
// Line adds a new plot line to the canvas.
func Line(title string, values []float64) *LinePlot {
return &LinePlot{
title: title,
values: values,
xScale: 1,
Expand All @@ -297,46 +297,46 @@ func PlotLine(title string, values []float64) *PlotLineWidget {
}

// SetPlotYAxis sets yAxis parameters.
func (p *PlotLineWidget) SetPlotYAxis(yAxis ImPlotYAxis) *PlotLineWidget {
func (p *LinePlot) SetPlotYAxis(yAxis ImPlotYAxis) *LinePlot {
p.yAxis = yAxis
return p
}

// XScale sets x-axis-scale.
func (p *PlotLineWidget) XScale(scale float64) *PlotLineWidget {
func (p *LinePlot) XScale(scale float64) *LinePlot {
p.xScale = scale
return p
}

// X0 sets a start position on x axis.
func (p *PlotLineWidget) X0(x0 float64) *PlotLineWidget {
func (p *LinePlot) X0(x0 float64) *LinePlot {
p.x0 = x0
return p
}

// Offset sets chart offset.
func (p *PlotLineWidget) Offset(offset int) *PlotLineWidget {
func (p *LinePlot) Offset(offset int) *LinePlot {
p.offset = offset
return p
}

// Plot implements Plot interface.
func (p *PlotLineWidget) Plot() {
func (p *LinePlot) Plot() {
imgui.ImPlotSetPlotYAxis(imgui.ImPlotYAxis(p.yAxis))
imgui.ImPlotLine(Context.FontAtlas.RegisterString(p.title), p.values, p.xScale, p.x0, p.offset)
}

// PlotLineXYWidget adds XY plot line.
type PlotLineXYWidget struct {
// LineXYPlot adds XY plot line.
type LineXYPlot struct {
title string
xs, ys []float64
offset int
yAxis ImPlotYAxis
}

// PlotLineXY adds XY plot line to canvas.
func PlotLineXY(title string, xvalues, yvalues []float64) *PlotLineXYWidget {
return &PlotLineXYWidget{
// LineXY adds XY plot line to canvas.
func LineXY(title string, xvalues, yvalues []float64) *LineXYPlot {
return &LineXYPlot{
title: title,
xs: xvalues,
ys: yvalues,
Expand All @@ -345,25 +345,25 @@ func PlotLineXY(title string, xvalues, yvalues []float64) *PlotLineXYWidget {
}

// SetPlotYAxis sets yAxis parameters.
func (p *PlotLineXYWidget) SetPlotYAxis(yAxis ImPlotYAxis) *PlotLineXYWidget {
func (p *LineXYPlot) SetPlotYAxis(yAxis ImPlotYAxis) *LineXYPlot {
p.yAxis = yAxis
return p
}

// Offset sets chart's offset.
func (p *PlotLineXYWidget) Offset(offset int) *PlotLineXYWidget {
func (p *LineXYPlot) Offset(offset int) *LineXYPlot {
p.offset = offset
return p
}

// Plot implements Plot interface.
func (p *PlotLineXYWidget) Plot() {
func (p *LineXYPlot) Plot() {
imgui.ImPlotSetPlotYAxis(imgui.ImPlotYAxis(p.yAxis))
imgui.ImPlotLineXY(Context.FontAtlas.RegisterString(p.title), p.xs, p.ys, p.offset)
}

// PlotPieChartWidget represents a pie chart.
type PlotPieChartWidget struct {
// PieChartPlot represents a pie chart.
type PieChartPlot struct {
labels []string
values []float64
x, y, radius float64
Expand All @@ -372,9 +372,9 @@ type PlotPieChartWidget struct {
angle0 float64
}

// PlotPieChart adds pie chart to the canvas.
func PlotPieChart(labels []string, values []float64, x, y, radius float64) *PlotPieChartWidget {
return &PlotPieChartWidget{
// PieChart adds pie chart to the canvas.
func PieChart(labels []string, values []float64, x, y, radius float64) *PieChartPlot {
return &PieChartPlot{
labels: labels,
values: values,
x: x,
Expand All @@ -386,35 +386,35 @@ func PlotPieChart(labels []string, values []float64, x, y, radius float64) *Plot
}
}

func (p *PlotPieChartWidget) Normalize(n bool) *PlotPieChartWidget {
func (p *PieChartPlot) Normalize(n bool) *PieChartPlot {
p.normalize = n
return p
}

// LabelFormat sets format of labels.
func (p *PlotPieChartWidget) LabelFormat(fmtStr string) *PlotPieChartWidget {
func (p *PieChartPlot) LabelFormat(fmtStr string) *PieChartPlot {
p.labelFormat = fmtStr
return p
}

func (p *PlotPieChartWidget) Angle0(a float64) *PlotPieChartWidget {
func (p *PieChartPlot) Angle0(a float64) *PieChartPlot {
p.angle0 = a
return p
}

func (p *PlotPieChartWidget) Plot() {
func (p *PieChartPlot) Plot() {
imgui.ImPlotPieChart(Context.FontAtlas.RegisterStringSlice(p.labels), p.values, p.x, p.y, p.radius, p.normalize, p.labelFormat, p.angle0)
}

type PlotScatterWidget struct {
type ScatterPlot struct {
label string
values []float64
xscale, x0 float64
offset int
}

func PlotScatter(label string, values []float64) *PlotScatterWidget {
return &PlotScatterWidget{
func Scatter(label string, values []float64) *ScatterPlot {
return &ScatterPlot{
label: label,
values: values,
xscale: 1,
Expand All @@ -423,45 +423,45 @@ func PlotScatter(label string, values []float64) *PlotScatterWidget {
}
}

func (p *PlotScatterWidget) XScale(s float64) *PlotScatterWidget {
func (p *ScatterPlot) XScale(s float64) *ScatterPlot {
p.xscale = s
return p
}

func (p *PlotScatterWidget) X0(x float64) *PlotScatterWidget {
func (p *ScatterPlot) X0(x float64) *ScatterPlot {
p.x0 = x
return p
}

func (p *PlotScatterWidget) Offset(offset int) *PlotScatterWidget {
func (p *ScatterPlot) Offset(offset int) *ScatterPlot {
p.offset = offset
return p
}

func (p *PlotScatterWidget) Plot() {
func (p *ScatterPlot) Plot() {
imgui.ImPlotScatter(Context.FontAtlas.RegisterString(p.label), p.values, p.xscale, p.x0, p.offset)
}

type PlotScatterXYWidget struct {
type ScatterXYPlot struct {
label string
xs, ys []float64
offset int
}

func PlotScatterXY(label string, xs, ys []float64) *PlotScatterXYWidget {
return &PlotScatterXYWidget{
func ScatterXY(label string, xs, ys []float64) *ScatterXYPlot {
return &ScatterXYPlot{
label: label,
xs: xs,
ys: ys,
offset: 0,
}
}

func (p *PlotScatterXYWidget) Offset(offset int) *PlotScatterXYWidget {
func (p *ScatterXYPlot) Offset(offset int) *ScatterXYPlot {
p.offset = offset
return p
}

func (p *PlotScatterXYWidget) Plot() {
func (p *ScatterXYPlot) Plot() {
imgui.ImPlotScatterXY(Context.FontAtlas.RegisterString(p.label), p.xs, p.ys, p.offset)
}
20 changes: 10 additions & 10 deletions examples/plot/main.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,22 +27,22 @@ var (
func loop() {
g.SingleWindow().Layout(
g.Plot("Plot 基本图表").AxisLimits(0, 100, -1.2, 1.2, g.ConditionOnce).XTicks(lineTicks, false).Plots(
g.PlotLine("Plot Line 线图", linedata),
g.PlotLine("Plot Line2", linedata2),
g.PlotScatter("Scatter 散点图", scatterdata),
g.Line("Plot Line 线图", linedata),
g.Line("Plot Line2", linedata2),
g.Scatter("Scatter 散点图", scatterdata),
),
g.Plot("Plot Time Axe 时间线").AxisLimits(timeDataMin, timeDataMax, 0, 1, g.ConditionOnce).XAxeFlags(g.PlotAxisFlagsTime).Plots(
g.PlotLineXY("Time Line 时间线", timeDataX, timeDataY),
g.PlotScatterXY("Time Scatter 时间散点图", timeDataX, timeScatterY),
g.LineXY("Time Line 时间线", timeDataX, timeDataY),
g.ScatterXY("Time Scatter 时间散点图", timeDataX, timeScatterY),
),
g.Row(
g.Plot("Plot Bars").
Size(500, 250).
AxisLimits(0, 10, -1.2, 1.2, g.ConditionOnce).
Plots(
g.PlotBar("Plot Bar 柱状图", bardata),
g.PlotBar("Plot Bar2", bardata2).Shift(0.2),
g.PlotBarH("Plot Bar H 水平柱状图", bardata3),
g.Bar("Plot Bar 柱状图", bardata),
g.Bar("Plot Bar2", bardata2).Shift(0.2),
g.BarH("Plot Bar H 水平柱状图", bardata3),
),
g.Plot("Pie Chart").
Flags(g.PlotFlagsEqual|g.PlotFlagsNoMousePos).
Expand All @@ -51,14 +51,14 @@ func loop() {
YAxeFlags(g.PlotAxisFlagsNoDecorations, 0, 0).
AxisLimits(0, 1, 0, 1, g.ConditionAlways).
Plots(
g.PlotPieChart([]string{"Part 1 图例1", "Part 2", "Part 3"}, []float64{0.22, 0.38, 0.4}, 0.5, 0.5, 0.45),
g.PieChart([]string{"Part 1 图例1", "Part 2", "Part 3"}, []float64{0.22, 0.38, 0.4}, 0.5, 0.5, 0.45),
),
),
)
}

func main() {
var delta = 0.1
delta := 0.1
for x := 0.0; x < 10; x += delta {
linedata = append(linedata, math.Sin(x))
linedata2 = append(linedata2, math.Cos(x))
Expand Down

0 comments on commit 3b519d9

Please sign in to comment.