From dcedd228db9551242c618d32eb705427a8a8b1c6 Mon Sep 17 00:00:00 2001
From: Jdrezen <jeremie.drezen@gmail.com>
Date: Wed, 12 May 2021 14:31:42 +0200
Subject: [PATCH] =?UTF-8?q?Modification=20des=20exemples=20pour=20fermer?=
=?UTF-8?q?=20la=20fenetre=20de=20mani=C3=A8re=20propre?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
ant_example/antsLaunchExample.py | 9 +--------
ant_example/controleurAntsExample.py | 2 +-
ant_example_2_phases/antsLaunchExample.py | 9 +--------
ant_example_2_phases/controleurAntsExample.py | 2 +-
ant_examplev2/antsLaunchExample.py | 9 +--------
ant_examplev2/controleurAntsExample.py | 2 +-
6 files changed, 6 insertions(+), 27 deletions(-)
diff --git a/ant_example/antsLaunchExample.py b/ant_example/antsLaunchExample.py
index 34ac9b5..c08eb76 100644
--- a/ant_example/antsLaunchExample.py
+++ b/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()
diff --git a/ant_example/controleurAntsExample.py b/ant_example/controleurAntsExample.py
index 8f3252b..ac7ded7 100644
--- a/ant_example/controleurAntsExample.py
+++ b/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)):
diff --git a/ant_example_2_phases/antsLaunchExample.py b/ant_example_2_phases/antsLaunchExample.py
index 34ac9b5..c08eb76 100644
--- a/ant_example_2_phases/antsLaunchExample.py
+++ b/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()
diff --git a/ant_example_2_phases/controleurAntsExample.py b/ant_example_2_phases/controleurAntsExample.py
index 8f3252b..ac7ded7 100644
--- a/ant_example_2_phases/controleurAntsExample.py
+++ b/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)):
diff --git a/ant_examplev2/antsLaunchExample.py b/ant_examplev2/antsLaunchExample.py
index 34ac9b5..c08eb76 100644
--- a/ant_examplev2/antsLaunchExample.py
+++ b/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()
diff --git a/ant_examplev2/controleurAntsExample.py b/ant_examplev2/controleurAntsExample.py
index 8f3252b..ac7ded7 100644
--- a/ant_examplev2/controleurAntsExample.py
+++ b/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)):
--
GitLab