[VTK] Implement Glyph3Dmapper serialization - Round 2 (#2003)

holoviz · Feb 24, 2021 · 72441fd · 72441fd
1 parent fd9e09c
commit 72441fd
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 8 deletions.
diff --git a/panel/pane/vtk/synchronizable_deserializer.py b/panel/pane/vtk/synchronizable_deserializer.py
@@ -65,14 +65,16 @@ def poly_data_builder(state, zf, register):
     if 'points' in state['properties']:
         points = state['properties']['points']
         vtkpoints = vtk.vtkPoints()
-        data_arr = ARRAY_TYPES[points['dataType']]()
-        fill_array(data_arr, points, zf)
-        vtkpoints.SetData(data_arr)
+        points_data_arr = ARRAY_TYPES[points['dataType']]()
+        fill_array(points_data_arr, points, zf)
+        vtkpoints.SetData(points_data_arr)
         instance.SetPoints(vtkpoints)
     for cell_type in ['verts', 'lines', 'polys', 'strips']:
         if cell_type in state['properties']:
             cell_arr = vtk.vtkCellArray()
-            fill_array(cell_arr.GetData(), state['properties'][cell_type], zf)
+            cell_data_arr = vtk.vtkIdTypeArray()
+            fill_array(cell_data_arr, state['properties'][cell_type], zf)
+            cell_arr.ImportLegacyFormat(cell_data_arr)
             getattr(instance, 'Set' + capitalize(cell_type))(cell_arr)
 
     # datasets

diff --git a/panel/pane/vtk/synchronizable_serializer.py b/panel/pane/vtk/synchronizable_serializer.py
@@ -1111,7 +1111,7 @@ def mergeToPolydataSerializer(parent, dataObject, dataObjectId, context, depth):
         gf.Update()
         dataset = gf.GetOutput()
     else:
-        dataset = parent.GetInput()
+        dataset = dataObject
 
     return polydataSerializer(parent, dataset, dataObjectId, context, depth)
 

diff --git a/panel/pane/vtk/vtk.py b/panel/pane/vtk/vtk.py
@@ -313,7 +313,6 @@ def _serialize_ren_win(self, ren_win, context, binary=False, compression=True, e
         import panel.pane.vtk.synchronizable_serializer as rws
         if exclude_arrays is None:
             exclude_arrays = []
-        store_offscreen_rendering = ren_win.GetOffScreenRendering()
         ren_win.OffScreenRenderingOn() # to not pop a vtk windows
         ren_win.Modified()
         ren_win.Render()
@@ -322,8 +321,6 @@ def _serialize_ren_win(self, ren_win, context, binary=False, compression=True, e
         arrays = {name: context.getCachedDataArray(name, binary=binary, compression=compression)
                     for name in context.dataArrayCache.keys()
                     if name not in exclude_arrays}
-        ren_win.Finalize()
-        ren_win.SetOffScreenRendering(store_offscreen_rendering)
         return scene, arrays
 
     @staticmethod