Skip to content

Commit

Permalink
Merge pull request #177 from prabhuramachandran/view-strided-arrays
Browse files Browse the repository at this point in the history
Support for viewing components of strided props.
  • Loading branch information
prabhuramachandran committed Feb 27, 2019
2 parents 0b273ee + 1d0ec10 commit 9d46b26
Showing 1 changed file with 16 additions and 1 deletion.
17 changes: 16 additions & 1 deletion pysph/tools/mayavi_viewer.py
Original file line number Diff line number Diff line change
Expand Up @@ -288,6 +288,10 @@ class ParticleArrayHelper(HasTraits):

edit_vectors = Button('More options ...')

stride = Int(1, desc='stride value for property')

component = Int(0)

# Private attribute to store the Text module.
_text = Instance(PipelineBase)

Expand Down Expand Up @@ -317,6 +321,7 @@ class ParticleArrayHelper(HasTraits):
editor=EnumEditor(name='scalar_list')),
Item(name='list_all_scalars'),
Item(name='show_time'),
Item(name='component', enabled_when='stride > 1'),
columns=2,
),
Item(name='edit_scalars', show_label=False),
Expand Down Expand Up @@ -360,7 +365,14 @@ def _get_scalar(self, pa, scalar):
method_name = '_add_' + scalar
method = getattr(self, method_name)
method(pa)
return pa.get(scalar, only_real_particles=False)

self.stride = stride = pa.stride.get(scalar, 1)
component = max(0, min(self.component, stride - 1))
array = pa.get(scalar, only_real_particles=False)
if stride > 1:
return array[component::stride]
else:
return array

# Traits handlers #############################################
def _edit_scalars_fired(self):
Expand Down Expand Up @@ -433,6 +445,9 @@ def _scalar_changed(self, value):
)
p.module_manager.scalar_lut_manager.data_name = value

def _component_changed(self, value):
self._scalar_changed(self.scalar)

def _list_all_scalars_changed(self, list_all_scalars):
pa = self.particle_array
if list_all_scalars:
Expand Down

0 comments on commit 9d46b26

Please sign in to comment.