Improve smesh GUI display() speed for viewing mesh - set this feature off by default

+ ParaView 5.8 backward compatibility

diff --git a/src/VTKViewer/VTKViewer_GeometryFilter.cxx b/src/VTKViewer/VTKViewer_GeometryFilter.cxx
index c3ecaaca5915bbfe5daab8b061fd740c0be6411b..c85c84c225a050ee86ef16a04f6bda36d85c31d0 100644 (file)
--- a/src/VTKViewer/VTKViewer_GeometryFilter.cxx
+++ b/src/VTKViewer/VTKViewer_GeometryFilter.cxx
@@ -182,6 +182,7 @@ VTKViewer_GeometryFilter
      return 0;
     }
 
+#if VTK_VERSION_NUMBER >= VTK_VERSION_CHECK(9,0,0)
   if (delegateToVtk)
     {
 
@@ -247,11 +248,14 @@ VTKViewer_GeometryFilter
      return this->vtkGeometryFilter::DataSetExecute(input, output, &exc);
     }  
     else // !delegateToVtk
+#endif
     {
      if (input->GetDataObjectType() == VTK_UNSTRUCTURED_GRID){
        return this->UnstructuredGridExecute(input, output, outInfo);
-     }else
+     }
+     else {
        return Superclass::RequestData(request,inputVector,outputVector);
+     }
     }
 }
 

diff --git a/src/VTKViewer/VTKViewer_GeometryFilter.h b/src/VTKViewer/VTKViewer_GeometryFilter.h
index 7c5836895550d1edf955419d62cfcc2d029d1249..333814674421d76c60192c302d13dc23b75d1663 100644 (file)
--- a/src/VTKViewer/VTKViewer_GeometryFilter.h
+++ b/src/VTKViewer/VTKViewer_GeometryFilter.h
@@ -35,7 +35,6 @@
 #endif
 
 class vtkUnstructuredGrid;
-struct vtkExcludedFaces;
 
 /*! \brief This class used same as vtkGeometryFilter. See documentation on VTK for more information.
  */
@@ -143,7 +142,7 @@ protected:
                          bool triangulate = false);
 
   // Delegate VTKViewer_GeometryFilter::UnstructuredGridExecute to vtkGeometryFilter::UnstructuredGridExecute
-  bool delegateToVtk = true;
+  bool delegateToVtk = false;
     
 private:
   TVectorId myVTK2ObjIds;