Merge from V6_5_BR 05/06/2012

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

diff --git a/src/SMDS/SMDS_UnstructuredGrid.hxx b/src/SMDS/SMDS_UnstructuredGrid.hxx
index 02bbf5f85446d4da6564b636d652dec91d670724..6cf909263b5f0816926342962623dfc3d0ee8246 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
@@ -24,6 +24,8 @@
 #ifndef _SMDS_UNSTRUCTUREDGRID_HXX
 #define _SMDS_UNSTRUCTUREDGRID_HXX
 
+#include "SMESH_SMDS.hxx"
+
 #include <vtkUnstructuredGrid.h>
 #include <vtkCellLinks.h>
 #include "chrono.hxx"
@@ -46,9 +48,10 @@
 
 class SMDS_Downward;
 class SMDS_Mesh;
+class SMDS_MeshCell;
 class SMDS_MeshVolume;
 
-class SMDS_CellLinks: public vtkCellLinks
+class SMDS_EXPORT SMDS_CellLinks: public vtkCellLinks
 {
 public:
   vtkCellLinks::Link* ResizeL(vtkIdType sz);
@@ -59,7 +62,7 @@ protected:
   ~SMDS_CellLinks();
 };
 
-class SMDS_UnstructuredGrid: public vtkUnstructuredGrid
+class SMDS_EXPORT SMDS_UnstructuredGrid: public vtkUnstructuredGrid
 {
 public:
   void setSMDS_mesh(SMDS_Mesh *mesh);
@@ -84,11 +87,11 @@ public:
   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;