/[escript]/trunk/pyvisi/py_src/ellipsoid.py
ViewVC logotype

Diff of /trunk/pyvisi/py_src/ellipsoid.py

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 943 by jongui, Mon Jan 29 07:22:43 2007 UTC revision 945 by jongui, Tue Jan 30 22:34:27 2007 UTC
# Line 11  from sphere import Sphere Line 11  from sphere import Sphere
11  from normals import Normals  from normals import Normals
12  from glyph import  TensorGlyph  from glyph import  TensorGlyph
13  from outline import Outline  from outline import Outline
14    from point import StructuredPoints
15    from probe import Probe
16    
17  # NOTE: DataSetMapper, Actor3D, Sphere, Normals and TensorGlyph were inherited  # NOTE: DataSetMapper, Actor3D, Sphere, Normals and TensorGlyph were inherited
18  # to allow access to their public methods from the driver.  # to allow access to their public methods from the driver.
19  class Ellipsoid(DataSetMapper, Actor3D, Sphere, Normals, TensorGlyph):  class Ellipsoid(DataSetMapper, Actor3D, Sphere, Normals, TensorGlyph, StructuredPoints, Probe):
20      """      """
21      Class that show a tensor field using ellipsoid.      Class that show a tensor field using ellipsoid.
22      """      """
# Line 80  class Ellipsoid(DataSetMapper, Actor3D, Line 82  class Ellipsoid(DataSetMapper, Actor3D,
82              lookup_table = LookupTable()              lookup_table = LookupTable()
83              lookup_table._setLookupTableToGreyScale()              lookup_table._setLookupTableToGreyScale()
84    
85            StructuredPoints.__init__(self, data_collector._getOutput())
86            Probe.__init__(self, data_collector._getOutput(),
87                    StructuredPoints._getStructuredPoints(self))
88    
89          Sphere.__init__(self)          Sphere.__init__(self)
90          TensorGlyph.__init__(self, data_collector._getOutput(),          #TensorGlyph.__init__(self, data_collector._getOutput(),
91            TensorGlyph.__init__(self, Probe._getOutput(self),
92                  Sphere._getOutput(self))                  Sphere._getOutput(self))
93          Normals.__init__(self, TensorGlyph._getOutput(self))          Normals.__init__(self, TensorGlyph._getOutput(self))
94    
# Line 102  from cutter import Cutter Line 109  from cutter import Cutter
109  # and Cutter were inherited to allow access to their public methods from  # and Cutter were inherited to allow access to their public methods from
110  # the driver.  # the driver.
111  class EllipsoidOnPlaneCut(DataSetMapper, Actor3D, Sphere, Normals,    class EllipsoidOnPlaneCut(DataSetMapper, Actor3D, Sphere, Normals,  
112      TensorGlyph, Transform, Plane, Cutter):      TensorGlyph, Transform, Plane, Cutter, StructuredPoints, Probe):
113      """      """
114      Class that show a tensor field using ellipsoids on a plane.      Class that show a tensor field using ellipsoids on a plane.
115      """      """
# Line 171  class EllipsoidOnPlaneCut(DataSetMapper, Line 178  class EllipsoidOnPlaneCut(DataSetMapper,
178          Transform.__init__(self)              Transform.__init__(self)    
179          Plane.__init__(self, Transform._getTransform(self))          Plane.__init__(self, Transform._getTransform(self))
180    
181          Cutter.__init__(self, data_collector._getOutput(),          StructuredPoints.__init__(self, data_collector._getOutput())
182            Probe.__init__(self, data_collector._getOutput(),
183                    StructuredPoints._getStructuredPoints(self))
184    
185            #Cutter.__init__(self, data_collector._getOutput(),
186            Cutter.__init__(self, Probe._getOutput(self),
187                  Plane._getPlane(self))                    Plane._getPlane(self))  
188    
189          Sphere.__init__(self)          Sphere.__init__(self)
# Line 193  from clipper import Clipper Line 205  from clipper import Clipper
205  # and Clipper were inherited to allow access to their public methods from  # and Clipper were inherited to allow access to their public methods from
206  # the driver.  # the driver.
207  class EllipsoidOnPlaneClip(DataSetMapper, Actor3D, Sphere, Normals,    class EllipsoidOnPlaneClip(DataSetMapper, Actor3D, Sphere, Normals,  
208      TensorGlyph, Transform, Plane, Clipper):      TensorGlyph, Transform, Plane, Clipper, StructuredPoints, Probe):
209      """      """
210      Class that show a tensor field using ellipsoids on a plane.      Class that show a tensor field using ellipsoids on a plane.
211      """      """
# Line 262  class EllipsoidOnPlaneClip(DataSetMapper Line 274  class EllipsoidOnPlaneClip(DataSetMapper
274          Transform.__init__(self)              Transform.__init__(self)    
275          Plane.__init__(self, Transform._getTransform(self))          Plane.__init__(self, Transform._getTransform(self))
276    
277            StructuredPoints.__init__(self, data_collector._getOutput())
278            Probe.__init__(self, data_collector._getOutput(),
279                    StructuredPoints._getStructuredPoints(self))
280    
281          # NOTE: TensorGlyph must come before Clipper. Otherwise the output          # NOTE: TensorGlyph must come before Clipper. Otherwise the output
282          # will be incorrect.          # will be incorrect.
283          Sphere.__init__(self)          Sphere.__init__(self)
284          TensorGlyph.__init__(self, data_collector._getOutput(),          #TensorGlyph.__init__(self, data_collector._getOutput(),
285            TensorGlyph.__init__(self, Probe._getOutput(self),
286                  Sphere._getOutput(self))                  Sphere._getOutput(self))
287          Normals.__init__(self, TensorGlyph._getOutput(self))          Normals.__init__(self, TensorGlyph._getOutput(self))
288    

Legend:
Removed from v.943  
changed lines
  Added in v.945

  ViewVC Help
Powered by ViewVC 1.1.26