Added dump bounds

dtmilano · dtmilano · commit 81d94f82cc28 · 2015-01-27T18:00:12.000-05:00
- Changed traverse default value for transform (now TRAVERSE_CIT)
diff --git a/src/com/dtmilano/android/viewclient.py b/src/com/dtmilano/android/viewclient.py
@@ -18,7 +18,7 @@
 @author: Diego Torres Milano
 '''
 
-__version__ = '9.5.1'
+__version__ = '9.6.0'
 
 import sys
 import warnings
@@ -712,6 +712,15 @@ def getPositionAndSize(self):
         h = self.getHeight()
         return (x, y, w, h)
 
+    def getBounds(self):
+        '''
+        Gets the View bounds
+        '''
+
+        if 'bounds' in self.map:
+            return self.map['bounds']
+        else:
+            return self.getCoords()
 
     def getCenter(self):
         '''
@@ -1612,6 +1621,20 @@ def traverseShowClassIdTextPositionAndSize(view):
 
         return ViewClient.traverseShowClassIdAndText(view, View.getPositionAndSize)
 
+    @staticmethod
+    def traverseShowClassIdTextAndBounds(view):
+        '''
+        Shows the View class, id and text if available.
+        This function can be used as a transform function to L{ViewClient.traverse()}
+
+        @type view: I{View}
+        @param view: the View
+        @return: the string containing class, id, and text if available plus
+                 View bounds
+        '''
+
+        return ViewClient.traverseShowClassIdAndText(view, View.getBounds)
+
     @staticmethod
     def traverseTakeScreenshot(view):
         '''
@@ -1639,6 +1662,8 @@ def traverseTakeScreenshot(view):
     ''' An alias for L{traverseShowClassIdTextAndCenter(view)} '''
     TRAVERSE_CITPS = traverseShowClassIdTextPositionAndSize
     ''' An alias for L{traverseShowClassIdTextPositionAndSize(view)} '''
+    TRAVERSE_CITB = traverseShowClassIdTextAndBounds
+    ''' An alias for L{traverseShowClassIdTextAndBounds(view)} '''
     TRAVERSE_CITCDS = traverseShowClassIdTextContentDescriptionAndScreenshot
     ''' An alias for L{traverseShowClassIdTextContentDescriptionAndScreenshot(view)} '''
     TRAVERSE_S = traverseTakeScreenshot
@@ -1881,7 +1906,7 @@ def getRoot(self):
         '''
         return self.root
 
-    def traverse(self, root="ROOT", indent="", transform=View.__str__, stream=sys.stdout):
+    def traverse(self, root="ROOT", indent="", transform=None, stream=sys.stdout):
         '''
         Traverses the C{View} tree and prints its nodes.
 
@@ -1896,6 +1921,12 @@ def traverse(self, root="ROOT", indent="", transform=View.__str__, stream=sys.st
         @param transform: a method to use to transform the node before is printed
         '''
 
+        if transform is None:
+            # this cannot be a default value, otherwise
+            # TypeError: 'staticmethod' object is not callable
+            # is raised
+            transform = ViewClient.TRAVERSE_CIT
+
         if type(root) == types.StringType and root == "ROOT":
             root = self.root
 
diff --git a/tools/dump b/tools/dump
@@ -1,12 +1,12 @@
 #! /usr/bin/env python
 '''
-Copyright (C) 2012  Diego Torres Milano
+Copyright (C) 2012-2015  Diego Torres Milano
 Created on Feb 3, 2012
 
 @author: diego
 '''
 
-__version__ = '9.2.1'
+__version__ = '9.6.0'
 
 import sys
 import os
@@ -30,6 +30,7 @@ DO_NOT_IGNORE_UIAUTOMATOR_KILLED = 'do-not-ignore-uiautomator-killed'
 WINDOW = 'window'
 UNIQUE_ID = 'uniqueId'
 POSITION = 'position'
+BOUNDS = 'bounds'
 CONTENT_DESCRIPTION = 'content-description'
 TAG = 'tag'
 CENTER = 'center'
@@ -39,6 +40,7 @@ DO_NOT_DUMP_VIEWS = 'do-not-dump-views'
 
 MAP = {'i':ViewClient.TRAVERSE_CITUI, UNIQUE_ID:ViewClient.TRAVERSE_CITUI,
        'x':ViewClient.TRAVERSE_CITPS, POSITION:ViewClient.TRAVERSE_CITPS,
+       'b':ViewClient.TRAVERSE_CITB, BOUNDS:ViewClient.TRAVERSE_CITB,
        'd':ViewClient.TRAVERSE_CITCD, CONTENT_DESCRIPTION:ViewClient.TRAVERSE_CITCD,
        'g':ViewClient.TRAVERSE_CITG, TAG:ViewClient.TRAVERSE_CITG, 
        'c':ViewClient.TRAVERSE_CITC, CENTER:ViewClient.TRAVERSE_CITC,
@@ -47,10 +49,10 @@ MAP = {'i':ViewClient.TRAVERSE_CITUI, UNIQUE_ID:ViewClient.TRAVERSE_CITUI,
        }
 
 USAGE = 'usage: %s [OPTION]... [serialno]'
-SHORT_OPTS = 'HVvIEFSkw:ixdgcf:W:D'
+SHORT_OPTS = 'HVvIEFSkw:ixbdgcf:W:D'
 LONG_OPTS =  [HELP, VERBOSE, VERSION, IGNORE_SECURE_DEVICE, IGNORE_VERSION_CHECK, FORCE_VIEW_SERVER_USE,
               DO_NOT_START_VIEW_SERVER, DO_NOT_IGNORE_UIAUTOMATOR_KILLED, WINDOW + '=',
-              UNIQUE_ID, POSITION, CONTENT_DESCRIPTION, TAG, CENTER,
+              UNIQUE_ID, POSITION, BOUNDS, CONTENT_DESCRIPTION, TAG, CENTER,
               SAVE_SCREENSHOT + '=', SAVE_VIEW_SCREENSHOTS + '=',
               DO_NOT_DUMP_VIEWS,
               ]
@@ -65,6 +67,7 @@ OPTS_HELP = {
     'w': 'dump WINDOW content (default: -1, all windows)',
     'i': 'dump View unique IDs',
     'x': 'dump View positions',
+    'b': 'dump View bounds', 
     'd': 'dump View content descriptions',
     'g': 'dump View tags',
     'c': 'dump View centers',
