gofmt on package
This commit is contained in:
legoff.laurent
parent
f837e5edf3
commit
873e6bfa2b
3 changed files with 31 additions and 32 deletions
|
|
@ -20,7 +20,7 @@ func NewDashConverter(dash []float, dashOffset float, converter VertexConverter)
|
|||
|
||||
func (dasher *DashVertexConverter) NextCommand(cmd VertexCommand) {
|
||||
dasher.command = cmd
|
||||
if(dasher.command == VertexStopCommand) {
|
||||
if dasher.command == VertexStopCommand {
|
||||
dasher.next.NextCommand(VertexStopCommand)
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -22,9 +22,9 @@ type GraphicContext struct {
|
|||
PaintedImage *image.RGBA
|
||||
fillRasterizer *raster.Rasterizer
|
||||
strokeRasterizer *raster.Rasterizer
|
||||
freetype *freetype.Context
|
||||
defaultFontData FontData
|
||||
DPI int
|
||||
freetype *freetype.Context
|
||||
defaultFontData FontData
|
||||
DPI int
|
||||
current *contextStack
|
||||
}
|
||||
|
||||
|
|
@ -41,7 +41,7 @@ type contextStack struct {
|
|||
join Join
|
||||
previous *contextStack
|
||||
fontSize float
|
||||
fontData FontData
|
||||
fontData FontData
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -53,14 +53,14 @@ func NewGraphicContext(pi *image.RGBA) *GraphicContext {
|
|||
width, height := gc.PaintedImage.Bounds().Dx(), gc.PaintedImage.Bounds().Dy()
|
||||
gc.fillRasterizer = raster.NewRasterizer(width, height)
|
||||
gc.strokeRasterizer = raster.NewRasterizer(width, height)
|
||||
|
||||
|
||||
gc.DPI = 92
|
||||
gc.defaultFontData = FontData{"luxi", FontFamilySans, FontStyleNormal}
|
||||
gc.freetype = freetype.NewContext()
|
||||
gc.freetype.SetDPI(gc.DPI)
|
||||
gc.freetype.SetClip(pi.Bounds())
|
||||
gc.freetype.SetDst(pi)
|
||||
|
||||
|
||||
gc.current = new(contextStack)
|
||||
|
||||
gc.current.tr = NewIdentityMatrix()
|
||||
|
|
@ -73,7 +73,7 @@ func NewGraphicContext(pi *image.RGBA) *GraphicContext {
|
|||
gc.current.join = RoundJoin
|
||||
gc.current.fontSize = 10
|
||||
gc.current.fontData = gc.defaultFontData
|
||||
|
||||
|
||||
return gc
|
||||
}
|
||||
|
||||
|
|
@ -236,7 +236,7 @@ func (gc *GraphicContext) Close() {
|
|||
gc.current.path.Close()
|
||||
}
|
||||
|
||||
func (gc *GraphicContext) FillString(text string) (cursor float){
|
||||
func (gc *GraphicContext) FillString(text string) (cursor float) {
|
||||
gc.freetype.SetSrc(image.NewColorImage(gc.current.strokeColor))
|
||||
// Draw the text.
|
||||
x, y := gc.current.path.LastPoint()
|
||||
|
|
@ -244,11 +244,11 @@ func (gc *GraphicContext) FillString(text string) (cursor float){
|
|||
x0, fontSize := 0.0, gc.current.fontSize
|
||||
gc.current.tr.VectorTransform(&x0, &fontSize)
|
||||
font := GetFont(gc.current.fontData)
|
||||
if(font == nil) {
|
||||
if font == nil {
|
||||
font = GetFont(gc.defaultFontData)
|
||||
}
|
||||
if(font == nil) {
|
||||
return 0
|
||||
}
|
||||
if font == nil {
|
||||
return 0
|
||||
}
|
||||
gc.freetype.SetFont(font)
|
||||
gc.freetype.SetFontSize(fontSize)
|
||||
|
|
@ -258,14 +258,13 @@ func (gc *GraphicContext) FillString(text string) (cursor float){
|
|||
log.Println(err)
|
||||
}
|
||||
x1, _ := gc.current.path.LastPoint()
|
||||
x2, y2 := float(p.X) / 256, float(p.Y) / 256
|
||||
x2, y2 := float(p.X)/256, float(p.Y)/256
|
||||
gc.current.tr.InverseTransform(&x2, &y2)
|
||||
width := x2 - x1
|
||||
return width
|
||||
return width
|
||||
}
|
||||
|
||||
|
||||
|
||||
func (gc *GraphicContext) paint(rasterizer *raster.Rasterizer, color image.Color) {
|
||||
painter := raster.NewRGBAPainter(gc.PaintedImage)
|
||||
painter.SetColor(color)
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@ import (
|
|||
|
||||
var (
|
||||
fontFolder = "../../fonts/"
|
||||
fonts = make(map[string] *truetype.Font)
|
||||
fonts = make(map[string]*truetype.Font)
|
||||
)
|
||||
|
||||
|
||||
|
|
@ -34,32 +34,34 @@ const (
|
|||
|
||||
|
||||
type FontData struct {
|
||||
Name string
|
||||
Name string
|
||||
Family FontFamily
|
||||
Style FontStyle
|
||||
Style FontStyle
|
||||
}
|
||||
|
||||
|
||||
|
||||
func GetFont(fontData FontData) (*truetype.Font) {
|
||||
func GetFont(fontData FontData) *truetype.Font {
|
||||
fontFileName := fontData.Name
|
||||
switch fontData.Family {
|
||||
case FontFamilySans: fontFileName += "s"
|
||||
case FontFamilySerif: fontFileName += "r"
|
||||
case FontFamilyMono: fontFileName += "m"
|
||||
case FontFamilySans:
|
||||
fontFileName += "s"
|
||||
case FontFamilySerif:
|
||||
fontFileName += "r"
|
||||
case FontFamilyMono:
|
||||
fontFileName += "m"
|
||||
}
|
||||
if(fontData.Style & FontStyleBold != 0) {
|
||||
if fontData.Style&FontStyleBold != 0 {
|
||||
fontFileName += "b"
|
||||
} else {
|
||||
fontFileName += "r"
|
||||
}
|
||||
|
||||
if(fontData.Style & FontStyleItalic != 0) {
|
||||
}
|
||||
|
||||
if fontData.Style&FontStyleItalic != 0 {
|
||||
fontFileName += "i"
|
||||
}
|
||||
fontFileName += ".ttf"
|
||||
font := fonts[fontFileName]
|
||||
if(font != nil) {
|
||||
if font != nil {
|
||||
return font
|
||||
}
|
||||
fonts[fontFileName] = loadFont(fontFileName)
|
||||
|
|
@ -74,7 +76,7 @@ func SetFontFolder(folder string) {
|
|||
fontFolder = folder
|
||||
}
|
||||
|
||||
func loadFont(fontFileName string) (*truetype.Font) {
|
||||
func loadFont(fontFileName string) *truetype.Font {
|
||||
fontBytes, err := ioutil.ReadFile(path.Join(fontFolder, fontFileName))
|
||||
if err != nil {
|
||||
log.Println(err)
|
||||
|
|
@ -87,5 +89,3 @@ func loadFont(fontFileName string) (*truetype.Font) {
|
|||
}
|
||||
return font
|
||||
}
|
||||
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue