Ticket #48867: mayaviPR-247.diff

mayavi/tests/test_glyph.py

@@ -140 +140 @@
     def test_mask_input_points_with_random_mode(self):
         """Test if masking input points works with random mode.
            Tests Issue #165"""
-        s = self.scene
-        src = s.children[0]
-        g = src.children[0].children[1]
-        g.glyph.mask_input_points = True
         self.check(mask=True, mask_random_mode=True)
 
     def test_mask_input_points_without_random_mode(self):

tvtk/common.py

@@ -47 +47 @@
 def is_old_pipeline():
     return vtk_major_version < 6
 
-def is_version_62():
-    return vtk_major_version == 6 and vtk_minor_version == 2
+def is_version_62_or_later():
+    return vtk_major_version == 6 and vtk_minor_version > 1
 
 def is_version_58():
     return vtk_major_version == 5 and vtk_minor_version == 8

tvtk/tests/test_vtk_parser.py

@@ -94 +94 @@
                'DiffuseColor': ((1.0, 1.0, 1.0), None),
                'EdgeColor': ((1.0, 1.0, 1.0), None),
                'LineStipplePattern': (65535, None),
-               'LineStippleRepeatFactor': (1, (1, vtk.VTK_LARGE_INTEGER)),
-               'LineWidth': (1.0, (0.0, vtk.VTK_LARGE_FLOAT)),
+               'LineStippleRepeatFactor': (1, (1, vtk.VTK_INT_MAX)),
+               'LineWidth': (1.0, (0.0, vtk.VTK_FLOAT_MAX)),
                'Opacity': (1.0, (0.0, 1.0)),
-               'PointSize': (1.0, (0.0, vtk.VTK_LARGE_FLOAT)),
+               'PointSize': (1.0, (0.0, vtk.VTK_FLOAT_MAX)),
                'ReferenceCount': (1, None),
                'Specular': (0.0, (0.0, 1.0)),
                'SpecularColor': ((1.0, 1.0, 1.0), None),
@@ -140 +140 @@
                 res = ['AddShaderVariable', 'BackfaceRender', 'DeepCopy',
                        'ReleaseGraphicsResources', 'RemoveAllTextures', 
                        'RemoveTexture', 'Render']
-                if vtk_minor_version == 2:
+                if vtk_minor_version > 1:
                     res.append('VTKTextureUnit')
             else:
                 res = ['AddShaderVariable', 'BackfaceRender', 'DeepCopy',

tvtk/vtk_parser.py

@@ -12 +12 @@
 # Local imports (these are relative imports for a good reason).
 import class_tree
 import vtk_module as vtk
-from common import is_version_62
+from common import is_version_62_or_later
 
 class VTKMethodParser:
     """This class provides useful methods for parsing methods of a VTK
@@ -301 +301 @@
 
         """
         # VTK 6.2 false built in funcs/methods are ignored
-        if is_version_62():
+        if is_version_62_or_later():
             built_in_func = isinstance(method, types.BuiltinFunctionType)
             built_in_meth = isinstance(method, types.BuiltinMethodType)
             if not (built_in_func or built_in_meth):

tvtk/wrapper_gen.py

@@ -16 +16 @@
 
 # Local imports (these are relative imports because the package is not
 # installed when these modules are imported).
-from common import get_tvtk_name, camel2enthought, is_version_62, is_version_58
+from common import get_tvtk_name, camel2enthought, is_version_58
 import vtk_parser
 import indenter
 import special_gen