Merge branch 'master' into V9_3_BR

[modules/smesh.git] / src / StdMeshers_I / StdMeshers_CartesianParameters3D_i.hxx

diff --git a/src/StdMeshers_I/StdMeshers_CartesianParameters3D_i.hxx b/src/StdMeshers_I/StdMeshers_CartesianParameters3D_i.hxx
index a1f00f6059b24d160c9172d3f882bf835c9b6a75..03dad0cfbc62ccb25f0e44dae045c41d85eeb60c 100644 (file)
--- a/src/StdMeshers_I/StdMeshers_CartesianParameters3D_i.hxx
+++ b/src/StdMeshers_I/StdMeshers_CartesianParameters3D_i.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2013  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2019  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -6,7 +6,7 @@
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
 // License as published by the Free Software Foundation; either
-// version 2.1 of the License.
+// version 2.1 of the License, or (at your option) any later version.
 //
 // This library is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -46,7 +46,6 @@ class STDMESHERS_I_EXPORT StdMeshers_CartesianParameters3D_i:
  public:
   // Constructor
   StdMeshers_CartesianParameters3D_i( PortableServer::POA_ptr thePOA,
-                                      int                     theStudyId,
                                       ::SMESH_Gen*            theGenImpl );
   // Destructor
   virtual ~StdMeshers_CartesianParameters3D_i();
@@ -73,8 +72,8 @@ class STDMESHERS_I_EXPORT StdMeshers_CartesianParameters3D_i:
    *  \param internalPoints - points dividing a grid into parts along each direction
    *  \param axis - index of an axis counterd from zero, i.e. 0==X, 1==Y, 2==Z
    *
-   * Parameter t of spaceFunction f(t) is a position [0,1] withing bounding box of
-   * the shape to mesh or withing an interval defined by internal points
+   * Parameter t of spaceFunction f(t) is a position [0,1] within bounding box of
+   * the shape to mesh or within an interval defined by internal points
    */
   void SetGridSpacing(const SMESH::string_array& spaceFunctions,
                       const SMESH::double_array& internalPoints,
@@ -83,6 +82,30 @@ class STDMESHERS_I_EXPORT StdMeshers_CartesianParameters3D_i:
   void GetGridSpacing(SMESH::string_array_out xSpaceFunctions,
                       SMESH::double_array_out xInternalPoints,
                       CORBA::Short            axis) throw (SALOME::SALOME_Exception);
+  /*!
+   * Set custom direction of axes
+   */
+  void SetAxesDirs(const SMESH::DirStruct& x,
+                   const SMESH::DirStruct& y,
+                   const SMESH::DirStruct& z) throw (SALOME::SALOME_Exception);
+  void GetAxesDirs(SMESH::DirStruct& x,
+                   SMESH::DirStruct& y,
+                   SMESH::DirStruct& z);
+  /*!
+   * Set/unset a fixed point, at which a node will be created provided that grid
+   * is defined by spacing in all directions
+   */
+  void SetFixedPoint(const ::SMESH::PointStruct& p, CORBA::Boolean toUnset);
+  CORBA::Boolean GetFixedPoint(::SMESH::PointStruct& p);
+
+
+  /*!
+   * \brief Enables implementation of geometrical edges into the mesh. If this feature
+   *        is disabled, sharp edges of the shape are lost ("smoothed") in the mesh if
+   *        they don't coincide with the grid lines
+   */
+  void SetToAddEdges(CORBA::Boolean toAdd);
+  CORBA::Boolean GetToAddEdges();
 
   /*!
    * \brief Return true if the grid is defined by spacing functions and 
@@ -90,6 +113,14 @@ class STDMESHERS_I_EXPORT StdMeshers_CartesianParameters3D_i:
    */
   CORBA::Boolean IsGridBySpacing(CORBA::Short axis);
 
+  /*!
+   * Returns axes at which number of hexahedra is maximal
+   */
+  void ComputeOptimalAxesDirs(GEOM::GEOM_Object_ptr shape,
+                              CORBA::Boolean        isOrthogonal,
+                              SMESH::DirStruct&     x,
+                              SMESH::DirStruct&     y,
+                              SMESH::DirStruct&     z) throw (SALOME::SALOME_Exception);
   /*!
    * \brief Computes node coordinates by spacing functions
    *  \param x0 - lower coordinate
@@ -110,6 +141,13 @@ class STDMESHERS_I_EXPORT StdMeshers_CartesianParameters3D_i:
 
   // Verify whether hypothesis supports given entity type 
   CORBA::Boolean IsDimSupported( SMESH::Dimension type );
+
+
+  // Methods for copying mesh definition to other geometry
+  virtual bool getObjectsDependOn( std::vector< std::string > & entryArray,
+                                   std::vector< int >         & subIDArray ) const { return false; }
+  virtual bool setObjectsDependOn( std::vector< std::string > & entryArray,
+                                   std::vector< int >         & subIDArray ) { return true; }
 };
 
 #endif