products/patches/ParaView-5.4.1_b5c4c89-3DGlyphs.patch

   1 diff -Naur ParaView_ori/CMakeLists.txt ParaView_new/CMakeLists.txt
   2 --- ParaView_ori/CMakeLists.txt 2018-01-11 09:32:16.000000000 +0100
   3 +++ ParaView_new/CMakeLists.txt 2018-04-13 13:30:54.503629695 +0200
   4 @@ -213,6 +213,9 @@
   5  option(PARAVIEW_USE_VISITBRIDGE "Build ParaView with VisIt readers." OFF)
   6  option(PARAVIEW_USE_OPENTURNS "Build ParaView with OpenTURNS filters and density maps" OFF)
   7
   8 +# AC - OP spns 7810 Add option to disable 3D Glyphs representation
   9 +option(PARAVIEW_USE_3DGLYPH "Build ParaView with 3D Glyph presentation" ON)
  10 +
  11  # NvPipe requires an NVIDIA GPU.
  12  option(PARAVIEW_ENABLE_NVPIPE
  13         "Build ParaView with NvPipe remoting. Requires CUDA and an NVIDIA GPU" OFF)
  14 diff -Naur ParaView_ori/ParaViewCore/ClientServerCore/Default/Testing/Cxx/ParaViewCoreClientServerCorePrintSelf.cxx ParaView_new/ParaViewCore/ClientServerCore/Default/Testing/Cxx/ParaViewCoreClientServerCorePrintSelf.cxx
  15 --- ParaView_ori/ParaViewCore/ClientServerCore/Default/Testing/Cxx/ParaViewCoreClientServerCorePrintSelf.cxx    2018-01-11 09:32:03.000000000 +0100
  16 +++ ParaView_new/ParaViewCore/ClientServerCore/Default/Testing/Cxx/ParaViewCoreClientServerCorePrintSelf.cxx    2018-04-13 13:34:01.726070038 +0200
  17 @@ -9,7 +9,12 @@
  18  #include "vtkDataLabelRepresentation.h"
  19  #include "vtkGeometryRepresentation.h"
  20  #include "vtkGeometryRepresentationWithFaces.h"
  21 +
  22 +// AC - OP spns 7810 Disable 3D Glyphs representation
  23 +#ifdef PARAVIEW_USE_3DGLYPH
  24  #include "vtkGlyph3DRepresentation.h"
  25 +#endif
  26 +
  27  #include "vtkImageSliceMapper.h"
  28  #include "vtkImageSliceRepresentation.h"
  29  #include "vtkImageVolumeRepresentation.h"
  30 @@ -111,7 +116,12 @@
  31    PRINT_SELF(vtkDataLabelRepresentation);
  32    PRINT_SELF(vtkGeometryRepresentation);
  33    PRINT_SELF(vtkGeometryRepresentationWithFaces);
  34 +
  35 +  // AC - OP spns 7810 Disable 3D Glyphs representation
  36 +#ifdef PARAVIEW_USE_3DGLYPH
  37    PRINT_SELF(vtkGlyph3DRepresentation);
  38 +#endif
  39 +
  40    PRINT_SELF(vtkImageSliceMapper);
  41    PRINT_SELF(vtkImageSliceRepresentation);
  42    PRINT_SELF(vtkImageVolumeRepresentation);
  43 diff -Naur ParaView_ori/ParaViewCore/ClientServerCore/Rendering/CMakeLists.txt ParaView_new/ParaViewCore/ClientServerCore/Rendering/CMakeLists.txt
  44 --- ParaView_ori/ParaViewCore/ClientServerCore/Rendering/CMakeLists.txt 2018-01-11 09:32:16.000000000 +0100
  45 +++ ParaView_new/ParaViewCore/ClientServerCore/Rendering/CMakeLists.txt 2018-04-13 13:39:53.538166496 +0200
  46 @@ -28,6 +28,8 @@
  47  #  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  48  #
  49  #==========================================================================
  50 +
  51 +# AC - OP spns #7810 Disable 3D Glyphs representation
  52  set (Module_SRCS
  53    vtk3DWidgetRepresentation.cxx
  54    vtkAMROutlineRepresentation.cxx
  55 @@ -44,7 +46,6 @@
  56    vtkGeometryRepresentation.cxx
  57    vtkGeometryRepresentationWithFaces.cxx
  58    vtkGeometrySliceRepresentation.cxx
  59 -  vtkGlyph3DRepresentation.cxx
  60    vtkImageSliceRepresentation.cxx
  61    vtkImageVolumeRepresentation.cxx
  62    vtkMoleculeRepresentation.cxx
  63 @@ -104,7 +105,13 @@
  64    vtkThreeSliceFilter.cxx
  65    vtkUnstructuredGridVolumeRepresentation.cxx
  66    vtkXYChartRepresentation.cxx
  67 -)
  68 +  )
  69 +
  70 +if (PARAVIEW_USE_3DGLYPH)
  71 +  list(APPEND Module_SRCS
  72 +    vtkGlyph3DRepresentation.cxx)
  73 +endif()
  74 +
  75
  76  list(APPEND Module_SRCS
  77    vtkPointGaussianRepresentation.cxx)
  78 diff -Naur ParaView_ori/ParaViewCore/ServerManager/SMApplication/Resources/views_and_representations.xml ParaView_new/ParaViewCore/ServerManager/SMApplication/Resources/views_and_representations.xml
  79 --- ParaView_ori/ParaViewCore/ServerManager/SMApplication/Resources/views_and_representations.xml       2018-01-11 09:32:16.000000000 +0100
  80 +++ ParaView_new/ParaViewCore/ServerManager/SMApplication/Resources/views_and_representations.xml       2018-04-13 13:47:59.330840906 +0200
  81 @@ -3608,9 +3608,12 @@
  82        <RepresentationType subproxy="SurfaceRepresentation"
  83                            subtype="Surface With Edges"
  84                            text="Surface With Edges" />
  85 +      <!-- AC - OP spns #7810 Disable 3D Glyphs representation -->
  86 +#ifdef PARAVIEW_USE_3DGLYPH
  87        <RepresentationType subproxy="Glyph3DRepresentation"
  88                            subtype="Surface"
  89                            text="3D Glyphs" />
  90 +#endif
  91        <StringVectorProperty command="GetRepresentationTypes"
  92                              information_only="1"
  93                              name="RepresentationTypesInfo"
  94 @@ -3785,6 +3788,8 @@
  95            <Exception name="Visibility" />
  96          </ShareProperties>
  97        </SubProxy>
  98 +      <!-- AC - OP spns #7810 Disable 3D Glyphs representation -->
  99 +#ifdef PARAVIEW_USE_3DGLYPH
 100        <SubProxy>
 101          <Proxy name="Glyph3DRepresentation"
 102                 proxygroup="representations"
 103 @@ -3834,6 +3839,7 @@
 104            <Exception name="Visibility" />
 105          </ShareProperties>
 106        </SubProxy>
 107 + #endif
 108        <ProxyProperty name="DataAxesGrid"
 109                       command="SetGridAxesRepresentation"
 110                       panel_widget="proxy_editor">
 111 @@ -4792,6 +4798,8 @@
 112        </DoubleVectorProperty>
 113      </RepresentationProxy>
 114      <!-- ================================================================== -->
 115 +    <!-- AC - OP spns #7810 Disable 3D Glyphs representation -->
 116 +#ifdef PARAVIEW_USE_3DGLYPH
 117      <RepresentationProxy base_proxygroup="internal_representations"
 118                           base_proxyname="SurfaceRepresentationBase"
 119                           class="vtkGlyph3DRepresentation"
 120 @@ -4997,6 +5005,7 @@
 121        </IntVectorProperty>
 122        <!-- end of Glyph3DRepresentation -->
 123      </RepresentationProxy>
 124 +#endif
 125      <!-- ================================================================== -->
 126      <RepresentationProxy class="vtkDataLabelRepresentation"
 127                           name="DataLabelRepresentation"
 128 diff -Naur ParaView_ori/vtkPVConfig.h.in ParaView_new/vtkPVConfig.h.in
 129 --- ParaView_ori/vtkPVConfig.h.in       2018-01-11 09:32:16.000000000 +0100
 130 +++ ParaView_new/vtkPVConfig.h.in       2018-04-13 13:53:16.193719426 +0200
 131 @@ -49,6 +49,9 @@
 132  //Build ParaView with enforced secure connection (--connect-id)
 133  #cmakedefine PARAVIEW_ALWAYS_SECURE_CONNECTION
 134
 135 +// AC - OP spns #7810 Disable 3D Glyphs representation
 136 +#cmakedefine PARAVIEW_USE_3DGLYPH
 137 +
 138  #define PARAVIEW_VERSION_MAJOR @PARAVIEW_VERSION_MAJOR@
 139  #define PARAVIEW_VERSION_MINOR @PARAVIEW_VERSION_MINOR@
 140  #define PARAVIEW_VERSION_PATCH @PARAVIEW_VERSION_PATCH@