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 8d71a8fd9dfe0ecfab5025967cf279d076513439..91b0479a27cfed043cd1a635b72107a4a91e96b6 100644 (file)
--- 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 19739281bac0efd4a8d1ed57c0b3f0ed0f97d13f..e98f9143ef6340d7a0692b7510414948be04a6cf 100644 (file)
--- a/src/Plugins/MedReader/IO/vtkExtractGroup.cxx
+++ b/src/Plugins/MedReader/IO/vtkExtractGroup.cxx
@@ -44,7 +44,7 @@
 //#include <vtkstd/map>
 //#include <vtkstd/deque>
 
-// 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 7943fd1a9246cd02fca602ae807846985500e436..3585fab30a50ea086b6632da21cea67800562f04 100644 (file)
--- a/src/Plugins/MedReader/IO/vtkGenerateStructElement.cxx
+++ b/src/Plugins/MedReader/IO/vtkGenerateStructElement.cxx
@@ -77,7 +77,7 @@ protected :
   std::map<std::string, vtkDataArray*> 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 c096256bf994b2bfbc731deeae5e43a66d0e1efc..1ae89113cd3c8d53377ab92332ae8f7e7f9e6be9 100644 (file)
--- 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 47990389b8d2294a1d3aa0ab3da76fe5a3cca478..94bf00e52aa07d1ae7e2f1568d9851379f127899 100644 (file)
--- a/src/Plugins/MedReader/IO/vtkMedConstantAttribute.cxx
+++ b/src/Plugins/MedReader/IO/vtkMedConstantAttribute.cxx
@@ -31,7 +31,7 @@
 #include <vector>
 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 0aa9c86baa981c34f62f192eb07b9ba2d95d0baa..bf4d77d7ad27921614dd8c0c849ca95aa46f5029 100644 (file)
--- 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 432d836e4013a0bef7b1c7dc59c60fa67ea993da..80fe2e8835cf3395c59d22a378f571c1f16f21b1 100644 (file)
--- 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 924cc856efab2227ea81e9bc8ebd3eac5b38c37e..a90f22cba659ff096fd24775bad450340300772a 100644 (file)
--- a/src/Plugins/MedReader/IO/vtkMedDriver30.cxx
+++ b/src/Plugins/MedReader/IO/vtkMedDriver30.cxx
@@ -58,7 +58,7 @@
 #include <algorithm>
 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 0960055c8b572558ac73968e3e26cb9a1afad5ec..0dd21523c998a0a93d17da10ade3130b15056f9e 100644 (file)
--- 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 ecf75d81d6d0eb114c73d5c5ce754006dd0eaf68..53959e1fa3850e94afada43b2911966d47b6777c 100644 (file)
--- 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 9de55e3ae2ee65ca027c39fab152858adff6d066..d203fef561a1c08bbccef115bd3bc934e8ba295a 100644 (file)
--- 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 5ca047dee61fbbb6cdd26868a30f114b4cc21ddf..ad3a60406f93caccfe71184d0e2925a9896a5a56 100644 (file)
--- 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 e528f2ce139f8f845ae0a0b72b046b8ab132a619..1bb4bd1e43a669da58f6bb364d9e2283e24215a9 100644 (file)
--- 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 188a6ffcc848aaf2a22af459fb66cd44376ad21a..aef1ecd1e842b79e6d8a932515930c56d346df14 100644 (file)
--- 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 2dd88932c2f37b53d8c4ccf55f6b499cd5820b46..a865a66de638fe9a9682930c531cfcd92606b24f 100644 (file)
--- 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 70b48f063e246e771b2eb2f24567641be7fe70b9..df0dacaeab5889e6d89356e3b3a7877b49708e11 100644 (file)
--- 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 a5b9147bd9cd870eabc3af36169574a33e7cc49c..80379a42015701f0ef7d6948737b4bfeaca083f7 100644 (file)
--- 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 e4ba27a12ed5232d3a20e3ec67d544900d0a12b9..4d4d20f2580d0b9f798da3396050112e42d1878b 100644 (file)
--- 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 9187d761f9b118179abaa1db6993fdeb9e0bd2a4..202383af6b2d24a45c7cc6d62256d99e9f362977 100644 (file)
--- 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 d2851a6a4615ce5b8db7f35712cac0e1454a561e..a782ef616624d35b330690bd5806fa3c768e3874 100644 (file)
--- 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 17d7da1d631dc4276b9dd5725109c7ad5db122ed..f4ffd6f787566ca68f5e797f9d030e802bac198b 100644 (file)
--- 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 f6075f3cd0dc42901cc130a66da358640c45288c..ff12a462b4cefd876d692bcc88125febd8f5490d 100644 (file)
--- 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 57d19e1c6f14bf35d405ca03804b7cf6feced805..6d2572f65ee02d608ee2bcac3e69a630cfa21c22 100644 (file)
--- 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 c56080c504b78101e16e8c014ae401af4b49b3d8..53e2e9cbd25e7f89cae7e121b7df0fecc77432de 100644 (file)
--- 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 0c749b0c5ff812f228e1adaf16b45b2c076deb34..2be247f0a2e90467ea690ed1bd7c39703dfd751e 100644 (file)
--- 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 d8af2007936d95511958701db0d846ccbbf58a68..6b4915cf7956f7896f233d5d981f655bbf056ca4 100644 (file)
--- 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 fddb066d0f7f15359f1bb4672697e50ae911fec3..4fb3484b3d22792753314e1b0925550dccef2b84 100644 (file)
--- 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 1b320cbbbe45fbc34149e8af943e592df37edf1e..3a00b906906b6b462fc135a962d51d9db7147a33 100644 (file)
--- a/src/Plugins/MedReader/IO/vtkMedLink.cxx
+++ b/src/Plugins/MedReader/IO/vtkMedLink.cxx
@@ -26,7 +26,7 @@
 #include <string>
 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 3406b8fab3b386d413d30c6788db943509bf4321..ec0013546bb34b5705838da2db271223eb1e5806 100644 (file)
--- 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 65398d2a41d16343214c856b3740b7a8fff2ecf0..b1ac7611babd226dd21a4dd90fe557026d47d442 100644 (file)
--- 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 d9721d40c5bfc5699f0f2600aa6cd63afc09c854..672dc1a385e05a72054cd83bc3ec4eb40d48ad0b 100644 (file)
--- 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 2623ae41fb376faede37c2cc2d47d3af18f30974..b76e3c1bb3cc826893dc7e83f8d65fd1e7a32da8 100644 (file)
--- 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 4e45660e928a8b79d9c6d0eab7fc047e067a2e82..f400bc356e083dafa92ae49b372a5e8e5e39ba7a 100644 (file)
--- 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 799d2b3ee51012521c07ac6dea4abf538dcee7c8..59d0ed35f1facc15f80ad52f8f638bdee8d3097e 100644 (file)
--- 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 0c0a38d0f1759e7fced4ddd94ec5881573248fa2..9b4df435c985a3cdb1e0e5215ae615cbe2db55bf 100644 (file)
--- 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 caf05acdebd286b2561f39d765eacc873ae093fa..b3c23b2ddbfee7c1faad36bc33adfb8614689953 100644 (file)
--- 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 8e3074e978ec2ece80d7a145d9811a93592ba0d1..ffc9ae099d45dbf1db10f61e6409a6169b40ff2a 100644 (file)
--- 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 18c9e582288617640b726dcdea7f47f9f350af59..cf24ade20d9c78abde47dd43edb627974e63193b 100644 (file)
--- 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 7b025a454c5baecb3aac39709f1961077991211a..b03ac2d94f34711eeb0a42c785a798795e28c32a 100644 (file)
--- a/src/Plugins/MedReader/IO/vtkMedVariableAttribute.cxx
+++ b/src/Plugins/MedReader/IO/vtkMedVariableAttribute.cxx
@@ -30,7 +30,7 @@
 #include <vector>
 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 97a4e37223af2244976b23f5e64451bccbf0b698..0b96cc29e0fbce5e525c7b0ef6788fe91c75150a 100644 (file)
--- 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">
 
+      <Hints>
+       <ReaderFactory extensions="med rmed"
+            file_description="MED Files">
+       </ReaderFactory>
+      </Hints>
+       
       <StringVectorProperty
         name="FileName"
         command="SetFileName"

diff --git a/src/Plugins/MedReader/ParaViewPlugin/Resources/pqMedReader.qrc b/src/Plugins/MedReader/ParaViewPlugin/Resources/pqMedReader.qrc
index bb1f914aa85a16e3431484666758065417537d2c..8030a8e24e2aa330242d7acf25688975fb2fe825 100644 (file)
--- a/src/Plugins/MedReader/ParaViewPlugin/Resources/pqMedReader.qrc
+++ b/src/Plugins/MedReader/ParaViewPlugin/Resources/pqMedReader.qrc
@@ -3,7 +3,6 @@
         <file>Icons/pqCellData16.png</file>
         <file>Icons/pqPointData16.png</file>
         <file>Icons/pqQuadratureData16.png</file>
-        <file>MedReaderClient.xml</file>
         <file>Icons/pqElnoData16.png</file>
     </qresource>
 </RCC>

diff --git a/src/Plugins/ParaMEDCorba/CMakeLists.txt b/src/Plugins/ParaMEDCorba/CMakeLists.txt
index 35a53b3772906e238d044769f5980bae7c6d9561..b866c28f4557a12273f767857a407a0c975a7923 100644 (file)
--- 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