make the changes for the activity works again

4 files changed, 19 insertions, 10 deletions

diff --git a/activity.py b/activity.py
index 6d456ec..ee17ffa 100755
--- a/activity.py
+++ b/activity.py
@@ -38,6 +38,8 @@ from sugar.activity.widgets import ActivityToolbarButton
 from sugar.activity.widgets import StopButton
 from sugar.graphics.toolbarbox import ToolbarButton
 import sugargame.canvas
+import main
+import robot
 import followme
 from gettext import gettext as _
 
@@ -58,7 +60,7 @@ class Activity(activity.Activity):
         self.use_threshold_view = True
         self.mode = 'RGB'
 
-        self.followme_activity = followme.FollowMe(self)
+        self.followme_activity = main.Main(self)
         self.build_toolbar()
         self._pygamecanvas = sugargame.canvas.PygameCanvas(self)
         self.set_canvas(self._pygamecanvas)
diff --git a/followme.py b/followme.py
index 42779ee..ab1bc3e 100755
--- a/followme.py
+++ b/followme.py
@@ -26,14 +26,11 @@
 # Aylen Ricca <ar18_90@hotmail.com>
 # Rodrigo Dearmas <piegrande46@hotmail.com>
 
-
+import gtk
+import time
 import pygame
 import pygame.camera
 import gtk
-import butiaAPI
-import time
-import subprocess
-import commands
 from gettext import gettext as _
 
 # seteamos el tamaño de captura
diff --git a/main.py b/main.py
index 9e04477..461fc7d 100755
--- a/main.py
+++ b/main.py
@@ -26,7 +26,13 @@
 # Aylen Ricca <ar18_90@hotmail.com>
 # Rodrigo Dearmas <piegrande46@hotmail.com>
 
-   
+import gtk
+import pygame
+import robot
+from robot import Robot
+import followme
+from followme import FollowMe
+from gettext import gettext as _
 
 class Main:
 
@@ -80,14 +86,14 @@ class Main:
         self.c.set_camera_flags()
 
     def run(self):
-        self.r = Robot()
+        self.r = Robot((320, 240))
         self.threshold = (25, 25, 25)
         self.colorC = (255, 255, 255)
         self.pixels = 10
         self.show_size = (960, 720)
         self.show = True
         self.mode = 'RGB'
-        self.c = Captura(self.mode, self.parent)
+        self.c = FollowMe(self.mode, self.parent)
         if (self.c.cam == None):
             while gtk.events_pending():
                 gtk.main_iteration()
diff --git a/robot.py b/robot.py
index d4a6a61..2a33f97 100755
--- a/robot.py
+++ b/robot.py
@@ -26,7 +26,11 @@
 # Aylen Ricca <ar18_90@hotmail.com>
 # Rodrigo Dearmas <piegrande46@hotmail.com>
 
-
+import time
+import commands
+import butiaAPI
+import subprocess
+from gettext import gettext as _
 
 class Robot(object):