Mercurial > gemma

comparison pkg/xlsx/templater.go @ 5346:72469b713705 extented-report

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
XLSX templater: Cosmetics
author Sascha L. Teichmann <sascha.teichmann@intevation.de>
date Sun, 20 Jun 2021 14:10:32 +0200
parents 7df6062a1371
children a352a695b69c
comparison
equal deleted inserted replaced
5345:95dafb72a288 5346:72469b713705
64 y2 int 64 y2 int
65 mc excelize.MergeCell 65 mc excelize.MergeCell
66 } 66 }
67 67
68 func mergeCellToArea(mc excelize.MergeCell) (area, error) { 68 func mergeCellToArea(mc excelize.MergeCell) (area, error) {
69 sa := mc.GetStartAxis() 69 x1, y1, err := excelize.CellNameToCoordinates(mc.GetStartAxis())
70 x1, y1, err := excelize.CellNameToCoordinates(sa)
71 if err != nil { 70 if err != nil {
72 return area{}, err 71 return area{}, err
73 } 72 }
74 ea := mc.GetEndAxis() 73 x2, y2, err := excelize.CellNameToCoordinates(mc.GetEndAxis())
75 x2, y2, err := excelize.CellNameToCoordinates(ea)
76 if err != nil { 74 if err != nil {
77 return area{}, err 75 return area{}, err
78 } 76 }
79 return area{ 77 return area{
80 x1: x1, 78 x1: x1,
84 mc: mc, 82 mc: mc,
85 }, nil 83 }, nil
86 } 84 }
87 85
88 func (a *area) contains(x, y int) bool { 86 func (a *area) contains(x, y int) bool {
89 return x >= a.x1 && x <= a.x2 && y >= a.y1 && y <= a.y2 87 return a.x1 <= x && x <= a.x2 && a.y1 <= y && y <= a.y2
90 } 88 }
91 89
92 func ActionFromFile(filename string) (*Action, error) { 90 func ActionFromFile(filename string) (*Action, error) {
93 f, err := os.Open(filename) 91 f, err := os.Open(filename)
94 if err != nil { 92 if err != nil {