Actualización 2

5 files changed, 164 insertions, 47 deletions

diff --git a/activity.py b/activity.py
index b55e6e9..85bf7f8 100644
--- a/activity.py
+++ b/activity.py
@@ -72,7 +72,7 @@ class JugandoAprendesActivity(activity.Activity):
     def cargar_ui(self):
         vbox = gtk.VBox()
         self.set_canvas(vbox)
-        hbox = gtk.HBox()
+        self.hbox = gtk.HBox()
         label = gtk.Label()
         self.connect('key-press-event', self.__key_press_cb)
         
@@ -80,22 +80,22 @@ class JugandoAprendesActivity(activity.Activity):
         vbox.add(hbox)
             
         image=gtk.Image()
-        image.set_from_file('imagenes/Derecha.png')
+        image.set_from_file('imagenes/derecha.png')
         image.show()
         hbox.pack_start(image)
             
         image=gtk.Image()
-        image.set_from_file('imagenes/Izquierda.png')
+        image.set_from_file('imagenes/izquierda.png')
         image.show()
         hbox.pack_start(image)
             
         image=gtk.Image()
-        image.set_from_file('imagenes/Arriba.png')
+        image.set_from_file('imagenes/arriba.png')
         image.show()
         hbox.pack_start(image)
             
         image=gtk.Image()
-        image.set_from_file('imagenes/Abajo.png')
+        image.set_from_file('imagenes/abajo.png')
         image.show()
         hbox.pack_start(image)
             
@@ -107,28 +107,55 @@ class JugandoAprendesActivity(activity.Activity):
         words= parser.get('inicio','patron')
         self.say (words)    
         
-    def patrones(self):
-        #parser=SafeConfigParser()
-        #parser.read('config.ini')
-        #words= parser.get('patron1','patron')
-        self.words=['arriba','abajo','izquierda','derecha']
-        random.shuffle(words)
-        self.say (words)    
+    def leer_patrones(self):
+        def leer_patrones(self):
+        self.say(self.p)
+        #self.controlar_patrones()  
         
+    def generar_patrones(self):
+        self.patron=['arriba','abajo','izquierda', 'derecha']
+        random.shuffle(self.patron)
+        self.p="    ".join(self.patron)
+        #self.hbox.clear()
+        image=gtk.Image()
+        image.set_from_file('imagenes/'+patron[0]+'.png')
+        image.show()
+        self.hbox.pack_start(image)
+            
+        image=gtk.Image()
+        image.set_from_file('imagenes/'+patron[1]+'.png')
+        image.show()
+        self.hbox.pack_start(image)
+            
+        image=gtk.Image()
+        image.set_from_file('imagenes/'+patron[2]+'.png')
+        image.show()
+        self.hbox.pack_start(image)
+            
+        image=gtk.Image()
+        image.set_from_file('imagenes/'+patron[3]+'.png')
+        image.show()
+        self.hbox.pack_start(image)
+        self.leer_patrones()
+            
           
             
     def __key_press_cb(self, window, event, label):
         key_name = gtk.gdk.keyval_name(event.keyval)
-        if (key_name=='Up'):
+        if (self.key_name=='Up'):
             self.say ('Arriba')
-        elif (key_name=='Down'):
+            self.key_name='arriba'
+        elif (self.key_name=='Down'):
             self.say ('Abajo')
-        elif (key_name=='Left'):
+            self.key_name='abajo'
+        elif (self.key_name=='Left'):
             self.say ('Izquierda')
-        elif (key_name=='Right'):
+            self.key_name='izquierda'
+        elif (self.key_name=='Right'):
             self.say ('Derecha')
-        elif (key_name=='space'):
-            self.patrones()
+            self.key_name='derecha'
+        elif (self.key_name=='space'):
+            self.generar_patrones()
         else:
             self.say('Tecla incorrecta')
                        
diff --git a/activity/activity-helloworld.svg b/activity/activity-helloworld.svg
new file mode 100644
index 0000000..8da7c63
--- /dev/null
+++ b/activity/activity-helloworld.svg
@@ -0,0 +1,26 @@
+<?xml version="1.0" ?><!DOCTYPE svg  PUBLIC '-//W3C//DTD SVG 1.1//EN'  'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd' [
+	<!ENTITY stroke_color "#010101">
+	<!ENTITY fill_color "#FFFFFF">
+]>
+<svg enable-background="new 0 0 55 55" height="55px" version="1.1" viewBox="0 0 55 55" width="55px" x="0px" xml:space="preserve" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
+  <g display="block" id="activity-helloworld">
+    <path d="M9.263,48.396c0.682,1.152,6.027,0.059,8.246-1.463   c2.102-1.432,3.207-2.596,4.336-2.596c1.133,0,12.54,0.92,20.935-5.715c7.225-5.707,9.773-13.788,4.52-21.437   c-5.252-7.644-13.832-9.08-20.878-8.56C16.806,9.342,4.224,16.91,4.677,28.313c0.264,6.711,3.357,9.143,4.922,10.703   c1.562,1.566,4.545,1.566,2.992,5.588C11.981,46.183,8.753,47.522,9.263,48.396z" display="inline" fill="&fill_color;" stroke="&stroke_color;" stroke-width="3.5"/>
+  </g>
+  <circle cx="27.375" cy="27.5" r="19.903"
+     transform="matrix(0.6,0,0,0.6,10.95,11)"
+     id="circle4" fill="&fill_color;" stroke="&stroke_color;" stroke-width="3.5" display="inline" />
+  <g transform="matrix(0.6,0,0,0.6,10.95,11)" id="g6" style="display:inline">
+    <path d="m 27.376,7.598 c 0,0 -11.205,8.394 -11.205,19.976 0,11.583 11.205,19.829 11.205,19.829"
+       id="path8" fill="&fill_color;" stroke="&stroke_color;" stroke-width="3.5" />
+    <path d="m 27.376,7.598 c 0,0 11.066,9.141 11.066,19.976 0,10.839 -11.066,19.829 -11.066,19.829"
+       id="path10" fill="&fill_color;" stroke="&stroke_color;" stroke-width="3.5" />
+    <line x1="27.375999" x2="27.375999" y1="7.598" y2="47.402"
+       id="line12" fill="&fill_color;" stroke="&stroke_color;" stroke-width="3.5" />
+    <line x1="27.375999" x2="27.375999" y1="7.598" y2="47.402"
+       id="line14" fill="&fill_color;" stroke="&stroke_color;" stroke-width="3.5" />
+    <line x1="27.375999" x2="27.375999" y1="7.598" y2="47.402"
+       id="line16" fill="&fill_color;" stroke="&stroke_color;" stroke-width="3.5" />
+    <line x1="7.4720001" x2="47.278" y1="27.5" y2="27.5"
+       id="line18" fill="&fill_color;" stroke="&stroke_color;" stroke-width="3.5" />
+  </g>
+</svg>
diff --git a/activity/activity.info b/activity/activity.info
new file mode 100644
index 0000000..09abd87
--- /dev/null
+++ b/activity/activity.info
@@ -0,0 +1,7 @@
+[Activity]
+name = Jugando-Aprendes
+activity_version = 3
+bundle_id = org.sugarlabs.Jugando_Aprendes
+exec = sugar-activity activity.JugandoAprendesActivity
+icon = activity-helloworld
+license = GPLv2+
diff --git a/activity/activity.info~ b/activity/activity.info~
new file mode 100644
index 0000000..4aa4f7f
--- /dev/null
+++ b/activity/activity.info~
@@ -0,0 +1,7 @@
+[Activity]
+name = HelloWorld
+activity_version = 3
+bundle_id = org.sugarlabs.HelloWorld
+exec = sugar-activity activity.HelloWorldActivity
+icon = activity-helloworld
+license = GPLv2+
diff --git a/prueba.py b/prueba.py
index 2a56461..76fa63d 100644
--- a/prueba.py
+++ b/prueba.py
@@ -17,54 +17,100 @@ class MyApp():
         parser.read('config.ini')
         words= parser.get('inicio','patron')
         self.say (words)    
+     
+    # def __key_press_cb_capture(self, window, event, label):
+     #   self.say('Ingrese por teclado los patrones que has escuchado')
+      #  self.key_name = gtk.gdk.keyval_name(event.keyval)
+       # if (self.key_name=='Up'):
+        #    self.say ('Arriba')
+         #   self.key_name='arriba'
+        #elif (self.key_name=='Down'):
+         #   self.say ('Abajo')
+          #  self.key_name='abajo'
+        #elif (self.key_name=='Left'):
+         #   self.say ('Izquierda')
+          #  self.key_name='izquierda'
+        #elif (self.key_name=='Right'):
+         #   self.say ('Derecha')
+          #  self.key_name='derecha'
+        #if(self.key_name==patr
         
-    def patrones(self):
-        parser=SafeConfigParser()
-        parser.read('config.ini')
-        words= parser.get('patron1','patron')
-        #words=['arriba','abajo','izquierda','derecha']
-        random.shuffle(words)
-        n=0;m=10
-        for i in words: 
-            self.say(i[n:m])
-            n+=1
-            m+=1
-               
-       
+          
+   
+     #def controlar_patrones():
+      #  for i in range(4):
+       #     if (self.patron[i]==self.key_name):
+        #        self.say('Correcto')
+         #   else:
+          #      self.say('Incorrecto. Vuelva a intentarlo desde el inicio')
+           #     controlar_patrones()
+                
+        #self.say('Felicidades, has acertado totalmente. Aprieta espacio para generar un nuevo patron')
+                    
         
+    def leer_patrones(self):
+        self.say(self.p)
+        #self.controlar_patrones()    
+        
+    def generar_patrones(self):
+        self.patron=['arriba','abajo','izquierda', 'derecha']
+        random.shuffle(self.patron)
+        self.p="    ".join(self.patron)
+        self.hbox.clear()
+        image=gtk.Image()
+        image.set_from_file('imagenes/'+patron[0]+'.png')
+        image.show()
+        self.hbox.pack_start(image)
+            
+        image=gtk.Image()
+        image.set_from_file('imagenes/'+patron[1]+'.png')
+        image.show()
+        self.hbox.pack_start(image)
+            
+        image=gtk.Image()
+        image.set_from_file('imagenes/'+patron[2]+'.png')
+        image.show()
+        self.hbox.pack_start(image)
+            
+        image=gtk.Image()
+        image.set_from_file('imagenes/'+patron[3]+'.png')
+        image.show()
+        self.hbox.pack_start(image)
+        self.leer_patrones()
+      
         
     def cargar_ui(self):
-        window = gtk.Window()
+        self.window = gtk.Window()
         vbox = gtk.VBox()
         hbox = gtk.HBox()
         label = gtk.Label()
-        window.connect('destroy', self.destroy)
-        window.connect('key-press-event', self.__key_press_cb, label)
-        window.add(vbox)
+        self.window.connect('destroy', self.destroy)
+        self.window.connect('key-press-event', self.__key_press_cb, label)
+        self.window.add(vbox)
     
         vbox.add(hbox)
         
         image=gtk.Image()
-        image.set_from_file('imagenes/Derecha.png')
+        image.set_from_file('imagenes/derecha.png')
         image.show()
         hbox.pack_start(image)
         
         image=gtk.Image()
-        image.set_from_file('imagenes/Izquierda.png')
+        image.set_from_file('imagenes/izquierda.png')
         image.show()
         hbox.pack_start(image)
         
         image=gtk.Image()
-        image.set_from_file('imagenes/Arriba.png')
+        image.set_from_file('imagenes/arriba.png')
         image.show()
         hbox.pack_start(image)
         
         image=gtk.Image()
-        image.set_from_file('imagenes/Abajo.png')
+        image.set_from_file('imagenes/abajo.png')
         image.show()
         hbox.pack_start(image)
         
-        window.show_all()
+        self.window.show_all()
         
                  
     def destroy(self, window, data=None):
@@ -72,17 +118,21 @@ class MyApp():
         
             
     def __key_press_cb(self, window, event, label):
-        key_name = gtk.gdk.keyval_name(event.keyval)
-        if (key_name=='Up'):
+        self.key_name = gtk.gdk.keyval_name(event.keyval)
+        if (self.key_name=='Up'):
             self.say ('Arriba')
-        elif (key_name=='Down'):
+            self.key_name='arriba'
+        elif (self.key_name=='Down'):
             self.say ('Abajo')
-        elif (key_name=='Left'):
+            self.key_name='abajo'
+        elif (self.key_name=='Left'):
             self.say ('Izquierda')
-        elif (key_name=='Right'):
+            self.key_name='izquierda'
+        elif (self.key_name=='Right'):
             self.say ('Derecha')
-        elif (key_name=='space'):
-            self.patrones()
+            self.key_name='derecha'
+        elif (self.key_name=='space'):
+            self.generar_patrones()
         else:
             self.say('Tecla incorrecta')