[cig-commits] r5550 - mc/3D/CitcomS/trunk/visual/Mayavi2/citcoms_plugins/plugins

[luis at geodynamics.org]

Author: luis
Date: 2006-12-08 12:03:11 -0800 (Fri, 08 Dec 2006)
New Revision: 5550

Modified:
   mc/3D/CitcomS/trunk/visual/Mayavi2/citcoms_plugins/plugins/CitcomS_hdf_file_reader.py
   mc/3D/CitcomS/trunk/visual/Mayavi2/citcoms_plugins/plugins/OpenCitcomSFILES.py
Log:
Last set of patches to citcoms_plugins
    * Display filename in mayavi pipeline
    * Changed glob pattern so that only HDF5 timestep files can be selected


Modified: mc/3D/CitcomS/trunk/visual/Mayavi2/citcoms_plugins/plugins/CitcomS_hdf_file_reader.py
===================================================================
--- mc/3D/CitcomS/trunk/visual/Mayavi2/citcoms_plugins/plugins/CitcomS_hdf_file_reader.py	2006-12-08 19:47:43 UTC (rev 5549)
+++ mc/3D/CitcomS/trunk/visual/Mayavi2/citcoms_plugins/plugins/CitcomS_hdf_file_reader.py	2006-12-08 20:03:11 UTC (rev 5550)
@@ -83,6 +83,7 @@
 
     # Our view.
     view = View(Group(#Item(name='current_timestep'),
+                      #Item(name='filename'), # how to disable editing?
                       Item(name='nx_redu', label='Grid Size in X'),
                       Item(name='ny_redu', label='Grid Size in Y'),
                       Item(name='nz_redu', label='Grid Size in Z'),
@@ -204,11 +205,13 @@
     def tno_get_label(self, node):
         """ Gets the label to display for a specified object.
         """
-        ret = "CitcomS HDF5 Data (not initialized)"
+        import os.path
+        par, file = os.path.split(self.filename)
         if self.data:
-            typ = self.data.__class__.__name__
-            ret = "CitcomS HDF5 Data (step %d)" % self.timestep
-        return ret
+            msg = "ready"
+        else:
+            msg = "not initialized"
+        return "%s (%s)" % (file, msg)
 
     ######################################################################
     # Non-public interface

Modified: mc/3D/CitcomS/trunk/visual/Mayavi2/citcoms_plugins/plugins/OpenCitcomSFILES.py
===================================================================
--- mc/3D/CitcomS/trunk/visual/Mayavi2/citcoms_plugins/plugins/OpenCitcomSFILES.py	2006-12-08 19:47:43 UTC (rev 5549)
+++ mc/3D/CitcomS/trunk/visual/Mayavi2/citcoms_plugins/plugins/OpenCitcomSFILES.py	2006-12-08 20:03:11 UTC (rev 5550)
@@ -21,15 +21,15 @@
 
     def perform(self):
         """ Performs the action. """
-        wildcard = 'HDF files (*.h5)|*.h5|' + FileDialog.WILDCARD_ALL
+        wildcard = 'HDF5 timestep files (*.*.h5)|*.*.h5|' + FileDialog.WILDCARD_ALL
         parent = self.window.control
         dialog = FileDialog(parent=parent,
-                            title='Open CitcomS HDF5 file',
+                            title='Open CitcomS HDF5 timestep file',
                             action='open', wildcard=wildcard
                             )
         if dialog.open() == OK:
             if not isfile(dialog.path):
-                error("File '%s' does not exist!"%dialog.path, parent)
+                error("File '%s' does not exist!" % dialog.path, parent)
                 return
             from citcoms_plugins.plugins.CitcomS_hdf_file_reader import CitcomSHDFFileReader
             r = CitcomSHDFFileReader()