Changeset 5735 for qesdi/geoplot

Timestamp:

18/09/09 09:57:15 (10 years ago)

Author:

pnorton

Message:

Added the ability to change the coastline colour in the coastline layer drawer. Also fixed a minor problem with the colour bar that was causing problems when unicode is used rather than strings.

Location:

qesdi/geoplot/trunk/lib/geoplot

Files:

• colour_bar.py (modified) (1 diff)
• contour_drawer.py (modified) (1 diff)
• layer_drawer.py (modified) (1 diff)
• layer_drawer_coastline.py (modified) (4 diffs)
• tests/unit/test_layer_drawer_coastline.py (added)

qesdi/geoplot/trunk/lib/geoplot/colour_bar.py

@@ -101 +101 @@
             cmap.set_bad("w")        
         
-        elif type(self.cmap) == str:
+        elif type(self.cmap) in [str, unicode]:
             cmap = cm.get_cmap(self.cmap)
             cmap.set_bad("w")     

qesdi/geoplot/trunk/lib/geoplot/contour_drawer.py

@@ -87 +87 @@
                  cmap=cmap,
                  origin='lower',
-                 linewidths=1,
+                 linewidths=0.5,
                  norm=normalize,
                  extend='neither',

qesdi/geoplot/trunk/lib/geoplot/layer_drawer.py

@@ -54 +54 @@
         self._mapFactory = MapFactory(projection, drawCoast=True, drawRivers=False, resolution=resolution)
         
-    def makeImage(self, xLimits=None, yLimits=None, width=800, height=600, dpi=100):
+    def makeImage(self, xLimits=None, yLimits=None, width=800, height=600, dpi=200):
         """
         Creates a PIL image of the selected area of the layer.

qesdi/geoplot/trunk/lib/geoplot/layer_drawer_coastline.py

@@ -5 +5 @@
 
 import logging
+
+import matplotlib.colors
 
 from geoplot.layer_drawer import LayerDrawerBase
@@ -21 +23 @@
                                  resolution=resolution)
         
+        self._coastlineColour = 'black'
+        
         # must be done after the base constructor or the _mapFactory won't be 
         # created
@@ -33 +37 @@
         
         #draw the map onto the axes 
-        map.drawMap(axes)
+        map.basemap.drawcoastlines(ax = axes, 
+                                   linewidth=0.5,
+                                   color=self.coastlineColour,
+                                   antialiased=0,                                       
+                                   xLimits=xLimits, yLimits=yLimits)
+
+        if map.drawRivers:
+            map.basemap.drawrivers(ax = axes, color='b', linewidth=0.3,
+                                    antialiased=0,                                   
+                                    xLimits=xLimits, yLimits=yLimits)
+                    
         
-        #map.basemap.fillcontinents(color='coral',lake_color='aqua', ax=axes)
+        #map.basemap.fillcontinents(color='coral',lake_color=None, ax=axes)
+       #map.basemap.drawparallels([10,20,30,40],ax=axes)
         #map.basemap.bluemarble(ax=axes)
+
+    def _getMatplotlibColour(self, value):
+        """
+        Makes sure that value is a valid matplotlib colour, will convert form a float
+        to a string if neccesary. Will raise a ValueError if the value is not a valid colour.
+        """
+        if type(value) == float:
+            val = str(value)
+        else:
+            val = value
+            
+        try:
+            matplotlib.colors.colorConverter.to_rgb(val)
+        except:
+            raise
+        else:
+            return val
 
     def __set_drawRivers(self, value):
@@ -45 +77 @@
     
     drawRivers = property(__get_drawRivers, __set_drawRivers)    
-     
+    
+    
+    def __set_coastlineColour(self, value):
+        
+        try:
+            newCoastColour = self._getMatplotlibColour(value)
+        except ValueError, e:
+            log.warning("Error occurred getting matplotlib colour form %s, Exception:%s" % (value, e))
+        else:
+            self._coastlineColour = newCoastColour
                 
-
+    def __get_coastlineColour(self):
+        return self._coastlineColour
+    
+    coastlineColour = property(__get_coastlineColour, __set_coastlineColour)