changeset 17:fb6a04e47fdc draft

Uploaded
author greg
date Tue, 12 Jul 2016 13:54:32 -0400
parents e8fe7af37fac
children 076ff1968c8b
files icqsol_utils.py test-data/box_with_surface_field.vtkascii tool_dependencies.xml
diffstat 3 files changed, 8 insertions(+), 13 deletions(-) [+]
line wrap: on
line diff
--- 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):
--- 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 
--- 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 @@
 <?xml version="1.0"?>
 <tool_dependency>
     <package name="icqsol" version="1.0">
-        <repository changeset_revision="a357536fb363" name="package_icqsol_1_0" owner="greg" toolshed="https://testtoolshed.g2.bx.psu.edu" />
+        <repository changeset_revision="f830d27a3a29" name="package_icqsol_1_0" owner="greg" toolshed="https://testtoolshed.g2.bx.psu.edu" />
     </package>
 </tool_dependency>