multiple lines multiple colors

bitly · Dec 12, 2023 · 5639bb1 · 5639bb1
1 parent 318279f
commit 5639bb1
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 5 deletions.
diff --git a/tscli/main.go b/tscli/main.go
@@ -120,7 +120,7 @@ func executeQuery(cmd *cobra.Command, args []string) error {
 
 	tsi := GoogleCloudMonitoringClient.ListTimeSeries(context.Background(), request)
 	// todo: handle multiple time series
-	plot, err := tsplot.NewPlotFromTimeSeriesIterator(tsi)
+	plot, err := tsplot.NewPlotFromTimeSeriesIterator(tsi, "classification")
 	if err != nil {
 		log.Fatal(err)
 	}

diff --git a/tsplot/color_palettes.go b/tsplot/color_palettes.go
@@ -6,6 +6,18 @@ import (
 	"golang.org/x/image/colornames"
 )
 
+var usedColors = make(map[string]color.RGBA)
+
+func getUnusedColor() color.RGBA {
+	for k, v := range colornames.Map {
+		if _, ok := usedColors[k]; !ok {
+			usedColors[k] = v
+			return v
+		}
+	}
+	return colornames.Black
+}
+
 type ColorPalette struct {
 	Foreground color.Color
 	Background color.Color

diff --git a/tsplot/plot.go b/tsplot/plot.go
@@ -72,7 +72,7 @@ func NewPlotFromTimeSeries(ts *monitoringpb.TimeSeries, opts ...PlotOption) (*pl
 	return p, nil
 }
 
-func NewPlotFromTimeSeriesIterator(tsi *monitoring.TimeSeriesIterator) (*plot.Plot, error) {
+func NewPlotFromTimeSeriesIterator(tsi *monitoring.TimeSeriesIterator, groupByLabel string, opts ...PlotOption) (*plot.Plot, error) {
 	p := plot.New()
 	for {
 		timeSeries, err := tsi.Next()
@@ -82,9 +82,22 @@ func NewPlotFromTimeSeriesIterator(tsi *monitoring.TimeSeriesIterator) (*plot.Pl
 			}
 			return nil, err
 		}
-		line, _ := createLine(timeSeries.GetPoints())
+
+		// add colored line to plot
+		lineColor := getUnusedColor()
+		applyLine := WithColoredLineFromPoints(timeSeries.GetPoints(), lineColor)
+		applyLine(p)
+
+		// add to legend
+		legendEntry, _ := plotter.NewPolygon()
+		legendEntry.Color = lineColor
+		p.Legend.Add(timeSeries.GetMetric().GetLabels()[groupByLabel], legendEntry)
+
 		p.Y.Max = 400 // todo: make dynamic according to data
-		p.Add(line)
+	}
+
+	for _, opt := range opts {
+		opt(p)
 	}
 
 	return p, nil
@@ -95,7 +108,7 @@ func createLine(dataPoints []*monitoringpb.Point) (*plotter.Line, error) {
 	var XYs plotter.XYs
 	for _, point := range dataPoints {
 		x := point.GetInterval().GetEndTime().GetSeconds()
-		y := point.GetValue().GetDoubleValue()
+		y := point.GetValue().GetDoubleValue() // todo: This breaks if the valuetype is an int64
 		XYs = append(XYs, plotter.XY{
 			X: float64(x),
 			Y: y,