From ce5b4c3c617a66fe574528db36a47dbd20affe33 Mon Sep 17 00:00:00 2001 From: vsr Date: Sat, 13 Mar 2021 12:53:43 +0300 Subject: [PATCH] bos #23995: Porting to ParaView 5.9 --- src/PVGUI/PVGUI_Module.cxx | 2 +- .../plugin/JSONReaderModule/vtkJSONReader.cxx | 4 ++-- .../MEDLoaderForPV/MEDFileFieldRepresentationTree.cxx | 10 +++++----- .../plugin/MEDLoaderForPV/vtkGenerateVectors.cxx | 6 +++--- .../plugin/MEDReaderIO/vtkExtractCellType.cxx | 4 ++-- .../MEDReader/plugin/MEDReaderIO/vtkExtractGroup.cxx | 4 ++-- .../MEDReaderIO/vtkInformationGaussDoubleVectorKey.h | 4 ++-- 7 files changed, 17 insertions(+), 17 deletions(-) diff --git a/src/PVGUI/PVGUI_Module.cxx b/src/PVGUI/PVGUI_Module.cxx index 08fc02d2..a472ce09 100644 --- a/src/PVGUI/PVGUI_Module.cxx +++ b/src/PVGUI/PVGUI_Module.cxx @@ -798,7 +798,7 @@ QString PVGUI_Module::getTraceString() vtkSMTrace* tracer = vtkSMTrace::GetActiveTracer(); if ( tracer ) { - traceString = tracer->GetCurrentTrace(); + traceString = tracer->GetCurrentTrace().c_str(); // 'import pvsimple' is necessary to fix the first call to DisableFirstRenderCamera in the paraview trace // 'ShowParaviewView()' ensure there is an opened viewing window (otherwise SEGFAULT!) traceString = "import pvsimple" + end_line + diff --git a/src/Plugins/JSONReader/plugin/JSONReaderModule/vtkJSONReader.cxx b/src/Plugins/JSONReader/plugin/JSONReaderModule/vtkJSONReader.cxx index ff72f761..082b322f 100644 --- a/src/Plugins/JSONReader/plugin/JSONReaderModule/vtkJSONReader.cxx +++ b/src/Plugins/JSONReader/plugin/JSONReaderModule/vtkJSONReader.cxx @@ -34,7 +34,7 @@ #include #include - +#include // Key words #define MD "_metadata" #define CMT "_comment" @@ -183,7 +183,7 @@ int vtkJSONReader::CanParseFile(const char *fname, Json::Value &root) return 0; } - ifstream file; + std::ifstream file; std::ostringstream oss; bool parsedSuccess = true; Json::Reader reader; diff --git a/src/Plugins/MEDReader/plugin/MEDLoaderForPV/MEDFileFieldRepresentationTree.cxx b/src/Plugins/MEDReader/plugin/MEDLoaderForPV/MEDFileFieldRepresentationTree.cxx index 61edea6c..6b1857b6 100644 --- a/src/Plugins/MEDReader/plugin/MEDLoaderForPV/MEDFileFieldRepresentationTree.cxx +++ b/src/Plugins/MEDReader/plugin/MEDLoaderForPV/MEDFileFieldRepresentationTree.cxx @@ -43,7 +43,7 @@ #include "vtkInformationQuadratureSchemeDefinitionVectorKey.h" #include "vtkInformationIntegerKey.h" #include "vtkInformation.h" -#include "vtkDataArrayTemplate.h" +#include "vtkAOSDataArrayTemplate.h" #include "vtkIdTypeArray.h" #include "vtkDoubleArray.h" #include "vtkIntArray.h" @@ -118,7 +118,7 @@ vtkIdTypeArray *ELGACmp::isExisting(const std::vector& locsReallyUs template vtkIdTypeArray *ELGACmp::createNew(const MEDCoupling::MEDFileFieldGlobsReal *globs, const std::vector& locsReallyUsed, vtkDataArray *vtkd, vtkDataSet *ds, ExportedTinyInfo *internalInfo) const { - const int VTK_DATA_ARRAY_DELETE=vtkDataArrayTemplate::VTK_DATA_ARRAY_DELETE; + const int VTK_DATA_ARRAY_DELETE=vtkAOSDataArrayTemplate::VTK_DATA_ARRAY_DELETE; std::vector< std::vector > locNames(_loc_names); std::vector elgas(_elgas); std::vector< std::pair< vtkQuadratureSchemeDefinition *, unsigned char > > defs; @@ -263,9 +263,9 @@ template void AssignDataPointerToVTK(typename MEDFileVTKTraits::VtkType *vtkTab, typename MEDFileVTKTraits::MCType *mcTab, bool noCpyNumNodes) { if(noCpyNumNodes) - vtkTab->SetArray(mcTab->getPointer(),mcTab->getNbOfElems(),1,vtkDataArrayTemplate::VTK_DATA_ARRAY_FREE); + vtkTab->SetArray(mcTab->getPointer(),mcTab->getNbOfElems(),1,vtkAOSDataArrayTemplate::VTK_DATA_ARRAY_FREE); else - { vtkTab->SetArray(mcTab->getPointer(),mcTab->getNbOfElems(),0,vtkDataArrayTemplate::VTK_DATA_ARRAY_FREE); mcTab->accessToMemArray().setSpecificDeallocator(0); } + { vtkTab->SetArray(mcTab->getPointer(),mcTab->getNbOfElems(),0,vtkAOSDataArrayTemplate::VTK_DATA_ARRAY_FREE); mcTab->accessToMemArray().setSpecificDeallocator(0); } } // here copy is always assumed. @@ -291,7 +291,7 @@ void AssignToFieldData(DataArray *vPtr, const MEDTimeReq *tr, vtkFieldData *att, const std::vector& discs, const ELGACmp& elgaCmp, const MEDCoupling::MEDFileFieldGlobsReal *globs, MEDFileAnyTypeField1TS *f1ts, vtkDataSet *ds, ExportedTinyInfo *internalInfo) { - const int VTK_DATA_ARRAY_DELETE=vtkDataArrayTemplate::VTK_DATA_ARRAY_DELETE; + const int VTK_DATA_ARRAY_DELETE=vtkAOSDataArrayTemplate::VTK_DATA_ARRAY_DELETE; typename MEDFileVTKTraits::MCType *vi(static_cast::MCType *>(vPtr)); typename MEDFileVTKTraits::VtkType *vtkd(MEDFileVTKTraits::VtkType::New()); vtkd->SetNumberOfComponents((int)vi->getNumberOfComponents()); diff --git a/src/Plugins/MEDReader/plugin/MEDLoaderForPV/vtkGenerateVectors.cxx b/src/Plugins/MEDReader/plugin/MEDLoaderForPV/vtkGenerateVectors.cxx index 56cc3164..53f2f4c6 100644 --- a/src/Plugins/MEDReader/plugin/MEDLoaderForPV/vtkGenerateVectors.cxx +++ b/src/Plugins/MEDReader/plugin/MEDLoaderForPV/vtkGenerateVectors.cxx @@ -19,7 +19,7 @@ // Author : Anthony Geay #include "vtkGenerateVectors.h" -#include "vtkDataArrayTemplate.h" +#include "vtkAOSDataArrayTemplate.h" #include "vtkDoubleArray.h" #include "vtkInformation.h" #include "vtkUnstructuredGrid.h" @@ -83,7 +83,7 @@ void vtkGenerateVectors::Operate(vtkFieldData *fd) vtkDoubleArray *vtkGenerateVectors::Operate2Compo(vtkDoubleArray *oldArr) { - const int VTK_DATA_ARRAY_FREE=vtkDataArrayTemplate::VTK_DATA_ARRAY_FREE; + const int VTK_DATA_ARRAY_FREE=vtkAOSDataArrayTemplate::VTK_DATA_ARRAY_FREE; vtkDoubleArray *ret(vtkDoubleArray::New()); vtkIdType nbOfTuples(oldArr->GetNumberOfTuples()); const double *inPt(oldArr->GetPointer(0)); @@ -106,7 +106,7 @@ vtkDoubleArray *vtkGenerateVectors::Operate2Compo(vtkDoubleArray *oldArr) vtkDoubleArray *vtkGenerateVectors::OperateMoreThan3Compo(vtkDoubleArray *oldArr) { - const int VTK_DATA_ARRAY_FREE=vtkDataArrayTemplate::VTK_DATA_ARRAY_FREE; + const int VTK_DATA_ARRAY_FREE=vtkAOSDataArrayTemplate::VTK_DATA_ARRAY_FREE; vtkDoubleArray *ret(vtkDoubleArray::New()); int nbOfCompo(oldArr->GetNumberOfComponents()); vtkIdType nbOfTuples(oldArr->GetNumberOfTuples()); diff --git a/src/Plugins/MEDReader/plugin/MEDReaderIO/vtkExtractCellType.cxx b/src/Plugins/MEDReader/plugin/MEDReaderIO/vtkExtractCellType.cxx index bb3fc7c9..03a0b8b6 100644 --- a/src/Plugins/MEDReader/plugin/MEDReaderIO/vtkExtractCellType.cxx +++ b/src/Plugins/MEDReader/plugin/MEDReaderIO/vtkExtractCellType.cxx @@ -23,7 +23,7 @@ #include "MEDFileFieldOverView.hxx" #include "vtkAdjacentVertexIterator.h" -#include "vtkDataArrayTemplate.h" +#include "vtkAOSDataArrayTemplate.h" #include "vtkIntArray.h" #include "vtkCellData.h" #include "vtkPointData.h" @@ -371,7 +371,7 @@ int vtkExtractCellType::RequestInformation(vtkInformation * /*request*/, vtkInfo vtkDataSet *FilterFamilies(vtkDataSet *input, const std::vector& idsToKeep, bool insideOut) { - const int VTK_DATA_ARRAY_DELETE=vtkDataArrayTemplate::VTK_DATA_ARRAY_DELETE; + const int VTK_DATA_ARRAY_DELETE=vtkAOSDataArrayTemplate::VTK_DATA_ARRAY_DELETE; const char ZE_SELECTION_ARR_NAME[]="@@ZeSelection@@"; vtkDataSet *output(input->NewInstance()); output->ShallowCopy(input); diff --git a/src/Plugins/MEDReader/plugin/MEDReaderIO/vtkExtractGroup.cxx b/src/Plugins/MEDReader/plugin/MEDReaderIO/vtkExtractGroup.cxx index 5996b950..40a76ea6 100644 --- a/src/Plugins/MEDReader/plugin/MEDReaderIO/vtkExtractGroup.cxx +++ b/src/Plugins/MEDReader/plugin/MEDReaderIO/vtkExtractGroup.cxx @@ -25,7 +25,7 @@ #include "VTKMEDTraits.hxx" #include "vtkAdjacentVertexIterator.h" -#include "vtkDataArrayTemplate.h" +#include "vtkAOSDataArrayTemplate.h" #include "vtkIntArray.h" #include "vtkLongArray.h" #ifdef WIN32 @@ -135,7 +135,7 @@ vtkDataSet *FilterFamilies(vtkSmartPointer& thres, vtkDataSet *input, const std::set& idsToKeep, bool insideOut, const char *arrNameOfFamilyField, const char *associationForThreshold, bool& catchAll, bool& catchSmth) { - const int VTK_DATA_ARRAY_DELETE=vtkDataArrayTemplate::VTK_DATA_ARRAY_DELETE; + const int VTK_DATA_ARRAY_DELETE=vtkAOSDataArrayTemplate::VTK_DATA_ARRAY_DELETE; const char ZE_SELECTION_ARR_NAME[]="@@ZeSelection@@"; vtkDataSet *output(input->NewInstance()); output->ShallowCopy(input); diff --git a/src/Plugins/MEDReader/plugin/MEDReaderIO/vtkInformationGaussDoubleVectorKey.h b/src/Plugins/MEDReader/plugin/MEDReaderIO/vtkInformationGaussDoubleVectorKey.h index 47429cd5..3c72138f 100644 --- a/src/Plugins/MEDReader/plugin/MEDReaderIO/vtkInformationGaussDoubleVectorKey.h +++ b/src/Plugins/MEDReader/plugin/MEDReaderIO/vtkInformationGaussDoubleVectorKey.h @@ -26,7 +26,7 @@ class VTK_EXPORT vtkInformationGaussDoubleVectorKey : public vtkInformationDoubl { public: vtkTypeMacro(vtkInformationGaussDoubleVectorKey, vtkInformationDoubleVectorKey) - void PrintSelf(ostream& /*os*/, vtkIndent /*indent*/) VTK_OVERRIDE{} + void PrintSelf(ostream& /*os*/, vtkIndent /*indent*/) override {}; vtkInformationGaussDoubleVectorKey(const char* name, const char* location, int length = -1) : vtkInformationDoubleVectorKey(name, location, length) { } @@ -48,7 +48,7 @@ public: */ void CopyDefaultInformation(vtkInformation* /*request*/, vtkInformation* fromInfo, - vtkInformation* toInfo) VTK_OVERRIDE + vtkInformation* toInfo) override { this->ShallowCopy(fromInfo, toInfo); } -- 2.39.2