/examples/stm32/f1/stm32-h107/

/a>
APBTeamNicolas Schodet
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--host/inter/dist_sensor.py3
-rw-r--r--host/inter/inter.py60
-rw-r--r--host/inter/inter_node.py17
-rw-r--r--host/inter/path.py2
-rw-r--r--host/simu/__init__.py0
-rw-r--r--host/simu/inter/__init__.py0
-rw-r--r--host/simu/inter/drawable.py (renamed from host/inter/drawable.py)98
-rw-r--r--host/simu/inter/test/test_drawable.py (renamed from host/inter/test/test_drawable.py)2
-rw-r--r--host/simu/utils/__init__.py0
-rw-r--r--host/simu/utils/trans_matrix.py (renamed from host/inter/trans_matrix.py)2
10 files changed, 100 insertions, 84 deletions
diff --git a/host/inter/dist_sensor.py b/host/inter/dist_sensor.py
index 859b311f..1f6a4668 100644
--- a/host/inter/dist_sensor.py
+++ b/host/inter/dist_sensor.py
@@ -25,7 +25,7 @@
from math import pi, cos, sin, sqrt
from Tkinter import *
-from drawable import *
+from simu.inter.drawable import *
from utils.observable import Observable
class DistSensor (Drawable, Observable):
@@ -34,6 +34,7 @@ class DistSensor (Drawable, Observable):
def __init__ (self, onto, pos, angle, range):
Drawable.__init__ (self, onto)
Observable.__init__ (self)
+ self.onto = onto
self.pos = pos
self.angle = angle
self.range = range
diff --git a/host/inter/inter.py b/host/inter/inter.py
index 8dedd680..a8270e53 100644
--- a/host/inter/inter.py
+++ b/host/inter/inter.py
@@ -23,17 +23,13 @@
# }}}
"""Inter and its childrens."""
from Tkinter import *
-from drawable import *
+from simu.inter.drawable import *
from math import pi, cos, sin
class Robot (Drawable):
"""The robot."""
- def __init__ (self, onto):
- Drawable.__init__ (self, onto)
- self.drawn = [ ]
-
def draw (self):
self.reset ()
self.trans_rotate (self.angle)
@@ -48,8 +44,7 @@ class Robot (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)
- for i in self.drawn:
- i.draw ()
+ Drawable.draw (self)
class Obsta