PR: synchro V7_main tag mergefrom_V6_main_06Mar13

[modules/smesh.git] / src / SMDS / SMDS_UnstructuredGrid.hxx

diff --git a/src/SMDS/SMDS_UnstructuredGrid.hxx b/src/SMDS/SMDS_UnstructuredGrid.hxx
index d2489a020668ef79439e9981a8d76c9fcfb008a2..4292dfd8df5c159e0f6bd30792c01c10b7d6de10 100644 (file)
--- a/src/SMDS/SMDS_UnstructuredGrid.hxx
+++ b/src/SMDS/SMDS_UnstructuredGrid.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2010-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2010-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -48,13 +48,13 @@
 
 class SMDS_Downward;
 class SMDS_Mesh;
+class SMDS_MeshCell;
 class SMDS_MeshVolume;
 
 class SMDS_EXPORT SMDS_CellLinks: public vtkCellLinks
 {
 public:
-  vtkCellLinks::Link* ResizeL(vtkIdType sz);
-  vtkIdType GetLinksSize();
+  void ResizeForPoint(vtkIdType vtkID);
   static SMDS_CellLinks* New();
 protected:
   SMDS_CellLinks();
@@ -65,12 +65,14 @@ class SMDS_EXPORT SMDS_UnstructuredGrid: public vtkUnstructuredGrid
 {
 public:
   void setSMDS_mesh(SMDS_Mesh *mesh);
-  void compactGrid(std::vector<int>& idNodesOldToNew, int newNodeSize, std::vector<int>& idCellsOldToNew,
-                   int newCellSize);
-
+  void compactGrid(std::vector<int>& idNodesOldToNew,
+                   int               newNodeSize,
+                   std::vector<int>& idCellsOldToNew,
+                   int               newCellSize);
   virtual unsigned long GetMTime();
-  virtual void Update();
-  virtual void UpdateInformation();
+  // OUV_PORTING_VTK6: seems to be useless
+  //virtual void Update();
+  //virtual void UpdateInformation();
   virtual vtkPoints *GetPoints();
 
   //#ifdef VTK_HAVE_POLYHEDRON
@@ -81,16 +83,17 @@ public:
   void setCellIdToDownId(int vtkCellId, int downId);
   void CleanDownwardConnectivity();
   void BuildDownwardConnectivity(bool withEdges);
-  int GetNeighbors(int* neighborsVtkIds, int* downIds, unsigned char* downTypes, int vtkId);
+  int GetNeighbors(int* neighborsVtkIds, int* downIds, unsigned char* downTypes, int vtkId, bool getSkin=false);
   int GetParentVolumes(int* volVtkIds, int vtkId);
   int GetParentVolumes(int* volVtkIds, int downId, unsigned char downType);
   void GetNodeIds(std::set<int>& nodeSet, int downId, unsigned char downType);
   void ModifyCellNodes(int vtkVolId, std::map<int, int> localClonedNodeIds);
-  int getOrderedNodesOfFace(int vtkVolId, std::vector<vtkIdType>& orderedNodes);
+  int getOrderedNodesOfFace(int vtkVolId, int& dim, std::vector<vtkIdType>& orderedNodes);
   void BuildLinks();
-  SMDS_MeshVolume* extrudeVolumeFromFace(int vtkVolId, int domain1, int domain2, std::set<int>& originalNodes,
-                                         std::map<int, std::map<int, int> >& nodeDomains,
-                                         std::map<int, std::map<long,int> >& nodeQuadDomains);
+  SMDS_MeshCell* extrudeVolumeFromFace(int vtkVolId, int domain1, int domain2,
+                                       std::set<int>&                      originalNodes,
+                                       std::map<int, std::map<int, int> >& nodeDomains,
+                                       std::map<int, std::map<long,int> >& nodeQuadDomains);
   vtkCellLinks* GetLinks()
   {
     return Links;
@@ -99,8 +102,13 @@ public:
   {
     return _downArray[vtkType];
   }
+  void AllocateDiameters( vtkIdType maxVtkID );
+  void SetBallDiameter( vtkIdType vtkID, double diameter );
+  double GetBallDiameter( vtkIdType vtkID ) const;
+
   static SMDS_UnstructuredGrid* New();
   SMDS_Mesh *_mesh;
+
 protected:
   SMDS_UnstructuredGrid();
   ~SMDS_UnstructuredGrid();