Actualizacion 4HEADmaster

2 files changed, 133 insertions, 118 deletions

diff --git a/activity.py b/activity.py
index c8d05da..7628aaa 100644
--- a/activity.py
+++ b/activity.py
@@ -67,6 +67,8 @@ class JugandoAprendesActivity(activity.Activity):
         
         self.load_data()
         self.cargar_ui()
+        self.flag=0
+        self.patron_nuevo=''
 
         # label with the text, make the string translatable
     def cargar_ui(self):
@@ -74,8 +76,7 @@ class JugandoAprendesActivity(activity.Activity):
         self.set_canvas(vbox)
         self.hbox = gtk.HBox()
         label = gtk.Label()
-        self.connect('key-press-event', self.__key_press_cb)
-        
+        self.connect('key-press-event', self.__key_press_cb, label)
         
         vbox.add(self.hbox)
             
@@ -107,70 +108,95 @@ class JugandoAprendesActivity(activity.Activity):
         words= parser.get('inicio','patron')
         self.say (words)    
         
+    def controlar_patrones(self):
+        while(self.i < 4):
+            if (self.patron[self.i]==self.key_name):
+                self.say(self.patron[self.i]+'Correcto')
+                self.i+=1
+                self.flag=1
+                break
+            else:
+                self.say(self.patron[self.i]+'Incorrecto Vuelva a escuchar los patrones e intentelo de nuevo'+self.patron_nuevo)
+                self.i+=0
+                break
+        
     def leer_patrones(self):
-        def leer_patrones(self):
-        self.say(self.p)
-        #self.controlar_patrones()  
+        self.say(self.patron_nuevo)    
+        self.i=0  
+        self.flag=1
         
     def generar_patrones(self):
-        self.patron=['arriba','abajo','izquierda', 'derecha']
-        random.shuffle(self.patron)
-        self.p="    ".join(self.patron)
-        self.hbox.remove(self.image1)
-        self.hbox.remove(self.image2)
-        self.hbox.remove(self.image3)
-        self.hbox.remove(self.image4)
-        
-        self.image1=gtk.Image()
-        self.image1.set_from_file('imagenes/'+self.patron[0]+'.png')
-        self.image1.show()
-        self.hbox.pack_start(self.image1)
-        
-                  
-        self.image2=gtk.Image()
-        self.image2.set_from_file('imagenes/'+self.patron[1]+'.png')
-        self.image2.show()
-        self.hbox.pack_start(self.image2)
-        
-                   
-        self.image3=gtk.Image()
-        self.image3.set_from_file('imagenes/'+self.patron[2]+'.png')
-        self.image3.show()
-        self.hbox.pack_start(self.image3)
-        
-                   
-        self.image4=gtk.Image()
-        self.image4.set_from_file('imagenes/'+self.patron[3]+'.png')
-        self.image4.show()
-        self.hbox.pack_start(self.image4)
-        self.leer_patrones()    
-          
+        if (self.flag==0):
+            self.patron=['arriba','abajo','izquierda', 'derecha']
+            random.shuffle(self.patron)
+            self.patron_nuevo="    ".join(self.patron)
+            self.hbox.remove(self.image1)
+            self.hbox.remove(self.image2)
+            self.hbox.remove(self.image3)
+            self.hbox.remove(self.image4)
+            
+            self.image1=gtk.Image()
+            self.image1.set_from_file('imagenes/'+self.patron[0]+'.png')
+            self.image1.show()
+            self.hbox.pack_start(self.image1)
+            
+                      
+            self.image2=gtk.Image()
+            self.image2.set_from_file('imagenes/'+self.patron[1]+'.png')
+            self.image2.show()
+            self.hbox.pack_start(self.image2)
+            
+                       
+            self.image3=gtk.Image()
+            self.image3.set_from_file('imagenes/'+self.patron[2]+'.png')
+            self.image3.show()
+            self.hbox.pack_start(self.image3)
+            
+                       
+            self.image4=gtk.Image()
+            self.image4.set_from_file('imagenes/'+self.patron[3]+'.png')
+            self.image4.show()
+            self.hbox.pack_start(self.image4)
+            self.leer_patrones()    
+              
             
     def __key_press_cb(self, window, event, label):
-        key_name = gtk.gdk.keyval_name(event.keyval)
+        self.key_name = gtk.gdk.keyval_name(event.keyval)
         if (self.key_name=='Up'):
             self.say ('Arriba')
             self.key_name='arriba'
+            if(self.patron_nuevo != ''):
+                self.controlar_patrones()
         elif (self.key_name=='Down'):
             self.say ('Abajo')
             self.key_name='abajo'
+            if(self.patron_nuevo != ''):
+                self.controlar_patrones()
         elif (self.key_name=='Left'):
             self.say ('Izquierda')
             self.key_name='izquierda'
+            if(self.patron_nuevo != ''):
+                self.controlar_patrones()
         elif (self.key_name=='Right'):
             self.say ('Derecha')
             self.key_name='derecha'
+            if(self.patron_nuevo != ''):
+                self.controlar_patrones()
         elif (self.key_name=='space'):
-            self.generar_patrones()
+            if(self.flag==0):
+                self.generar_patrones()
+            else:
+                self.say(self.patron_nuevo)
         else:
             self.say('Tecla incorrecta')
                        
     def say(self, text):
         Popen(['espeak', '-v', 'es', text])
         
-           
-if __name__ == "__main__":
-    my_app = MyApp()
-    gtk.main()
-     
+    def read_file(self, file_name):
+        self.patron=self.metadata['juego']
         
+    def write_file(self, file_name):
+        self.metadata['juego']=self.patron
+    
+    
diff --git a/prueba.py b/prueba.py
index debf8a9..8b2aaf8 100644
--- a/prueba.py
+++ b/prueba.py
@@ -11,6 +11,9 @@ class MyApp():
     def __init__(self):
        self.load_data()
        self.cargar_ui()
+       self.flag=0
+       self.p=''
+       
                   
     def load_data(self):
         parser=SafeConfigParser()
@@ -18,86 +21,60 @@ class MyApp():
         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 controlar_patrones(self):
-       print 'entra'
-       if (self.key_name != 'space'):
-        i=0
-        while (i<3):
-          if (self.patron[i]==self.key_name):
-              self.say('Correcto')
-              print 'estoy en el if'
-              i+=1
-          else:
-              self.say('Incorrecto')
-              self.leer_patrones()
-              print 'estoy en el else'
-              i=0
-              break
-        self.controlar_patrones()          
-              
-         #   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')
-                   
-        
+        while(self.i < 4):
+            if (self.patron[self.i]==self.key_name):
+                self.say(self.patron[self.i])
+                self.i+=1
+                self.flag=0
+                break
+            else:
+                self.say(self.patron[self.i]+'Incorrecto Vuelva a escuchar los patrones e intentelo de nuevo'+self.p)
+                self.i=0
+                break
+             
+               
     def leer_patrones(self):
         self.say(self.p)    
-        self.controlar_patrones()    
+        self.i=0
+        self.flag=1
+            
         
           
     def generar_patrones(self):
-        self.patron=['arriba','abajo','izquierda', 'derecha']
-        random.shuffle(self.patron)
-        self.p="    ".join(self.patron)
-        self.hbox.remove(self.image1)
-        self.hbox.remove(self.image2)
-        self.hbox.remove(self.image3)
-        self.hbox.remove(self.image4)
-        
-        self.image1=gtk.Image()
-        self.image1.set_from_file('imagenes/'+self.patron[0]+'.png')
-        self.image1.show()
-        self.hbox.pack_start(self.image1)
-        
-                  
-        self.image2=gtk.Image()
-        self.image2.set_from_file('imagenes/'+self.patron[1]+'.png')
-        self.image2.show()
-        self.hbox.pack_start(self.image2)
-        
-                   
-        self.image3=gtk.Image()
-        self.image3.set_from_file('imagenes/'+self.patron[2]+'.png')
-        self.image3.show()
-        self.hbox.pack_start(self.image3)
-        
-                   
-        self.image4=gtk.Image()
-        self.image4.set_from_file('imagenes/'+self.patron[3]+'.png')
-        self.image4.show()
-        self.hbox.pack_start(self.image4)
-        self.leer_patrones()
+        if (self.flag==0):
+            self.patron=['arriba','abajo','izquierda', 'derecha']
+            random.shuffle(self.patron)
+            self.p="    ".join(self.patron)
+            self.hbox.remove(self.image1)
+            self.hbox.remove(self.image2)
+            self.hbox.remove(self.image3)
+            self.hbox.remove(self.image4)
+            
+            self.image1=gtk.Image()
+            self.image1.set_from_file('imagenes/'+self.patron[0]+'.png')
+            self.image1.show()
+            self.hbox.pack_start(self.image1)
+            
+                      
+            self.image2=gtk.Image()
+            self.image2.set_from_file('imagenes/'+self.patron[1]+'.png')
+            self.image2.show()
+            self.hbox.pack_start(self.image2)
+            
+                       
+            self.image3=gtk.Image()
+            self.image3.set_from_file('imagenes/'+self.patron[2]+'.png')
+            self.image3.show()
+            self.hbox.pack_start(self.image3)
+            
+                       
+            self.image4=gtk.Image()
+            self.image4.set_from_file('imagenes/'+self.patron[3]+'.png')
+            self.image4.show()
+            self.hbox.pack_start(self.image4)
+            self.leer_patrones()
       
         
     def cargar_ui(self):
@@ -111,6 +88,7 @@ class MyApp():
     
         vbox.add(self.hbox)
         
+                
         self.image1=gtk.Image()
         self.image1.set_from_file('imagenes/derecha.png')
         self.image1.show()
@@ -143,17 +121,28 @@ class MyApp():
         if (self.key_name=='Up'):
             self.say ('Arriba')
             self.key_name='arriba'
+            if(self.p != ''):
+                self.controlar_patrones()
         elif (self.key_name=='Down'):
             self.say ('Abajo')
             self.key_name='abajo'
+            if(self.p != ''):
+                self.controlar_patrones()
         elif (self.key_name=='Left'):
             self.say ('Izquierda')
             self.key_name='izquierda'
+            if(self.p != ''):
+                self.controlar_patrones()
         elif (self.key_name=='Right'):
             self.say ('Derecha')
             self.key_name='derecha'
+            if(self.p != ''):
+                self.controlar_patrones()
         elif (self.key_name=='space'):
-            self.generar_patrones()
+            if(self.flag==0):
+                self.generar_patrones()
+            else:
+                self.say(self.p)
         else:
             self.say('Tecla incorrecta')