summaryrefslogtreecommitdiffhomepage
path: root/host
diff options
context:
space:
mode:
authorNicolas Schodet2010-05-13 02:59:20 +0200
committerNicolas Schodet2010-05-13 02:59:20 +0200
commit44f55257cae560ee1e949d378504a9a457eb71c0 (patch)
tree74066f7ed9b3a6f57405e8db701994ed3d2b6fb8 /host
parent645b7d11df890ed99e5b00c8272d4e794060f703 (diff)
digital/asserv, digital/io, host/simu: change gate contact position
Diffstat (limited to 'host')
-rw-r--r--host/simu/robots/marcel/model/loader.py2
-rw-r--r--host/simu/robots/marcel/view/loader.py4
2 files changed, 3 insertions, 3 deletions
diff --git a/host/simu/robots/marcel/model/loader.py b/host/simu/robots/marcel/model/loader.py
index 79292ecd..0270ce79 100644
--- a/host/simu/robots/marcel/model/loader.py
+++ b/host/simu/robots/marcel/model/loader.py
@@ -36,7 +36,7 @@ class Loader (Observable):
ELEVATOR_LINEAR_STROKE = 32
ELEVATOR_ROTATING_STROKE = 200 - 32
- GATE_STROKE = 3.3284 * pi
+ GATE_STROKE = -3.0124 * 2 * pi
FRONT_ZONE_X_MIN = 120 - 15
FRONT_ZONE_X_MAX = 120 + CLAMP_LENGTH - 15
diff --git a/host/simu/robots/marcel/view/loader.py b/host/simu/robots/marcel/view/loader.py
index 4ad2ffce..5bda5d5b 100644
--- a/host/simu/robots/marcel/view/loader.py
+++ b/host/simu/robots/marcel/view/loader.py
@@ -60,11 +60,11 @@ class Loader (Drawable):
x = 0
y += 40
if self.model.gate_angle is not None:
- ratio = self.model.gate_angle / self.model.GATE_STROKE
+ ratio = 1 - self.model.gate_angle / self.model.GATE_STROKE
# Draw gate.
for i in xrange (0, 4):
self.draw_line ((100, 125 + 5 * i),
- (300, 25 + 25 * i + (75 - 10 * i) * ratio))
+ (300, 25 + 25 * i + (150 - 20 * i) * ratio))
if self.model.elevator_height is not None:
self.trans_identity ()
self.trans_rotate (-self.model.elevator_angle)