Merge branch 'window_closing'

ant_example/antsLaunchExample.py

@@ -19,14 +19,7 @@ amas = AntHillExample(env)
 controleur = ControleurAntsExample(fenetre, amas)
 
 
-def run():
-    controleur.get_amas().start()
-
-
 def main():
-    controleur.initialisation()
-    Thread(target=run).start()
-    controleur.get_fenetre().display()
-
+    controleur.start()
 
 main()

ant_example/controleurAntsExample.py

@@ -17,7 +17,7 @@ class ControleurAntsExample(Controleur):
         for i in range(self.__numberAnts):
             self.__ants.append(self.draw_image(widthCanvas / 2, heightCanvas / 2, 'images/blackAnt.png'))
 
-    def updateCycle(self, env, amas):
+    def updateWindow(self, env, amas):
         ants = amas.get_Agents_Sorted()
 
         for i in range(len(ants)):

ant_example_2_phases/antsLaunchExample.py

@@ -19,14 +19,7 @@ amas = AntHillExample(env)
 controleur = ControleurAntsExample(fenetre, amas)
 
 
-def run():
-    controleur.get_amas().start()
-
-
 def main():
-    controleur.initialisation()
-    Thread(target=run).start()
-    controleur.get_fenetre().display()
-
+    controleur.start()
 
 main()

ant_example_2_phases/controleurAntsExample.py

@@ -17,7 +17,7 @@ class ControleurAntsExample(Controleur):
         for i in range(self.__numberAnts):
             self.__ants.append(self.draw_image(widthCanvas / 2, heightCanvas / 2, 'images/blackAnt.png'))
 
-    def updateCycle(self, env, amas):
+    def updateWindow(self, env, amas):
         ants = amas.get_Agents_Sorted()
 
         for i in range(len(ants)):

ant_examplev2/antsLaunchExample.py

@@ -19,14 +19,7 @@ amas = AntHillExample(env)
 controleur = ControleurAntsExample(fenetre, amas)
 
 
-def run():
-    controleur.get_amas().start()
-
-
 def main():
-    controleur.initialisation()
-    Thread(target=run).start()
-    controleur.get_fenetre().display()
-
+    controleur.start()
 
 main()

ant_examplev2/controleurAntsExample.py

@@ -17,7 +17,7 @@ class ControleurAntsExample(Controleur):
         for i in range(self.__numberAnts):
             self.__ants.append(self.draw_image(widthCanvas / 2, heightCanvas / 2, 'images/blackAnt.png'))
 
-    def updateCycle(self, env, amas):
+    def updateWindow(self, env, amas):
         ants = amas.get_Agents_Sorted()
 
         for i in range(len(ants)):

philosopher_example/controleurPhilosophersExample.py

@@ -60,7 +60,7 @@ class ControleurPhilosophersExample(Controleur):
             self.addPoint(self.__barChart[2],0,i*50,y)
             self.addPoint(self.__barChart[2],1,i*50,y-50)
 
-    def updateCycle(self, env, amas):
+    def updateWindow(self, env, amas):
         agents = amas.get_Agents_Sorted()
 
         for i in range(10):

philosopher_example/philosophersLaunchExample.py

 from pyAmakIHM.classes.fenetre import Fenetre
 from controleurPhilosophersExample import ControleurPhilosophersExample
 from philosophersAmasExample import PhilosophersAmasExamples
-from threading import Thread
 
 fenetre = Fenetre("Prototype Philosophers")
 amas = PhilosophersAmasExamples()
@@ -9,14 +8,8 @@ amas = PhilosophersAmasExamples()
 controleur = ControleurPhilosophersExample(fenetre, amas)
 
 
-def run():
-    controleur.get_amas().start()
-
-
 def main():
-    controleur.initialisation()
-    Thread(target=run).start()
-    controleur.get_fenetre().display()
+    controleur.start()
 
 
 main()