From 5532fb5e50d071be08e3c37404d1755748762d7c Mon Sep 17 00:00:00 2001 From: Nicolas Schodet Date: Thu, 29 Apr 2010 23:04:20 +0200 Subject: host/simu/robots/marcel: add actuator simulation, refs #131 --- host/simu/robots/marcel/view/bag.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'host/simu/robots/marcel/view/bag.py') diff --git a/host/simu/robots/marcel/view/bag.py b/host/simu/robots/marcel/view/bag.py index 75f7ff50..fb2182a8 100644 --- a/host/simu/robots/marcel/view/bag.py +++ b/host/simu/robots/marcel/view/bag.py @@ -27,6 +27,7 @@ from simu.view.distance_sensor_us import DistanceSensorUS from simu.view.path import Path from simu.view.pos_report import PosReport from simu.robots.marcel.view.robot import Robot +from simu.robots.marcel.view.loader import Loader class Bag: @@ -34,7 +35,9 @@ class Bag: self.jack = Switch (sensor_frame, model_bag.jack, 'Jack') self.color_switch = Switch (sensor_frame, model_bag.color_switch, 'Color') - self.robot = Robot (table, model_bag.position) + self.robot = Robot (table, model_bag.position, model_bag.loader) + self.loader = Loader (actuator_view.add_view (Loader.width, + Loader.height), model_bag.loader) self.distance_sensor = [DistanceSensorUS (self.robot, ds) for ds in model_bag.distance_sensor] self.path = Path (table, model_bag.path) -- cgit v1.2.3