Fix birdseye optimistic approach (#6764)

This commit is contained in:
Nicolas Mowen 2023-06-11 07:47:34 -06:00 committed by GitHub
parent d81dd60fef
commit 0f1cf67b91
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -312,18 +312,24 @@ class BirdsEyeFrameManager:
y_i += 1 y_i += 1
camera_layout.append([]) camera_layout.append([])
x = 0 x = 0
if camera_dims[0] * coefficient > canvas_width:
safe_coefficient = 1
else:
safe_coefficient = coefficient
camera_layout[y_i].append( camera_layout[y_i].append(
( (
camera, camera,
( (
x, x,
y, y,
int(camera_dims[0] * coefficient), int(camera_dims[0] * safe_coefficient),
int(camera_dims[1] * coefficient), int(camera_dims[1] * safe_coefficient),
), ),
) )
) )
x += int(camera_dims[0] * coefficient) x += int(camera_dims[0] * safe_coefficient)
return (camera_layout, y + max_height) return (camera_layout, y + max_height)
@ -433,9 +439,9 @@ class BirdsEyeFrameManager:
coefficient, coefficient,
) )
if (canvas_height * 0.9) < total_height <= canvas_height: if (canvas_height * 0.75) < total_height <= canvas_height:
break break
elif total_height < canvas_height * 0.8: elif total_height < canvas_height * 0.75:
coefficient += 0.1 coefficient += 0.1
else: else:
coefficient -= 0.1 coefficient -= 0.1