[Yt-svn] yt-commit r1557 - trunk/yt/reason

[mturk at wrangler.dreamhost.com]

Author: mturk
Date: Tue Dec 15 16:09:11 2009
New Revision: 1557
URL: http://yt.enzotools.org/changeset/1557

Log:
Oops, missed the VTK widget update to work with the new hierarchy subset



Modified:
   trunk/yt/reason/tvtk_interface.py

Modified: trunk/yt/reason/tvtk_interface.py
==============================================================================
--- trunk/yt/reason/tvtk_interface.py	(original)
+++ trunk/yt/reason/tvtk_interface.py	Tue Dec 15 16:09:11 2009
@@ -46,7 +46,8 @@
 import yt.lagos as lagos
 from yt.funcs import *
 from yt.logger import ravenLogger as mylog
-from yt.extensions.HierarchySubset import ExtractedHierarchy
+from yt.extensions.HierarchySubset import \
+        ExtractedHierarchy, ExtractedParameterFile
 
 #from enthought.tvtk.pyface.ui.wx.wxVTKRenderWindowInteractor \
      #import wxVTKRenderWindowInteractor
@@ -441,9 +442,9 @@
         HasTraits.__init__(self, **traits)
         max_level = min(self.pf.h.max_level,
                         self.min_grid_level + self.number_of_levels - 1)
-        self.extracted_hierarchy = ExtractedHierarchy(
-                        self.pf, self.min_grid_level, max_level,
-                        offset=None)
+        self.extracted_pf = ExtractedParameterFile(self.pf,
+                             self.min_grid_level, max_level, offset=None)
+        self.extracted_hierarchy = self.extracted_pf.h
         self._hdata_set = tvtk.HierarchicalBoxDataSet()
         self._ugs = []
         self._grids = []
@@ -482,8 +483,9 @@
 
         scalars = grid.get_vertex_centered_data(self.field, smoothed=self.smoothed)
 
-        io, left_index, origin, dds = \
-            self.extracted_hierarchy._convert_grid(grid)
+        left_index = grid.get_global_startindex()
+        origin = grid.LeftEdge
+        dds = grid.dds
         right_index = left_index + scalars.shape - 1
         ug = tvtk.UniformGrid(origin=origin, spacing=dds,
                               dimensions=grid.ActiveDimensions+1)