# HG changeset patch # User greg # Date 1468346072 14400 # Node ID fb6a04e47fdc4c1c008a6ec4058dbd243cbe80f3 # Parent e8fe7af37fac565da8b17ee2486597ac4419a940 Uploaded diff -r e8fe7af37fac -r fb6a04e47fdc icqsol_utils.py --- a/icqsol_utils.py Mon Jan 25 07:55:40 2016 -0500 +++ b/icqsol_utils.py Tue Jul 12 13:54:32 2016 -0400 @@ -48,12 +48,7 @@ def get_shape_manager(format=None, dataset_type=None): # Instantiate a ShapeManager. - if format is None and dataset_type is None: - return ShapeManager() - if format == VTK: - return ShapeManager(file_format=format, vtk_dataset_type=dataset_type) - else: - return ShapeManager(file_format=format) + return ShapeManager(file_format=format, vtk_dataset_type=dataset_type) def get_temp_dir(prefix='tmp-vtk-', dir=None): diff -r e8fe7af37fac -r fb6a04e47fdc test-data/box_with_surface_field.vtkascii --- a/test-data/box_with_surface_field.vtkascii Mon Jan 25 07:55:40 2016 -0500 +++ b/test-data/box_with_surface_field.vtkascii Tue Jul 12 13:54:32 2016 -0400 @@ -1,4 +1,4 @@ -# vtk DataFile Version 3.0 +# vtk DataFile Version 4.0 vtk output ASCII DATASET POLYDATA @@ -26,12 +26,12 @@ 3 13 11 23 3 23 21 13 +CELL_DATA 12 +FIELD FieldData 1 +surface_field 1 12 double +0.0136441 0.218305 0.97075 1.17541 0.0136441 0.218305 0.0136441 0.218305 0.106345 +0.42538 1.21152 1.53055 POINT_DATA 24 -SCALARS surface_field double -LOOKUP_TABLE default -0 1.10517 1.10517 0 0 1.35344e-16 1.10517 1.10517 0 -0 1.10517 1.10517 1.10517 1.10517 0 0 0 0 -1.35344e-16 1.35344e-16 1.10517 1.10517 1.10517 1.10517 NORMALS Normals float -1 0 0 -1 0 0 -1 0 0 -1 0 0 1 0 0 1 0 0 diff -r e8fe7af37fac -r fb6a04e47fdc tool_dependencies.xml --- a/tool_dependencies.xml Mon Jan 25 07:55:40 2016 -0500 +++ b/tool_dependencies.xml Tue Jul 12 13:54:32 2016 -0400 @@ -1,6 +1,6 @@ - +