summaryrefslogtreecommitdiff
path: root/digital/ai/tools
diff options
context:
space:
mode:
authorNicolas Schodet2012-03-05 21:47:19 +0100
committerNicolas Schodet2012-03-05 23:53:03 +0100
commitdcb79f383269440ec2c5a54b6d7792fbb0110d5a (patch)
treec611781224f90f394207b840c177ad72643e7d94 /digital/ai/tools
parentc3fe438f1b60f20f6f5425db895777ee5248637f (diff)
digital/ai/tools: fix test_simu_control scripts
Diffstat (limited to 'digital/ai/tools')
-rw-r--r--digital/ai/tools/test_simu.py11
-rw-r--r--digital/ai/tools/test_simu_control_marcel.py7
-rw-r--r--digital/ai/tools/test_simu_control_robospierre.py7
3 files changed, 16 insertions, 9 deletions
diff --git a/digital/ai/tools/test_simu.py b/digital/ai/tools/test_simu.py
index 50eaf265..1b804e22 100644
--- a/digital/ai/tools/test_simu.py
+++ b/digital/ai/tools/test_simu.py
@@ -49,7 +49,7 @@ class ObstacleWithBeacon (obstacle_view.RoundObstacle):
class TestSimu (InterNode):
"""Interface, with simulated programs."""
- def __init__ (self, robot_class, robot_nb = 1):
+ def __init__ (self, robot_class, robot_nb = 1, color_switch = True):
# Hub.
self.hub = mex.hub.Hub (min_clients = 1 + robot_class.client_nb
* robot_nb)
@@ -86,10 +86,11 @@ class TestSimu (InterNode):
r.view = r.robot_view.Bag (self.table, self.actuator_view,
self.sensor_frame, r.model)
# Color switch.
- def change_color (r = r):
- i = r.model.color_switch.state
- r.asserv.set_simu_pos (*r.robot_start_pos[i]);
- r.model.color_switch.register (change_color)
+ if color_switch:
+ def change_color (r = r):
+ i = r.model.color_switch.state
+ r.asserv.set_simu_pos (*r.robot_start_pos[i])
+ r.model.color_switch.register (change_color)
def close (self):
self.forked_hub.kill ()
diff --git a/digital/ai/tools/test_simu_control_marcel.py b/digital/ai/tools/test_simu_control_marcel.py
index 2a43b7bb..1d5563e0 100644
--- a/digital/ai/tools/test_simu_control_marcel.py
+++ b/digital/ai/tools/test_simu_control_marcel.py
@@ -28,8 +28,11 @@ import math
class TestSimuControl (TestSimu):
"""Interface with extra control."""
- def __init__ (self, robot_class):
- TestSimu.__init__ (self, robot_class)
+ def __init__ (self, robot_class, *args):
+ TestSimu.__init__ (self, robot_class, *args, color_switch = False)
+ self.io = self.robots[0].io
+ self.asserv = self.robots[0].asserv
+ self.mimot = self.robots[0].mimot
def create_widgets (self):
TestSimu.create_widgets (self)
diff --git a/digital/ai/tools/test_simu_control_robospierre.py b/digital/ai/tools/test_simu_control_robospierre.py
index 1795e17f..c1a16c3c 100644
--- a/digital/ai/tools/test_simu_control_robospierre.py
+++ b/digital/ai/tools/test_simu_control_robospierre.py
@@ -32,8 +32,11 @@ class TestSimuControl (TestSimu):
ROTATION_STROKE = 0x233e
- def __init__ (self, robot_class):
- TestSimu.__init__ (self, robot_class)
+ def __init__ (self, robot_class, *args):
+ TestSimu.__init__ (self, robot_class, *args, color_switch = False)
+ self.io = self.robots[0].io
+ self.asserv = self.robots[0].asserv
+ self.mimot = self.robots[0].mimot
def create_widgets (self):
TestSimu.create_widgets (self)