Changeset bc02e89

Timestamp:

05/23/11 21:14:49 (2 years ago)

Author:

xkolman2 <xkolman2@…>

Branches:

master

Children:

f8d618c

Parents:

123c06c

git-author:

xkolman2 <xkolman2@…> (05/23/11 21:14:49)

git-committer:

xkolman2 <xkolman2@…> (05/23/11 21:14:49)

Message:

add togglable debugging info to tile loading function
redraw screen when new tiles are available

git-svn-id: ​https://nlp.fi.muni.cz/svn/gps_navigace/trunk@384 0858a4d0-ffff-46e5-938e-62b5ecb34222

Location:

modules

Files:

• mod_mapTiles.py (modified) (7 diffs)
• mod_options.py (modified) (1 diff)

modules/mod_mapTiles.py

@@ -223 +223 @@
           print "exception in tile download manager thread:\n%s" % e
 
-  def startTileLoadingThread(self):
-    """start the loading-request consumer thread"""
-    t = Thread(target=self.tileLoader, name='tile loading thread')
-    t.setDaemon(True) # we need that the worker dies with the program
-    t.start()
+#  def startTileLoadingThread(self):
+#    """start the loading-request consumer thread"""
+#    t = Thread(target=self.tileLoader, name='tile loading thread')
+#    t.setDaemon(True) # we need that the worker dies with the program
+#    t.start()
 
 #  def tileLoader(self):
@@ -642 +642 @@
     # Return the cairo projection to what it was
     cr.restore()
-    
+
+  def _fakePrint(self, text):
+    """print that does nothing"""
+    pass
+
+  def _realPrint(self,text):
+    print(text)
+
   def loadImage(self,name , x, y, z, layer):
     """Check that an image is loaded, and try to load it if not"""
@@ -648 +655 @@
     """at this point, there is only a placeholder image in the memmory cache"""
 
+    # check if tile loading debugging is on
+    debug = self.get('tileLoadingDebug', False)
+    if debug:
+      sprint = self._realPrint
+    else:
+      sprint = self._fakePrint
+
+    sprint("###")
+    sprint("loading tile %s" % name)
+
     # first, is it already in the process of being downloaded?
     with self.threadlListCondition:
       if name in self.threads.keys():
+        sprint("tile is being downloaded")
         if(not self.threads[name].finished):
           with self.imagesLock: # substitute the "loading" tile with a "downloading" tile
@@ -663 +681 @@
     layerInfo = maplayers.get(layer, None)
     if(layerInfo == None): # is the layer info valid
+      sprint("invalid layer")
       return('NOK')
 
@@ -670 +689 @@
     storeTiles = self.m.get('storeTiles', None) # get the tile storage module
     if storeTiles:
+      start1 = time.clock()
       pixbuf = storeTiles.getTile(layerPrefix, z, x, y, layerType)
       """None from getTiles means the tile was not found
          False means loading the tile from file to pixbuf failed"""
       if pixbuf:
+        start2 = time.clock()
         self.storeInMemmory(self.pixbufToCairoImageSurface(pixbuf), name)
+        if debug:
+          storageType = self.get('tileStorageType', 'files')
+          sprint("tile loaded from local storage (%s) in %1.2f ms" % (storageType,(1000 * (time.clock() - start1))))
+          sprint("tile cached in memmory in %1.2f ms" % (1000 * (time.clock() - start2)))
         return('OK')
 
+
+    # Image not found anywhere locally - resort to downloading it
     filename = self.getTileFolderPath() + (self.getImagePath(x,y,z,layerPrefix, layerType))
-
-    # Image not found anywhere locally - resort to downloading it
+    sprint("image not found locally - trying to download")
 
     # Are we allowed to download it ? (network=='full')
     if(self.get('network','full')=='full'):
+      sprint("automatic tile download enabled - starting download")
       # use threads
       """the thread list condition is used to signalize to the download manager,
@@ -700 +727 @@
 
         self.threadlListCondition.notifyAll() # wake up the download manager
+    else:
+      sprint("automatic tile download disabled - not starting download")
 
   def loadImageFromFile(self,path,name, type="normal", expireTimestamp=None, dictIndex=0):
@@ -746 +775 @@
       if len(self.images[0]) > self.maxImagesInMemmory:
         self.trimCache()
+      # new tile available, make redraw request TODO: what overhead does this create ?
+      if self.get('tileLoadedRedraw', True):
+        self.set('needRedraw', True)
 
   def trimCache(self):

modules/mod_options.py

@@ -524 +524 @@
     group = addGroup("Tiles", "tiles", catDebug, "generic")
     addBoolOpt("Print tile cache status to terminal", "reportTileCachStatus", group, False)
+    addBoolOpt("Tile loading status to terminal", "tileLoadingDebug", group, False)
+    addBoolOpt("Redraw screen once a new tile is loaded", "tileLoadedRedraw", group, True)
     addBoolOpt("Remove dups berofe batch dl", "checkTiles", group, False)
     # ** tracklog drawing