Join modifications from branch BR_DEBUG_3_2_0b1

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

diff --git a/src/SMDS/SMDS_VolumeTool.hxx b/src/SMDS/SMDS_VolumeTool.hxx
index 89732b1da2c265a8f4c40ec8f1eb3de77b7a4622..4c0e1a911b90d1bed377ba1d36afe4b9f2f13232 100644 (file)
--- a/src/SMDS/SMDS_VolumeTool.hxx
+++ b/src/SMDS/SMDS_VolumeTool.hxx
@@ -17,7 +17,7 @@
 //  License along with this library; if not, write to the Free Software 
 //  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA 
 // 
-//  See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org 
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
 //
 //
@@ -37,6 +37,18 @@ class SMDS_PolyhedralVolumeOfNodes;
 #include <vector>
 #include <set>
 
+//#ifdef WNT
+//#include <SALOME_WNT.hxx>
+//#else
+//#define SALOME_WNT_EXPORT
+//#endif
+
+#if defined WNT && defined WIN32 && defined SMDS_EXPORTS
+#define SMDS_WNT_EXPORT __declspec( dllexport )
+#else
+#define SMDS_WNT_EXPORT
+#endif
+
 // =========================================================================
 //
 // Class providing topological and other information about SMDS_MeshVolume:
@@ -45,10 +57,13 @@ class SMDS_PolyhedralVolumeOfNodes;
 //
 // =========================================================================
 
-class SMDS_VolumeTool
+class SMDS_WNT_EXPORT SMDS_VolumeTool
 {
  public:
 
+  enum VolumeType { UNKNOWN = -1, TETRA = 0, PYRAM, PENTA, HEXA, QUAD_TETRA,
+                    QUAD_PYRAM, QUAD_PENTA, QUAD_HEXA, POLYHEDA };
+
   SMDS_VolumeTool ();
   ~SMDS_VolumeTool ();
   SMDS_VolumeTool (const SMDS_MeshElement* theVolume);
@@ -61,6 +76,8 @@ class SMDS_VolumeTool
   // general info
   // -----------------------
 
+  VolumeType GetVolumeType() const;
+
   bool IsForward() const { return myVolForward; }
   // Check volume orientation. can be changed by Inverse().
   // See node order of forward volumes at the file bottom
@@ -158,8 +175,6 @@ class SMDS_VolumeTool
   // static methods for faces
   // ------------------------
 
-  enum VolumeType { UNKNOWN, TETRA, PYRAM, PENTA, HEXA };
-
   static VolumeType GetType(int nbNodes);
   // return VolumeType by nb of nodes in a volume