Merge pull request #110 from UV-CDAT/taylor_plots

Taylor plots

Author: painter1

src/python/frontend/diags.py

@@ -284,7 +284,7 @@ def run_diagnostics_from_filetables( opts, modelfts, obsfts ):
                                 # tmmobs[ir] is the template for plotting a simple plot on a page
                                 #   which has the entire compound plot - that's vcanvas2
                                 gmobs, tmobs, tmmobs = return_templates_graphic_methods( vcanvas, gms, ovly, onPage )
-                                if 1==1: # optional debugging:
+                                if 1: # optional debugging:
                                     print "tmpl nsingleplots=",nsingleplots,"nsimpleplots=",nsimpleplots
                                     print "tmpl gms=",gms
                                     print "tmpl len(res)=",len(res),"ovly=",ovly,"onPage=",onPage

src/python/frontend/it.py

@@ -8,7 +8,6 @@
 #                                                                                                     #
 #######################################################################################################
 def return_templates_graphic_methods(canvas1=None, gms=None, ovly=None, onPage=None):
-
    if len(gms) == len(ovly): 
 
       # Create a unique graphics method for each diagnostic display
@@ -36,7 +35,7 @@ def return_templates_graphic_methods(canvas1=None, gms=None, ovly=None, onPage=N
                gmobs[i].linewidth = 2.0
                gmobs[i].linecolor = 242
                gmobs[i].markersize = 1
-         if (gms[i] == 'taylor'):
+         if (gms[i] == 'taylordiagram'):
             td = canvas1.createtaylordiagram('taylor_' + (str(random.random())[2:]), 'default')
             gmobs.append( td )
             #gmobs[i].addMarker()
@@ -54,7 +53,7 @@ def return_templates_graphic_methods(canvas1=None, gms=None, ovly=None, onPage=N
                tmobs.append( canvas1.createtemplate('uvwg_' + (str(random.random())[2:]), 'UVWG1D') )
              else:                # overlay plot use DUD - only plot the data
                tmobs.append( canvas1.createtemplate('uvwg_DUD_' + (str(random.random())[2:]), 'UVWG1D_DUD') )
-          elif (gms[i] in ['taylor']):
+          elif (gms[i] in ['taylordiagram']):
              tmpl = canvas1.createtemplate('taylor_' + (str(random.random())[2:]), 'deftaylor')
              tmobs.append( tmpl )
 

src/python/frontend/uvcdat.py

@@ -230,7 +230,7 @@ def __init__( self, pvars, presentation, labels=[], title='', source='', ranges=
                 self.presentation = vcsx.createisoline()
             elif presentation == "Scatter":
                 self.presentation = vcsx.createscatter()
-            elif presentation == "Taylor":
+            elif presentation == "Taylordiagram":
                 self.presentation = vcsx.createtaylordiagram()
             else:
                 print "ERROR, uvc_plotspec doesn't recognize presentation",presentation
@@ -579,28 +579,6 @@ def finalize( self, flip_x=False, flip_y=False ):
             #print markersizes
             #print self.vars
 
-            #setup the markersize and colors
-            MAX = max(markersizes)
-            MIN = min(markersizes)
-            scale = vcs.mkscale(MIN, MAX)
-            #labels = vcs.mklabels(scale)
-            colorScale = vcs.getcolors(scale, split=False)
-            sizes = range(10, 10+len(colorScale))
-                            
-            dotsizes = []
-            dotcolors = []
-            
-            #determine dot size and color
-            for size in markersizes:
-                for index in range(0, len(scale)-1):
-                    low, high = scale[index], scale[index+1]
-                    if low <= size and size < high:
-                        dotsizes +=  [sizes[index]]
-                        dotcolors += [colorScale[index]]
-                        #print dotsizes
-                        #print dotcolors
-                        break        
-
             #determine the identifier for the legend
             IDs = []
             for ID in markerids:
@@ -614,13 +592,10 @@ def finalize( self, flip_x=False, flip_y=False ):
             #out to the plot
             self.legendTitles = IDs
 
-            index = []
-            for i in range(len(markersizes)):
-                index += [str(i)]    
-            self.presentation.Marker.size = dotsizes          
-            self.presentation.Marker.color = dotcolors 
+            #self.presentation.Marker.size = dotsizes          
+            #self.presentation.Marker.color = dotcolors 
             #self.presentation.IDs = IDs
-            self.presentation.Marker.id = index
+            #self.presentation.Marker.id = index
             #pdb.set_trace()
 
             #create list of offsets
@@ -632,9 +607,31 @@ def finalize( self, flip_x=False, flip_y=False ):
             else:
                 XOFF = XOFF.tolist()
                 YOFF = YOFF.tolist()
-            self.presentation.Marker.xoffset = XOFF
-            self.presentation.Marker.yoffset = YOFF
-            self.presentation.Marker.id_size = len(markersizes)*[20]
+            #self.presentation.Marker.xoffset = XOFF
+            #self.presentation.Marker.yoffset = YOFF
+            #self.presentation.Marker.id_size = len(markersizes)*[20]
+            for i in range(len(markersizes)):
+                if markersizes[i]>1.01:
+                  mtype = "triangle_up"
+                elif markersizes[i]<.99:
+                  mtype = "triangle_down"
+                else:
+                  mtype = "circle"
+                b = abs(1.-markersizes[i])
+                if b<5:
+                  size = 12
+                elif b<10:
+                  size = 16
+                elif b<20:
+                  size = 20
+                else:
+                  size = 25
+
+                self.presentation.Marker.addMarker(size=size,
+                    id=str(i),id_size=20,
+                    symbol = mtype,
+                    xoffset=XOFF[i],yoffset=YOFF[i])
+            self.presentation.Marker.equalize()
 
             #self.presentation.list()
 

src/python/packages/amwg/amwg.py

@@ -2626,7 +2626,7 @@ def __init__( self, model, obs, varid, seasonid='JAN', region=None, aux=None ):
             self.obsfns = [obsfn]
         self.legendTitles = []
         plot_spec.__init__(self, seasonid)
-        self.plottype = 'Taylor'
+        self.plottype = 'Taylordiagram'
         self._seasonid = seasonid
         self.season = cdutil.times.Seasons(self._seasonid) 
         #ft1id, ft2id = filetable_ids(filetable1, filetable2)