[gcompris: 4/111] removing timer incase of crash

[Bruno Coudoin <bcoudoin src gnome org>]

commit 12e28632143274e785322a53da33a829cada15f8
Author: serah <serah4291 gmail com>
Date:   Thu May 24 16:39:42 2012 +0530

    removing timer incase of crash

 src/intro_gravity-activity/intro_gravity.py |   33 ++++++++++++++++++++++----
 1 files changed, 28 insertions(+), 5 deletions(-)
---
diff --git a/src/intro_gravity-activity/intro_gravity.py b/src/intro_gravity-activity/intro_gravity.py
index 4b3b6d1..444a0aa 100644
--- a/src/intro_gravity-activity/intro_gravity.py
+++ b/src/intro_gravity-activity/intro_gravity.py
@@ -215,6 +215,7 @@ class Gcompris_intro_gravity:
     self.timer_on = False  
     self.force_neptune = self.force_saturn = 10
     self.mass_neptune = self.mass_saturn = 10000 
+#    self.distance_neptune = self.distance_saturn = 1000
     self.velocity = 0.05
     self.direction = None
     self.crash = False
@@ -261,6 +262,10 @@ class Gcompris_intro_gravity:
   
   
   def increase_neptune(self,a,b,c):
+#    q,w = goocanvas.Canvas.convert_to_item_space(self.neptune,630,170)
+#    print q,w 
+#    x = self.neptune.get_bounds().x1
+#    print x
     self.timer()
     #increase planet if not maximum and move bar
     if self.yBar_neptune > 207:
@@ -295,7 +300,7 @@ class Gcompris_intro_gravity:
     #decrease planet size if not minimum and move bar  
     if self.yBar_neptune < 247:
       self.neptune.scale(0.9,0.9) 
-      self.neptune.translate(75,23)
+      self.neptune.translate(80,23)
       self.yBar_neptune +=8
       gcompris.utils.item_absolute_move(self.bar_neptune, 782,self.yBar_neptune)
       if self.direction == None:
@@ -324,7 +329,7 @@ class Gcompris_intro_gravity:
     #start timer if not initiated
     #if planets don't crash during this time then level is won
     if self.timer_on == False:
-      gobject.timeout_add(30000,self.stopGame)
+      self.t = gobject.timeout_add(30000,self.stopGame)
       self.timer_on = True
 
 
@@ -336,12 +341,12 @@ class Gcompris_intro_gravity:
       self.timer_on = False    
       self.board_paused = 1
     else:
-      self.crash = False
       gcompris.bonus.display(gcompris.bonus.LOOSE,gcompris.bonus.TUX)
       self.end()
-      self.timer_on = False    
       self.board_paused = 1
-      return False    
+      self.crash = False
+      self.timer_on = False    
+      gobject.source_remove(self.t)  
    
 
   def move_mid_planet(self):
@@ -350,6 +355,8 @@ class Gcompris_intro_gravity:
       self.position = int(x - self.velocity)
 #      gcompris.utils.item_absolute_move(self.mid_planet,self.position,200)
       self.mid_planet.set_properties(x=self.position,y=200)
+#      self.distance_neptune += 1
+#      self.distance_saturn -= 1
       if self.position > 200:
         gobject.timeout_add(30,self.force)
       else:
@@ -361,6 +368,8 @@ class Gcompris_intro_gravity:
       self.position = int(x + self.velocity)
 #      gcompris.utils.item_absolute_move(self.mid_planet,self.position,200)
       self.mid_planet.set_properties(x=self.position,y=200)
+#      self.distance_neptune -= 1
+#      self.distance_saturn += 1
       if self.position < 615:
         gobject.timeout_add(30,self.force)
       else:
@@ -369,6 +378,19 @@ class Gcompris_intro_gravity:
       
       
   def force(self):
+#    print 'before cal neptune',self.force_neptune
+#    print 'before cal saturn',self.force_saturn
+
+#    print 'neptune distance',self.distance_neptune
+#    print 'saturn distance',self.distance_saturn
+
+#    print 'mass of neptune',self.mass_neptune
+#    print 'mass of saturn',self.mass_saturn
+
+#    self.force_neptune = self.mass_neptune/self.distance_neptune 
+#    self.force_saturn = self.mass_saturn/self.distance_saturn
+#    print 'neptune force',self.force_neptune
+#    print 'saturn force',self.force_saturn
     if self.mass_neptune == self.mass_saturn:
       self.velocity = 0.10
       print 'equal',self.direction
@@ -383,6 +405,7 @@ class Gcompris_intro_gravity:
       self.move_mid_planet()
       self.direction = 1
       print 'saturn greater',self.direction
+#      print self.velocity