[pkg-fso-commits] [SCM] freesmartphone.org demo GUI branch, master, updated. milestone2-25-gf72c138

[Jan Luebbe]

The following commit has been merged in the master branch:
commit 0a01a5d73ec683f0988332b71b03d6f8798273d8
Author: Jan Luebbe <jluebbe at debian.org>
Date:   Wed Aug 27 13:42:58 2008 +0200

    apply fix for gps signal strength (thanks quickdev)

diff --git a/src/zhone b/src/zhone
index 38bd1ea..450e670 100755
--- a/src/zhone
+++ b/src/zhone
@@ -802,15 +802,24 @@ class pyphone_location( edje_group ):
         def __init__( self, *args, **kargs ):
             evas.ClippedSmartObject.__init__( self, *args, **kargs )
             self.textheight = 45
-            self.font = ( "Sans", 35 )
+            self.font = ( "Sans", 15 )
             self.children = []
             self.values = []
             self.maxvalue = None
+            self.resized = 0
 
         def resize( self, w, h ):
+            self.w = w
+            self.h = h
+            self.render()
+            self.resized = 1
+
+        def render( self ):
             x, y = self.pos
-            barwidth = w / len( self.children )
-            barheight = h - self.textheight
+            if len ( self.children ) == 0:
+                return
+            barwidth = self.w / len( self.children )
+            barheight = self.h - self.textheight
             for (rect, key_text, value_text), (key, value) in zip( self.children, self.values ):
                 key_text.text = str( key )
                 value_text.text = str( value )
@@ -830,6 +839,7 @@ class pyphone_location( edje_group ):
                 )
                 x += barwidth
 
+
         def addChild( self ):
             rect = self.Rectangle( color=( 0, 255, 0, 255 ) )
             rect.show()
@@ -861,11 +871,15 @@ class pyphone_location( edje_group ):
                     self.values = [(0, 0)]
                 else:
                     self.maxvalue = max( [ x[1] for x in values] )
+                    if self.maxvalue == 0:
+                        self.maxvalue = 1
 
             while len( self.children ) > len( self.values ):
                 self.delChild()
             while len( self.children ) < len( self.values ):
                 self.addChild()
+            if self.resized:
+                self.render()
             self.resize( *self.size )
 
     class PositionGraph( evas.ClippedSmartObject ):
@@ -945,7 +959,7 @@ class pyphone_location( edje_group ):
 
     def __init__(self, main):
         edje_group.__init__( self, main, "location" )
-        #self.signalgraph = self.SignalGraph( self.evas )
+        self.signalgraph = self.SignalGraph( self.evas )
         self.positiongraph = self.PositionGraph( self.evas )
 
         self.page = "left"
@@ -973,13 +987,13 @@ class pyphone_location( edje_group ):
             if self.part_swallow_get( "swallow" ):
                 self.part_swallow_get( "swallow" ).hide()
                 self.part_unswallow( self.part_swallow_get( "swallow" ) )
-        #elif self.page == "middle":
-        #    self.part_text_set( "status", u"" )
-        #    if self.part_swallow_get( "swallow" ):
-        #        self.part_swallow_get( "swallow" ).hide()
-        #        self.part_unswallow( self.part_swallow_get( "swallow" ) )
-        #    self.part_swallow( "swallow", self.signalgraph )
-        #    self.signalgraph.show()
+        elif self.page == "middle":
+            self.part_text_set( "status", u"" )
+            if self.part_swallow_get( "swallow" ):
+                self.part_swallow_get( "swallow" ).hide()
+                self.part_unswallow( self.part_swallow_get( "swallow" ) )
+            self.part_swallow( "swallow", self.signalgraph )
+            self.signalgraph.show()
         elif self.page == "right":
             self.part_text_set( "status", u"" )
             if self.part_swallow_get( "swallow" ):
@@ -997,8 +1011,9 @@ class pyphone_location( edje_group ):
         self.update()
 
     def onSatellitesChanged( self, satellites ):
-        #signallist = [ (int(sat[0]), float(sat[4])) for sat in satellites ]
-        #self.signalgraph.update( signallist )
+        if self.page == "middle":
+            signallist = [ (int(sat[0]), float(sat[4])) for sat in satellites ]
+            self.signalgraph.update( signallist )
         positionlist = [ (int(sat[0]), int(sat[3]), int(sat[2])) for sat in satellites ]
         self.positiongraph.update( positionlist )
 

-- 
freesmartphone.org demo GUI