Merge remote-tracking branch 'origin/master'

This commit is contained in:
ben 2022-08-02 13:22:23 -05:00
commit 8ac6529106
2 changed files with 6 additions and 6 deletions

View file

@ -125,7 +125,7 @@ def next_image():
# Get image name and load it # Get image name and load it
image_num = (image_num + 1) % len(file_list) image_num = (image_num + 1) % len(file_list)
load = Image.open(file_list[image_num]) load = Image.open(file_list[image_num])
# pic_label.config(text=file_list[image_num]) pic_label.config(text=file_list[image_num])
# Place image on canvas # Place image on canvas
img = ImageTk.PhotoImage(load) img = ImageTk.PhotoImage(load)
@ -142,13 +142,13 @@ image_container = canvas.create_image(CANVAS_WIDTH // 2, CANVAS_HEIGHT // 2)
canvas.pack(padx=5, pady=5) canvas.pack(padx=5, pady=5)
image_num = -1 image_num = -1
# pic_label = tk.Label(text='') pic_label = tk.Label(text='')
# pic_label.pack(pady=5) pic_label.pack(pady=5)
next_image() next_image()
# next_button = tk.Button(text='Next', command=next_image) next_button = tk.Button(text='Next', command=next_image)
# next_button.pack(pady=5) next_button.pack(pady=5)
# This must be at the end of your program # This must be at the end of your program
window.mainloop() window.mainloop()

View file

@ -69,7 +69,7 @@ class CarManager:
car_bottom_edge = car.ycor() - 11 car_bottom_edge = car.ycor() - 11
car_left_edge = car.xcor() - 20 car_left_edge = car.xcor() - 20
car_right_edge = car.xcor() + 20 car_right_edge = car.xcor() + 20
# It's mom's spaghetti (code) # It's mom's spaghetti code
if ( if (
( (
(other_top_edge - car_bottom_edge > 0 and car_top_edge - other_top_edge > 0) (other_top_edge - car_bottom_edge > 0 and car_top_edge - other_top_edge > 0)