Changeset 4072 for cows/trunk

Timestamp:

29/07/08 13:55:09 (12 years ago)

Author:

spascoe

Message:

Improved bbox_util functionality.

File:

• cows/trunk/cows/bbox_util.py (modified) (4 diffs)

cows/trunk/cows/bbox_util.py

@@ -6 +6 @@
 
 """
+
+import math
 
 def intersection(bbox1, bbox2):
@@ -31 +33 @@
     return (sx, sy)
 
-def geoToPixel(x_g, y_g, bbox, width, height):
+def geoToPixel(x_g, y_g, bbox, width, height, roundUpX=False, roundUpY=False):
     """
     Calculate the pixel coordinate of a point within a bbox given the
@@ -44 +46 @@
     @param width: The width of the image in pixels
     @param height: The height of the image in pixels.
+    @param roundUpX: Round the X pixel value upwards.
+    @param roundUpY: Round the y pixel value upwards.
+    
     @return: (x,y) in pixel coordinates
 
@@ -50 +55 @@
     x = (x_g - bbox[0])*width / (bbox[2]-bbox[0])
     y = (bbox[3] - y_g)*height / (bbox[3]-bbox[1])
+
+    if roundUpX:
+        x = math.ceil(x)
+    if roundUpY:
+        y = math.ceil(y)
 
     return int(x), int(y)