Issue 587 projected ticks

Packages/vcs/Lib/Canvas.py

@@ -1978,9 +1978,9 @@ def continents(self, *args, **parms):
     #                                                                           #
     #############################################################################
     def createline(self,name=None, source='default', ltype=None,
-                 width=None, color=None, priority=1,
+                 width=None, color=None, priority=None,
                  viewport=None, worldcoordinate=None,
-                 x=None, y=None, projection='default'):
+                 x=None, y=None, projection=None):
         return vcs.createline(name,source,ltype,width,color,priority,viewport,worldcoordinate,x,y,projection)
     createline.__doc__ = vcs.manageElements.createline.__doc__
 
@@ -2229,7 +2229,7 @@ def drawfillarea(self, name=None, style=1, index=1, color=241,
     #                                                                           #
     #############################################################################
     def createtexttable(self,name=None, source='default', font=None,
-                 spacing=None, expansion=None, color=None, priority=1,
+                 spacing=None, expansion=None, color=None, priority=None,
                  viewport=None, worldcoordinate=None,
                  x=None, y=None):
       return vcs.createtexttable(name,source,font,spacing,expansion,color,priority,
@@ -2263,7 +2263,7 @@ def gettextorientation(self,To_name_src='default'):
     # Text Combined  functions for VCS.                                         #
     #                                                                           #
     #############################################################################
-    def createtextcombined(self,Tt_name=None, Tt_source='default', To_name=None, To_source='default', font=None, spacing=None, expansion=None, color=None, priority=1, viewport=None, worldcoordinate=None, x=None, y=None, height=None, angle=None, path=None, halign=None, valign=None, projection=None):
+    def createtextcombined(self,Tt_name=None, Tt_source='default', To_name=None, To_source='default', font=None, spacing=None, expansion=None, color=None, priority=None, viewport=None, worldcoordinate=None, x=None, y=None, height=None, angle=None, path=None, halign=None, valign=None, projection=None):
         return vcs.createtextcombined(Tt_name, Tt_source, To_name, To_source,
             font, spacing, expansion, color, priority, viewport, worldcoordinate,
             x, y, height, angle, path, halign, valign, projection)
@@ -2678,7 +2678,6 @@ def __plot (self, arglist, keyargs):
             #    copy_tmpl=self.createtemplate(source=arglist[2])
         check_mthd = vcs.getgraphicsmethod(arglist[3],arglist[4])
         check_tmpl = vcs.gettemplate(arglist[2])
-
         # By defalut do the ratio thing for lat/lon and linear projection
         # but it can be overwritten by keyword
         Doratio = keyargs.get("ratio",None)
@@ -3485,7 +3484,6 @@ def set_convert_labels(copy_mthd,test=0):
             p=self.getprojection(gm.projection)
             if p.type in ["polar (non gctp)","polar stereographic"] and (doratio=="0" or doratio[:4]=="auto"):
               doratio="1t"
-
             for keyarg in keyargs.keys():
                 if not keyarg in self.__class__._plot_keywords_+self.backend._plot_keywords:
                      warnings.warn('Unrecognized vcs plot keyword: %s, assuming backend (%s) keyword'%(keyarg,self.backend.type))
@@ -3519,6 +3517,7 @@ def set_convert_labels(copy_mthd,test=0):
                 # Now creates a copy of the primitives, in case it's used on other canvases with diferent ratios
                 if arglist[3]=='text':
                     nms = arglist[4].split(":::")
+                    P=self.gettext(nms[0],nms[1])
                     p = self.createtext(Tt_source=nms[0],To_source=nms[1])
                 elif arglist[3]=='marker':
                     p = self.createmarker(source=arglist[4])

Packages/vcs/Lib/VTKPlots.py

@@ -434,13 +434,13 @@ def plot(self,data1,data2,template,gtype,gname,bg,*args,**kargs):
       returned.update(self.plot3D(data1,data2,tpl,gm,ren,**kargs))
     elif gtype in ["text"]:
       if tt.priority!=0:
-        if not (None,None,None) in self._renderers.keys():
-            ren = self.createRenderer()
-            self.renWin.AddRenderer(ren)
-            self.setLayer(ren,1)
-            self._renderers[(None,None,None)]=ren
-        else:
-            ren = self._renderers[(None,None,None)]
+        #if not (None,None,None) in self._renderers.keys():
+        ren = self.createRenderer()
+        self.renWin.AddRenderer(ren)
+        self.setLayer(ren,1)
+        #    self._renderers[(None,None,None)]=ren
+        #else:
+        #    ren = self._renderers[(None,None,None)]
         returned["vtk_backend_text_actors"] = vcs2vtk.genTextActor(ren,to=to,tt=tt)
         self.setLayer(ren,tt.priority)
     elif gtype=="line":
@@ -1631,66 +1631,77 @@ def fitToViewport(self,Actor,vp,wc=None,geo=None):
       else:
         Xrg=[float(wc[0]),float(wc[1])]
         Yrg=[float(wc[2]),float(wc[3])]
-      if Yrg[0]>Yrg[1]:
-        #Yrg=[Yrg[1],Yrg[0]]
-        #T.RotateY(180)
-        Yrg=[Yrg[1],Yrg[0]]
-        flipY = True
-      else:
-        flipY = False
-      if Xrg[0]>Xrg[1]:
-        Xrg=[Xrg[1],Xrg[0]]
-        flipX=True
-      else:
-        flipX=False
-
-      if geo is not None:
-       pt = vtk.vtkPoints()
-       pt.SetNumberOfPoints(1)
-       Xrg2 = [1.e20,-1.e20]
-       Yrg2 = [1.e20,-1.e20]
-       Npts=50.
-       for x in numpy.arange(Xrg[0],Xrg[1],(Xrg[1]-Xrg[0])/Npts):
-         for y in numpy.arange(Yrg[0],Yrg[1],(Yrg[1]-Yrg[0])/Npts):
-           pt.SetPoint(0,x,y,0)
-           pts = vtk.vtkPoints()
-           geo.TransformPoints(pt,pts)
-           b = pts.GetBounds()
-           xm,xM,ym,yM=b[:4]
-           if xm!=-numpy.inf:
-             Xrg2[0]=min(Xrg2[0],xm)
-           if xM!=numpy.inf:
-             Xrg2[1]=max(Xrg2[1],xM)
-           if ym!=-numpy.inf:
-             Yrg2[0]=min(Yrg2[0],ym)
-           if yM!=numpy.inf:
-             Yrg2[1]=max(Yrg2[1],yM)
-       Xrg=Xrg2
-       Yrg=Yrg2
-      sc = self.renWin.GetSize()
-      wRatio = float(sc[0])/float(sc[1])
-      dRatio = (Xrg[1]-Xrg[0])/(Yrg[1]-Yrg[0])
-      vRatio = float(vp[1]-vp[0])/float(vp[3]-vp[2])
 
+      wc_used = (float(Xrg[0]),float(Xrg[1]),float(Yrg[0]),float(Yrg[1]))
+      sc = self.renWin.GetSize()
 
-      if wRatio>1.: #landscape orientated window
-          yScale = 1.
-          xScale = vRatio*wRatio/dRatio
-      else:
-          xScale = 1.
-          yScale = dRatio/(vRatio*wRatio)
-      ## Ok now we know scaling and vp, let's see if we did this already.
-      if (vp,xScale,yScale) in self._renderers.keys():
+      # Ok at this point this is all the info we need
+      # we can determine if it's a unique renderer or not
+      # let's see if we did this already.
+      if (vp,wc_used,sc) in self._renderers.keys():
         #yep already have one, we will use this Renderer
-        Renderer = self._renderers[(vp,xScale,yScale)]
+        Renderer,xScale,yScale = self._renderers[(vp,wc_used,sc)]
         didRenderer = True
       else:
         Renderer = self.createRenderer()
         self.renWin.AddRenderer(Renderer)
-        self._renderers[(vp,xScale,yScale)]=Renderer
         Renderer.SetViewport(vp[0],vp[2],vp[1],vp[3])
         didRenderer = False
 
+        if Yrg[0]>Yrg[1]:
+          #Yrg=[Yrg[1],Yrg[0]]
+          #T.RotateY(180)
+          Yrg=[Yrg[1],Yrg[0]]
+          flipY = True
+        else:
+          flipY = False
+        if Xrg[0]>Xrg[1]:
+          Xrg=[Xrg[1],Xrg[0]]
+          flipX=True
+        else:
+          flipX=False
+
+        if geo is not None:
+         pt = vtk.vtkPoints()
+         pt.SetNumberOfPoints(1)
+         Xrg2 = [1.e20,-1.e20]
+         Yrg2 = [1.e20,-1.e20]
+         if geo.GetDestinationProjection().GetName() in ["aeqd",]:
+             ## These need more precision to compute actual range
+             Npts=250.
+             print "Yes doing the long one"
+         else:
+             Npts=50.
+         for x in numpy.arange(Xrg[0],Xrg[1],(Xrg[1]-Xrg[0])/Npts):
+           for y in numpy.arange(Yrg[0],Yrg[1],(Yrg[1]-Yrg[0])/Npts):
+             pt.InsertNextPoint(x,y,0)
+             pts = vtk.vtkPoints()
+         geo.TransformPoints(pt,pts)
+         b = pts.GetBounds()
+         xm,xM,ym,yM=b[:4]
+         if xm!=-numpy.inf:
+           Xrg2[0]=min(Xrg2[0],xm)
+         if xM!=numpy.inf:
+           Xrg2[1]=max(Xrg2[1],xM)
+         if ym!=-numpy.inf:
+           Yrg2[0]=min(Yrg2[0],ym)
+         if yM!=numpy.inf:
+           Yrg2[1]=max(Yrg2[1],yM)
+         Xrg=Xrg2
+         Yrg=Yrg2
+        wRatio = float(sc[0])/float(sc[1])
+        dRatio = (Xrg[1]-Xrg[0])/(Yrg[1]-Yrg[0])
+        vRatio = float(vp[1]-vp[0])/float(vp[3]-vp[2])
+
+
+        if wRatio>1.: #landscape orientated window
+            yScale = 1.
+            xScale = vRatio*wRatio/dRatio
+        else:
+            xScale = 1.
+            yScale = dRatio/(vRatio*wRatio)
+        self._renderers[(vp,wc_used,sc)] = Renderer,xScale,yScale
+
       T = vtk.vtkTransform()
       T.Scale(xScale,yScale,1.)
 

Packages/vcs/Lib/manageElements.py

@@ -1021,9 +1021,9 @@ def getscatter(GSp_name_src='default'):
 getscatter.__doc__ = getscatter.__doc__ % (plot_keywords_doc,graphics_method_core,axesconvert, get_GM_input, scatter_output)
 
 def createline(name=None, source='default', ltype=None, 
-             width=None, color=None, priority=1,
+             width=None, color=None, priority=None,
              viewport=None, worldcoordinate=None,
-             x=None, y=None, projection='default'):
+             x=None, y=None, projection=None):
     """
 Function: createline                       # Construct a new line secondary method
 
@@ -1071,7 +1071,8 @@ def createline(name=None, source='default', ltype=None,
         ln.x = x
     if (y is not None):
         ln.y = y
-    ln.projection=projection
+    if (projection is not None):
+        ln.projection=projection
     return ln
 
 def getline(name='default', ltype=None, width=None, color=None,
@@ -1133,7 +1134,7 @@ def getline(name='default', ltype=None, width=None, color=None,
     return ln
 
 def createmarker(name=None, source='default', mtype=None,
-             size=None, color=None,priority=1,
+             size=None, color=None,priority=None,
              viewport=None, worldcoordinate=None,
              x=None, y=None,projection=None):
     """
@@ -1244,7 +1245,7 @@ def getmarker(name='default', mtype=None, size=None, color=None,
     return mrk
 
 def createfillarea(name=None, source='default', style=None,
-             index=None, color=None, priority=1,
+             index=None, color=None, priority=None,
              viewport=None, worldcoordinate=None,
              x=None, y=None):
     """
@@ -1353,7 +1354,7 @@ def getfillarea(name='default', style=None,
     return fa
 
 def createtexttable(name=None, source='default', font=None,
-             spacing=None, expansion=None, color=None, priority=1,
+             spacing=None, expansion=None, color=None, priority=None,
              viewport=None, worldcoordinate=None,
              x=None, y=None):
     """
@@ -1507,7 +1508,7 @@ def gettextorientation(To_name_src='default'):
       raise ValueError,"The textorientation '%s' does not exists" % To_name_src
     return vcs.elements["textorientation"][To_name_src]
 
-def createtextcombined(Tt_name=None, Tt_source='default', To_name=None, To_source='default', font=None, spacing=None, expansion=None, color=None, priority=1, viewport=None, worldcoordinate=None, x=None, y=None, height=None, angle=None, path=None, halign=None, valign=None, projection=None):
+def createtextcombined(Tt_name=None, Tt_source='default', To_name=None, To_source='default', font=None, spacing=None, expansion=None, color=None, priority=None, viewport=None, worldcoordinate=None, x=None, y=None, height=None, angle=None, path=None, halign=None, valign=None, projection=None):
     """
 Function: createtext or createtextcombined  # Construct a new text combined secondary method