add option for selecting layout to graph handler and using circo as new default
This commit is contained in:
parent
641bd6a9e9
commit
5a6c878fb5
@ -76,16 +76,27 @@ func (h *graphHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
|
|||||||
buf := bytes.NewBufferString(dot)
|
buf := bytes.NewBufferString(dot)
|
||||||
|
|
||||||
format := r.URL.Query().Get("format")
|
format := r.URL.Query().Get("format")
|
||||||
if format == "" {
|
if format == "dot" || format == "gv" {
|
||||||
format = "svg"
|
|
||||||
} else if format == ".dot" || format == ".gv" {
|
|
||||||
// If the raw dot data is requested, return it as string.
|
// If the raw dot data is requested, return it as string.
|
||||||
// This allows client-side rendering rather than server-side.
|
// This allows client-side rendering rather than server-side.
|
||||||
w.Write(buf.Bytes())
|
w.Write(buf.Bytes())
|
||||||
return
|
return
|
||||||
|
} else if format == "" {
|
||||||
|
format = "svg"
|
||||||
|
} else if format != "png" && format != "bmp" && format != "fig" && format != "gif" && format != "json" && format != "ps" {
|
||||||
|
http.Error(w, "unsupported format", http.StatusInternalServerError)
|
||||||
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
command := exec.Command("dot", "-T"+format)
|
layout := r.URL.Query().Get("layout")
|
||||||
|
if layout == "" {
|
||||||
|
layout = "circo"
|
||||||
|
} else if layout != "dot" && layout != "neato" && format != "twopi" && format != "fdp" {
|
||||||
|
http.Error(w, "unsupported layout", http.StatusInternalServerError)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
command := exec.Command("dot", "-K"+layout, "-T"+format)
|
||||||
command.Stderr = os.Stderr
|
command.Stderr = os.Stderr
|
||||||
|
|
||||||
stdin, err := command.StdinPipe()
|
stdin, err := command.StdinPipe()
|
||||||
|
Loading…
Reference in New Issue
Block a user