diff --git a/util/.window.py.swp b/util/.window.py.swp deleted file mode 100644 index 96dcd04..0000000 Binary files a/util/.window.py.swp and /dev/null differ diff --git a/util/50.png b/util/50.png deleted file mode 100644 index ae7ba22..0000000 Binary files a/util/50.png and /dev/null differ diff --git a/util/window.py b/util/window.py index f47a54c..a5f0791 100644 --- a/util/window.py +++ b/util/window.py @@ -1,4 +1,4 @@ -from tkinter import Tk, Label, Button, PhotoImage, Canvas, NW +from tkinter import Tk, Label, Button, StringVar from PIL import Image, ImageTk class Window(Tk): @@ -19,17 +19,25 @@ class Window(Tk): self.c2 = None def build_window(self): + """Ajoute les composants de base à la fenêtre""" self.title = Label(text="Bataille", font=("Courrier", 32)) self.title.grid(row=1, column=1) - self.button = Button(self, text="Jouer") #, command=) + + self.button = Button(self, text="Jouer", command=self.show_cards) + self.button.grid(row=4, column=1) + + #.set() pour changer le texte + self.text_content = StringVar() + self.text = Label(self, textvariable=self.text_content) + self.text.grid(row=3, column=1) def show_cards(self): + """Affiche les dernières cartes jouées par les deux joueurs""" if self.c1 is not None: self.c1.destroy() if self.c2 is not None: self.c2.destroy() - #self.c1 = Label(text=self.p1.derniere_carte, font=("Courrier", 48)) - #self.c2 = Label(text=self.p2.derniere_carte, font=("Courrier", 48)) + img1 = ImageTk.PhotoImage(card_to_image(self.p1.derniere_carte)) self.c1 = Label(self, image=img1) self.c1.photo = img1 @@ -37,17 +45,13 @@ class Window(Tk): img2 = ImageTk.PhotoImage(card_to_image(self.p2.derniere_carte)) self.c2 = Label(image=img2) self.c2.photo = img2 + self.c1.grid(row=2, column=0) self.c2.grid(row=2, column=2) def card_to_image(card): - card_names = list(range(56-card.valeur*4, 52-card.valeur*4 , -1)) + """Lie la valeur et couleur de la carte à son image""" + card_names = list(range(56-(card.valeur-1)*4, 52-(card.valeur-1)*4 , -1)) image = Image.open("./img/"+str(card_names[card.couleur])+".png") - print(str(card_names[card.couleur])+".png") return image -if __name__ == "__main__": - card_to_image(Carte(2, 4)) - #app = Window(None, None) - #app.show_cards() - #app.mainloop()