hplot{,vgop}: add support for Save("foo.json")

Signed-off-by: Sebastien Binet <[email protected]>
go-hep · Sep 8, 2023 · 970796d · 970796d
1 parent e1cbaa6
commit 970796d
Show file tree

Hide file tree

Showing 5 changed files with 1,433 additions and 5 deletions.
diff --git a/hplot/io.go b/hplot/io.go
@@ -13,6 +13,7 @@ import (
 	"path/filepath"
 	"strings"
 
+	"go-hep.org/x/hep/hplot/vgop"
 	"gonum.org/v1/plot/vg"
 	"gonum.org/v1/plot/vg/draw"
 	"gonum.org/v1/plot/vg/vgeps"
@@ -32,7 +33,7 @@ type Drawer interface {
 //
 // Supported extensions are:
 //
-//	.eps, .jpg, .jpeg, .pdf, .png, .svg, .tex, .tif and .tiff.
+//	.eps, .jpg, .jpeg, .json, .pdf, .png, .svg, .tex, .tif and .tiff.
 //
 // If w or h are <= 0, the value is chosen such that it follows the Golden Ratio.
 // If w and h are <= 0, the values are chosen such that they follow the Golden Ratio
@@ -95,7 +96,7 @@ func Save(p Drawer, w, h vg.Length, fnames ...string) (err error) {
 // WriterTo returns an io.WriterTo that will write the plots as
 // the specified image format.
 //
-// # Supported formats are the same ones than hplot.Plot.WriterTo
+// Supported formats are the same ones than hplot.Save.
 //
 // If w or h are <= 0, the value is chosen such that it follows the Golden Ratio.
 // If w and h are <= 0, the values are chosen such that they follow the Golden Ratio
@@ -122,7 +123,7 @@ func WriterTo(p Drawer, w, h vg.Length, format string) (io.WriterTo, error) {
 //
 // Supported formats are:
 //
-//	eps, jpg|jpeg, pdf, png, svg, tex and tif|tiff.
+//	eps, jpg|jpeg, json, pdf, png, svg, tex and tif|tiff.
 func newFormattedCanvas(w, h vg.Length, format string, dpi float64) (vg.CanvasWriterTo, error) {
 	var c vg.CanvasWriterTo
 	switch format {
@@ -135,6 +136,9 @@ func newFormattedCanvas(w, h vg.Length, format string, dpi float64) (vg.CanvasWr
 			vgimg.UseWH(w, h),
 		)}
 
+	case "json":
+		c = vgop.NewJSON(vgop.WithSize(w, h))
+
 	case "pdf":
 		c = vgpdf.New(w, h)
 

diff --git a/hplot/plot.go b/hplot/plot.go
@@ -69,7 +69,7 @@ func (p *Plot) Add(ps ...plot.Plotter) {
 //
 // Supported extensions are:
 //
-//	.eps, .jpg, .jpeg, .pdf, .png, .svg, .tex, .tif and .tiff.
+//	.eps, .jpg, .jpeg, .json, .pdf, .png, .svg, .tex, .tif and .tiff.
 //
 // If w or h are <= 0, the value is chosen such that it follows the Golden Ratio.
 // If w and h are <= 0, the values are chosen such that they follow the Golden Ratio

diff --git a/hplot/tiledplot.go b/hplot/tiledplot.go
@@ -98,7 +98,7 @@ func (tp *TiledPlot) Draw(c draw.Canvas) {
 // Save saves the plots to an image file.
 // The file format is determined by the extension.
 //
-// Supported extensions are the same ones than hplot.Plot.Save.
+// Supported extensions are the same ones than hplot.Save.
 //
 // If w or h are <= 0, the value is chosen such that it follows the Golden Ratio.
 // If w and h are <= 0, the values are chosen such that they follow the Golden Ratio