Skip to content

Issue 587 projected ticks #1144

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
alliepiper merged 28 commits into from
Mar 18, 2015
Merged

Issue 587 projected ticks #1144

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
28 commits
Select commit Hold shift + click to select a range
d08c888
after various tries
doutriaux1 Mar 9, 2015
927cb75
small progress but text can't projecT
doutriaux1 Mar 10, 2015
328014c
getting closer
doutriaux1 Mar 10, 2015
25c1216
Merge remote-tracking branch 'origin/vcs3D-fix_2.2_interaction_problems'
doutriaux1 Mar 11, 2015
64ee86a
Merge branch 'master' into issue_587_projected_ticks
doutriaux1 Mar 11, 2015
fff3631
most primitive would always reset prio to 1
doutriaux1 Mar 11, 2015
c8cf011
more create[primitive] with prio reset to 1
doutriaux1 Mar 11, 2015
4b8da1a
had to increase resolution to find actual range
doutriaux1 Mar 11, 2015
6c1abd4
tweaks for prints and uncomments
doutriaux1 Mar 11, 2015
0a927d1
ok renderers are reused correctly
doutriaux1 Mar 12, 2015
1342dc2
renderer layer was being constantly reset
doutriaux1 Mar 16, 2015
4ce0967
data not always applied
doutriaux1 Mar 16, 2015
8a62e74
well no progress but at least adding actor in fitToViewport now
doutriaux1 Mar 16, 2015
62792f9
removed bit that would increase priority on tick marks
doutriaux1 Mar 16, 2015
5e77431
too many layers seemed to be the issue
doutriaux1 Mar 16, 2015
f22a375
ok removed print statements, but the number of layers wasn't the issue
doutriaux1 Mar 16, 2015
5f296b7
ok got only switching text way for projections
doutriaux1 Mar 16, 2015
80e54d2
unbroke plots of gm w/o datawc_x1 or projection attrbutes
doutriaux1 Mar 17, 2015
a9bd712
fixed random blank of screen
doutriaux1 Mar 17, 2015
85befa3
correct widening of viewport for polar proj ticks
doutriaux1 Mar 17, 2015
8df53e6
ok prettyfied round_projections
doutriaux1 Mar 17, 2015
6c80bca
we were removing object that needed to be kept
doutriaux1 Mar 17, 2015
6f301d8
not setting the number of point for transformed led to seg fault in s…
doutriaux1 Mar 17, 2015
543db38
pushing with debugs for @dlonie
doutriaux1 Mar 17, 2015
8c091e7
using InsertPoint rather than SetPoint fixes core dump/seg fault
doutriaux1 Mar 18, 2015
7052e68
ok turning this off makes tick reappear
doutriaux1 Mar 18, 2015
31fd1fc
ok seems to have ticks here again and prettyfied text for them
doutriaux1 Mar 18, 2015
3f14c64
some proj were not actually round ones
doutriaux1 Mar 18, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 12 additions & 10 deletions Packages/vcs/Lib/Canvas.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,7 @@
import vcsaddons
import vcs.manageElements
import configurator
from projection import round_projections

class SIGNAL(object):

Expand Down Expand Up @@ -1978,9 +1979,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__

Expand Down Expand Up @@ -2229,7 +2230,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,
Expand Down Expand Up @@ -2263,7 +2264,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)
Expand Down Expand Up @@ -2678,7 +2679,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)
Expand Down Expand Up @@ -3482,10 +3482,11 @@ def set_convert_labels(copy_mthd,test=0):
elif tp=="default":
tp="boxfill"
gm=vcs.elements[tp][arglist[4]]
if hasattr(gm,"priority") and gm.priority==0:
return
p=self.getprojection(gm.projection)
if p.type in ["polar (non gctp)","polar stereographic"] and (doratio=="0" or doratio[:4]=="auto"):
if p.type in round_projections 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))
Expand Down Expand Up @@ -3519,6 +3520,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])
Expand All @@ -3532,7 +3534,7 @@ def set_convert_labels(copy_mthd,test=0):
t.data.y2 = p.viewport[3]

proj = self.getprojection(p.projection)
if proj.type in ["polar (non gctp)","polar stereographic"]:
if proj.type in round_projections and (doratio=="0" or doratio[:4]=="auto"):
doratio="1t"

if proj.type=='linear' and doratio[:4]=='auto':
Expand All @@ -3551,7 +3553,7 @@ def set_convert_labels(copy_mthd,test=0):
else:
arglist[4]=p.name
else:
if arglist[3]=='text':
if arglist[3]=='text' and keyargs.get("donotstoredisplay",False) is True:
sp = p.name.split(":::")
del(vcs.elements["texttable"][sp[0]])
del(vcs.elements["textorientation"][sp[1]])
Expand All @@ -3577,7 +3579,7 @@ def set_convert_labels(copy_mthd,test=0):
tp="textcombined"
gm=vcs.elements[tp][arglist[4]]
p=self.getprojection(gm.projection)
if p.type in ["polar (non gctp)","polar stereographic"]:
if p.type in round_projections:
doratio="1t"
if p.type == 'linear':
if gm.g_name =='Gfm':
Expand Down
205 changes: 102 additions & 103 deletions Packages/vcs/Lib/VTKPlots.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -434,42 +434,36 @@ 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():
Copy link
Copy Markdown
Contributor

@alliepiper alliepiper Mar 12, 2015

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is there a reason to save this?

ren = self.createRenderer()
self.renWin.AddRenderer(ren)
self.setLayer(ren,1)
Copy link
Copy Markdown
Contributor

@alliepiper alliepiper Mar 12, 2015

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It looks like this will have no effect, as the same call is made a few lines later with tt.priority for the layer. Which is correct?

Copy link
Copy Markdown
Contributor Author

@doutriaux1 doutriaux1 Mar 16, 2015

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yes we can take this one out, it's left-over from debugging stages.

# 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":
if gm.priority!=0:
actors = vcs2vtk.prepLine(self.renWin,gm)
returned["vtk_backend_line_actors"]=actors
for act,geo in actors:
ren = self.fitToViewport(act,gm.viewport,wc=gm.worldcoordinate,geo=geo)
ren.AddActor(act)
self.setLayer(ren,gm.priority)
ren = self.fitToViewport(act,gm.viewport,wc=gm.worldcoordinate,geo=geo,priority=gm.priority)
elif gtype=="marker":
if gm.priority!=0:
actors = vcs2vtk.prepMarker(self.renWin,gm)
returned["vtk_backend_marker_actors"]=actors
for g,gs,pd,act,geo in actors:
ren = self.fitToViewport(act,gm.viewport,wc=gm.worldcoordinate,geo=geo)
ren.AddActor(act)
ren = self.fitToViewport(act,gm.viewport,wc=gm.worldcoordinate,geo=geo,priority=gm.priority)
if pd is None and act.GetUserTransform():
vcs2vtk.scaleMarkerGlyph(g, gs, pd, act)
self.setLayer(ren,gm.priority)

elif gtype=="fillarea":
if gm.priority!=0:
actors = vcs2vtk.prepFillarea(self.renWin,gm)
returned["vtk_backend_fillarea_actors"]=actors
for act,geo in actors:
ren = self.fitToViewport(act,gm.viewport,wc=gm.worldcoordinate,geo=geo)
ren.AddActor(act)
self.setLayer(ren,gm.priority)
ren = self.fitToViewport(act,gm.viewport,wc=gm.worldcoordinate,geo=geo,priority=gm.priority)
elif gtype=="1d":
#self.renWin.AddRenderer(ren)
returned.update(self.plot1D(data1,data2,tpl,gm))
Expand Down Expand Up @@ -587,11 +581,10 @@ def plot1D(self,data1,data2,tmpl,gm):
return {}

def setLayer(self,renderer,priority):
n = self.numberOfPlotCalls + (priority-1)*10000 + 1
n = self.numberOfPlotCalls + (priority-1)*200 + 1
nMax = max(self.renWin.GetNumberOfLayers(),n+1)
self.renWin.SetNumberOfLayers(nMax)
renderer.SetLayer(n)
pass

def plot3D(self,data1,data2,tmpl,gm,ren,**kargs):
from DV3D.Application import DV3DApp
Expand Down Expand Up @@ -701,11 +694,7 @@ def plotVector(self,data1,data2,tmpl,gm,vtk_backend_grid=None,vtk_backend_geo=No
act.GetProperty().SetColor(r/100.,g/100.,b/100.)
x1,x2,y1,y2 = vcs.utils.getworldcoordinates(gm,data1.getAxis(-1),data1.getAxis(-2))
act = vcs2vtk.doWrap(act,[x1,x2,y1,y2],wrap)
ren = self.fitToViewport(act,[tmpl.data.x1,tmpl.data.x2,tmpl.data.y1,tmpl.data.y2],[x1,x2,y1,y2])
if tmpl.data.priority!=0:
ren.AddActor(act)
self.setLayer(ren,tmpl.data.priority)
ren.AddActor(act)
ren = self.fitToViewport(act,[tmpl.data.x1,tmpl.data.x2,tmpl.data.y1,tmpl.data.y2],[x1,x2,y1,y2],priority=tmpl.data.priority)
returned.update(self.renderTemplate(tmpl,data1,gm,taxis,zaxis))
if self.canvas._continents is None:
continents = False
Expand Down Expand Up @@ -1168,10 +1157,8 @@ def plot2D(self,data1,data2,tmpl,gm,vtk_backend_grid=None,vtk_backend_geo=None):
pass
# create a new renderer for this mapper
# (we need one for each mapper because of cmaera flips)
ren = self.fitToViewport(act,[tmpl.data.x1,tmpl.data.x2,tmpl.data.y1,tmpl.data.y2],wc=[x1,x2,y1,y2],geo=geo)
if tmpl.data.priority>0:
ren.AddActor(act)
self.setLayer(ren,tmpl.data.priority)
ren = self.fitToViewport(act,[tmpl.data.x1,tmpl.data.x2,tmpl.data.y1,tmpl.data.y2],
wc=[x1,x2,y1,y2],geo=geo,priority=tmpl.data.priority)
returned["vtk_backend_actors"] = actors

if isinstance(gm,meshfill.Gfm):
Expand Down Expand Up @@ -1224,13 +1211,8 @@ def plotContinents(self,x1,x2,y1,y2,projection,wrap,tmpl):
else:
geo=None

ren = self.fitToViewport(contActor,[tmpl.data.x1,tmpl.data.x2,tmpl.data.y1,tmpl.data.y2],wc=[x1,x2,y1,y2],geo=geo)
if tmpl.data.priority!=0:
self.setLayer(ren,tmpl.data.priority)
ren.AddActor(contActor)
col = ren.GetActors()
col.InitTraversal()
n=col.GetNextActor()
ren = self.fitToViewport(contActor,[tmpl.data.x1,tmpl.data.x2,tmpl.data.y1,tmpl.data.y2],
wc=[x1,x2,y1,y2],geo=geo,priority=tmpl.data.priority)
return {}

def renderTemplate(self,tmpl,data,gm,taxis,zaxis):
Expand Down Expand Up @@ -1622,75 +1604,109 @@ def scaleLogo(self):
self.setLayer(self.logoRenderer,1)
self.renWin.AddRenderer(self.logoRenderer)

def fitToViewport(self,Actor,vp,wc=None,geo=None):
def fitToViewport(self,Actor,vp,wc=None,geo=None,priority=None):
## Data range in World Coordinates
if priority==0:
return None
vp=tuple(vp)
if wc is None:
Xrg = list(Actor.GetXRange())
Yrg = list(Actor.GetYRange())
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,priority) 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,priority)]
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()
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
else:
Npts=50
NGridCover=0
pt.SetNumberOfPoints(Npts*Npts)
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.InsertPoint(NGridCover,x,y,0)
NGridCover+=1
pts = vtk.vtkPoints()
#pts.SetNumberOfPoints(Npts*Npts)
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.setLayer(Renderer,priority)
self._renderers[(vp,wc_used,sc,priority)] = Renderer,xScale,yScale

xc = xScale*float(Xrg[1]+Xrg[0])/2.
yc = yScale*float(Yrg[1]+Yrg[0])/2.
xd = xScale*float(Xrg[1]-Xrg[0])/2.
yd = yScale*float(Yrg[1]-Yrg[0])/2.
cam = Renderer.GetActiveCamera()
cam.ParallelProjectionOn()
cam.SetParallelScale(yd)
cd = cam.GetDistance()
cam.SetPosition(xc,yc,cd)
cam.SetFocalPoint(xc,yc,0.)
if geo is None:
if flipY:
cam.Elevation(180.)
cam.Roll(180.)
pass
if flipX:
cam.Azimuth(180.)

T = vtk.vtkTransform()
T.Scale(xScale,yScale,1.)

Expand Down Expand Up @@ -1734,24 +1750,7 @@ def fitToViewport(self,Actor,vp,wc=None,geo=None):
plane.SetNormal(outNormal[0], outNormal[1], outNormal[2])
plane = planeCollection.GetNextItem()

if not didRenderer:
xc = xScale*float(Xrg[1]+Xrg[0])/2.
yc = yScale*float(Yrg[1]+Yrg[0])/2.
xd = xScale*float(Xrg[1]-Xrg[0])/2.
yd = yScale*float(Yrg[1]-Yrg[0])/2.
cam = Renderer.GetActiveCamera()
cam.ParallelProjectionOn()
cam.SetParallelScale(yd)
cd = cam.GetDistance()
cam.SetPosition(xc,yc,cd)
cam.SetFocalPoint(xc,yc,0.)
if geo is None:
if flipY:
cam.Elevation(180.)
cam.Roll(180.)
pass
if flipX:
cam.Azimuth(180.)
Renderer.AddActor(Actor)
return Renderer

def update_input(self,vtkobjects,array1,array2=None,update=True):
Expand Down
Loading
⚡