From: enk <enk@opencascade.com>
Date: Thu, 2 Nov 2006 14:21:36 +0000 (+0000)
Subject: Fix for Bug IPAL13723:
X-Git-Tag: mergeto_V3_2_0_maintainance_30Nov06~5
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=1d38e3a7cad0dcc5b54ebca6978aae76bfc67e2d;p=modules%2Fvisu.git

Fix for Bug IPAL13723:
enk/PRSMERGER: white scalar map on groups.

Fix for carre_en_quad4_seg2.med.
---

diff --git a/src/VISU_I/VISU_PrsMerger_i.cc b/src/VISU_I/VISU_PrsMerger_i.cc
index 8450d072..3c40a3f2 100644
--- a/src/VISU_I/VISU_PrsMerger_i.cc
+++ b/src/VISU_I/VISU_PrsMerger_i.cc
@@ -36,6 +36,7 @@
 #include "SUIT_ResourceMgr.h"
 
 #include <vtkUnstructuredGrid.h>
+#include <vtkCellType.h>
 #include <vtkProperty.h>
 #include <vtkMapper.h>
 
@@ -266,7 +267,8 @@ AddMeshOnGroup(const char* theMeshName,
   CORBA::Long aRetVal = -1;
   VISU::PIDMapper anIDMapper;
   anIDMapper = myResult->GetInput()->GetMeshOnGroup(theMeshName,theGroupName);
-
+  if(!anIDMapper)
+    MESSAGE("Warning: There are no mesh with group=|"<<theGroupName<<"|");
   VISU_MeshPL* aTmpMesh = VISU_MeshPL::New();
   aTmpMesh->SetIDMapper(anIDMapper);
 
@@ -336,6 +338,11 @@ SetScalarMap(const char* theMeshName,
   if (MYDEBUG) MESSAGE("VISU::PrsMerger_i::SetScalarMap");
   VISU::PIDMapper anIDMapper;
   anIDMapper = myResult->GetInput()->GetTimeStampOnMesh(theMeshName,(VISU::TEntity)theEntity,theFieldName,int(theStampsNum));
+
+  myEntity    = (VISU::TEntity)theEntity;
+  myFieldName = theFieldName;
+  myIteration = theStampsNum;
+
   myScalarsPL->SetIDMapper(anIDMapper);
   myPrsMergerPL->SetScalars(myScalarsPL);
 }
@@ -444,11 +451,33 @@ VISU::PrsMerger_i
   if(!anIDMapper) return false;
   
   bool aAllPoints = true;
-  for(int i=0;i<anIDMapper->GetVTKOutput()->GetNumberOfCells();i++)
-    if(anIDMapper->GetVTKOutput()->GetCellType(i) != 1){
-      aAllPoints = false;
+  if(anIDMapper->GetVTKOutput()->GetNumberOfCells()>0){
+    int aVtkCellType = anIDMapper->GetVTKOutput()->GetCellType(0);
+    if (MYDEBUG) MESSAGE("CellType="<<aVtkCellType);
+    switch(myEntity){
+    case NODE_ENTITY:
+    case CELL_ENTITY:
+      if(aVtkCellType != VTK_LINE &&
+	 aVtkCellType != VTK_POLY_LINE && 
+	 aVtkCellType != VTK_VERTEX &&
+	 aVtkCellType != VTK_PIXEL)
+	aAllPoints = false;
+      break;
+    case EDGE_ENTITY:
+      if(aVtkCellType == VTK_LINE ||
+	 aVtkCellType == VTK_POLY_LINE)
+	aAllPoints = false;
+      break;
+    case FACE_ENTITY:
+      if(aVtkCellType == VTK_TRIANGLE ||
+	 aVtkCellType == VTK_TRIANGLE_STRIP ||
+	 aVtkCellType == VTK_POLYGON ||
+	 aVtkCellType == VTK_QUAD)
+	aAllPoints = false;
       break;
     }
+  }
 
+  if (MYDEBUG) MESSAGE("return="<<!aAllPoints);
   return (!aAllPoints);
 }