From: apo <apo@opencascade.com>
Date: Mon, 26 Sep 2005 14:52:08 +0000 (+0000)
Subject: To fix a regression
X-Git-Tag: BR-D5-38-2003_D2005-12-10~133
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=c1d5ddb50978f305136ea0c859152f21372a88e3;p=modules%2Fvisu.git

To fix a regression
---

diff --git a/src/CONVERTOR/VISU_Convertor_impl.cxx b/src/CONVERTOR/VISU_Convertor_impl.cxx
index b64cd6d2..3a9db26d 100644
--- a/src/CONVERTOR/VISU_Convertor_impl.cxx
+++ b/src/CONVERTOR/VISU_Convertor_impl.cxx
@@ -58,7 +58,7 @@ static int MYVTKDEBUG = 0;
 
 #ifdef _DEBUG_
 static int MYDEBUG = 0;
-static int MYDEBUGWITHFILES = 1;
+static int MYDEBUGWITHFILES = 0;
 //#define _DEXCEPT_
 #else
 static int MYDEBUG = 0;
@@ -1292,9 +1292,8 @@ namespace
     int aNbTuples = theSource->GetNumberOfPoints();
     std::string aFieldName = GenerateFieldName(theField,theValForTime);
     INITMSG(MYDEBUG,"GetTimeStampOnGaussMesh - aNbTuples = "<<aNbTuples<<endl);
-    //
+
     vtkDataSetAttributes* aDataSetAttributes;
-    //
     switch(theField->myEntity){
     case VISU::NODE_ENTITY : 
       aDataSetAttributes = theSource->GetPointData();
@@ -1302,7 +1301,7 @@ namespace
     default: 
       aDataSetAttributes = theSource->GetCellData();
     }
-    //
+
     int aNbComp = theField->myNbComp;
     vtkFloatArray *aFloatArray = vtkFloatArray::New();
     switch(aNbComp){
@@ -1316,20 +1315,19 @@ namespace
     }
     aFloatArray->SetNumberOfTuples(aNbTuples);
     aFloatArray->SetName(aFieldName.c_str());
-    //
+
     vtkFloatArray *aDataArray = vtkFloatArray::New();
     aDataArray->SetNumberOfComponents(aNbComp);
     aDataArray->SetNumberOfTuples(aNbTuples);
     aDataSetAttributes->AddArray(aDataArray);
     aDataArray->SetName("VISU_FIELD");
-    //
+
     const TGeom2Value& aGeom2Value = theValForTime->myGeom2Value;
 
     PGaussMeshImpl aGaussMesh = theValForTime->myGaussMesh;
     const TGeom2GaussSubMesh& aGeom2GaussSubMesh = aGaussMesh->myGeom2GaussSubMesh;
     TGeom2GaussSubMesh::const_iterator anIter = aGeom2GaussSubMesh.begin();
     TVector<float> aDataValues(aNbComp);
-    //
     for(int aTupleId = 0; anIter != aGeom2GaussSubMesh.end(); anIter++){
       vtkIdType aGeom = anIter->first;
       PGaussSubMeshImpl aGaussSubMesh = anIter->second;
@@ -1353,17 +1351,13 @@ namespace
 	      "; aNbComp = "<<aNbComp<<
 	      "; aNbGauss = "<<aNbGauss<<
 	      endl);
-      //
+
       int aNbComp2 = aNbComp;
-      switch(aNbComp){
-	case 2:
-	case 4:
-	  aNbComp2 = 2;
-	  break;
-      default:
+      if(aNbComp == 2 || aNbComp == 4)
+	aNbComp2 = 2;
+      else if(aNbComp > 4)
 	aNbComp2 = 3;
-      }
-      //
+
       for(int iElem = 0; iElem < aNbElem; iElem++){
 	float aValue[] = {0.0, 0.0, 0.0};
 	TCValueSliceArr aValueSliceArr = aMeshValue.GetGaussValueSliceArr(iElem);