label-tool: send pages as UTF-8

label-tool: make it possible to print free form text
Also commit the label subpackage that we forgot to.
2019-04-25 21:54:58 +02:00 · 2019-04-25 21:54:57 +02:00 · 2019-04-25 20:35:00 +02:00 · 2019-04-25 19:59:43 +02:00
3 changed files with 210 additions and 51 deletions
--- a/cmd/bdf-preview/main.go
+++ b/cmd/bdf-preview/main.go
@ -20,21 +20,21 @@ type fontItem struct {
 var fonts = map[string]fontItem{}

 var tmpl = template.Must(template.New("list").Parse(`
-	<!DOCTYPE html>
-	<html><body>
-	<table border='1' cellpadding='3' style='border-collapse: collapse'>
-		<tr>
-			<th>Name</th>
-			<th>Preview</th>
-		<tr>
-{{range $k, $v := . }}
-		<tr>
-			<td>{{$k}}</td>
-			<td><img src='?name={{$k}}'></td>
-		</tr>
-{{end}}
-	</table>
-	</body></html>
+<!DOCTYPE html>
+<html><body>
+<table border='1' cellpadding='3' style='border-collapse: collapse'>
+	<tr>
+		<th>Name</th>
+		<th>Preview</th>
+	<tr>
+	{{- range $k, $v := . }}
+	<tr>
+		<td>{{ $k }}</td>
+		<td><img src='?name={{ $k }}'></td>
+	</tr>
+	{{- end }}
+</table>
+</body></html>
 `))

 func handle(w http.ResponseWriter, r *http.Request) {
@ -87,7 +87,7 @@ func main() {
 		fonts[filename] = fontItem{Font: font, Preview: img}
 	}

-	log.Println("Starting server")
+	log.Println("starting server")
 	http.HandleFunc("/", handle)
 	log.Fatal(http.ListenAndServe(":8080", nil))
 }
--- a/cmd/label-tool/main.go
+++ b/cmd/label-tool/main.go
@ -4,6 +4,7 @@ import (
 	"errors"
 	"html/template"
 	"image"
+	"image/draw"
 	"image/png"
 	"log"
 	"net/http"
@ -16,17 +17,28 @@ import (
 	"janouch.name/sklad/ql"
 )

-var font *bdf.Font
+var tmplFont = template.Must(template.New("font").Parse(`
+<!DOCTYPE html>
+<html><body>
+<h1>PT-CBP label printing tool</h1>
+<h2>Choose font</h2>
+{{ range $i, $f := . }}
+<p><a href='?font={{ $i }}'>
+<img src='?font={{ $i }}&amp;preview' title='{{ $f.Path }}'></a>
+{{ end }}
+</body></html>
+`))

-var tmpl = template.Must(template.New("form").Parse(`
+var tmplForm = template.Must(template.New("form").Parse(`
 <!DOCTYPE html>
 <html><body>
 <h1>PT-CBP label printing tool</h1>
 <table><tr>
 <td valign=top>
-	<img border=1 src='?img&amp;scale={{.Scale}}&amp;text={{.Text}}'>
+	<img border=1 src='?font={{ .FontIndex }}&amp;scale={{ .Scale }}{{/*
+	*/}}&amp;text={{ .Text }}&amp;render'>
 </td>
-<td valign=top>
+<td valign=top><form>
 	<fieldset>
 		{{ if .Printer }}

@ -59,21 +71,38 @@ var tmpl = template.Must(template.New("form").Parse(`
 		{{ end }}
 	</fieldset>
 	<fieldset>
-		<p>Font: {{ .Font.Name }}
-	</fieldset>
-	<form><fieldset>
-		<p><label for=text>Text:</label>
-			<input id=text name=text value='{{.Text}}'>
-			<label for=scale>Scale:</label>
+		<legend>Font</legend>
+		<p>{{ .Font.Name }} <a href='?'>Change</a>
+			<input type=hidden name=font value='{{ .FontIndex }}'>
+		<p><label for=scale>Scale:</label>
 			<input id=scale name=scale value='{{.Scale}}' size=1>
+	</fieldset>
+	<fieldset>
+		<legend>Label</legend>
+		<p><textarea name=text>{{.Text}}</textarea>
+		<p>Kind:
+			<input type=radio id=kind-text name=kind value=text
+				{{ if eq .Kind "text" }} checked{{ end }}>
+			<label for=kind-text>plain text (horizontal)</label>
+			<input type=radio id=kind-qr name=kind value=qr
+				{{ if eq .Kind "qr" }} checked{{ end }}>
+			<label for=kind-qr>QR code (vertical)</label>
 		<p><input type=submit value='Update'>
 			<input type=submit name=print value='Update and Print'>
-	</fieldset></form>
-</td>
+	</fieldset>
+</form></td>
 </tr></table>
 </body></html>
 `))

+type fontItem struct {
+	Path    string
+	Font    *bdf.Font
+	Preview image.Image
+}
+
+var fonts = []*fontItem{}
+
 func getPrinter() (*ql.Printer, error) {
 	printer, err := ql.Open()
 	if err != nil {
@ -96,8 +125,30 @@ func getStatus(printer *ql.Printer) error {
 }

 func handle(w http.ResponseWriter, r *http.Request) {
-	if err := r.ParseForm(); err != nil {
-		http.Error(w, err.Error(), 500)
+	if r.Method == http.MethodGet {
+		w.Header().Set("Cache-Control", "no-store")
+	}
+
+	var (
+		font      *fontItem
+		fontIndex int
+		err       error
+	)
+	if fontIndex, err = strconv.Atoi(r.FormValue("font")); err == nil {
+		font = fonts[fontIndex]
+	} else {
+		w.Header().Set("Content-Type", "text/html; charset=utf-8")
+		if err := tmplFont.Execute(w, fonts); err != nil {
+			http.Error(w, err.Error(), 500)
+		}
+		return
+	}
+
+	if _, ok := r.Form["preview"]; ok {
+		w.Header().Set("Content-Type", "image/png")
+		if err := png.Encode(w, font.Preview); err != nil {
+			http.Error(w, err.Error(), 500)
+		}
 		return
 	}

@ -126,27 +177,38 @@ func handle(w http.ResponseWriter, r *http.Request) {
 		InitErr    error
 		MediaInfo  *ql.MediaInfo
 		Font       *bdf.Font
+		FontIndex  int
 		Text       string
 		Scale      int
+		Kind       string
 	}{
 		Printer:    printer,
 		PrinterErr: printerErr,
 		InitErr:    initErr,
 		MediaInfo:  mediaInfo,
-		Font:       font,
+		Font:       font.Font,
+		FontIndex:  fontIndex,
 		Text:       r.FormValue("text"),
+		Kind:       r.FormValue("kind"),
 	}

-	var err error
 	params.Scale, err = strconv.Atoi(r.FormValue("scale"))
 	if err != nil {
 		params.Scale = 3
 	}
+	if params.Kind == "" {
+		params.Kind = "text"
+	}

 	var img image.Image
 	if mediaInfo != nil {
-		img = &imgutil.LeftRotate{Image: label.GenLabelForHeight(
-			font, params.Text, mediaInfo.PrintAreaPins, params.Scale)}
+		if params.Kind == "qr" {
+			img = &imgutil.LeftRotate{Image: label.GenLabelForHeight(
+				font.Font, params.Text, mediaInfo.PrintAreaPins, params.Scale)}
+		} else {
+			img = label.GenLabelForWidth(
+				font.Font, params.Text, mediaInfo.PrintAreaPins, params.Scale)
+		}
 		if r.FormValue("print") != "" {
 			if err := printer.Print(img); err != nil {
 				log.Println("print error:", err)
@ -154,9 +216,11 @@ func handle(w http.ResponseWriter, r *http.Request) {
 		}
 	}

-	if _, ok := r.Form["img"]; !ok {
-		w.Header().Set("Content-Type", "text/html")
-		tmpl.Execute(w, &params)
+	if _, ok := r.Form["render"]; !ok {
+		w.Header().Set("Content-Type", "text/html; charset=utf-8")
+		if err := tmplForm.Execute(w, &params); err != nil {
+			http.Error(w, err.Error(), 500)
+		}
 		return
 	}

@ -173,24 +237,32 @@ func handle(w http.ResponseWriter, r *http.Request) {
 }

 func main() {
-	if len(os.Args) != 3 {
-		log.Fatalf("usage: %s ADDRESS BDF-FILE\n", os.Args[0])
+	if len(os.Args) < 3 {
+		log.Fatalf("usage: %s ADDRESS BDF-FILE...\n", os.Args[0])
 	}

-	address, bdfPath := os.Args[1], os.Args[2]
+	address, bdfPaths := os.Args[1], os.Args[2:]
+	for _, path := range bdfPaths {
+		fi, err := os.Open(path)
+		if err != nil {
+			log.Fatalln(err)
+		}
+		font, err := bdf.NewFromBDF(fi)
+		if err != nil {
+			log.Fatalf("%s: %s\n", path, err)
+		}
+		if err := fi.Close(); err != nil {
+			log.Fatalln(err)
+		}

-	var err error
-	fi, err := os.Open(bdfPath)
-	if err != nil {
-		log.Fatalln(err)
-	}
+		r, _ := font.BoundString(font.Name)
+		super := r.Inset(-3)

-	font, err = bdf.NewFromBDF(fi)
-	if err := fi.Close(); err != nil {
-		log.Fatalln(err)
-	}
-	if err != nil {
-		log.Fatalln(err)
+		img := image.NewRGBA(super)
+		draw.Draw(img, super, image.White, image.ZP, draw.Src)
+		font.DrawString(img, image.ZP, font.Name)
+
+		fonts = append(fonts, &fontItem{Path: path, Font: font, Preview: img})
 	}

 	log.Println("starting server")
--- a/label/label.go
+++ b/label/label.go
@ -0,0 +1,87 @@
+package label
+
+import (
+	"image"
+	"image/draw"
+	"strings"
+
+	"janouch.name/sklad/bdf"
+	"janouch.name/sklad/imgutil"
+
+	"github.com/boombuler/barcode"
+	"github.com/boombuler/barcode/qr"
+)
+
+// TODO: Rename to GenQRLabelForHeight.
+func GenLabelForHeight(font *bdf.Font,
+	text string, height, scale int) image.Image {
+	// Create a scaled bitmap of the text label.
+	textRect, _ := font.BoundString(text)
+	textImg := image.NewRGBA(textRect)
+	draw.Draw(textImg, textRect, image.White, image.ZP, draw.Src)
+	font.DrawString(textImg, image.ZP, text)
+
+	scaledTextImg := imgutil.Scale{Image: textImg, Scale: scale}
+	scaledTextRect := scaledTextImg.Bounds()
+
+	remains := height - scaledTextRect.Dy() - 20
+
+	width := scaledTextRect.Dx()
+	if remains > width {
+		width = remains
+	}
+
+	// Create a scaled bitmap of the QR code.
+	qrImg, _ := qr.Encode(text, qr.H, qr.Auto)
+	qrImg, _ = barcode.Scale(qrImg, remains, remains)
+	qrRect := qrImg.Bounds()
+
+	// Combine.
+	combinedRect := image.Rect(0, 0, width, height)
+	combinedImg := image.NewRGBA(combinedRect)
+	draw.Draw(combinedImg, combinedRect, image.White, image.ZP, draw.Src)
+	draw.Draw(combinedImg,
+		combinedRect.Add(image.Point{X: (width - qrRect.Dx()) / 2, Y: 0}),
+		qrImg, image.ZP, draw.Src)
+
+	target := image.Rect(
+		(width-scaledTextRect.Dx())/2, qrRect.Dy()+20,
+		combinedRect.Max.X, combinedRect.Max.Y)
+	draw.Draw(combinedImg, target, &scaledTextImg, scaledTextRect.Min, draw.Src)
+	return combinedImg
+}
+
+func GenLabelForWidth(font *bdf.Font,
+	text string, width, scale int) image.Image {
+	var lines []string
+	for _, line := range strings.Split(text, "\n") {
+		lines = append(lines, strings.TrimSuffix(line, "\r"))
+	}
+
+	height := 0
+	var rects []image.Rectangle
+	for _, line := range lines {
+		r, _ := font.BoundString(line)
+		rects = append(rects, r)
+		height += r.Dy() * scale
+	}
+
+	imgRect := image.Rect(0, 0, width, height)
+	img := image.NewRGBA(imgRect)
+	draw.Draw(img, imgRect, image.White, image.ZP, draw.Src)
+
+	y := 0
+	for i := 0; i < len(lines); i++ {
+		textImg := image.NewRGBA(rects[i])
+		draw.Draw(textImg, rects[i], image.White, image.ZP, draw.Src)
+		font.DrawString(textImg, image.ZP, lines[i])
+
+		scaledImg := imgutil.Scale{Image: textImg, Scale: scale}
+		scaledRect := scaledImg.Bounds()
+
+		target := image.Rect(0, y, imgRect.Max.X, imgRect.Max.Y)
+		draw.Draw(img, target, &scaledImg, scaledRect.Min, draw.Src)
+		y += scaledRect.Dy()
+	}
+	return img
+}
Author	SHA1	Message	Date
Přemysl Eric Janouch	e56482d73f	label-tool: send pages as UTF-8	2019-04-25 21:54:58 +02:00
Přemysl Eric Janouch	2f47b3f5da	label-tool: make it possible to print free form text Also commit the label subpackage that we forgot to.	2019-04-25 21:54:57 +02:00
Přemysl Eric Janouch	154f3147e3	label-tool: allow choosing from multiple fonts	2019-04-25 20:35:00 +02:00
Přemysl Eric Janouch	5cef6b240a	bdf-preview: style corrections	2019-04-25 19:59:43 +02:00