[cig-commits] r5561 - in mc/3D/CitcomS/trunk/visual: . Mayavi2/citcoms_plugins

tan2 at geodynamics.org tan2 at geodynamics.org
Fri Dec 8 15:30:40 PST 2006


Author: tan2
Date: 2006-12-08 15:30:39 -0800 (Fri, 08 Dec 2006)
New Revision: 5561

Added:
   mc/3D/CitcomS/trunk/visual/mayavi2_citcoms_display.py
Removed:
   mc/3D/CitcomS/trunk/visual/Mayavi2/citcoms_plugins/Citcoms_HdfDisplay.py
Modified:
   mc/3D/CitcomS/trunk/visual/Makefile.am
Log:
Renamed the MayaVi launching script and move it to visual/


Modified: mc/3D/CitcomS/trunk/visual/Makefile.am
===================================================================
--- mc/3D/CitcomS/trunk/visual/Makefile.am	2006-12-08 23:26:02 UTC (rev 5560)
+++ mc/3D/CitcomS/trunk/visual/Makefile.am	2006-12-08 23:30:39 UTC (rev 5561)
@@ -32,6 +32,7 @@
 abs_builddir = @abs_builddir@
 
 dist_bin_SCRIPTS = \
+	mayavi2_citcoms_display.py \
 	autocombine.py \
 	batchcombine.py \
 	batchpaste.sh \
@@ -67,7 +68,6 @@
 	Mayavi2/citcoms_plugins/plugins/filter/CitcomSSphere.py \
 	Mayavi2/citcoms_plugins/plugins/filter/CitcomsCapFilter.py \
 	Mayavi2/citcoms_plugins/plugins/filter/CitcomsReduceFilter.py \
-	Mayavi2/citcoms_plugins/Citcoms_HdfDisplay.py \
 	Mayavi2/citcoms_plugins/utils.py \
 	Mayavi2/citcoms_plugins/custom_ui.py \
 	Mayavi2/citcoms_plugins/README \

Deleted: mc/3D/CitcomS/trunk/visual/Mayavi2/citcoms_plugins/Citcoms_HdfDisplay.py
===================================================================
--- mc/3D/CitcomS/trunk/visual/Mayavi2/citcoms_plugins/Citcoms_HdfDisplay.py	2006-12-08 23:26:02 UTC (rev 5560)
+++ mc/3D/CitcomS/trunk/visual/Mayavi2/citcoms_plugins/Citcoms_HdfDisplay.py	2006-12-08 23:30:39 UTC (rev 5561)
@@ -1,136 +0,0 @@
-#! /usr/bin/env python
-try:
-    import wxversion
-    wxversion.ensureMinimal('2.6')
-except ImportError:
-    pass
-
-from enthought.mayavi.app import Mayavi
-import sys
-from os.path import isfile
-from getopt import getopt, GetoptError
-
-class HdfDisplay(Mayavi):
-    
-    filename = None
-    timestep = 0
-    nx_redu = 0
-    ny_redu = 0
-    nz_redu = 0
-    
-    def run(self):
-
-        from enthought.mayavi.sources.vtk_file_reader import VTKFileReader
-        #import modules here
-        from enthought.mayavi.modules import surface, glyph , axes, outline, orientation_axes, scalar_cut_plane  
-        from enthought.mayavi.sources.vtk_data_source import VTKDataSource 
-        from enthought.tvtk.api import tvtk
-        #CitcomS Filter and Modules
-        from citcoms_plugins.plugins.CitcomSHDFUgrid import CitcomSHDFUgrid
-        from citcoms_plugins.plugins.filter.CitcomsCapFilter import CitcomsCapFilter
-        
-        import re
-        
-        
-        script = self.script
-         
-        #DEFINES
-        orange = (1.0,0.5,0)
-        reduce_factor = 2
-        
-        
-        #Read Hdf file
-        src_hdf = CitcomSHDFUgrid()
-        hexgrid = src_hdf.initialize(self.filename, self.timestep, self.nx_redu, self.ny_redu, self.nz_redu)
-        radius_inner = src_hdf._radius_inner
-        data = VTKDataSource()
-        data.data = hexgrid
-        
-        
-        ###########Display Data############
-        #Create new scene
-        script.new_scene()     
-        script.add_source(data)
-             
-        scap = CitcomsCapFilter()
-        script.add_filter(scap)
-        
-        #Show ScalarCutPlane
-        scp = scalar_cut_plane.ScalarCutPlane()
-        script.add_module(scp)
-        
-        # Display glyphs on vector field
-        gly = glyph.Glyph()
-        gly.glyph.glyph_source.scale = 0.082
-        gly.glyph.scale_mode = 'scale_by_scalar'
-        gly.glyph.color_mode = 'color_by_scalar'
-        script.add_module(gly)
-        mm = gly.module_manager
-        #mm.scalar_lut_manager.use_default_range = False
-        #mm.scalar_lut_manager.data_range = 0.0, 1.0
-
-        ################### Create CORE ################################
-        #Load VTK Data Sets
-        sphere = tvtk.SphereSource()
-        sphere.radius = radius_inner 
-        sphere.theta_resolution = 24 
-        sphere.phi_resolution = 24
-          
-        # Create a mesh from the data created above.
-        src = VTKDataSource()
-        src.data = sphere.output
-        script.add_source(src)
-        
-        #Show Surface
-        surf_module = surface.Surface()
-        surf_module.actor.property.color = orange
-        script.add_module(surf_module)
-        
-         # to create the rendering scene
-         ## your stuff here
-
-if __name__ == '__main__':
-    mc = HdfDisplay()
-    if len(sys.argv) > 1:
-        mc.filename = sys.argv[1]
-        if not isfile(mc.filename):
-            print "File not found."
-            sys.exit(1)
-    else:
-        print "Usage: %s [filename] -x [Reduced Grid Size X] -y [Reduced Grid Size X] -z [Reduced Grid Size Z]" % sys.argv[0]
-        sys.exit(0)
-
-   ##parse for reduction factors 
-    try:
-        opts, args = getopt(sys.argv[3:], "x:y:z:", ['x=','y=','z='])
-    except GetoptError, msg:
-        print "Error: %s" % msg
-        sys.exit(1)
-    
-    for opt,arg in opts:
-        if opt in ('-x','--nx_redu'):
-            try:
-                mc.nx_redu = int(arg)
-                print "Reducing Grid Size to x:",mc.nx_redu
-            except ValueError:
-                print "x is not a number..."
-                sys.exit(1)
-                
-        if opt in ('-y','--ny_redu'):
-            try:
-                mc.ny_redu = int(arg)
-                print "Reducing Grid Size to y:",mc.ny_redu
-            except ValueError:
-                print "y is not a number..."
-                sys.exit(1)
-        
-        if opt in ('-z','--nz_redu'):
-            try:
-                mc.nz_redu = int(arg)
-                print "Reducing Grid Size to z:",mc.nz_redu
-        
-            except ValueError:
-                print "z is not a number..."
-                sys.exit(1)
-        
-    mc.main()

Copied: mc/3D/CitcomS/trunk/visual/mayavi2_citcoms_display.py (from rev 5560, mc/3D/CitcomS/trunk/visual/Mayavi2/citcoms_plugins/Citcoms_HdfDisplay.py)



More information about the cig-commits mailing list