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 ++- host/simu/robots/marcel/view/loader.py | 76 ++++++++++++++++++++++++++++++++++ host/simu/robots/marcel/view/robot.py | 36 +++++++++++++++- 3 files changed, 115 insertions(+), 2 deletions(-) create mode 100644 host/simu/robots/marcel/view/loader.py (limited to 'host/simu/robots/marcel/view') 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) diff --git a/host/simu/robots/marcel/view/loader.py b/host/simu/robots/marcel/view/loader.py new file mode 100644 index 00000000..e640157b --- /dev/null +++ b/host/simu/robots/marcel/view/loader.py @@ -0,0 +1,76 @@ +# simu - Robot simulation. {{{ +# +# Copyright (C) 2010 Nicolas Schodet +# +# APBTeam: +# Web: http://apbteam.org/ +# Email: team AT apbteam DOT org +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +# +# }}} +"""Marcel loader.""" +from simu.inter.drawable import Drawable + +from simu.view.table_eurobot2010 import RED, corn_attr + +class Loader (Drawable): + + width = 420 + height = 370 + + def __init__ (self, onto, model): + Drawable.__init__ (self, onto) + self.model = model + self.model.register (self.__notified) + + def __notified (self): + self.update () + + def draw (self): + self.reset () + self.trans_translate ((-100, -125)) + self.draw_line ((25, 100), (25, 50), (300, 0), fill = '#808080') + if self.model.load: + # Draw load. + y = 0 + x = 0 + for e in self.model.load: + if hasattr (e, 'black'): + attr = corn_attr[e.black] + else: + attr = dict (fill = RED) + cx = x + e.radius + cy = y + cx * 50 / 300 + e.radius + self.draw_circle ((300 - cx, cy), e.radius, **attr) + x += e.radius + if x > 200: + x = 0 + y += 40 + if self.model.elevator_height is not None: + self.trans_identity () + self.trans_rotate (-self.model.elevator_angle) + self.trans_translate ((-100, -100 + self.model.elevator_height)) + # Draw clamp load. + if self.model.clamp_load: + elements = self.model.clamp_load + for e in elements: + if hasattr (e, 'black'): + self.draw_rectangle ((-25, -25), (-75, 125), + **corn_attr[e.black]) + else: + self.draw_circle ((-50, 0), e.radius, fill = RED) + # Draw clamp. + self.draw_line ((-100, -25), (0, -25), (0, 25), (-100, 25)) diff --git a/host/simu/robots/marcel/view/robot.py b/host/simu/robots/marcel/view/robot.py index 181d348b..4e2135f2 100644 --- a/host/simu/robots/marcel/view/robot.py +++ b/host/simu/robots/marcel/view/robot.py @@ -23,14 +23,19 @@ # }}} """Marcel robot view.""" import simu.inter.drawable +from math import cos + +from simu.view.table_eurobot2010 import RED, corn_attr class Robot (simu.inter.drawable.Drawable): - def __init__ (self, onto, position_model): + def __init__ (self, onto, position_model, loader_model): """Construct and make connections.""" simu.inter.drawable.Drawable.__init__ (self, onto) self.position_model = position_model self.position_model.register (self.__position_notified) + self.loader_model = loader_model + self.loader_model.register (self.__loader_notified) def __position_notified (self): """Called on position modifications.""" @@ -38,6 +43,11 @@ class Robot (simu.inter.drawable.Drawable): self.angle = self.position_model.angle self.update () + def __loader_notified (self): + """Called on loader modifications.""" + self.clamp_pos = self.loader_model.clamp_pos + self.update () + def draw (self): """Draw the robot.""" self.reset () @@ -57,6 +67,30 @@ class Robot (simu.inter.drawable.Drawable): self.draw_line ((0, +f / 2), (0, -f / 2), fill = axes_fill) self.draw_line ((-wr, f / 2), (+wr, f / 2), fill = axes_fill) self.draw_line ((-wr, -f / 2), (+wr, -f / 2), fill = axes_fill) + # Draw robot clamp. + if (self.clamp_pos[0] is not None + and self.clamp_pos[1] is not None): + l = self.loader_model.CLAMP_LENGTH * cos ( + self.loader_model.elevator_angle) + y = self.loader_model.CLAMP_WIDTH / 2 - self.clamp_pos[0] + self.draw_line ((120, y - 10), (120 + 0.15 * l, y), + (120 + 0.85 * l, y), (120 + l, y - 10)) + y = -self.loader_model.CLAMP_WIDTH / 2 + self.clamp_pos[1] + self.draw_line ((120, y + 10), (120 + 0.15 * l, y), + (120 + 0.85 * l, y), (120 + l, y + 10)) + # Draw clamp load. + if self.loader_model.clamp_load: + elements = self.loader_model.clamp_load + tickness = sum (e.radius * 2 for e in elements) + y = tickness / 2 + for e in elements: + if hasattr (e, 'black'): + attr = corn_attr[e.black] + else: + attr = dict (fill = RED) + self.draw_circle ((120 + l / 2, y - e.radius), + e.radius, **attr) + y -= e.radius * 2 # Extends. simu.inter.drawable.Drawable.draw (self) -- cgit v1.2.3