From 1e8fcc7983f67ab45ad8978c61d9fd54979720b1 Mon Sep 17 00:00:00 2001 From: YOANN AUDOUIN Date: Tue, 13 Apr 2021 14:24:00 +0200 Subject: [PATCH] Issues/Warnings detected by Paraview 5.9 in some plugins --- .../ElectromagnetismRotationIO/CMakeLists.txt | 2 +- ...n.cxx => vtkPVMetaDataInformationERIO.cxx} | 20 +++++----- ...ation.h => vtkPVMetaDataInformationERIO.h} | 18 ++++----- .../pqElectroRotationGroupWidget.cxx | 6 +-- .../plugin/filters.xml | 38 +++++++++---------- .../vtkElectromagnetismVecteur.h | 5 ++- .../plugin/filters.xml | 12 ++---- 7 files changed, 48 insertions(+), 53 deletions(-) rename src/ElectromagnetismRotation/plugin/ElectromagnetismRotationIO/{vtkPVMetaDataInformation.cxx => vtkPVMetaDataInformationERIO.cxx} (86%) rename src/ElectromagnetismRotation/plugin/ElectromagnetismRotationIO/{vtkPVMetaDataInformation.h => vtkPVMetaDataInformationERIO.h} (76%) diff --git a/src/ElectromagnetismRotation/plugin/ElectromagnetismRotationIO/CMakeLists.txt b/src/ElectromagnetismRotation/plugin/ElectromagnetismRotationIO/CMakeLists.txt index d5c5fc4..a5ea190 100644 --- a/src/ElectromagnetismRotation/plugin/ElectromagnetismRotationIO/CMakeLists.txt +++ b/src/ElectromagnetismRotation/plugin/ElectromagnetismRotationIO/CMakeLists.txt @@ -19,7 +19,7 @@ set(classes vtkElectromagnetismRotation - vtkPVMetaDataInformation + vtkPVMetaDataInformationERIO ) vtk_module_add_module(ElectromagnetismRotationIO diff --git a/src/ElectromagnetismRotation/plugin/ElectromagnetismRotationIO/vtkPVMetaDataInformation.cxx b/src/ElectromagnetismRotation/plugin/ElectromagnetismRotationIO/vtkPVMetaDataInformationERIO.cxx similarity index 86% rename from src/ElectromagnetismRotation/plugin/ElectromagnetismRotationIO/vtkPVMetaDataInformation.cxx rename to src/ElectromagnetismRotation/plugin/ElectromagnetismRotationIO/vtkPVMetaDataInformationERIO.cxx index 975fa12..7457418 100644 --- a/src/ElectromagnetismRotation/plugin/ElectromagnetismRotationIO/vtkPVMetaDataInformation.cxx +++ b/src/ElectromagnetismRotation/plugin/ElectromagnetismRotationIO/vtkPVMetaDataInformationERIO.cxx @@ -18,7 +18,7 @@ // // Author : Anthony Geay -#include "vtkPVMetaDataInformation.h" +#include "vtkPVMetaDataInformationERIO.h" #include "vtkAlgorithm.h" #include "vtkAlgorithmOutput.h" @@ -35,8 +35,8 @@ #include -vtkStandardNewMacro(vtkPVMetaDataInformation); -vtkCxxSetObjectMacro(vtkPVMetaDataInformation, InformationData, vtkDataObject); +vtkStandardNewMacro(vtkPVMetaDataInformationERIO); +vtkCxxSetObjectMacro(vtkPVMetaDataInformationERIO, InformationData, vtkDataObject); static vtkInformationDataObjectMetaDataKey* GetMEDReaderMetaDataIfAny() { @@ -52,19 +52,19 @@ static vtkInformationDataObjectMetaDataKey* GetMEDReaderMetaDataIfAny() } //---------------------------------------------------------------------------- -vtkPVMetaDataInformation::vtkPVMetaDataInformation() +vtkPVMetaDataInformationERIO::vtkPVMetaDataInformationERIO() { this->InformationData = NULL; } //---------------------------------------------------------------------------- -vtkPVMetaDataInformation::~vtkPVMetaDataInformation() +vtkPVMetaDataInformationERIO::~vtkPVMetaDataInformationERIO() { this->SetInformationData(NULL); } //---------------------------------------------------------------------------- -void vtkPVMetaDataInformation::CopyFromObject(vtkObject* obj) +void vtkPVMetaDataInformationERIO::CopyFromObject(vtkObject* obj) { this->SetInformationData(NULL); @@ -95,7 +95,7 @@ void vtkPVMetaDataInformation::CopyFromObject(vtkObject* obj) } //---------------------------------------------------------------------------- -void vtkPVMetaDataInformation::CopyToStream(vtkClientServerStream* css) +void vtkPVMetaDataInformationERIO::CopyToStream(vtkClientServerStream* css) { css->Reset(); if (!this->InformationData) @@ -127,7 +127,7 @@ void vtkPVMetaDataInformation::CopyToStream(vtkClientServerStream* css) } //---------------------------------------------------------------------------- -void vtkPVMetaDataInformation::CopyFromStream(const vtkClientServerStream* css) +void vtkPVMetaDataInformationERIO::CopyFromStream(const vtkClientServerStream* css) { this->SetInformationData(0); vtkTypeUInt32 length; @@ -145,12 +145,12 @@ void vtkPVMetaDataInformation::CopyFromStream(const vtkClientServerStream* css) } } -void vtkPVMetaDataInformation::AddInformation(vtkPVInformation*) +void vtkPVMetaDataInformationERIO::AddInformation(vtkPVInformation*) { } //---------------------------------------------------------------------------- -void vtkPVMetaDataInformation::PrintSelf(ostream& os, vtkIndent indent) +void vtkPVMetaDataInformationERIO::PrintSelf(ostream& os, vtkIndent indent) { this->Superclass::PrintSelf(os, indent); os << indent << "InformationData: " << this->InformationData << endl; diff --git a/src/ElectromagnetismRotation/plugin/ElectromagnetismRotationIO/vtkPVMetaDataInformation.h b/src/ElectromagnetismRotation/plugin/ElectromagnetismRotationIO/vtkPVMetaDataInformationERIO.h similarity index 76% rename from src/ElectromagnetismRotation/plugin/ElectromagnetismRotationIO/vtkPVMetaDataInformation.h rename to src/ElectromagnetismRotation/plugin/ElectromagnetismRotationIO/vtkPVMetaDataInformationERIO.h index b2f3133..76db423 100644 --- a/src/ElectromagnetismRotation/plugin/ElectromagnetismRotationIO/vtkPVMetaDataInformation.h +++ b/src/ElectromagnetismRotation/plugin/ElectromagnetismRotationIO/vtkPVMetaDataInformationERIO.h @@ -18,19 +18,19 @@ // // Author : Anthony Geay -#ifndef __vtkPVMetaDataInformation_h -#define __vtkPVMetaDataInformation_h +#ifndef __vtkPVMetaDataInformationERIO_h +#define __vtkPVMetaDataInformationERIO_h #include "vtkPVInformation.h" class vtkDataObject; class vtkInformationDataObjectKey; -class VTK_EXPORT vtkPVMetaDataInformation : public vtkPVInformation +class VTK_EXPORT vtkPVMetaDataInformationERIO : public vtkPVInformation { public: - static vtkPVMetaDataInformation* New(); - vtkTypeMacro(vtkPVMetaDataInformation, vtkPVInformation); + static vtkPVMetaDataInformationERIO* New(); + vtkTypeMacro(vtkPVMetaDataInformationERIO, vtkPVInformation); void PrintSelf(ostream& os, vtkIndent indent); // Description: @@ -51,14 +51,14 @@ public: //BTX protected: - vtkPVMetaDataInformation(); - ~vtkPVMetaDataInformation(); + vtkPVMetaDataInformationERIO(); + ~vtkPVMetaDataInformationERIO(); void SetInformationData(vtkDataObject*); vtkDataObject* InformationData; private: - vtkPVMetaDataInformation(const vtkPVMetaDataInformation&); // Not implemented - void operator=(const vtkPVMetaDataInformation&); // Not implemented + vtkPVMetaDataInformationERIO(const vtkPVMetaDataInformationERIO&); // Not implemented + void operator=(const vtkPVMetaDataInformationERIO&); // Not implemented //ETX }; diff --git a/src/ElectromagnetismRotation/plugin/ParaViewPlugin/pqElectroRotationGroupWidget.cxx b/src/ElectromagnetismRotation/plugin/ParaViewPlugin/pqElectroRotationGroupWidget.cxx index 0ee85e5..6dbcb6b 100644 --- a/src/ElectromagnetismRotation/plugin/ParaViewPlugin/pqElectroRotationGroupWidget.cxx +++ b/src/ElectromagnetismRotation/plugin/ParaViewPlugin/pqElectroRotationGroupWidget.cxx @@ -21,7 +21,7 @@ #include "pqElectroRotationGroupWidget.h" #include "vtkElectromagnetismRotation.h" -#include "vtkPVMetaDataInformation.h" +#include "vtkPVMetaDataInformationERIO.h" #include "pqTreeWidget.h" #include "pqTreeWidgetItemObject.h" @@ -51,7 +51,7 @@ pqElectroRotationGroupWidget::~pqElectroRotationGroupWidget() void pqElectroRotationGroupWidget::loadTreeWidgetItems() { // Recover Graph - vtkPVMetaDataInformation *info(vtkPVMetaDataInformation::New()); + vtkPVMetaDataInformationERIO *info(vtkPVMetaDataInformationERIO::New()); this->proxy()->GatherInformation(info); vtkGraph* graph = vtkGraph::SafeDownCast(info->GetInformationData()); if(!graph) @@ -152,7 +152,7 @@ void pqElectroRotationGroupWidget::loadTreeWidgetItems() // Tooltip grpItem->setData(0, Qt::ToolTipRole, name); - + grpItem->setData(0, Qt::DecorationRole, QPixmap(":/ParaViewResources/Icons/pqCellData16.png")); } } diff --git a/src/ElectromagnetismStreamTraceur/plugin/filters.xml b/src/ElectromagnetismStreamTraceur/plugin/filters.xml index e3cbb89..68d2af8 100644 --- a/src/ElectromagnetismStreamTraceur/plugin/filters.xml +++ b/src/ElectromagnetismStreamTraceur/plugin/filters.xml @@ -58,25 +58,6 @@ the streamlines will be generated. - - - - - - - - - - - - - - - - - - - @@ -199,6 +180,25 @@ + + + + + + + + + + + + + + + + + + + diff --git a/src/ElectromagnetismVecteur/plugin/VecteurFilters/vtkElectromagnetismVecteur.h b/src/ElectromagnetismVecteur/plugin/VecteurFilters/vtkElectromagnetismVecteur.h index 47f9824..9cceb17 100644 --- a/src/ElectromagnetismVecteur/plugin/VecteurFilters/vtkElectromagnetismVecteur.h +++ b/src/ElectromagnetismVecteur/plugin/VecteurFilters/vtkElectromagnetismVecteur.h @@ -61,14 +61,15 @@ public: vtkSetClampMacro(MaximumNumberOfSamplePoints, int, 1, VTK_INT_MAX); vtkGetMacro(MaximumNumberOfSamplePoints, int); + static const char *GetColorArrayName(); + + protected: vtkElectromagnetismVecteur(); ~vtkElectromagnetismVecteur() override = default; int RequestData(vtkInformation*, vtkInformationVector**, vtkInformationVector*) override; - static const char *GetColorArrayName(); - double ScaleFactor; int GlyphMode; diff --git a/src/ElectromagnetismVecteur/plugin/filters.xml b/src/ElectromagnetismVecteur/plugin/filters.xml index 9877144..35edcf1 100644 --- a/src/ElectromagnetismVecteur/plugin/filters.xml +++ b/src/ElectromagnetismVecteur/plugin/filters.xml @@ -31,12 +31,6 @@ - - - - - - @@ -122,7 +116,7 @@ Every Nth Point. value="1" /> - + - -