From: Adrien Bruneton Date: Thu, 13 Feb 2014 10:48:21 +0000 (+0100) Subject: Minimal porting of plugins to PV4.1 (MEDReader is still in its old version!!) X-Git-Tag: V7_3_1b1~2^2 X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=737a581068cf13fdf1dc14fc4b20f4503f8bd883;p=modules%2Fparavis.git Minimal porting of plugins to PV4.1 (MEDReader is still in its old version!!) --- diff --git a/src/Plugins/MedReader/CMakeLists.txt b/src/Plugins/MedReader/CMakeLists.txt index 8d71a8fd..91b0479a 100644 --- a/src/Plugins/MedReader/CMakeLists.txt +++ b/src/Plugins/MedReader/CMakeLists.txt @@ -61,7 +61,7 @@ OPTION(BUILD_SHARED_LIBS # Find dependant Library # SET(CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/CMake ${CMAKE_MODULE_PATH} ) -FIND_PACKAGE(MED REQUIRED) +#FIND_PACKAGE(MED REQUIRED) include_directories(${MED_INCLUDE_DIRS}) include_directories(${MEDFILE_INCLUDE_DIRS}) diff --git a/src/Plugins/MedReader/IO/vtkExtractGroup.cxx b/src/Plugins/MedReader/IO/vtkExtractGroup.cxx index 19739281..e98f9143 100644 --- a/src/Plugins/MedReader/IO/vtkExtractGroup.cxx +++ b/src/Plugins/MedReader/IO/vtkExtractGroup.cxx @@ -44,7 +44,7 @@ //#include //#include -// vtkCxxRevisionMacro(vtkExtractGroup, "$Revision$"); +// vtkCxxRevisionMacro(vtkExtractGroup, "$Revision: 1.2.2.2 $"); vtkStandardNewMacro(vtkExtractGroup); vtkCxxSetObjectMacro(vtkExtractGroup, SIL, vtkMutableDirectedGraph); diff --git a/src/Plugins/MedReader/IO/vtkGenerateStructElement.cxx b/src/Plugins/MedReader/IO/vtkGenerateStructElement.cxx index 7943fd1a..3585fab3 100644 --- a/src/Plugins/MedReader/IO/vtkGenerateStructElement.cxx +++ b/src/Plugins/MedReader/IO/vtkGenerateStructElement.cxx @@ -77,7 +77,7 @@ protected : std::map varAttribute; }; -// vtkCxxRevisionMacro(vtkGenerateStructElement, "$Revision$"); +// vtkCxxRevisionMacro(vtkGenerateStructElement, "$Revision: 1.2.2.2 $"); vtkStandardNewMacro(vtkGenerateStructElement); vtkGenerateStructElement::vtkGenerateStructElement() diff --git a/src/Plugins/MedReader/IO/vtkMedCartesianGrid.cxx b/src/Plugins/MedReader/IO/vtkMedCartesianGrid.cxx index c096256b..1ae89113 100644 --- a/src/Plugins/MedReader/IO/vtkMedCartesianGrid.cxx +++ b/src/Plugins/MedReader/IO/vtkMedCartesianGrid.cxx @@ -21,7 +21,7 @@ #include "vtkObjectFactory.h" -// vtkCxxRevisionMacro(vtkMedCartesianGrid, "$Revision$") +// vtkCxxRevisionMacro(vtkMedCartesianGrid, "$Revision: 1.2.2.2 $") vtkStandardNewMacro(vtkMedCartesianGrid) vtkMedCartesianGrid::vtkMedCartesianGrid() diff --git a/src/Plugins/MedReader/IO/vtkMedConstantAttribute.cxx b/src/Plugins/MedReader/IO/vtkMedConstantAttribute.cxx index 47990389..94bf00e5 100644 --- a/src/Plugins/MedReader/IO/vtkMedConstantAttribute.cxx +++ b/src/Plugins/MedReader/IO/vtkMedConstantAttribute.cxx @@ -31,7 +31,7 @@ #include using namespace std; -// vtkCxxRevisionMacro(vtkMedConstantAttribute, "$Revision$") +// vtkCxxRevisionMacro(vtkMedConstantAttribute, "$Revision: 1.2.2.2 $") vtkStandardNewMacro(vtkMedConstantAttribute); vtkCxxSetObjectMacro(vtkMedConstantAttribute, Values, vtkAbstractArray); diff --git a/src/Plugins/MedReader/IO/vtkMedCurvilinearGrid.cxx b/src/Plugins/MedReader/IO/vtkMedCurvilinearGrid.cxx index 0aa9c86b..bf4d77d7 100644 --- a/src/Plugins/MedReader/IO/vtkMedCurvilinearGrid.cxx +++ b/src/Plugins/MedReader/IO/vtkMedCurvilinearGrid.cxx @@ -34,7 +34,7 @@ vtkCxxSetObjectMacro(vtkMedCurvilinearGrid, Coordinates, vtkDataArray); -// vtkCxxRevisionMacro(vtkMedCurvilinearGrid, "$Revision$") +// vtkCxxRevisionMacro(vtkMedCurvilinearGrid, "$Revision: 1.2.2.2 $") vtkStandardNewMacro(vtkMedCurvilinearGrid) vtkMedCurvilinearGrid::vtkMedCurvilinearGrid() diff --git a/src/Plugins/MedReader/IO/vtkMedDriver.cxx b/src/Plugins/MedReader/IO/vtkMedDriver.cxx index 432d836e..80fe2e88 100644 --- a/src/Plugins/MedReader/IO/vtkMedDriver.cxx +++ b/src/Plugins/MedReader/IO/vtkMedDriver.cxx @@ -52,7 +52,7 @@ vtkCxxSetObjectMacro(vtkMedDriver, MedFile, vtkMedFile); -//vtkCxxRevisionMacro(vtkMedDriver, "$Revision$") +//vtkCxxRevisionMacro(vtkMedDriver, "$Revision: 1.2.2.3 $") vtkStandardNewMacro(vtkMedDriver) vtkMedDriver::vtkMedDriver() diff --git a/src/Plugins/MedReader/IO/vtkMedDriver30.cxx b/src/Plugins/MedReader/IO/vtkMedDriver30.cxx index 924cc856..a90f22cb 100644 --- a/src/Plugins/MedReader/IO/vtkMedDriver30.cxx +++ b/src/Plugins/MedReader/IO/vtkMedDriver30.cxx @@ -58,7 +58,7 @@ #include using namespace std; -// vtkCxxRevisionMacro(vtkMedDriver30, "$Revision$") +// vtkCxxRevisionMacro(vtkMedDriver30, "$Revision: 1.2.2.5 $") vtkStandardNewMacro(vtkMedDriver30) vtkMedDriver30::vtkMedDriver30() : vtkMedDriver() diff --git a/src/Plugins/MedReader/IO/vtkMedEntityArray.cxx b/src/Plugins/MedReader/IO/vtkMedEntityArray.cxx index 0960055c..0dd21523 100644 --- a/src/Plugins/MedReader/IO/vtkMedEntityArray.cxx +++ b/src/Plugins/MedReader/IO/vtkMedEntityArray.cxx @@ -49,7 +49,7 @@ vtkCxxSetObjectMacro(vtkMedEntityArray,NodeIndex,vtkMedIntArray); vtkCxxSetObjectMacro(vtkMedEntityArray,ParentGrid,vtkMedGrid); vtkCxxSetObjectMacro(vtkMedEntityArray,StructElement,vtkMedStructElement); -// vtkCxxRevisionMacro(vtkMedEntityArray, "$Revision$"); +// vtkCxxRevisionMacro(vtkMedEntityArray, "$Revision: 1.2.2.4 $"); vtkStandardNewMacro(vtkMedEntityArray); vtkMedEntityArray::vtkMedEntityArray() diff --git a/src/Plugins/MedReader/IO/vtkMedFactory.cxx b/src/Plugins/MedReader/IO/vtkMedFactory.cxx index ecf75d81..53959e1f 100644 --- a/src/Plugins/MedReader/IO/vtkMedFactory.cxx +++ b/src/Plugins/MedReader/IO/vtkMedFactory.cxx @@ -23,7 +23,7 @@ #include "vtkMedDriver30.h" -// vtkCxxRevisionMacro(vtkMedFactory, "$Revision$") +// vtkCxxRevisionMacro(vtkMedFactory, "$Revision: 1.2.2.2 $") vtkStandardNewMacro(vtkMedFactory) vtkMedFactory::vtkMedFactory() diff --git a/src/Plugins/MedReader/IO/vtkMedFamily.cxx b/src/Plugins/MedReader/IO/vtkMedFamily.cxx index 9de55e3a..d203fef5 100644 --- a/src/Plugins/MedReader/IO/vtkMedFamily.cxx +++ b/src/Plugins/MedReader/IO/vtkMedFamily.cxx @@ -28,7 +28,7 @@ vtkCxxGetObjectVectorMacro(vtkMedFamily, Group, vtkMedGroup); vtkCxxSetObjectVectorMacro(vtkMedFamily, Group, vtkMedGroup); -// vtkCxxRevisionMacro(vtkMedFamily, "$Revision$") +// vtkCxxRevisionMacro(vtkMedFamily, "$Revision: 1.2.2.2 $") vtkStandardNewMacro(vtkMedFamily) vtkMedFamily::vtkMedFamily() diff --git a/src/Plugins/MedReader/IO/vtkMedFamilyOnEntity.cxx b/src/Plugins/MedReader/IO/vtkMedFamilyOnEntity.cxx index 5ca047de..ad3a6040 100644 --- a/src/Plugins/MedReader/IO/vtkMedFamilyOnEntity.cxx +++ b/src/Plugins/MedReader/IO/vtkMedFamilyOnEntity.cxx @@ -32,7 +32,7 @@ vtkCxxSetObjectMacro(vtkMedFamilyOnEntity, EntityArray, vtkMedEntityArray); vtkCxxSetObjectMacro(vtkMedFamilyOnEntity, ParentGrid,vtkMedGrid); -// vtkCxxRevisionMacro(vtkMedFamilyOnEntity, "$Revision$"); +// vtkCxxRevisionMacro(vtkMedFamilyOnEntity, "$Revision: 1.2.2.2 $"); vtkStandardNewMacro(vtkMedFamilyOnEntity) vtkMedFamilyOnEntity::vtkMedFamilyOnEntity() diff --git a/src/Plugins/MedReader/IO/vtkMedFamilyOnEntityOnProfile.cxx b/src/Plugins/MedReader/IO/vtkMedFamilyOnEntityOnProfile.cxx index e528f2ce..1bb4bd1e 100644 --- a/src/Plugins/MedReader/IO/vtkMedFamilyOnEntityOnProfile.cxx +++ b/src/Plugins/MedReader/IO/vtkMedFamilyOnEntityOnProfile.cxx @@ -45,7 +45,7 @@ vtkCxxSetObjectMacro(vtkMedFamilyOnEntityOnProfile,FamilyOnEntity, vtkMedFamilyOnEntity); vtkCxxSetObjectMacro(vtkMedFamilyOnEntityOnProfile, Profile, vtkMedProfile); -// vtkCxxRevisionMacro(vtkMedFamilyOnEntityOnProfile, "$Revision$"); +// vtkCxxRevisionMacro(vtkMedFamilyOnEntityOnProfile, "$Revision: 1.2.2.4 $"); vtkStandardNewMacro(vtkMedFamilyOnEntityOnProfile) vtkMedFamilyOnEntityOnProfile::vtkMedFamilyOnEntityOnProfile() diff --git a/src/Plugins/MedReader/IO/vtkMedField.cxx b/src/Plugins/MedReader/IO/vtkMedField.cxx index 188a6ffc..aef1ecd1 100644 --- a/src/Plugins/MedReader/IO/vtkMedField.cxx +++ b/src/Plugins/MedReader/IO/vtkMedField.cxx @@ -38,7 +38,7 @@ vtkCxxSetObjectVectorMacro(vtkMedField, Interpolation, vtkMedInterpolation); vtkCxxSetObjectMacro(vtkMedField, ParentFile, vtkMedFile); -// vtkCxxRevisionMacro(vtkMedField, "$Revision$") +// vtkCxxRevisionMacro(vtkMedField, "$Revision: 1.2.2.3 $") vtkStandardNewMacro(vtkMedField) vtkMedField::vtkMedField() diff --git a/src/Plugins/MedReader/IO/vtkMedFieldOnProfile.cxx b/src/Plugins/MedReader/IO/vtkMedFieldOnProfile.cxx index 2dd88932..a865a66d 100644 --- a/src/Plugins/MedReader/IO/vtkMedFieldOnProfile.cxx +++ b/src/Plugins/MedReader/IO/vtkMedFieldOnProfile.cxx @@ -33,7 +33,7 @@ vtkCxxSetObjectMacro(vtkMedFieldOnProfile, Data, vtkDataArray); vtkCxxSetObjectMacro(vtkMedFieldOnProfile, Profile, vtkMedProfile); vtkCxxSetObjectMacro(vtkMedFieldOnProfile, ParentFieldOverEntity, vtkMedFieldOverEntity); -// vtkCxxRevisionMacro(vtkMedFieldOnProfile, "$Revision$") +// vtkCxxRevisionMacro(vtkMedFieldOnProfile, "$Revision: 1.2.2.2 $") vtkStandardNewMacro(vtkMedFieldOnProfile) vtkMedFieldOnProfile::vtkMedFieldOnProfile() diff --git a/src/Plugins/MedReader/IO/vtkMedFieldOverEntity.cxx b/src/Plugins/MedReader/IO/vtkMedFieldOverEntity.cxx index 70b48f06..df0dacae 100644 --- a/src/Plugins/MedReader/IO/vtkMedFieldOverEntity.cxx +++ b/src/Plugins/MedReader/IO/vtkMedFieldOverEntity.cxx @@ -34,7 +34,7 @@ vtkCxxSetObjectVectorMacro(vtkMedFieldOverEntity, FieldOnProfile, vtkMedFieldOnP vtkCxxSetObjectMacro(vtkMedFieldOverEntity, ParentStep, vtkMedFieldStep); -// vtkCxxRevisionMacro(vtkMedFieldOverEntity, "$Revision$") +// vtkCxxRevisionMacro(vtkMedFieldOverEntity, "$Revision: 1.2.2.2 $") vtkStandardNewMacro(vtkMedFieldOverEntity) vtkMedFieldOverEntity::vtkMedFieldOverEntity() diff --git a/src/Plugins/MedReader/IO/vtkMedFieldStep.cxx b/src/Plugins/MedReader/IO/vtkMedFieldStep.cxx index a5b9147b..80379a42 100644 --- a/src/Plugins/MedReader/IO/vtkMedFieldStep.cxx +++ b/src/Plugins/MedReader/IO/vtkMedFieldStep.cxx @@ -33,7 +33,7 @@ vtkCxxSetObjectVectorMacro(vtkMedFieldStep, FieldOverEntity, vtkMedFieldOverEnti vtkCxxSetObjectMacro(vtkMedFieldStep, ParentField, vtkMedField); vtkCxxSetObjectMacro(vtkMedFieldStep, PreviousStep, vtkMedFieldStep); -// vtkCxxRevisionMacro(vtkMedFieldStep, "$Revision$") +// vtkCxxRevisionMacro(vtkMedFieldStep, "$Revision: 1.2.2.2 $") vtkStandardNewMacro(vtkMedFieldStep) vtkMedFieldStep::vtkMedFieldStep() diff --git a/src/Plugins/MedReader/IO/vtkMedFile.cxx b/src/Plugins/MedReader/IO/vtkMedFile.cxx index e4ba27a1..4d4d20f2 100644 --- a/src/Plugins/MedReader/IO/vtkMedFile.cxx +++ b/src/Plugins/MedReader/IO/vtkMedFile.cxx @@ -56,7 +56,7 @@ vtkCxxSetObjectVectorMacro(vtkMedFile, SupportMesh, vtkMedMesh); vtkCxxSetObjectMacro(vtkMedFile, MedDriver, vtkMedDriver); -//vtkCxxRevisionMacro(vtkMedFile, "$Revision$") +//vtkCxxRevisionMacro(vtkMedFile, "$Revision: 1.2.2.2 $") vtkStandardNewMacro(vtkMedFile) vtkMedFile::vtkMedFile() diff --git a/src/Plugins/MedReader/IO/vtkMedFilter.cxx b/src/Plugins/MedReader/IO/vtkMedFilter.cxx index 9187d761..202383af 100644 --- a/src/Plugins/MedReader/IO/vtkMedFilter.cxx +++ b/src/Plugins/MedReader/IO/vtkMedFilter.cxx @@ -21,7 +21,7 @@ #include "vtkObjectFactory.h" -// vtkCxxRevisionMacro(vtkMedFilter, "$Revision$") +// vtkCxxRevisionMacro(vtkMedFilter, "$Revision: 1.2.2.2 $") vtkStandardNewMacro(vtkMedFilter) vtkMedFilter::vtkMedFilter() diff --git a/src/Plugins/MedReader/IO/vtkMedFraction.cxx b/src/Plugins/MedReader/IO/vtkMedFraction.cxx index d2851a6a..a782ef61 100644 --- a/src/Plugins/MedReader/IO/vtkMedFraction.cxx +++ b/src/Plugins/MedReader/IO/vtkMedFraction.cxx @@ -24,7 +24,7 @@ #include "vtkIntArray.h" #include "vtkDoubleArray.h" -// vtkCxxRevisionMacro(vtkMedFraction, "$Revision$") +// vtkCxxRevisionMacro(vtkMedFraction, "$Revision: 1.2.2.2 $") vtkStandardNewMacro(vtkMedFraction) vtkMedFraction::vtkMedFraction() diff --git a/src/Plugins/MedReader/IO/vtkMedGrid.cxx b/src/Plugins/MedReader/IO/vtkMedGrid.cxx index 17d7da1d..f4ffd6f7 100644 --- a/src/Plugins/MedReader/IO/vtkMedGrid.cxx +++ b/src/Plugins/MedReader/IO/vtkMedGrid.cxx @@ -40,7 +40,7 @@ vtkCxxSetObjectMacro(vtkMedGrid, PointGlobalIds, vtkMedIntArray); vtkCxxSetObjectMacro(vtkMedGrid, ParentMesh, vtkMedMesh); vtkCxxSetObjectMacro(vtkMedGrid, PreviousGrid, vtkMedGrid); -// vtkCxxRevisionMacro(vtkMedGrid, "$Revision$") +// vtkCxxRevisionMacro(vtkMedGrid, "$Revision: 1.2.2.2 $") vtkMedGrid::vtkMedGrid() { diff --git a/src/Plugins/MedReader/IO/vtkMedGroup.cxx b/src/Plugins/MedReader/IO/vtkMedGroup.cxx index f6075f3c..ff12a462 100644 --- a/src/Plugins/MedReader/IO/vtkMedGroup.cxx +++ b/src/Plugins/MedReader/IO/vtkMedGroup.cxx @@ -23,7 +23,7 @@ #include "vtkMedUtilities.h" -// vtkCxxRevisionMacro(vtkMedGroup, "$Revision$") +// vtkCxxRevisionMacro(vtkMedGroup, "$Revision: 1.2.2.2 $") vtkStandardNewMacro(vtkMedGroup) vtkMedGroup::vtkMedGroup() diff --git a/src/Plugins/MedReader/IO/vtkMedIntArray.cxx b/src/Plugins/MedReader/IO/vtkMedIntArray.cxx index 57d19e1c..6d2572f6 100644 --- a/src/Plugins/MedReader/IO/vtkMedIntArray.cxx +++ b/src/Plugins/MedReader/IO/vtkMedIntArray.cxx @@ -22,11 +22,12 @@ #include "vtkObjectFactory.h" //---------------------------------------------------------------------------- -// vtkCxxRevisionMacro(vtkMedIntArray, "$Revision$"); +// vtkCxxRevisionMacro(vtkMedIntArray, "$Revision: 1.2.2.2 $"); vtkStandardNewMacro(vtkMedIntArray); //---------------------------------------------------------------------------- -vtkMedIntArray::vtkMedIntArray(vtkIdType numComp): Superclass(numComp) +//vtkMedIntArray::vtkMedIntArray(vtkIdType numComp): Superclass(numComp) +vtkMedIntArray::vtkMedIntArray(): Superclass() { } diff --git a/src/Plugins/MedReader/IO/vtkMedIntArray.h b/src/Plugins/MedReader/IO/vtkMedIntArray.h index c56080c5..53e2e9cb 100644 --- a/src/Plugins/MedReader/IO/vtkMedIntArray.h +++ b/src/Plugins/MedReader/IO/vtkMedIntArray.h @@ -61,7 +61,7 @@ public : vtkTypeMacro(vtkMedIntArray,vtkMedIntArraySuperclass); void PrintSelf(ostream& os, vtkIndent indent); protected: - vtkMedIntArray(vtkIdType numComp=1); + vtkMedIntArray(); // (vtkIdType numComp=1) ~vtkMedIntArray(); }; diff --git a/src/Plugins/MedReader/IO/vtkMedIntArrayInternal.cxx b/src/Plugins/MedReader/IO/vtkMedIntArrayInternal.cxx index 0c749b0c..2be247f0 100644 --- a/src/Plugins/MedReader/IO/vtkMedIntArrayInternal.cxx +++ b/src/Plugins/MedReader/IO/vtkMedIntArrayInternal.cxx @@ -33,11 +33,12 @@ VTK_ARRAY_ITERATOR_TEMPLATE_INSTANTIATE(med_int); #include "vtkObjectFactory.h" -// vtkCxxRevisionMacro(vtkMedIntArrayInternal, "$Revision$"); +// vtkCxxRevisionMacro(vtkMedIntArrayInternal, "$Revision: 1.2.2.2 $"); vtkStandardNewMacro(vtkMedIntArrayInternal); //---------------------------------------------------------------------------- -vtkMedIntArrayInternal::vtkMedIntArrayInternal(vtkIdType numComp): RealSuperclass(numComp) +//vtkMedIntArrayInternal::vtkMedIntArrayInternal(vtkIdType numComp): RealSuperclass(numComp) +vtkMedIntArrayInternal::vtkMedIntArrayInternal(): RealSuperclass() { } diff --git a/src/Plugins/MedReader/IO/vtkMedIntArrayInternal.h b/src/Plugins/MedReader/IO/vtkMedIntArrayInternal.h index d8af2007..6b4915cf 100644 --- a/src/Plugins/MedReader/IO/vtkMedIntArrayInternal.h +++ b/src/Plugins/MedReader/IO/vtkMedIntArrayInternal.h @@ -131,7 +131,7 @@ public: { this->RealSuperclass::SetArray(array, size, save, deleteMethod); } protected: - vtkMedIntArrayInternal(vtkIdType numComp=1); + vtkMedIntArrayInternal(); // (vtkIdType numComp=1); ~vtkMedIntArrayInternal(); private: diff --git a/src/Plugins/MedReader/IO/vtkMedInterpolation.cxx b/src/Plugins/MedReader/IO/vtkMedInterpolation.cxx index fddb066d..4fb3484b 100644 --- a/src/Plugins/MedReader/IO/vtkMedInterpolation.cxx +++ b/src/Plugins/MedReader/IO/vtkMedInterpolation.cxx @@ -24,7 +24,7 @@ #include "vtkMedUtilities.h" #include "vtkMedFraction.h" -// vtkCxxRevisionMacro(vtkMedInterpolation, "$Revision$") +// vtkCxxRevisionMacro(vtkMedInterpolation, "$Revision: 1.2.2.2 $") vtkStandardNewMacro(vtkMedInterpolation) vtkCxxGetObjectVectorMacro(vtkMedInterpolation, BasisFunction, diff --git a/src/Plugins/MedReader/IO/vtkMedLink.cxx b/src/Plugins/MedReader/IO/vtkMedLink.cxx index 1b320cbb..3a00b906 100644 --- a/src/Plugins/MedReader/IO/vtkMedLink.cxx +++ b/src/Plugins/MedReader/IO/vtkMedLink.cxx @@ -26,7 +26,7 @@ #include using namespace std; -// vtkCxxRevisionMacro(vtkMedLink, "$Revision$") +// vtkCxxRevisionMacro(vtkMedLink, "$Revision: 1.2.2.2 $") vtkStandardNewMacro(vtkMedLink) vtkMedLink::vtkMedLink() diff --git a/src/Plugins/MedReader/IO/vtkMedLocalization.cxx b/src/Plugins/MedReader/IO/vtkMedLocalization.cxx index 3406b8fa..ec001354 100644 --- a/src/Plugins/MedReader/IO/vtkMedLocalization.cxx +++ b/src/Plugins/MedReader/IO/vtkMedLocalization.cxx @@ -372,7 +372,7 @@ static const char* PYRA13_functions[PYRA13_nnode] = vtkCxxSetObjectMacro(vtkMedLocalization, ParentFile, vtkMedFile); vtkCxxSetObjectMacro(vtkMedLocalization, Interpolation, vtkMedInterpolation); -// vtkCxxRevisionMacro(vtkMedLocalization, "$Revision$") +// vtkCxxRevisionMacro(vtkMedLocalization, "$Revision: 1.2.2.3 $") vtkStandardNewMacro(vtkMedLocalization) vtkMedLocalization::vtkMedLocalization() diff --git a/src/Plugins/MedReader/IO/vtkMedMesh.cxx b/src/Plugins/MedReader/IO/vtkMedMesh.cxx index 65398d2a..b1ac7611 100644 --- a/src/Plugins/MedReader/IO/vtkMedMesh.cxx +++ b/src/Plugins/MedReader/IO/vtkMedMesh.cxx @@ -45,7 +45,7 @@ vtkCxxSetObjectVectorMacro(vtkMedMesh, CellGroup, vtkMedGroup); vtkCxxSetObjectMacro(vtkMedMesh, ParentFile, vtkMedFile); -// vtkCxxRevisionMacro(vtkMedMesh, "$Revision$") +// vtkCxxRevisionMacro(vtkMedMesh, "$Revision: 1.2.2.2 $") vtkStandardNewMacro(vtkMedMesh) vtkMedMesh::vtkMedMesh() diff --git a/src/Plugins/MedReader/IO/vtkMedPolarGrid.cxx b/src/Plugins/MedReader/IO/vtkMedPolarGrid.cxx index d9721d40..672dc1a3 100644 --- a/src/Plugins/MedReader/IO/vtkMedPolarGrid.cxx +++ b/src/Plugins/MedReader/IO/vtkMedPolarGrid.cxx @@ -21,7 +21,7 @@ #include "vtkObjectFactory.h" -// vtkCxxRevisionMacro(vtkMedPolarGrid, "$Revision$") +// vtkCxxRevisionMacro(vtkMedPolarGrid, "$Revision: 1.2.2.2 $") vtkStandardNewMacro(vtkMedPolarGrid) vtkMedPolarGrid::vtkMedPolarGrid() diff --git a/src/Plugins/MedReader/IO/vtkMedProfile.cxx b/src/Plugins/MedReader/IO/vtkMedProfile.cxx index 2623ae41..b76e3c1b 100644 --- a/src/Plugins/MedReader/IO/vtkMedProfile.cxx +++ b/src/Plugins/MedReader/IO/vtkMedProfile.cxx @@ -29,7 +29,7 @@ vtkCxxSetObjectMacro(vtkMedProfile,Ids,vtkMedIntArray); vtkCxxSetObjectMacro(vtkMedProfile,ParentFile,vtkMedFile); -// vtkCxxRevisionMacro(vtkMedProfile, "$Revision$"); +// vtkCxxRevisionMacro(vtkMedProfile, "$Revision: 1.2.2.2 $"); vtkStandardNewMacro(vtkMedProfile); vtkMedProfile::vtkMedProfile() diff --git a/src/Plugins/MedReader/IO/vtkMedReader.cxx b/src/Plugins/MedReader/IO/vtkMedReader.cxx index 4e45660e..f400bc35 100644 --- a/src/Plugins/MedReader/IO/vtkMedReader.cxx +++ b/src/Plugins/MedReader/IO/vtkMedReader.cxx @@ -204,7 +204,7 @@ public: }; -//vtkCxxRevisionMacro(vtkMedReader, "$Revision$"); +//vtkCxxRevisionMacro(vtkMedReader, "$Revision: 1.2.2.4 $"); vtkStandardNewMacro(vtkMedReader); vtkMedReader::vtkMedReader() diff --git a/src/Plugins/MedReader/IO/vtkMedRegularGrid.cxx b/src/Plugins/MedReader/IO/vtkMedRegularGrid.cxx index 799d2b3e..59d0ed35 100644 --- a/src/Plugins/MedReader/IO/vtkMedRegularGrid.cxx +++ b/src/Plugins/MedReader/IO/vtkMedRegularGrid.cxx @@ -36,7 +36,7 @@ vtkCxxGetObjectVectorMacro(vtkMedRegularGrid, AxisCoordinate, vtkDataArray); vtkCxxSetAbstractObjectVectorMacro(vtkMedRegularGrid, AxisCoordinate, vtkDataArray); -// vtkCxxRevisionMacro(vtkMedRegularGrid, "$Revision$") +// vtkCxxRevisionMacro(vtkMedRegularGrid, "$Revision: 1.2.2.2 $") vtkStandardNewMacro(vtkMedRegularGrid) vtkMedRegularGrid::vtkMedRegularGrid() diff --git a/src/Plugins/MedReader/IO/vtkMedSelection.cxx b/src/Plugins/MedReader/IO/vtkMedSelection.cxx index 0c0a38d0..9b4df435 100644 --- a/src/Plugins/MedReader/IO/vtkMedSelection.cxx +++ b/src/Plugins/MedReader/IO/vtkMedSelection.cxx @@ -34,7 +34,7 @@ public : vector< string > Keys; }; -// vtkCxxRevisionMacro(vtkMedSelection, "$Revision$") +// vtkCxxRevisionMacro(vtkMedSelection, "$Revision: 1.2.2.2 $") vtkStandardNewMacro(vtkMedSelection) vtkMedSelection::vtkMedSelection() diff --git a/src/Plugins/MedReader/IO/vtkMedStructElement.cxx b/src/Plugins/MedReader/IO/vtkMedStructElement.cxx index caf05acd..b3c23b2d 100644 --- a/src/Plugins/MedReader/IO/vtkMedStructElement.cxx +++ b/src/Plugins/MedReader/IO/vtkMedStructElement.cxx @@ -39,7 +39,7 @@ vtkCxxSetObjectVectorMacro(vtkMedStructElement, ConstantAttribute, vtkMedConstan vtkCxxSetObjectMacro(vtkMedStructElement, ParentFile, vtkMedFile); vtkCxxSetObjectMacro(vtkMedStructElement, SupportMesh, vtkMedMesh); -// vtkCxxRevisionMacro(vtkMedStructElement, "$Revision$") +// vtkCxxRevisionMacro(vtkMedStructElement, "$Revision: 1.2.2.2 $") vtkStandardNewMacro(vtkMedStructElement) vtkMedStructElement::vtkMedStructElement() diff --git a/src/Plugins/MedReader/IO/vtkMedSupportMesh.cxx b/src/Plugins/MedReader/IO/vtkMedSupportMesh.cxx index 8e3074e9..ffc9ae09 100644 --- a/src/Plugins/MedReader/IO/vtkMedSupportMesh.cxx +++ b/src/Plugins/MedReader/IO/vtkMedSupportMesh.cxx @@ -32,7 +32,7 @@ using namespace std; vtkCxxSetObjectMacro(vtkMedSupportMesh, ParentFile, vtkMedFile); -// vtkCxxRevisionMacro(vtkMedSupportMesh, "$Revision$") +// vtkCxxRevisionMacro(vtkMedSupportMesh, "$Revision: 1.2.2.2 $") vtkStandardNewMacro(vtkMedSupportMesh) vtkMedSupportMesh::vtkMedSupportMesh() diff --git a/src/Plugins/MedReader/IO/vtkMedUnstructuredGrid.cxx b/src/Plugins/MedReader/IO/vtkMedUnstructuredGrid.cxx index 18c9e582..cf24ade2 100644 --- a/src/Plugins/MedReader/IO/vtkMedUnstructuredGrid.cxx +++ b/src/Plugins/MedReader/IO/vtkMedUnstructuredGrid.cxx @@ -45,7 +45,7 @@ vtkCxxSetObjectMacro(vtkMedUnstructuredGrid,Coordinates,vtkDataArray); -// vtkCxxRevisionMacro(vtkMedUnstructuredGrid, "$Revision$") +// vtkCxxRevisionMacro(vtkMedUnstructuredGrid, "$Revision: 1.2.2.3 $") vtkStandardNewMacro(vtkMedUnstructuredGrid) vtkMedUnstructuredGrid::vtkMedUnstructuredGrid() diff --git a/src/Plugins/MedReader/IO/vtkMedVariableAttribute.cxx b/src/Plugins/MedReader/IO/vtkMedVariableAttribute.cxx index 7b025a45..b03ac2d9 100644 --- a/src/Plugins/MedReader/IO/vtkMedVariableAttribute.cxx +++ b/src/Plugins/MedReader/IO/vtkMedVariableAttribute.cxx @@ -30,7 +30,7 @@ #include using namespace std; -// vtkCxxRevisionMacro(vtkMedVariableAttribute, "$Revision$") +// vtkCxxRevisionMacro(vtkMedVariableAttribute, "$Revision: 1.2.2.2 $") vtkStandardNewMacro(vtkMedVariableAttribute); vtkCxxSetObjectMacro(vtkMedVariableAttribute, ParentStructElement, vtkMedStructElement); diff --git a/src/Plugins/MedReader/ParaViewPlugin/Resources/MedReaderServer.xml b/src/Plugins/MedReader/ParaViewPlugin/Resources/MedReaderServer.xml index 97a4e372..0b96cc29 100644 --- a/src/Plugins/MedReader/ParaViewPlugin/Resources/MedReaderServer.xml +++ b/src/Plugins/MedReader/ParaViewPlugin/Resources/MedReaderServer.xml @@ -6,6 +6,12 @@ class="vtkMedReader" label="MED Reader"> + + + + + Icons/pqCellData16.png Icons/pqPointData16.png Icons/pqQuadratureData16.png - MedReaderClient.xml Icons/pqElnoData16.png diff --git a/src/Plugins/ParaMEDCorba/CMakeLists.txt b/src/Plugins/ParaMEDCorba/CMakeLists.txt index 35a53b37..b866c28f 100644 --- a/src/Plugins/ParaMEDCorba/CMakeLists.txt +++ b/src/Plugins/ParaMEDCorba/CMakeLists.txt @@ -34,7 +34,7 @@ PROJECT( ParaMEDCorba ) INCLUDE( ${PARAVIEW_USE_FILE} ) - FIND_PACKAGE( VTK 6.0 COMPONENTS vtkClientServer NO_MODULE) + FIND_PACKAGE( VTK 6.1 COMPONENTS vtkClientServer NO_MODULE) INCLUDE( ${VTK_USE_FILE} ) SET( PARACORBAPLUG_SRCS