Clean up

Author: aashish24

CMake/cmake_modules/FindMatplotlib.cmake

@@ -4,7 +4,7 @@ if ( NOT ${res} EQUAL 0 )
  message("Could not detect matplotlib, ${PYTHON_EXECUTABLE}")
  set( Matplotlib_FOUND 0 )
 else ( NOT ${res} EQUAL 0 )
- execute_process(COMMAND "@PYTHON_EXECUTABLE@" -c "import matplotlib;print matplotlib.__version__" RESULT_VARIABLE res OUTPUT_VARIABLE out ERROR_VARIABLE err)
+ execute_process(COMMAND ${PYTHON_EXECUTABLE} -c "import matplotlib;print matplotlib.__version__" RESULT_VARIABLE res OUTPUT_VARIABLE out ERROR_VARIABLE err)
  if ( ${out} VERSION_LESS ${MATPLOTLIB_MAJOR_MIN}.${MATPLOTLIB_MINOR_MIN}.${MATPLOTLIB_PATCH_MIN} )
    message("You need matplotlib version ${MATPLOTLIB_MAJOR_MIN}.${MATPLOTLIB_MINOR_MIN}.${MATPLOTLIB_PATCH_MIN} at minimum")
    set( Matplotlib_FOUND 0 )

Packages/vcs/Lib/VTKPlots.py

@@ -645,10 +645,6 @@ def plotContinents(self, x1, x2, y1, y2, projection, wrap, tmpl):
         else:
             geo = None
 
-        writer = vtk.vtkXMLPolyDataWriter()
-        writer.SetFileName("poly.vtk")
-        writer.SetInputData(contData)
-        writer.Write()
         self.fitToViewport(contActor,
                            [tmpl.data.x1, tmpl.data.x2,
                             tmpl.data.y1, tmpl.data.y2],

Packages/vcs/Lib/vcs2vtk.py

@@ -202,7 +202,6 @@ def genGridOnPoints(data1, gm, deep=True, grid=None, geo=None,
         m3 = numpy.concatenate((m3, z), axis=1)
         deep = True
         pts = vtk.vtkPoints()
-        pts.SetDataTypeToDouble()
         # Convert nupmy array to vtk ones
         ppV = numpy_to_vtk_wrapper(m3, deep=deep)
         pts.SetData(ppV)
@@ -543,11 +542,12 @@ def prepContinents(fnm):
     vcsContinents[fnm] = poly
     return poly
 
-def projectArray(w, projection, geo=None):
+def projectArray(w, projection, wc, geo=None):
+    xm, xM, ym, yM = wc
     if isinstance(projection, (str, unicode)):
         projection = vcs.elements["projection"][projection]
     if projection.type == "linear":
-        return None, pts
+        return None, w
 
     if geo is None:
         geo = vtk.vtkGeoTransform()

Packages/vcs/Lib/vcsvtk/vectorpipeline.py

@@ -58,7 +58,9 @@ def plot(self, data1, data2, tmpl, grid, transform):
             newv.InsertTupleValue(0, [lon.min(), lat.min(),  0])
             newv.InsertTupleValue(1, [lon.max(), lat.max(),  0])
 
-            vcs2vtk.projectArray(newv, projection=projection)
+            vcs2vtk.projectArray(newv, projection,
+                                 [gridGenDict['xm'], gridGenDict['xM'],
+                                  gridGenDict['ym'], gridGenDict['yM'],])
             dimMin = [0, 0, 0]
             dimMax = [0, 0, 0]
             newv.GetTupleValue(0, dimMin)