Merge pull request #47 from songys96/dev

AlexEMG · web-flow · commit 973e2600506f · 2021-05-15T19:41:47.000+02:00
Fix display x,y range
diff --git a/dlclive/display.py b/dlclive/display.py
@@ -85,7 +85,7 @@ def display_frame(self, frame, pose=None):
                         )
                         x1 = (
                             pose[i, 0] + self.radius
-                            if pose[i, 0] + self.radius < im_size[1]
+                            if pose[i, 0] + self.radius < im_size[0]
                             else im_size[1]
                         )
                         y0 = (
@@ -95,7 +95,7 @@ def display_frame(self, frame, pose=None):
                         )
                         y1 = (
                             pose[i, 1] + self.radius
-                            if pose[i, 1] + self.radius < im_size[0]
+                            if pose[i, 1] + self.radius < im_size[1]
                             else im_size[0]
                         )
                         coords = [x0, y0, x1, y1]

Original file line number	Diff line number	Diff line change
`@@ -85,7 +85,7 @@ def display_frame(self, frame, pose=None):`
`85`	`85`	`)`
`86`	`86`	`x1 = (`
`87`	`87`	`pose[i, 0] + self.radius`
`88`		`- if pose[i, 0] + self.radius < im_size[1]`
	`88`	`+ if pose[i, 0] + self.radius < im_size[0]`
`89`	`89`	`else im_size[1]`
`90`	`90`	`)`
`91`	`91`	`y0 = (`
`@@ -95,7 +95,7 @@ def display_frame(self, frame, pose=None):`
`95`	`95`	`)`
`96`	`96`	`y1 = (`
`97`	`97`	`pose[i, 1] + self.radius`
`98`		`- if pose[i, 1] + self.radius < im_size[0]`
	`98`	`+ if pose[i, 1] + self.radius < im_size[1]`
`99`	`99`	`else im_size[0]`
`100`	`100`	`)`
`101`	`101`	`coords = [x0, y0, x1, y1]`