crunchy-rocks/draw2d
2
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

fixed the SetFontData method

Browse source
This commit is contained in:
Stani 2015-06-27 19:41:34 +02:00
parent 13f1147b90
commit be91a632c9
2 changed files with 28 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
font.go
View file

@ -38,7 +38,7 @@ type FontData struct {
Style FontStyle Style FontStyle
} }
func fontFileName(fontData FontData) string { func FontFileName(fontData FontData) string {
fontFileName := fontData.Name fontFileName := fontData.Name
switch fontData.Family { switch fontData.Family {
case FontFamilySans: case FontFamilySans:
@ -62,11 +62,11 @@ func fontFileName(fontData FontData) string {
} }
func RegisterFont(fontData FontData, font *truetype.Font) { func RegisterFont(fontData FontData, font *truetype.Font) {
fonts[fontFileName(fontData)] = font fonts[FontFileName(fontData)] = font
} }
func GetFont(fontData FontData) *truetype.Font { func GetFont(fontData FontData) *truetype.Font {
fontFileName := fontFileName(fontData) fontFileName := FontFileName(fontData)
font := fonts[fontFileName] font := fonts[fontFileName]
if font != nil { if font != nil {
return font return font

29
pdf2d/graphiccontext.go
View file

@ -191,12 +191,33 @@ func (gc *GraphicContext) SetFillColor(c color.Color) {
gc.pdf.SetFillColor(rgb(c)) gc.pdf.SetFillColor(rgb(c))
} }
// SetFont sets the font used to draw text. // SetFont is unsupported by the pdf graphic context, use SetFontData
// instead.
func (gc *GraphicContext) SetFont(font *truetype.Font) {
// TODO: what to do with this api conflict between draw2d and gofpdf?!
}
// SetFontData sets the current font used to draw text. Always use
// this method, as SetFont is unsupported by the pdf graphic context.
// It is mandatory to call this method at least once before printing // It is mandatory to call this method at least once before printing
// text or the resulting document will not be valid. // text or the resulting document will not be valid.
func (gc *GraphicContext) SetFont(font *truetype.Font) { // It is necessary to generate a font definition file first with the
// TODO: this api conflict needs to be fixed // makefont utility. It is not necessary to call this function for the
gc.pdf.SetFont("Helvetica", "", 12) // core PDF fonts (courier, helvetica, times, zapfdingbats).
// go get github.com/jung-kurt/gofpdf/makefont
// http://godoc.org/github.com/jung-kurt/gofpdf#Fpdf.AddFont
func (gc *GraphicContext) SetFontData(fontData draw2d.FontData) {
gc.StackGraphicContext.SetFontData(fontData)
var style string
if fontData.Style&draw2d.FontStyleBold != 0 {
style += "B"
}
if fontData.Style&draw2d.FontStyleItalic != 0 {
style += "I"
}
fn := draw2d.FontFileName(fontData)
fn = fn[:len(fn)-4]
gc.pdf.AddFont(fn, style, fn+".json")
} }
// SetFontSize sets the font size in points (as in ``a 12 point font''). // SetFontSize sets the font size in points (as in ``a 12 point font'').