From: rnv <rnv@opencascade.com>
Date: Thu, 8 May 2008 06:17:05 +0000 (+0000)
Subject: Elno visualization development.
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=af307974c45191338fd45cb1dfc63fb6ac880645;p=modules%2Fvisu.git

Elno visualization development.
---

diff --git a/src/CONVERTOR/VISU_MeshValue.cxx b/src/CONVERTOR/VISU_MeshValue.cxx
index 0ed64565..51b4a72d 100644
--- a/src/CONVERTOR/VISU_MeshValue.cxx
+++ b/src/CONVERTOR/VISU_MeshValue.cxx
@@ -378,12 +378,13 @@ namespace VISU
 		"; aNbElem = "<<aNbElem<<
 		"; aNbGauss = "<<aNbGauss<<
 		std::endl);
-
+        std::vector<int> med2visu(aNbGauss);
+        InitMed2VisuArray(med2visu,aEGeom);
 	for ( vtkIdType iElem = 0; iElem < aNbElem; iElem++ ) {
           const typename TMeshValue::TValueSliceArr& aValueSliceArr = aMeshValue->GetGaussValueSliceArr( iElem );          
 
           for( vtkIdType iGauss = 0; iGauss < aNbGauss; iGauss++ ) {
-            const typename TMeshValue::TCValueSlice& aValueSlice = aValueSliceArr[ iGauss ];
+            const typename TMeshValue::TCValueSlice& aValueSlice = aValueSliceArr[ med2visu[iGauss] ];
 
             for( vtkIdType iComp = 0; iComp < aNbComp; iComp++ ) {
               aDataValues[ iComp ] = aValueSlice[ iComp ];
@@ -596,4 +597,96 @@ 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)
+    case eSEG3:
+      anArray[0] = 0;
+      anArray[2] = 1;  
+      anArray[1] = 2;
+      break;
+#endif
+
+#if !(defined(VTK_QUADRATIC_TRIANGLE) && defined(VISU_USE_VTK_QUADRATIC)) && defined(VISU_ENABLE_QUADRATIC)
+    case eTRIA6:
+      anArray[0] = 0;
+      anArray[2] = 1;  
+      anArray[4] = 2;  
+      
+      anArray[1] = 3;
+      anArray[3] = 4;  
+      anArray[5] = 5;
+      break;
+#endif
+
+#if !(defined(VTK_QUADRATIC_QUAD) && defined(VISU_USE_VTK_QUADRATIC)) && defined(VISU_ENABLE_QUADRATIC)
+    case eQUAD8:
+      anArray[0] = 0;
+      anArray[2] = 1;  
+      anArray[4] = 2;  
+      anArray[6] = 3;  
+      
+      anArray[1] = 4;
+      anArray[3] = 5;  
+      anArray[5] = 6;  
+      anArray[7] = 7;
+      break;
+#endif
+    case eTETRA4:
+      anArray[0] = 0;
+      anArray[1] = 2;
+      anArray[2] = 1;  
+      anArray[3] = 3;
+      break;
+    case ePYRA5:
+      anArray[0] = 0;
+      anArray[1] = 3;  
+      anArray[2] = 2;
+      anArray[3] = 1;  
+      anArray[4] = 4;
+      break;
+#if (defined(VTK_QUADRATIC_TETRA) && defined(VISU_USE_VTK_QUADRATIC)) && defined(VISU_ENABLE_QUADRATIC)
+    case eTETRA10:
+      anArray[0] = 0;
+      anArray[1] = 2;
+      anArray[2] = 1;  
+      anArray[3] = 3;  
+      
+      anArray[4] = 6;
+      anArray[5] = 5;
+      anArray[6] = 4;  
+      
+      anArray[7] = 7;  
+      anArray[8] = 9;  
+      anArray[9] = 8;
+      break;
+#endif
+
+#if (defined(VTK_QUADRATIC_PYRAMID) && defined(VISU_USE_VTK_QUADRATIC)) && defined(VISU_ENABLE_QUADRATIC)
+    case ePYRA13:
+      anArray[0] = 0;
+      anArray[1] = 3;
+      anArray[2] = 2;  
+      anArray[3] = 1;  
+      anArray[4] = 4;
+      
+      anArray[5] = 5;
+      anArray[6] = 8;  
+      anArray[7] = 7;  
+      anArray[8] = 6;  
+      
+      anArray[9] = 9;  
+      anArray[10] = 12;  
+      anArray[11] = 11;  
+      anArray[12] = 10;  
+      break;
+#endif
+    default:
+      for(int i=0;i<anArray.size();i++){
+        anArray[i] = i;
+      }
+      break;
+    }
+  }
 }
diff --git a/src/CONVERTOR/VISU_MeshValue.hxx b/src/CONVERTOR/VISU_MeshValue.hxx
index f09fb783..220f5370 100644
--- a/src/CONVERTOR/VISU_MeshValue.hxx
+++ b/src/CONVERTOR/VISU_MeshValue.hxx
@@ -212,6 +212,9 @@ namespace VISU
 			  const PFieldImpl& theField, 
 			  const PValForTimeImpl& theValForTime);
 
+  void 
+  InitMed2VisuArray(std::vector<int>& anArray, EGeometry aEGeom);
+
 
   //---------------------------------------------------------------
 }