From 3c29d7d4b451a8c48c31fd087d74df0548cdd9bc Mon Sep 17 00:00:00 2001
From: "aboulin.a" <aboulin.a@example.com>
Date: Wed, 14 Dec 2022 13:12:52 +0100
Subject: [PATCH] window fonctionnelle

---
 util/.window.py.swp | Bin 1024 -> 0 bytes
 util/50.png         | Bin 463 -> 0 bytes
 util/window.py      |  26 +++++++++++++++-----------
 3 files changed, 15 insertions(+), 11 deletions(-)
 delete mode 100644 util/.window.py.swp
 delete mode 100644 util/50.png

diff --git a/util/.window.py.swp b/util/.window.py.swp
deleted file mode 100644
index 96dcd04b4a58a5fe4a8d34b1ca971c49963770e1..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1024
zcmYc?$V<%2S1{7E)H7y40;{4K7!s56OLH>w^b(Q8u`wMD4Rr$yP_$!H#-N{(pPQ<m
zs1G++-z7h}G&eP`q*y;Gu_Q4wCnr_Ev?Mb}zdSQ9CBIy+pc1P&qk^L$Fd716g+M5}
FE&vnZ9M}K=

diff --git a/util/50.png b/util/50.png
deleted file mode 100644
index ae7ba22e2f769c5fbb6d320461868f5edae9d3a6..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 463
zcmV;=0WkiFP)<h;3K|Lk000e1NJLTq002k;003YF0{{R3Ogt$s0000mP)t-s|Ns90
z0047yT9kW)&d#+dF);`b7!V;TDG(T1Qc|3hbG^OJ=jZnT5QGpZj43gM#8R?}00046
zNkl<Zc%1E*F;W9D3`MoxRM4O>P(Wi-q$W2A1qa9x;3za)fEmscPKG7VBx^~tQjyZ`
zcIQR<k-hu>LP2*Gcmi+TAl$hSgrS66AF9%`3n5JFJ)5QwRQz_30>VY1jR}cDJJp*<
zke9-Zsp%0IQ)3A60;PH-ODTv?PS((Jr4NEW*P(YlWe*1p&6n#PLyuWQ``2EQ6h+XC
z_dc{oJeR7Pjz>e&Tz`2kwfX%z{eAzae>YM6#jVo!GND_1HXv&w6a+6*QXLcoZ--T;
zLFhc7*L}<fG@t<uXh2tj==JSFWCR|>mf}FooHW!~S+hB#Qpp}9?6q015gt0DW)qi?
zw0w>O9>l>yLMnz(M2QEQ#R^3u8L~KlDM+LQ8xp~fL!pNH2#K^y#@_W|l#;3e^|7`V
zat|FxUJs%|E`$(*%n^uoG&NT^+9R-fhM>R)*A^n5ZvPvjGMb(-9e@A;002ovPDHLk
FV1oSoyQu&G

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()