Fix off-by-one issue in drawing

blaise-io · blaise-io · commit b46650b5b6bc · 2021-01-03T13:20:54.000+01:00
diff --git a/git.go b/git.go
@@ -110,11 +110,10 @@ func PushAll(dir string, project string, branch string) error {
 	return command(dir, "git", "push", "-fu", githubURL, branch)
 }
 
-func pixelDaysAgo(x int, y int, w int, weeksAgo int) int {
-	ago := int(time.Now().Weekday()) + 1 // start on a Sunday
-	ago += (w - 1 - x + weeksAgo) * 7
-	ago += (6 - y)
-	return ago
+func pixelDaysAgo(x int, y int, width int, weeksAgo int) int {
+	startDaysAgo := (width + weeksAgo) * 7
+	startDaysAgo += int(time.Now().Weekday())
+	return startDaysAgo - (x * 7) - y
 }
 
 func drawPixel(dir string, f *os.File, px GraphPixel, pixelChrs string) error {

Original file line number	Diff line number	Diff line change
`@@ -110,11 +110,10 @@ func PushAll(dir string, project string, branch string) error {`
`110`	`110`	`return command(dir, "git", "push", "-fu", githubURL, branch)`
`111`	`111`	`}`
`112`	`112`
`113`		`-func pixelDaysAgo(x int, y int, w int, weeksAgo int) int {`
`114`		`- ago := int(time.Now().Weekday()) + 1 // start on a Sunday`
`115`		`- ago += (w - 1 - x + weeksAgo) * 7`
`116`		`- ago += (6 - y)`
`117`		`- return ago`
	`113`	`+func pixelDaysAgo(x int, y int, width int, weeksAgo int) int {`
	`114`	`+ startDaysAgo := (width + weeksAgo) * 7`
	`115`	`+ startDaysAgo += int(time.Now().Weekday())`
	`116`	`+ return startDaysAgo - (x * 7) - y`
`118`	`117`	`}`
`119`	`118`
`120`	`119`	`func drawPixel(dir string, f *os.File, px GraphPixel, pixelChrs string) error {`