Port for ParaView > 5.10.

diff --git a/src/PVGUI/PVGUI_Module_actions.cxx b/src/PVGUI/PVGUI_Module_actions.cxx
index 35d3fd0b815e3bb377c7c0272c974a29f4fe5f89..9231b3c2984d967cea5d7fa222a73f4555d3c923 100644 (file)
--- a/src/PVGUI/PVGUI_Module_actions.cxx
+++ b/src/PVGUI/PVGUI_Module_actions.cxx
@@ -245,7 +245,7 @@ void PVGUI_Module::pvCreateActions()
   anAction->setToolTip(tr("TOP_DELETE_ALL"));
   anAction->setStatusTip(tr("STB_DELETE_ALL"));
   registerAction(DeleteAllId, anAction);
-  new pqDeleteReaction(anAction, true);
+  new pqDeleteReaction(anAction, pqDeleteReaction::DeleteModes::ALL);
 
 
   // Setting

diff --git a/src/Plugins/CMakeLists.txt b/src/Plugins/CMakeLists.txt
index 9cfe8fe16d328e0ae16959174d89d43d216a8938..73d5bf8fa59a83678dad60a5610d34dcb5ad06b0 100644 (file)
--- a/src/Plugins/CMakeLists.txt
+++ b/src/Plugins/CMakeLists.txt
@@ -29,7 +29,7 @@ SET(_subdirs
   ArrayRenamer
   JSONReader
   DevelopedSurface
-  StaticMesh
+  #StaticMesh
   GaussToCell
   VoroGauss
   )

diff --git a/src/Plugins/DifferenceTimesteps/plugin/DifferenceTimestepsModule/vtkDifferenceTimestepsFilter.cxx b/src/Plugins/DifferenceTimesteps/plugin/DifferenceTimestepsModule/vtkDifferenceTimestepsFilter.cxx
index 5d34caa41f1dfbab71e205fb2e4ce6c73dbfcb4b..4e212bc43c60625ee56129be5b1d6304c98e88bc 100644 (file)
--- a/src/Plugins/DifferenceTimesteps/plugin/DifferenceTimestepsModule/vtkDifferenceTimestepsFilter.cxx
+++ b/src/Plugins/DifferenceTimesteps/plugin/DifferenceTimestepsModule/vtkDifferenceTimestepsFilter.cxx
@@ -280,7 +280,7 @@ int vtkDifferenceTimestepsFilter::RequestUpdateExtent(vtkInformation* /*theReque
 }
 
 //--------------------------------------------------------------------------------------------------
-int vtkDifferenceTimestepsFilter::RequestData(vtkInformation* vtkNotUsed(theRequest),
+/*int vtkDifferenceTimestepsFilter::RequestData(vtkInformation* vtkNotUsed(theRequest),
   vtkInformationVector** theInputVector, vtkInformationVector* theOutputVector)
 {
   // Get the information objects
@@ -317,7 +317,7 @@ int vtkDifferenceTimestepsFilter::RequestData(vtkInformation* vtkNotUsed(theRequ
   }
 
   return 1;
-}
+}*/
 
 //--------------------------------------------------------------------------------------------------
 vtkDataObject* vtkDifferenceTimestepsFilter::DifferenceDataObject(

diff --git a/src/Plugins/DifferenceTimesteps/plugin/DifferenceTimestepsModule/vtkDifferenceTimestepsFilter.h b/src/Plugins/DifferenceTimesteps/plugin/DifferenceTimestepsModule/vtkDifferenceTimestepsFilter.h
index aae94766705ff969fcfcc813a4880d9d7ca7a480..6df182926f9eb9cd0076179ba78518dade48302f 100644 (file)
--- a/src/Plugins/DifferenceTimesteps/plugin/DifferenceTimestepsModule/vtkDifferenceTimestepsFilter.h
+++ b/src/Plugins/DifferenceTimesteps/plugin/DifferenceTimestepsModule/vtkDifferenceTimestepsFilter.h
@@ -78,7 +78,7 @@ protected:
 
   int RequestUpdateExtent(vtkInformation*, vtkInformationVector**, vtkInformationVector*) override;
 
-  int RequestData(vtkInformation*, vtkInformationVector**, vtkInformationVector*) override;
+  //int RequestData(vtkInformation*, vtkInformationVector**, vtkInformationVector*) override;
 
   // Description:
   // General computation differences routine for any type on input data. This

diff --git a/src/Plugins/GaussToCell/plugin/GaussToCellModule/vtkGaussToCell.cxx b/src/Plugins/GaussToCell/plugin/GaussToCellModule/vtkGaussToCell.cxx
index 9a3018df4bec8c58fe84ed30020ba12a377b83da..2232ad95c37076b7f73120fa36c5944a17f89824 100644 (file)
--- a/src/Plugins/GaussToCell/plugin/GaussToCellModule/vtkGaussToCell.cxx
+++ b/src/Plugins/GaussToCell/plugin/GaussToCellModule/vtkGaussToCell.cxx
@@ -61,7 +61,7 @@
 #include "vtkWarpScalar.h"
 #include "vtkQuadratureSchemeDefinition.h"
 #include "vtkInformationQuadratureSchemeDefinitionVectorKey.h"
-#include "vtkCompositeDataToUnstructuredGridFilter.h"
+#include "vtkMergeBlocks.h"
 #include "vtkMultiBlockDataGroupFilter.h"
 
 #include "MEDCouplingMemArray.hxx"

diff --git a/src/Plugins/MEDReader/plugin/MEDReaderIO/vtkExtractGroup.cxx b/src/Plugins/MEDReader/plugin/MEDReaderIO/vtkExtractGroup.cxx
index c39dc03da3830800eeb39497967976ffdebc219b..f917c0c6e84cbe91787423c84259cdde3bf7519b 100644 (file)
--- a/src/Plugins/MEDReader/plugin/MEDReaderIO/vtkExtractGroup.cxx
+++ b/src/Plugins/MEDReader/plugin/MEDReaderIO/vtkExtractGroup.cxx
@@ -61,7 +61,7 @@
 #include "vtkDataObjectTreeIterator.h"
 #include "vtkThreshold.h"
 #include "vtkMultiBlockDataGroupFilter.h"
-#include "vtkCompositeDataToUnstructuredGridFilter.h"
+#include "vtkMergeBlocks.h"
 #include "vtkInformationDataObjectMetaDataKey.h"
 
 #include <map>
@@ -144,7 +144,8 @@ vtkDataSet *FilterFamilies(vtkSmartPointer<vtkThreshold>& thres,
   //vtkDataSetAttributes *dscOut(output->GetCellData()),*dscOut2(output->GetPointData()); // todo: unused
   //
   double vMin(insideOut==0?1.:0.),vMax(insideOut==0?2.:1.);
-  thres->ThresholdBetween(vMin,vMax);
+  thres->SetUpperThreshold(vMax);
+  thres->SetLowerThreshold(vMin);
   // OK for the output
   //
   CellPointExtractor cpe2(input);

diff --git a/src/Plugins/MEDReader/plugin/MEDReaderIO/vtkGroupAsMultiBlock.cxx b/src/Plugins/MEDReader/plugin/MEDReaderIO/vtkGroupAsMultiBlock.cxx
index 54473db14fef07f2767563a6296e47e2dbc02400..0caf2530d4b468754f40d041aeca622b15295dae 100644 (file)
--- a/src/Plugins/MEDReader/plugin/MEDReaderIO/vtkGroupAsMultiBlock.cxx
+++ b/src/Plugins/MEDReader/plugin/MEDReaderIO/vtkGroupAsMultiBlock.cxx
@@ -30,7 +30,7 @@
 #include <vtkCellData.h>
 #include "vtkMutableDirectedGraph.h"
 #include "vtkInformationDataObjectMetaDataKey.h"
-#include <vtkCompositeDataToUnstructuredGridFilter.h>
+#include <vtkMergeBlocks.h>
 #include <vtkMultiBlockDataGroupFilter.h>
 #include <vtkDoubleArray.h>
 #include <vtkInformation.h>

diff --git a/src/Plugins/MEDReader/plugin/MEDReaderIO/vtkGroupsNames.cxx b/src/Plugins/MEDReader/plugin/MEDReaderIO/vtkGroupsNames.cxx
index 1bed2b054f78a7472b3e51f631a5ed2c8448c6b5..32a8dd04b03aa79c47cc0c79119f0b2fcc2965d6 100644 (file)
--- a/src/Plugins/MEDReader/plugin/MEDReaderIO/vtkGroupsNames.cxx
+++ b/src/Plugins/MEDReader/plugin/MEDReaderIO/vtkGroupsNames.cxx
@@ -30,7 +30,7 @@
 #include <vtkCellData.h>
 #include "vtkMutableDirectedGraph.h"
 #include "vtkInformationDataObjectMetaDataKey.h"
-#include <vtkCompositeDataToUnstructuredGridFilter.h>
+#include <vtkMergeBlocks.h>
 #include <vtkMultiBlockDataGroupFilter.h>
 #include <vtkDoubleArray.h>
 #include <vtkInformation.h>

diff --git a/src/Plugins/MEDReader/plugin/MEDReaderIO/vtkMEDReader.cxx b/src/Plugins/MEDReader/plugin/MEDReaderIO/vtkMEDReader.cxx
index 66db0a4c9c6d96f30ce6094d63a73e030d70be68..2fba48c22cef0f920dbd8d78a1195c1fc945244a 100644 (file)
--- a/src/Plugins/MEDReader/plugin/MEDReaderIO/vtkMEDReader.cxx
+++ b/src/Plugins/MEDReader/plugin/MEDReaderIO/vtkMEDReader.cxx
@@ -50,7 +50,7 @@
 
 #ifdef MEDREADER_USE_MPI
 #include "vtkMultiProcessController.h"
-#include "vtkPUnstructuredGridGhostCellsGenerator.h"
+#include "vtkGhostCellsGenerator.h"
 #endif
 
 #include "MEDFileFieldRepresentationTree.hxx"
@@ -346,13 +346,14 @@ int vtkMEDReader::RequestData(vtkInformation *request, vtkInformationVector ** /
         nbParts = vmpc->GetNumberOfProcesses();
       if(this->Internal->GCGCP && nbParts>1)
       {
-        vtkSmartPointer<vtkPUnstructuredGridGhostCellsGenerator> gcg(vtkSmartPointer<vtkPUnstructuredGridGhostCellsGenerator>::New());
+        vtkSmartPointer<vtkGhostCellsGenerator> gcg(vtkSmartPointer<vtkGhostCellsGenerator>::New());
         {
           vtkDataSet *ret(RetrieveDataSetAtTime(reqTS,&ti));
           gcg->SetInputData(ret);
           ret->Delete();
         }
-        gcg->SetUseGlobalPointIds(true);
+        // To be checked
+        // gcg->SetUseGlobalPointIds(true);
         gcg->SetBuildIfRequired(false);
         gcg->Update();
         output->SetBlock(0,gcg->GetOutput());

diff --git a/src/Plugins/MEDReader/plugin/Test/testMEDReader13.py b/src/Plugins/MEDReader/plugin/Test/testMEDReader13.py
index aa2beb1d5cec4cf7f7a092089a2720c41343848f..0fbc7015fa2347faa57c21af1fcb57dd28967090 100644 (file)
--- a/src/Plugins/MEDReader/plugin/Test/testMEDReader13.py
+++ b/src/Plugins/MEDReader/plugin/Test/testMEDReader13.py
@@ -69,7 +69,7 @@ def test(baseline_file):
     #DataRepresentation2.SelectInputVectors = ['POINTS', 'fieldELNO_Vector']
     DataRepresentation2.ScalarOpacityUnitDistance = 1.7746382108908556
     DataRepresentation2.Texture = []
-    DataRepresentation2.ExtractedBlockIndex = 1
+    #DataRepresentation2.ExtractedBlockIndex = 1
     #DataRepresentation2.RadiusRange = [6.666666740784422e-05, 1.9999333620071411]
     DataRepresentation2.ScaleFactor = 0.19998666953397334
 

diff --git a/src/Plugins/MEDReader/plugin/Test/testMEDReader2.py b/src/Plugins/MEDReader/plugin/Test/testMEDReader2.py
index 887d7862cf1fe776a69a8acb39189189b2d2777e..fd9ac4994ee963a0c767474922b193684b3dbfb8 100644 (file)
--- a/src/Plugins/MEDReader/plugin/Test/testMEDReader2.py
+++ b/src/Plugins/MEDReader/plugin/Test/testMEDReader2.py
@@ -62,11 +62,12 @@ def GenerateCase():
 def test(baseline_file):
   fname = GenerateCase()
   ################### MED write is done -> Go to MEDReader
-  testMEDReader1=MEDReader(FileName=fname)
+  testMEDReader1=MEDReader(FileName=fname,registrationName='testMEDReader2.med')
   testMEDReader1.AllArrays=['TS0/mesh/ComSup0/ACellField@@][@@P0']
-  testMEDReader2=MEDReader(FileName=fname)
+  testMEDReader2=MEDReader(FileName=fname,registrationName='testMEDReader2_bis.med')
   testMEDReader2.AllArrays=['TS0/mesh/ComSup1/mesh@@][@@P0']
   GroupDatasets1=GroupDatasets(Input=[testMEDReader1,testMEDReader2])
+  #GroupDatasets1.BlockNames = ['testMEDReader2.med', 'testMEDReader2_bis.med']
 
   Clip1 = Clip(ClipType="Plane",Input=GroupDatasets1)
   Clip1.Scalars=['FamilyIdCell']
@@ -79,13 +80,12 @@ def test(baseline_file):
   DataRepresentation4.EdgeColor = [0.0, 0.0, 0.5000076295109483]
   DataRepresentation4.SelectionCellFieldDataArrayName = 'ACellField'
   DataRepresentation4.ScalarOpacityUnitDistance = 1.61104723630366
-  DataRepresentation4.ExtractedBlockIndex = 2
+  DataRepresentation4.BlockSelectors = ['/Root']
   DataRepresentation4.ScaleFactor = 0.6000000000000001
   DataRepresentation4.Visibility = 1
   DataRepresentation4.Representation = 'Wireframe'
-
   ExtractBlock1 = ExtractBlock(Input=Clip1)
-  ExtractBlock1.BlockIndices=[1, 2]
+  ExtractBlock1.Selectors = ['/Root/testMEDReader2med']
 
   DataRepresentation5 = Show()
   DataRepresentation5.EdgeColor = [0.0, 0.0, 0.5000076295109483]

diff --git a/src/Plugins/MEDReader/plugin/Test/testMEDReader3.py b/src/Plugins/MEDReader/plugin/Test/testMEDReader3.py
index ce301ee7bcce5402fb97c4660294cf3b660b677c..b1bb65ca834ecd9dafdb70639564bd1fd5c613c6 100644 (file)
--- a/src/Plugins/MEDReader/plugin/Test/testMEDReader3.py
+++ b/src/Plugins/MEDReader/plugin/Test/testMEDReader3.py
@@ -110,7 +110,7 @@ def test(baseline_file):
     DataRepresentation2.SelectionPointFieldDataArrayName='ANodeField'
     DataRepresentation2.SelectionCellFieldDataArrayName='FamilyIdCell'
     DataRepresentation2.ScalarOpacityUnitDistance=1.4142135623730951
-    DataRepresentation2.ExtractedBlockIndex=1
+    #DataRepresentation2.ExtractedBlockIndex=1
     DataRepresentation2.ScaleFactor=0.1
 
     a1_ANodeField_PVLookupTable=GetLookupTableForArray("ANodeField",1,RGBPoints=[0.0,0.23,0.299,0.754,4.0,0.706,0.016,0.15],VectorMode='Magnitude',NanColor=[0.25,0.0,0.0],

diff --git a/src/Plugins/ParaMEDCorba/plugin/ParaMEDMEM2VTK/VTKParaMEDFieldClient.cxx b/src/Plugins/ParaMEDCorba/plugin/ParaMEDMEM2VTK/VTKParaMEDFieldClient.cxx
index 5a059c2b7d0089f53a59db33ff8fab44d3387414..beeaaa589c8818a59011d789a9314af838b84903 100644 (file)
--- a/src/Plugins/ParaMEDCorba/plugin/ParaMEDMEM2VTK/VTKParaMEDFieldClient.cxx
+++ b/src/Plugins/ParaMEDCorba/plugin/ParaMEDMEM2VTK/VTKParaMEDFieldClient.cxx
@@ -24,7 +24,7 @@
 #include "vtkUnstructuredGrid.h"
 #include "vtkMultiBlockDataSet.h"
 #include "vtkMultiBlockDataGroupFilter.h"
-#include "vtkCompositeDataToUnstructuredGridFilter.h"
+#include "vtkMergeBlocks.h"
 
 std::vector<double> ParaMEDMEM2VTK::FillMEDCouplingParaFieldDoubleInstanceFrom(SALOME_MED::ParaMEDCouplingFieldDoubleCorbaInterface_ptr fieldPtr, int begin, int end,
                                                                                vtkMultiBlockDataSet *ret)
@@ -43,11 +43,11 @@ std::vector<double> ParaMEDMEM2VTK::FillMEDCouplingParaFieldDoubleInstanceFrom(S
       part->Delete();
     }
   tmp->Update();
-  vtkCompositeDataToUnstructuredGridFilter *tmp2=vtkCompositeDataToUnstructuredGridFilter::New();
+  vtkMergeBlocks *tmp2=vtkMergeBlocks::New();
   tmp2->SetInputData(tmp->GetOutput());
   tmp2->Update();
   //
-  vtkUnstructuredGrid *ret3=tmp2->GetOutput();
+  vtkUnstructuredGrid *ret3=static_cast<vtkUnstructuredGrid*>(tmp2->GetOutput());
   ret->SetBlock(0,ret3);
   //
   tmp->Delete();

diff --git a/src/Plugins/SimpleMode/plugin/SimpleModeModule/vtkSimpleMode.cxx b/src/Plugins/SimpleMode/plugin/SimpleModeModule/vtkSimpleMode.cxx
index 57d0476d0af46ec38a5bc4bad9b5f506c3e40aaa..a1ede3478cd3fd015c0f5c34630b8598110b2faa 100644 (file)
--- a/src/Plugins/SimpleMode/plugin/SimpleModeModule/vtkSimpleMode.cxx
+++ b/src/Plugins/SimpleMode/plugin/SimpleModeModule/vtkSimpleMode.cxx
@@ -24,7 +24,7 @@
 #include <vtkAlgorithmOutput.h>
 #include <vtkCellData.h>
 #include <vtkCharArray.h>
-#include <vtkCompositeDataToUnstructuredGridFilter.h>
+#include <vtkMergeBlocks.h>
 #include <vtkDataArraySelection.h>
 #include <vtkDataObjectTreeIterator.h>
 #include <vtkDataSet.h>

diff --git a/src/Plugins/StaticMesh/plugin/StaticMeshModule/vtkStaticPlaneCutter.h b/src/Plugins/StaticMesh/plugin/StaticMeshModule/vtkStaticPlaneCutter.h
index 9f74eb8c182fbb0b74760a59b833e890dc682e5f..ba836c440fe3b005ab11200d0adaba27a2f41d83 100644 (file)
--- a/src/Plugins/StaticMesh/plugin/StaticMeshModule/vtkStaticPlaneCutter.h
+++ b/src/Plugins/StaticMesh/plugin/StaticMeshModule/vtkStaticPlaneCutter.h
@@ -34,6 +34,7 @@
 #include <vtkNew.h>
 #include <vtkPlaneCutter.h>
 #include <vtkSmartPointer.h>
+#include <vtkUnstructuredGrid.h>
 
 #include <vector>
 

diff --git a/src/Plugins/VoroGauss/plugin/VoroGaussModule/vtkVoroGauss.cxx b/src/Plugins/VoroGauss/plugin/VoroGaussModule/vtkVoroGauss.cxx
index 5379218166d43b88bf93f2177ce78feff5d15f19..f8cb9f8444ac6be37accca42ccbe943238c60a21 100644 (file)
--- a/src/Plugins/VoroGauss/plugin/VoroGaussModule/vtkVoroGauss.cxx
+++ b/src/Plugins/VoroGauss/plugin/VoroGaussModule/vtkVoroGauss.cxx
@@ -61,7 +61,7 @@
 #include "vtkWarpScalar.h"
 #include "vtkQuadratureSchemeDefinition.h"
 #include "vtkInformationQuadratureSchemeDefinitionVectorKey.h"
-#include "vtkCompositeDataToUnstructuredGridFilter.h"
+#include "vtkMergeBlocks.h"
 #include "vtkMultiBlockDataGroupFilter.h"
 
 #include "MEDCouplingMemArray.hxx"
@@ -815,14 +815,14 @@ vtkSmartPointer<vtkUnstructuredGrid> ComputeVoroGauss(vtkUnstructuredGrid *usgIn
   if(res.empty())
     throw INTERP_KERNEL::Exception("Dataset is empty !");
   vtkSmartPointer<vtkMultiBlockDataGroupFilter> mb(vtkSmartPointer<vtkMultiBlockDataGroupFilter>::New());
-  vtkSmartPointer<vtkCompositeDataToUnstructuredGridFilter> cd(vtkSmartPointer<vtkCompositeDataToUnstructuredGridFilter>::New());
+  vtkSmartPointer<vtkMergeBlocks> cd(vtkSmartPointer<vtkMergeBlocks>::New());
   for(std::vector< vtkSmartPointer<vtkUnstructuredGrid> >::const_iterator it=res.begin();it!=res.end();it++)
     mb->AddInputData(*it);
   cd->SetInputConnection(mb->GetOutputPort());
   cd->SetMergePoints(0);
   cd->Update();
   vtkSmartPointer<vtkUnstructuredGrid> ret;
-  ret=cd->GetOutput();
+  ret=static_cast<vtkUnstructuredGrid*>(cd->GetOutput());
   return ret;
 }