Temporal fix for the '22738: [CEA 1249] No filter Tensor glyph in Salome 7.4.0, where...

diff --git a/src/PVViewer/PVViewer_ViewManager.cxx b/src/PVViewer/PVViewer_ViewManager.cxx
index a167c9acf8687e8c8515a2ec5fb3d87b36f7769f..74baf63fab3dc3f1617a0c7dc52672b721073006 100644 (file)
--- a/src/PVViewer/PVViewer_ViewManager.cxx
+++ b/src/PVViewer/PVViewer_ViewManager.cxx
@@ -143,9 +143,7 @@ void PVViewer_ViewManager::ParaviewLoadConfigurations()
       QString aPath = resMgr->stringValue("resources", "PVViewer", QString());
       if (!aPath.isNull()) {
           MyCoreApp->loadConfiguration(aPath + QDir::separator() + "ParaViewFilters.xml");
-          MyCoreApp->loadConfiguration(aPath + QDir::separator() + "ParaViewReaders.xml");
           MyCoreApp->loadConfiguration(aPath + QDir::separator() + "ParaViewSources.xml");
-          MyCoreApp->loadConfiguration(aPath + QDir::separator() + "ParaViewWriters.xml");
       }
       ConfigLoaded = true;
     }

diff --git a/src/PVViewer/resources/CMakeLists.txt b/src/PVViewer/resources/CMakeLists.txt
index 16d3b4f2469a9b58be377dac1e94ce6278b3d117..f3ba6dea2b4a7eef01e63f2c2d022933ca2b806b 100644 (file)
--- a/src/PVViewer/resources/CMakeLists.txt
+++ b/src/PVViewer/resources/CMakeLists.txt
@@ -19,9 +19,7 @@
 
 SET(dist_salomeres_DATA
   ParaViewFilters.xml
-  ParaViewReaders.xml
   ParaViewSources.xml
-  ParaViewWriters.xml
   )
 
 FOREACH(f ${dist_salomeres_DATA})

diff --git a/src/PVViewer/resources/ParaViewFilters.xml b/src/PVViewer/resources/ParaViewFilters.xml
old mode 100755 (executable)
new mode 100644 (file)
index 22eb6da..b4171e9
--- a/src/PVViewer/resources/ParaViewFilters.xml
+++ b/src/PVViewer/resources/ParaViewFilters.xml
@@ -1,8 +1,4 @@
 <ParaViewFilters>
-  <Category name="Cosmology" menu_label="Cosmology">
-    <Proxy group="filters" name="HaloFinder" />
-  </Category>
-
   <Category name="Common" menu_label="&amp;Common" preserve_order="1"
     show_in_toolbar="1">
     <Proxy group="filters" name="Calculator" icon=":/pqWidgets/Icons/pqCalculator24.png"/>
@@ -18,6 +14,12 @@
     <Proxy group="filters" name="ExtractHierarchicalLevel" icon=":/pqWidgets/Icons/pqGroupExtract24.png"/>
   </Category>
 
+  <Category name="CosmoTools" menu_label="&amp;CosmoTools" show_in_toolbar="0">
+    <Proxy group="filters" name="LANLHaloFinder" />
+    <Proxy group="filters" name="MinkowskiFilter" />
+    <Proxy group="filters" name="PMergeConnected" />
+  </Category>
+
   <Category name="DataAnalysis" menu_label="&amp;Data Analysis" show_in_toolbar="1" hide_for_tests="1">
     <Proxy group="filters" name="Calculator"
             icon=":/pqWidgets/Icons/pqCalculator24.png" omit_from_toolbar="1"/>
@@ -39,6 +41,11 @@
     <Proxy group="filters" name="PlotOnIntersectionCurves" omit_from_toolbar="1"/>
     <Proxy group="filters" name="ProgrammableFilter"
             icon=":/pqWidgets/Icons/pqProgrammableFilter24.png" omit_from_toolbar="1"/>
+    <Proxy group="filters" name="TransposeTable" omit_from_toolbar="1"/>
+    <Proxy group="filters" name="ComputeQuartiles"
+            icon=":/pqWidgets/Icons/pqBoxChart16.png" omit_from_toolbar="1"/>
+    <Proxy group="filters" name="ExtractBagPlots"
+            icon=":/pqWidgets/Icons/pqFunctionalBagChart16.png" omit_from_toolbar="1"/>
   </Category>
 
   <Category name="Statistics" menu_label="&amp;Statistics">
@@ -74,6 +81,9 @@
     <Proxy group="filters" name="MaterialInterfaceFilter" />
     <Proxy group="filters" name="AMRDualClip" />
     <Proxy group="filters" name="AMRDualContour" />
+    <Proxy group="filters" name="AMRConnectivity" />
+    <Proxy group="filters" name="AMRFragmentIntegration" />
+    <Proxy group="filters" name="AMRFragmentsFilter"/>
     <Proxy group="filters" name="ExtractHierarchicalLevel" />
     <Proxy group="filters" name="ExtractHierarchicalDataSets" />
   </Category>
@@ -89,15 +99,23 @@
     <Proxy group="filters" name="ExtractHierarchicalDataSets" />
   </Category>
 
+  <Category name="Quadrature Points" menu_label="&amp;Quadrature Points">
+    <Proxy group="filters" name="QuadraturePointInterpolator" />
+    <Proxy group="filters" name="QuadraturePointsGenerator" />
+    <Proxy group="filters" name="QuadraturePointStatistics" />
+    <Proxy group="filters" name="QuadratureSchemeDictionaryGenerator" />
+  </Category>
+
+
   <Proxy group="filters" name="ImageDataToAMR" />
   <Proxy group="filters" name="UniformGridPartitioner" />
   <Proxy group="filters" name="AnnotateGlobalData" />
   <Proxy group="filters" name="Append" />
   <Proxy group="filters" name="AppendAttributes" />
   <Proxy group="filters" name="AppendPolyData" />
-  <Proxy group="filters" name="ArbitrarySourceGlyph" />
   <Proxy group="filters" name="ArbitrarySourceStreamTracer" />
   <Proxy group="filters" name="BlockIdScalars" />
+  <Proxy group="filters" name="RandomAttributeGenerator" />
   <Proxy group="filters" name="BrownianPoints" />
   <Proxy group="filters" name="Calculator" />
   <Proxy group="filters" name="CellCenters" />
@@ -131,6 +149,7 @@
   <Proxy group="filters" name="GaussianSplatter"/>
   <Proxy group="filters" name="GenerateIdScalars"/>
   <Proxy group="filters" name="Glyph" />
+  <Proxy group="filters" name="GlyphWithCustomSource" />
   <Proxy group="filters" name="Gradient" />
   <Proxy group="filters" name="GridConnectivity" />
   <Proxy group="filters" name="GroupDataSets" />
@@ -138,6 +157,7 @@
   <Proxy group="filters" name="ImageDataToPointSet" />
   <Proxy group="filters" name="IntegrateAttributes" />
   <Proxy group="filters" name="IntegrateFlowThroughSurface" />
+  <Proxy group="filters" name="LegacyGlyph" />
   <!--  <Proxy group="filters" name="LevelIdScalars" /> -->
   <Proxy group="filters" name="LinearExtrusionFilter" />
   <Proxy group="filters" name="LoopSubdivisionFilter" />
@@ -158,6 +178,7 @@
   <Proxy group="filters" name="PointDataToCellData" />
   <Proxy group="filters" name="PolyDataNormals" />
   <Proxy group="filters" name="Probe" />
+  <Proxy group="filters" name="ImageResampling" />
   <Proxy group="filters" name="ProbeLine" />
   <Proxy group="filters" name="ProbePoint" />
   <Proxy group="filters" name="ProcessIdScalars" />
@@ -166,10 +187,7 @@
   <Proxy group="filters" name="PythonCalculator" />
   <Proxy group="filters" name="PythonAnnotation" />
   <Proxy group="filters" name="PythonExtractSelection" />
-  <Proxy group="filters" name="QuadraturePointInterpolator" />
-  <Proxy group="filters" name="QuadraturePointsGenerator" />
-  <Proxy group="filters" name="QuadraturePointStatistics" />
-  <Proxy group="filters" name="QuadratureSchemeDictionaryGenerator" />
+
   <Proxy group="filters" name="QuadricClustering" />
   <Proxy group="filters" name="RectilinearGridConnectivity" />
   <Proxy group="filters" name="RectilinearGridToPointSet" />
@@ -189,6 +207,7 @@
   <Proxy group="filters" name="TemporalSnapToTimeStep" />
   <Proxy group="filters" name="TemporalShiftScale" />
   <Proxy group="filters" name="TemporalStatistics" />
+  <Proxy group="filters" name="TensorGlyph" />
   <Proxy group="filters" name="TessellatorFilter" />
   <Proxy group="filters" name="TextureMapToCylinder" />
   <Proxy group="filters" name="TextureMapToPlane" />
@@ -212,4 +231,5 @@
   <Proxy group="filters" name="GenericCut" />
   <Proxy group="filters" name="GenericStreamTracer" />
   <Proxy group="filters" name="GenericGeometryFilter" />
+  <Proxy group="filters" name="SliceAlongPolyLine" />
 </ParaViewFilters>

diff --git a/src/PVViewer/resources/ParaViewSources.xml b/src/PVViewer/resources/ParaViewSources.xml
old mode 100755 (executable)
new mode 100644 (file)