Changeset 637 for trunk/py

Timestamp:

07/26/08 08:52:19 (4 months ago)

Author:

asc

Message:

start using pwmarker

Files:

• trunk/py/wscompose/pinwin.py (modified) (1 diff)
• trunk/py/wscompose/plotting.py (modified) (9 diffs)

trunk/py/wscompose/pinwin.py

@@ -233 +233 @@
-            
-        #
+
+        for data in self.ctx['markers'] :
+            self.draw_shadow(img, data, bleed_x, bleed_y)
-        
-        for data in self.ctx['markers'] :

trunk/py/wscompose/plotting.py

@@ -9 +9 @@
-
-import wscompose
-markers
+pwmarker
-import string
-import random
@@ -75 +75 @@
-            
-            mrk = self.load_marker(w, h, a)
-
-            pt = self.latlon_to_point(mrk_data['latitude'], mrk_data['longitude'])
-            
@@ -91 +90 @@
-            x1 = mrk_data['x'] - int(mrk.x_offset)
-            y1 = mrk_data['y'] - int(mrk.y_offset)
-
-mrk.padding
-mrk.padding
+
+(mrk.x_padding * 2)
+(mrk.y_padding * 2)
-            
-            mrk_data['canvas'] = (x1, y1, x2, y2)
@@ -164 +163 @@
-
-        # print "does %s overlap %s" % (cur_label, test_label)
+        # print "current %s" % current
-        
-        # first, ensure that some part of 'current'
@@ -232 +232 @@
-            
-        for data in self.ctx['markers'] :
+            self.draw_shadow(img, data)
+
+        for data in self.ctx['markers'] :
-            self.draw_marker(img, data)
-
@@ -237 +240 @@
-    
-    # ##########################################################
-
-marker
+
+shadow
-
-        w = mrk_data['width']
@@ -245 +248 @@
-        
-        mrk = self.load_marker(w, h, a)
-                                
+
-        loc = ModestMaps.Geo.Location(mrk_data['latitude'], mrk_data['longitude'])
-        pt = self.ctx['map'].locationPoint(loc)            
@@ -257 +260 @@
-        my = mrk_data['y'] - int(mrk.y_offset)
-
-
-
-
-
-
-
+
+
-
-        #
-
-
+
+
-        
-        mrk_data['x_fill'] = dx
-        mrk_data['y_fill'] = dy        
+
+    # ##########################################################
+    
+    def draw_marker (self, img, mrk_data, bleed_x=0, bleed_y=0) :
+
+        w = mrk_data['width']
+        h = mrk_data['height']
+        a = mrk_data['adjust_cone_height']
+        
+        mrk = self.load_marker(w, h, a)
+        
+        loc = ModestMaps.Geo.Location(mrk_data['latitude'], mrk_data['longitude'])
+        pt = self.ctx['map'].locationPoint(loc)            
+
+        #
+        
+        mrk_data['x'] = int(pt.x) + bleed_x
+        mrk_data['y'] = int(pt.y) + bleed_y
+
+        mx = mrk_data['x'] - int(mrk.x_offset)
+        my = mrk_data['y'] - int(mrk.y_offset)
+        
+        dx = mx + mrk.x_padding
+        dy = my + mrk.y_padding
+
+        #
+
+        pinwin = mrk.fh('pinwin')
+        img.paste(pinwin, (mx, my), pinwin)
+        
+        mrk_data['x_fill'] = dx
+        mrk_data['y_fill'] = dy        
+
-           
-    # ##########################################################
@@ -291 +324 @@
-
-        key = "%s-%s-%s" % (w, h, a)
-
+
-        if not self.__markers__.has_key(key) :
-
-
+
+
+
+
+
-        return self.__markers__[key]
-