rnv: Remove VTK_QUADRATIC_<Element Type> macros from code, because them were removed...

diff --git a/src/CONVERTOR/VISU_ConvertorUtils.cxx b/src/CONVERTOR/VISU_ConvertorUtils.cxx
index 7b831c3b6d67f8eb9493baebd3cd639d825ddddb..ab8088d6b494dc866fff92b6b931abd6efb4a121 100644 (file)
--- a/src/CONVERTOR/VISU_ConvertorUtils.cxx
+++ b/src/CONVERTOR/VISU_ConvertorUtils.cxx
@@ -132,49 +132,49 @@ namespace VISU
 #else
 
     case VISU::eSEG3: 
-#if defined(VTK_QUADRATIC_EDGE) && defined(VISU_USE_VTK_QUADRATIC)
+#if defined(VISU_USE_VTK_QUADRATIC)
       return VTK_QUADRATIC_EDGE;
 #else
       return VTK_POLY_LINE;
 #endif
 
     case VISU::eTRIA6: 
-#if defined(VTK_QUADRATIC_TRIANGLE) && defined(VISU_USE_VTK_QUADRATIC)
+#if defined(VISU_USE_VTK_QUADRATIC)
       return VTK_QUADRATIC_TRIANGLE;
 #else
       return VTK_POLYGON;
 #endif
 
     case VISU::eQUAD8: 
-#if defined(VTK_QUADRATIC_QUAD) && defined(VISU_USE_VTK_QUADRATIC)
+#if defined(VISU_USE_VTK_QUADRATIC)
       return VTK_QUADRATIC_QUAD;
 #else
       return VTK_POLYGON;
 #endif
 
     case VISU::eTETRA10: 
-#if defined(VTK_QUADRATIC_TETRA) && defined(VISU_USE_VTK_QUADRATIC)
+#if defined(VISU_USE_VTK_QUADRATIC)
       return VTK_QUADRATIC_TETRA;
 #else
       return VTK_CONVEX_POINT_SET;
 #endif
 
     case VISU::eHEXA20: 
-#if defined(VTK_QUADRATIC_HEXAHEDRON) && defined(VISU_USE_VTK_QUADRATIC)
+#if defined(VISU_USE_VTK_QUADRATIC)
       return VTK_QUADRATIC_HEXAHEDRON;
 #else
       return VTK_CONVEX_POINT_SET;
 #endif
 
     case VISU::ePENTA15: 
-#if defined(VTK_QUADRATIC_WEDGE) && defined(VISU_USE_VTK_QUADRATIC)
+#if defined(VISU_USE_VTK_QUADRATIC)
       return VTK_QUADRATIC_WEDGE;
 #else
       return VTK_CONVEX_POINT_SET;
 #endif
 
     case VISU::ePYRA13: 
-#if defined(VTK_QUADRATIC_PYRAMID) && defined(VISU_USE_VTK_QUADRATIC)
+#if defined(VISU_USE_VTK_QUADRATIC)
       return VTK_QUADRATIC_PYRAMID;
 #else
       return VTK_CONVEX_POINT_SET;

diff --git a/src/CONVERTOR/VISU_MedConvertor.cxx b/src/CONVERTOR/VISU_MedConvertor.cxx
index a300bb77947379af82deb6121b0718af41e247ed..8801b54d9cf6632780367d792982de261594a0ae 100644 (file)
--- a/src/CONVERTOR/VISU_MedConvertor.cxx
+++ b/src/CONVERTOR/VISU_MedConvertor.cxx
@@ -2587,7 +2587,7 @@ VISU_MedConvertor
             }
             
             switch(aMGeom){
-#if !(defined(VTK_QUADRATIC_EDGE) && defined(VISU_USE_VTK_QUADRATIC)) && defined(VISU_ENABLE_QUADRATIC)
+#if !(defined(VISU_USE_VTK_QUADRATIC)) && defined(VISU_ENABLE_QUADRATIC)
             case MED::eSEG3:
               anArray[0] = aConnect[0];
               anArray[2] = aConnect[1];  
@@ -2595,7 +2595,7 @@ VISU_MedConvertor
               anArray[1] = aConnect[2];
               break;
 #endif
-#if !(defined(VTK_QUADRATIC_TRIANGLE) && defined(VISU_USE_VTK_QUADRATIC)) && defined(VISU_ENABLE_QUADRATIC)
+#if !(defined(VISU_USE_VTK_QUADRATIC)) && defined(VISU_ENABLE_QUADRATIC)
             case MED::eTRIA6:
               anArray[0] = aConnect[0];
               anArray[2] = aConnect[1];  
@@ -2606,7 +2606,7 @@ VISU_MedConvertor
               anArray[5] = aConnect[5];  
               break;
 #endif
-#if !(defined(VTK_QUADRATIC_QUAD) && defined(VISU_USE_VTK_QUADRATIC)) && defined(VISU_ENABLE_QUADRATIC)
+#if !(defined(VISU_USE_VTK_QUADRATIC)) && defined(VISU_ENABLE_QUADRATIC)
             case MED::eQUAD8:
               anArray[0] = aConnect[0];
               anArray[2] = aConnect[1];  
@@ -2619,7 +2619,7 @@ VISU_MedConvertor
               anArray[7] = aConnect[7];  
               break;
 #endif
-#if (defined(VTK_QUADRATIC_TETRA) && defined(VISU_USE_VTK_QUADRATIC)) && defined(VISU_ENABLE_QUADRATIC)
+#if (defined(VISU_USE_VTK_QUADRATIC)) && defined(VISU_ENABLE_QUADRATIC)
             case MED::eTETRA10:
               anArray[0] = aConnect[0];
               anArray[1] = aConnect[2];
@@ -2641,7 +2641,7 @@ VISU_MedConvertor
               anArray[2] = aConnect[1];  
               anArray[3] = aConnect[3];  
               break;
-#if (defined(VTK_QUADRATIC_PYRAMID) && defined(VISU_USE_VTK_QUADRATIC)) && defined(VISU_ENABLE_QUADRATIC)
+#if (defined(VISU_USE_VTK_QUADRATIC)) && defined(VISU_ENABLE_QUADRATIC)
             case MED::ePYRA13:
               anArray[0] = aConnect[0];
               anArray[1] = aConnect[3];

diff --git a/src/CONVERTOR/VISU_MeshValue.cxx b/src/CONVERTOR/VISU_MeshValue.cxx
index 75336eb62103dc239b69c269b67f603c1e9ded5b..123194f1d77fce41cdb30109a19879d6305db592 100644 (file)
--- a/src/CONVERTOR/VISU_MeshValue.cxx
+++ b/src/CONVERTOR/VISU_MeshValue.cxx
@@ -741,7 +741,7 @@ namespace VISU
 
   void InitMed2VisuArray(std::vector<int>& anArray, EGeometry aEGeom){
     switch(aEGeom){
-#if !(defined(VTK_QUADRATIC_EDGE) && defined(VISU_USE_VTK_QUADRATIC)) && defined(VISU_ENABLE_QUADRATIC)
+#if !(defined(VISU_USE_VTK_QUADRATIC)) && defined(VISU_ENABLE_QUADRATIC)
     case eSEG3:
       anArray[0] = 0;
       anArray[2] = 1;
@@ -749,7 +749,7 @@ namespace VISU
       break;
 #endif
 
-#if !(defined(VTK_QUADRATIC_TRIANGLE) && defined(VISU_USE_VTK_QUADRATIC)) && defined(VISU_ENABLE_QUADRATIC)
+#if !(defined(VISU_USE_VTK_QUADRATIC)) && defined(VISU_ENABLE_QUADRATIC)
     case eTRIA6:
       anArray[0] = 0;
       anArray[2] = 1;
@@ -761,7 +761,7 @@ namespace VISU
       break;
 #endif
 
-#if !(defined(VTK_QUADRATIC_QUAD) && defined(VISU_USE_VTK_QUADRATIC)) && defined(VISU_ENABLE_QUADRATIC)
+#if !(defined(VISU_USE_VTK_QUADRATIC)) && defined(VISU_ENABLE_QUADRATIC)
     case eQUAD8:
       anArray[0] = 0;
       anArray[2] = 1;
@@ -787,7 +787,7 @@ namespace VISU
       anArray[3] = 1;
       anArray[4] = 4;
       break;
-#if (defined(VTK_QUADRATIC_TETRA) && defined(VISU_USE_VTK_QUADRATIC)) && defined(VISU_ENABLE_QUADRATIC)
+#if (defined(VISU_USE_VTK_QUADRATIC)) && defined(VISU_ENABLE_QUADRATIC)
     case eTETRA10:
       anArray[0] = 0;
       anArray[1] = 2;
@@ -804,7 +804,7 @@ namespace VISU
       break;
 #endif
 
-#if (defined(VTK_QUADRATIC_PYRAMID) && defined(VISU_USE_VTK_QUADRATIC)) && defined(VISU_ENABLE_QUADRATIC)
+#if (defined(VISU_USE_VTK_QUADRATIC)) && defined(VISU_ENABLE_QUADRATIC)
     case ePYRA13:
       anArray[0] = 0;
       anArray[1] = 3;

diff --git a/src/CONVERTOR/VISU_Structures_impl.cxx b/src/CONVERTOR/VISU_Structures_impl.cxx
index d95491ca1500b93314fec9f15db3b1feb6d0aa12..773d6b113bbb43e580dae97862e14adb5b2b54b8 100644 (file)
--- a/src/CONVERTOR/VISU_Structures_impl.cxx
+++ b/src/CONVERTOR/VISU_Structures_impl.cxx
@@ -198,41 +198,28 @@ namespace VISU
       return VISU::ePOLYEDRE;
 
 #if defined(VISU_ENABLE_QUADRATIC) && defined(VISU_USE_VTK_QUADRATIC)
-  #if defined(VTK_QUADRATIC_EDGE)
+
     case VTK_QUADRATIC_EDGE:
       return VISU::eSEG3;
-  #endif
 
-  #if defined(VTK_QUADRATIC_TRIANGLE)
     case VTK_QUADRATIC_TRIANGLE:
       return VISU::eTRIA6;
-  #endif
 
-  #if defined(VTK_QUADRATIC_QUAD)
     case VTK_QUADRATIC_QUAD:
       return VISU::eQUAD8;
-  #endif
 
-  #if defined(VTK_QUADRATIC_TETRA)
     case VTK_QUADRATIC_TETRA:
       return VISU::eTETRA10;
-  #endif
 
-  #if defined(VTK_QUADRATIC_HEXAHEDRON)
     case VTK_QUADRATIC_HEXAHEDRON:
       return VISU::eHEXA20;
-  #endif
 
-  #if defined(VTK_QUADRATIC_WEDGE)
     case VTK_QUADRATIC_WEDGE:
       return VISU::ePENTA15;
-  #endif
 
-  #if defined(VTK_QUADRATIC_PYRAMID)
     case VTK_QUADRATIC_PYRAMID:
       return VISU::ePYRA13;
-  #endif
-
+      
 #endif //VISU_ENABLE_QUADRATIC
 
     default:
@@ -1523,7 +1510,7 @@ namespace VISU
   ::TValForTimeImpl():
     myGaussPtsIDFilter(new TGaussPtsIDFilter()),
     myUnstructuredGridIDMapper(new TUnstructuredGridIDMapperImpl()),
-       myIsFilled(false)
+  myIsFilled(false)
   {}
 
   const PMeshValue&

diff --git a/src/VISU_I/VISU_CorbaMedConvertor.cxx b/src/VISU_I/VISU_CorbaMedConvertor.cxx
index f888ebb378ae55b2140a785e588216e35ebbe803..51bee28fe128d278fddddf0dac5ef8db4a9691e9 100644 (file)
--- a/src/VISU_I/VISU_CorbaMedConvertor.cxx
+++ b/src/VISU_I/VISU_CorbaMedConvertor.cxx
@@ -1650,7 +1650,7 @@ VISU_MEDConvertor
             aConnect[k] = aConn[kj+k] - 1;
 
           switch(aMGeom){
-#if !(defined(VTK_QUADRATIC_EDGE) && defined(VISU_USE_VTK_QUADRATIC)) && defined(VISU_ENABLE_QUADRATIC)
+#if !(defined(VISU_USE_VTK_QUADRATIC)) && defined(VISU_ENABLE_QUADRATIC)
           case SALOME_MED::MED_SEG3:
             anArray[0] = aConnect[0];
             anArray[2] = aConnect[1];  
@@ -1658,7 +1658,7 @@ VISU_MEDConvertor
             anArray[1] = aConnect[2];
             break;
 #endif
-#if !(defined(VTK_QUADRATIC_TRIANGLE) && defined(VISU_USE_VTK_QUADRATIC)) && defined(VISU_ENABLE_QUADRATIC)
+#if !(defined(VISU_USE_VTK_QUADRATIC)) && defined(VISU_ENABLE_QUADRATIC)
           case SALOME_MED::MED_TRIA6:
             anArray[0] = aConnect[0];
             anArray[2] = aConnect[1];  
@@ -1669,7 +1669,7 @@ VISU_MEDConvertor
             anArray[5] = aConnect[5];  
             break;
 #endif
-#if !(defined(VTK_QUADRATIC_QUAD) && defined(VISU_USE_VTK_QUADRATIC)) && defined(VISU_ENABLE_QUADRATIC)
+#if !(defined(VISU_USE_VTK_QUADRATIC)) && defined(VISU_ENABLE_QUADRATIC)
           case SALOME_MED::MED_QUAD8:
             anArray[0] = aConnect[0];
             anArray[2] = aConnect[1];  
@@ -1682,7 +1682,7 @@ VISU_MEDConvertor
             anArray[7] = aConnect[7];  
             break;
 #endif
-#if (defined(VTK_QUADRATIC_TETRA) && defined(VISU_USE_VTK_QUADRATIC)) && defined(VISU_ENABLE_QUADRATIC)
+#if (defined(VISU_USE_VTK_QUADRATIC)) && defined(VISU_ENABLE_QUADRATIC)
           case SALOME_MED::MED_TETRA10 :
 #endif
           case SALOME_MED::MED_TETRA4 :
@@ -1691,7 +1691,7 @@ VISU_MEDConvertor
             anArray[2] = aConnect[3];  
             anArray[3] = aConnect[2];  
             break;
-#if (defined(VTK_QUADRATIC_PYRAMID) && defined(VISU_USE_VTK_QUADRATIC)) && defined(VISU_ENABLE_QUADRATIC)
+#if (defined(VISU_USE_VTK_QUADRATIC)) && defined(VISU_ENABLE_QUADRATIC)
           case SALOME_MED::MED_PYRA13:
 #endif
           case SALOME_MED::MED_PYRA5 :