Compare commits
No commits in common. "e56482d73f6d8f8f46096ca980ac9e6dcd7b8300" and "81927e9017deb911d5d52461317bfad8a0b14406" have entirely different histories.
e56482d73f
...
81927e9017
|
@ -20,21 +20,21 @@ type fontItem struct {
|
||||||
var fonts = map[string]fontItem{}
|
var fonts = map[string]fontItem{}
|
||||||
|
|
||||||
var tmpl = template.Must(template.New("list").Parse(`
|
var tmpl = template.Must(template.New("list").Parse(`
|
||||||
<!DOCTYPE html>
|
<!DOCTYPE html>
|
||||||
<html><body>
|
<html><body>
|
||||||
<table border='1' cellpadding='3' style='border-collapse: collapse'>
|
<table border='1' cellpadding='3' style='border-collapse: collapse'>
|
||||||
<tr>
|
<tr>
|
||||||
<th>Name</th>
|
<th>Name</th>
|
||||||
<th>Preview</th>
|
<th>Preview</th>
|
||||||
<tr>
|
<tr>
|
||||||
{{- range $k, $v := . }}
|
{{range $k, $v := . }}
|
||||||
<tr>
|
<tr>
|
||||||
<td>{{ $k }}</td>
|
<td>{{$k}}</td>
|
||||||
<td><img src='?name={{ $k }}'></td>
|
<td><img src='?name={{$k}}'></td>
|
||||||
</tr>
|
</tr>
|
||||||
{{- end }}
|
{{end}}
|
||||||
</table>
|
</table>
|
||||||
</body></html>
|
</body></html>
|
||||||
`))
|
`))
|
||||||
|
|
||||||
func handle(w http.ResponseWriter, r *http.Request) {
|
func handle(w http.ResponseWriter, r *http.Request) {
|
||||||
|
@ -87,7 +87,7 @@ func main() {
|
||||||
fonts[filename] = fontItem{Font: font, Preview: img}
|
fonts[filename] = fontItem{Font: font, Preview: img}
|
||||||
}
|
}
|
||||||
|
|
||||||
log.Println("starting server")
|
log.Println("Starting server")
|
||||||
http.HandleFunc("/", handle)
|
http.HandleFunc("/", handle)
|
||||||
log.Fatal(http.ListenAndServe(":8080", nil))
|
log.Fatal(http.ListenAndServe(":8080", nil))
|
||||||
}
|
}
|
||||||
|
|
|
@ -4,7 +4,6 @@ import (
|
||||||
"errors"
|
"errors"
|
||||||
"html/template"
|
"html/template"
|
||||||
"image"
|
"image"
|
||||||
"image/draw"
|
|
||||||
"image/png"
|
"image/png"
|
||||||
"log"
|
"log"
|
||||||
"net/http"
|
"net/http"
|
||||||
|
@ -17,28 +16,17 @@ import (
|
||||||
"janouch.name/sklad/ql"
|
"janouch.name/sklad/ql"
|
||||||
)
|
)
|
||||||
|
|
||||||
var tmplFont = template.Must(template.New("font").Parse(`
|
var font *bdf.Font
|
||||||
<!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 }}&preview' title='{{ $f.Path }}'></a>
|
|
||||||
{{ end }}
|
|
||||||
</body></html>
|
|
||||||
`))
|
|
||||||
|
|
||||||
var tmplForm = template.Must(template.New("form").Parse(`
|
var tmpl = template.Must(template.New("form").Parse(`
|
||||||
<!DOCTYPE html>
|
<!DOCTYPE html>
|
||||||
<html><body>
|
<html><body>
|
||||||
<h1>PT-CBP label printing tool</h1>
|
<h1>PT-CBP label printing tool</h1>
|
||||||
<table><tr>
|
<table><tr>
|
||||||
<td valign=top>
|
<td valign=top>
|
||||||
<img border=1 src='?font={{ .FontIndex }}&scale={{ .Scale }}{{/*
|
<img border=1 src='?img&scale={{.Scale}}&text={{.Text}}'>
|
||||||
*/}}&text={{ .Text }}&render'>
|
|
||||||
</td>
|
</td>
|
||||||
<td valign=top><form>
|
<td valign=top>
|
||||||
<fieldset>
|
<fieldset>
|
||||||
{{ if .Printer }}
|
{{ if .Printer }}
|
||||||
|
|
||||||
|
@ -71,38 +59,21 @@ var tmplForm = template.Must(template.New("form").Parse(`
|
||||||
{{ end }}
|
{{ end }}
|
||||||
</fieldset>
|
</fieldset>
|
||||||
<fieldset>
|
<fieldset>
|
||||||
<legend>Font</legend>
|
<p>Font: {{ .Font.Name }}
|
||||||
<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>
|
||||||
<fieldset>
|
<form><fieldset>
|
||||||
<legend>Label</legend>
|
<p><label for=text>Text:</label>
|
||||||
<p><textarea name=text>{{.Text}}</textarea>
|
<input id=text name=text value='{{.Text}}'>
|
||||||
<p>Kind:
|
<label for=scale>Scale:</label>
|
||||||
<input type=radio id=kind-text name=kind value=text
|
<input id=scale name=scale value='{{.Scale}}' size=1>
|
||||||
{{ 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'>
|
<p><input type=submit value='Update'>
|
||||||
<input type=submit name=print value='Update and Print'>
|
<input type=submit name=print value='Update and Print'>
|
||||||
</fieldset>
|
</fieldset></form>
|
||||||
</form></td>
|
</td>
|
||||||
</tr></table>
|
</tr></table>
|
||||||
</body></html>
|
</body></html>
|
||||||
`))
|
`))
|
||||||
|
|
||||||
type fontItem struct {
|
|
||||||
Path string
|
|
||||||
Font *bdf.Font
|
|
||||||
Preview image.Image
|
|
||||||
}
|
|
||||||
|
|
||||||
var fonts = []*fontItem{}
|
|
||||||
|
|
||||||
func getPrinter() (*ql.Printer, error) {
|
func getPrinter() (*ql.Printer, error) {
|
||||||
printer, err := ql.Open()
|
printer, err := ql.Open()
|
||||||
if err != nil {
|
if err != nil {
|
||||||
|
@ -125,30 +96,8 @@ func getStatus(printer *ql.Printer) error {
|
||||||
}
|
}
|
||||||
|
|
||||||
func handle(w http.ResponseWriter, r *http.Request) {
|
func handle(w http.ResponseWriter, r *http.Request) {
|
||||||
if r.Method == http.MethodGet {
|
if err := r.ParseForm(); err != nil {
|
||||||
w.Header().Set("Cache-Control", "no-store")
|
http.Error(w, err.Error(), 500)
|
||||||
}
|
|
||||||
|
|
||||||
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
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -177,38 +126,27 @@ func handle(w http.ResponseWriter, r *http.Request) {
|
||||||
InitErr error
|
InitErr error
|
||||||
MediaInfo *ql.MediaInfo
|
MediaInfo *ql.MediaInfo
|
||||||
Font *bdf.Font
|
Font *bdf.Font
|
||||||
FontIndex int
|
|
||||||
Text string
|
Text string
|
||||||
Scale int
|
Scale int
|
||||||
Kind string
|
|
||||||
}{
|
}{
|
||||||
Printer: printer,
|
Printer: printer,
|
||||||
PrinterErr: printerErr,
|
PrinterErr: printerErr,
|
||||||
InitErr: initErr,
|
InitErr: initErr,
|
||||||
MediaInfo: mediaInfo,
|
MediaInfo: mediaInfo,
|
||||||
Font: font.Font,
|
Font: font,
|
||||||
FontIndex: fontIndex,
|
|
||||||
Text: r.FormValue("text"),
|
Text: r.FormValue("text"),
|
||||||
Kind: r.FormValue("kind"),
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
var err error
|
||||||
params.Scale, err = strconv.Atoi(r.FormValue("scale"))
|
params.Scale, err = strconv.Atoi(r.FormValue("scale"))
|
||||||
if err != nil {
|
if err != nil {
|
||||||
params.Scale = 3
|
params.Scale = 3
|
||||||
}
|
}
|
||||||
if params.Kind == "" {
|
|
||||||
params.Kind = "text"
|
|
||||||
}
|
|
||||||
|
|
||||||
var img image.Image
|
var img image.Image
|
||||||
if mediaInfo != nil {
|
if mediaInfo != nil {
|
||||||
if params.Kind == "qr" {
|
img = &imgutil.LeftRotate{Image: label.GenLabelForHeight(
|
||||||
img = &imgutil.LeftRotate{Image: label.GenLabelForHeight(
|
font, params.Text, mediaInfo.PrintAreaPins, params.Scale)}
|
||||||
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 r.FormValue("print") != "" {
|
||||||
if err := printer.Print(img); err != nil {
|
if err := printer.Print(img); err != nil {
|
||||||
log.Println("print error:", err)
|
log.Println("print error:", err)
|
||||||
|
@ -216,11 +154,9 @@ func handle(w http.ResponseWriter, r *http.Request) {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if _, ok := r.Form["render"]; !ok {
|
if _, ok := r.Form["img"]; !ok {
|
||||||
w.Header().Set("Content-Type", "text/html; charset=utf-8")
|
w.Header().Set("Content-Type", "text/html")
|
||||||
if err := tmplForm.Execute(w, ¶ms); err != nil {
|
tmpl.Execute(w, ¶ms)
|
||||||
http.Error(w, err.Error(), 500)
|
|
||||||
}
|
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -237,32 +173,24 @@ func handle(w http.ResponseWriter, r *http.Request) {
|
||||||
}
|
}
|
||||||
|
|
||||||
func main() {
|
func main() {
|
||||||
if len(os.Args) < 3 {
|
if len(os.Args) != 3 {
|
||||||
log.Fatalf("usage: %s ADDRESS BDF-FILE...\n", os.Args[0])
|
log.Fatalf("usage: %s ADDRESS BDF-FILE\n", os.Args[0])
|
||||||
}
|
}
|
||||||
|
|
||||||
address, bdfPaths := os.Args[1], os.Args[2:]
|
address, bdfPath := 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)
|
|
||||||
}
|
|
||||||
|
|
||||||
r, _ := font.BoundString(font.Name)
|
var err error
|
||||||
super := r.Inset(-3)
|
fi, err := os.Open(bdfPath)
|
||||||
|
if err != nil {
|
||||||
|
log.Fatalln(err)
|
||||||
|
}
|
||||||
|
|
||||||
img := image.NewRGBA(super)
|
font, err = bdf.NewFromBDF(fi)
|
||||||
draw.Draw(img, super, image.White, image.ZP, draw.Src)
|
if err := fi.Close(); err != nil {
|
||||||
font.DrawString(img, image.ZP, font.Name)
|
log.Fatalln(err)
|
||||||
|
}
|
||||||
fonts = append(fonts, &fontItem{Path: path, Font: font, Preview: img})
|
if err != nil {
|
||||||
|
log.Fatalln(err)
|
||||||
}
|
}
|
||||||
|
|
||||||
log.Println("starting server")
|
log.Println("starting server")
|
||||||
|
|
|
@ -1,87 +0,0 @@
|
||||||
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
|
|
||||||
}
|
|
Loading…
Reference in New Issue