Changeset 5753 for qesdi/geoplot

Timestamp:

23/09/09 09:28:37 (10 years ago)

Author:

pnorton

Message:

Added some additional options to set the line width of the coastline and contour lines.

Location:

qesdi/geoplot/trunk/lib/geoplot

Files:

• config.ini (modified) (1 diff)
• contour_drawer.py (modified) (3 diffs)
• layer_drawer_coastline.py (modified) (3 diffs)
• layer_drawer_contour.py (modified) (3 diffs)

qesdi/geoplot/trunk/lib/geoplot/config.ini

@@ -48 +48 @@
 numContourLines=10
 contourLabelInterval=1
+contourLineWidth=0.5
 
 [Defaults:GridDrawer]

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

@@ -33 +33 @@
     """
 
-    def __init__(self, numContourLines=10, contourLabelInterval=1):
+    def __init__(self, numContourLines=10, contourLabelInterval=1, contourLineWidth=0.5):
         """
         Constructs a ContourDrawer object              
@@ -40 +40 @@
         self.numContourLines = numContourLines
         self.contourLabelInterval = contourLabelInterval
+        self.contourLineWidth = contourLineWidth
         self._contourFont = config['Fonts']['ContourLines']
         
@@ -87 +88 @@
                  cmap=cmap,
                  origin='lower',
-                 linewidths=0.5,
+                 linewidths=self.contourLineWidth,
                  norm=normalize,
                  extend='neither',

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

@@ -17 +17 @@
     """
     
-    def __init__(self, projection='latlon', resolution='i', transparent=False, drawRivers=False):
+    def __init__(self, 
+                 projection='latlon', 
+                 resolution='i', 
+                 transparent=False, 
+                 drawRivers=False,
+                 coastlineColour='black',
+                 coastlineWidth=0.5):
+        
+        # incase the coastlineColour isn't valid default to black
+        self._coastlineColour = 'black'
+        
+        self.coastlineColour = coastlineColour
+        self.coastlineWidth = 0.5
         
         LayerDrawerBase.__init__(self, transparent=transparent,
                                  projection=projection,
-                                 resolution=resolution)
+                                 resolution=resolution,
+                                 )
         
-        self._coastlineColour = 'black'
         
         # must be done after the base constructor or the _mapFactory won't be 
@@ -38 +50 @@
         #draw the map onto the axes 
         map.basemap.drawcoastlines(ax = axes, 
-                                   linewidth=0.5,
+                                   linewidth=self.coastlineWidth,
                                    color=self.coastlineColour,
                                    antialiased=0,                                       
@@ -50 +62 @@
         
         #map.basemap.fillcontinents(color='coral',lake_color=None, ax=axes)
-       #map.basemap.drawparallels([10,20,30,40],ax=axes)
+        #map.basemap.drawparallels([10,20,30,40],ax=axes)
         #map.basemap.bluemarble(ax=axes)
 

qesdi/geoplot/trunk/lib/geoplot/layer_drawer_contour.py

@@ -15 +15 @@
     def __init__(self, cdmsVar, gridType='latlon', projection='latlon', cmap = None,  cmapRange=(None,None),
                  transparent=False, numLines=10, fontSize='medium', labelInterval=1, 
-                 intervalColourbar=False, 
-                 intervalNames=None):
+                 intervalColourbar=False, intervalNames=None, lineWidth=0.5):
         
         self._contourDrawer = ContourDrawer()
@@ -23 +22 @@
         self.fontSize = fontSize
         self.labelInterval =labelInterval
+        self.lineWidth = lineWidth
         
         LayerDrawerBase.__init__(self, gridType=gridType, transparent=transparent, cmap=cmap, cmapRange=cmapRange)
@@ -74 +74 @@
 
     labelInterval = property(__get_labelInterval, __set_labelInterval)
+    
+    def __set_lineWidth(self, value):
+        self._contourDrawer.contourLineWidth = value
+    
+    def __get_lineWidth(self):
+        return self._contourDrawer.contourLineWidth
+    
+    lineWidth = property(__get_lineWidth, __set_lineWidth)