Merge pull request #53 from AngelFP/fix_saving_opacity

Allow saving opacity if it is out of range

Author: AngelFP

visualpic/visualization/volume_appearance.py

@@ -94,8 +94,10 @@ def get_opacity_values(self, op_name):
 
         def save_opacity(self, name, field_values, opacity_values,
                          folder_path):
+            # Make sure opacity is within bounds.
+            opacity_values[opacity_values < 0.] = 0.
+            opacity_values[opacity_values > 1] = 1.
             if (field_values.min() >= 0 and field_values.max() <= 255
-                and opacity_values.min() >= 0 and opacity_values.max() <= 1
                 and len(field_values) == len(opacity_values)
                     and len(opacity_values) <= self.max_len):
                 file_path = self.create_file_path(name, folder_path)

visualpic/visualization/vtk_visualizer.py

@@ -411,7 +411,7 @@ def set_background(self, background):
             colors.
 
         """
-        if (type(background) == list) and (len(background) == 2):
+        if isinstance(background, list) and (len(background) == 2):
             self._set_background_colors(*background)
         elif background == 'default gradient':
             self._set_background_colors('black', [0.12, 0.3, 0.475])
@@ -753,15 +753,15 @@ def _load_data_into_multi_volume(self, timestep):
         # only a single volume. The fix replaces the 'vtkMultiVolume' for a
         # 'vtkVolume' and then calls '_load_data_into_single_volume'.
         if len(self.volume_field_list) == 1:
-            if type(self.vtk_volume) != vtk.vtkVolume:
+            if not isinstance(self.vtk_volume, vtk.vtkVolume):
                 self.renderer.RemoveVolume(self.vtk_volume)
                 self.vtk_volume = vtk.vtkVolume()
                 self.renderer.AddVolume(self.vtk_volume)
                 self.vtk_volume.SetMapper(self.vtk_volume_mapper)
             return self._load_data_into_single_volume(timestep)
         # If the 'vtkMultiVolume' was replaced by a 'vtkVolume' but now the
         # number of volumes is >1, go back to having a 'vtkMultiVolume'.
-        if type(self.vtk_volume) != vtk.vtkMultiVolume:
+        if not isinstance(self.vtk_volume, vtk.vtkMultiVolume):
             self.renderer.RemoveVolume(self.vtk_volume)
             self.vtk_volume = vtk.vtkMultiVolume()
             self.renderer.AddVolume(self.vtk_volume)