From df7ef7b61f23a06786063157555808455394173c Mon Sep 17 00:00:00 2001 From: Aashish Chaudhary Date: Wed, 23 Sep 2015 22:28:26 -0400 Subject: [PATCH] Attempt to fix failing dashboard tests --- Packages/vcs/Lib/vcs2vtk.py | 5 ++--- Packages/vcs/Lib/vcsvtk/vectorpipeline.py | 3 +-- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/Packages/vcs/Lib/vcs2vtk.py b/Packages/vcs/Lib/vcs2vtk.py index f75cbbbfb5..be64b284d3 100644 --- a/Packages/vcs/Lib/vcs2vtk.py +++ b/Packages/vcs/Lib/vcs2vtk.py @@ -145,7 +145,7 @@ def handleProjectionEdgeCases(projection, data): def genGridOnPoints(data1, gm, deep=True, grid=None, geo=None, - skipReprojection=False, data2=None): + data2=None): continents = False projection = vcs.elements["projection"][gm.projection] xm, xM, ym, yM = None, None, None, None @@ -211,7 +211,7 @@ def genGridOnPoints(data1, gm, deep=True, grid=None, geo=None, xm, xM, ym, yM, tmp, tmp2 = grid.GetPoints().GetBounds() vg = grid xm, xM, ym, yM = getRange(gm, xm, xM, ym, yM) - if geo is None and not skipReprojection: + if geo is None: geo, geopts = project(pts, projection, [xm, xM, ym, yM]) pts = geopts # Sets the vertices into the grid @@ -607,7 +607,6 @@ def project(pts, projection, wc, geo=None): geo.SetSourceProjection(ps) geo.SetDestinationProjection(pd) geopts = vtk.vtkPoints() - geopts.SetDataTypeToDouble() geo.TransformPoints(pts, geopts) return geo, geopts diff --git a/Packages/vcs/Lib/vcsvtk/vectorpipeline.py b/Packages/vcs/Lib/vcsvtk/vectorpipeline.py index a1b0394600..a04c2c2947 100644 --- a/Packages/vcs/Lib/vcsvtk/vectorpipeline.py +++ b/Packages/vcs/Lib/vcsvtk/vectorpipeline.py @@ -39,8 +39,7 @@ def plot(self, data1, data2, tmpl, grid, transform): scale = (lat.max() - lat.min()) * (lon.max() - lon.min()) gridGenDict = vcs2vtk.genGridOnPoints(data1, self._gm, deep=False, grid=grid, - geo=transform, skipReprojection=False, - data2=data2) + geo=transform, data2=data2) data1 = gridGenDict["data"] data2 = gridGenDict["data2"]