Merge branch 'master' of...

Merge branch 'master' of gitlab-student.centralesupelec.fr:2018boujerfay/coding-week-gol-dolleans-boujerfaoui

game_of_life/AffichageTkinter.py

@@ -3,6 +3,7 @@ from game_of_life.generate_universe import *
 from game_of_life.generation import *
 from game_of_life.survival import *
 from game_of_life.add_seed import *
+import random as rd
 
 fenetre = Tk()
 game_of_life = Toplevel(fenetre)
@@ -25,9 +26,16 @@ def create_a_grid():
         zones.append([])
         for y in range(len(universe[0])):
             if universe[x][y]==1:
-                zones.append(canvas.create_rectangle(x*width/100,(x+1)*width/100,y*width/100,(y+1)*width/100), fill="black")
+                zones[x].append(canvas.create_rectangle(x*width/100,(x+1)*width/100,y*width/100,(y+1)*width/100), fill="black")
             else:
-                zones.append(canvas.create_rectangle(x*width/100,(x+1)*width/100,y*width/100,(y+1)*width/100, fill="white"))
+                zones[x].append(canvas.create_rectangle(x*width/100,(x+1)*width/100,y*width/100,(y+1)*width/100, fill="white"))
+    for x in range (len(universe)):
+        for y in range (len(universe[0])):
+            if universe[x][y]==1:
+                canvas.itemconfig(zones[x][y], fill="black")
+            else:
+                canvas.itemconfig(zones[x][y], fill="white")
+
 
 def update_grid():
     """mets la grille a jours """
@@ -35,43 +43,50 @@ def update_grid():
     for x in range(len(universe)):
         for y in range (len(universe[0])):
             if universe[x][y] == 0:
-                if naissance([x][y]) == 1:
+                if naissance(universe[x][y]) == 1:
                     "colorier la case zones[x][y] en vert"
+                    canvas.itemconfig(zones[x][y], fill="green")
+                else:
+                    "colorier la case zones[x][y] en banc"
+                    canvas.itemconfig(zones[x][y], fill="white")
             else:
                 if survival(universe[x][y]) == 0:
                     "colorier la case zones[x][y] en rouge"
+                    canvas.itemconfig(zones[x][y], fill="red")
+                else:
+                    "colorier la case zones[x][y] en noir"
+                    canvas.itemconfig(zones[x][y], fill="black")
     universe = generation(universe)
 
 def create_cell_on_click(event):
     """créer une cellule vivante la ou l'utilisateur clique"""
     global universe
-    x = event.x//(width/100)
-    y = event.y//(heigth/100)
+    x = event.x//(game_of_life.winfo_width()/100)
+    y = event.y//(game_of_life.winfo_height()/100)
     universe[x][y] = 1
 
 def add_seed_tk():
-    """ajoute la graine donner dans la fenetre principale"""
+    """ajoute la graine donnée dans la fenetre principale"""
 
     global universe
     type_seed = ligne_texte.get()
-    print(type_seed)
-    ligne_texte.config(text=" ")
     seed = create_seed(type_seed)
-    """Gestion d'exceptions"""
-    try:
-        x_start = rd.randint(0,size[0]-len(seed))
-        y_start = rd.randint(0,size[1]-len(seed[0]))
-        universe= add_seed_to_universe(seed, universe, x_start, y_start)
-    except:
-        print("la graine est trop grande pour l'univers")
 
+    x_start = rd.randint(0,100-len(seed))
+    y_start = rd.randint(0,100-len(seed[0]))
+    universe= add_seed_to_universe(seed, universe, x_start, y_start)
 
 
 
 button_add_seed = Button(fenetre, text="ajoute la graine",command=add_seed_tk)
 button_add_seed.pack()
 
+button_next_step = Button(fenetre, text="go to next gen",command=update_grid)
+button_next_step.pack()
+
+
 create_a_grid()
+canvas.bind("<Button-1>", create_cell_on_click)