22362: EDF SMESH: Quadrangle (mapping) algorithm: enforced vertices

[modules/smesh.git] / src / StdMeshers / StdMeshers_Quadrangle_2D.hxx

diff --git a/src/StdMeshers/StdMeshers_Quadrangle_2D.hxx b/src/StdMeshers/StdMeshers_Quadrangle_2D.hxx
index 9fe6e120a9b659da4b54ae693e3e5ef6f6713a2a..48ebdb21dd2dde38618107202608a834b69a468b 100644 (file)
--- a/src/StdMeshers/StdMeshers_Quadrangle_2D.hxx
+++ b/src/StdMeshers/StdMeshers_Quadrangle_2D.hxx
@@ -58,6 +58,7 @@ struct FaceQuadStruct
     };
     StdMeshers_FaceSidePtr grid;
     int                    from, to;     // indices of grid points used by the quad
+    int                    di;           // +1 or -1 depending on IsReversed()
     std::set<int>          forced_nodes; // indices of forced grid points
     std::vector<Contact>   contacts;     // contacts with sides of other quads
     int                    nbNodeOut;    // nb of missing nodes on an opposite shorter side
@@ -71,10 +72,15 @@ struct FaceQuadStruct
     int  ToQuadIndex( int sideNodeIndex ) const;
     bool IsForced( int nodeIndex ) const;
     bool IsReversed() const { return nbNodeOut ? false : to < from; }
+    bool Reverse(bool keepGrid);
     int  NbPoints() const { return Abs( to - from ); }
     double Param( int nodeIndex ) const;
     double Length( int from=-1, int to=-1) const;
     gp_XY Value2d( double x ) const;
+    const UVPtStruct& First() const { return GetUVPtStruct()[ from ]; }
+    const UVPtStruct& Last()  const {
+      return GetUVPtStruct()[ to-nbNodeOut-(IsReversed() ? -1 : +1)];
+    }
     // some sortcuts
     const vector<UVPtStruct>& GetUVPtStruct(bool isXConst=0, double constValue=0) const
     { return nbNodeOut ?
@@ -82,16 +88,38 @@ struct FaceQuadStruct
         grid->GetUVPtStruct( isXConst, constValue );
     }
   };
+  struct SideIterator // iterator on UVPtStruct of a Side
+  {
+    const UVPtStruct *uvPtr, *uvEnd;
+    int               dPtr, counter;
+    SideIterator(): uvPtr(0), uvEnd(0), dPtr(0), counter(0) {}
+    void Init( const Side& side ) {
+      dPtr  = counter = 0;
+      uvPtr = uvEnd = 0;
+      if ( side.NbPoints() > 0 ) {
+        uvPtr = & side.First();
+        uvEnd = & side.Last();
+        dPtr  = ( uvEnd > uvPtr ) ? +1 : -1;
+        uvEnd += dPtr;
+      }
+    }
+    bool More() const { return uvPtr != uvEnd; }
+    void Next() { uvPtr += dPtr; ++counter; }
+    UVPtStruct& UVPt() const { return (UVPtStruct&) *uvPtr; }
+    UVPtStruct& operator[](int i) { return (UVPtStruct&) uvPtr[ i*dPtr]; }
+    int  Count() const { return counter; }
+  };
 
   std::vector< Side >      side;
   std::vector< UVPtStruct> uv_grid;
   int                      iSize, jSize;
   TopoDS_Face              face;
   Bnd_B2d                  uv_box;
+  std::string              name; // to ease debugging
 
-  FaceQuadStruct ( const TopoDS_Face& F = TopoDS_Face() );
+  FaceQuadStruct ( const TopoDS_Face& F = TopoDS_Face(), const std::string& nm="main" );
   UVPtStruct& UVPt( int i, int j ) { return uv_grid[ i + j * iSize ]; }
-  void  shift    ( size_t nb, bool keepUnitOri );
+  void  shift    ( size_t nb, bool keepUnitOri, bool keepGrid=false );
   int & nbNodeOut( int iSide ) { return side[ iSide ].nbNodeOut; }
   bool  findCell ( const gp_XY& uv, int & i, int & j );
   bool  isNear   ( const gp_XY& uv, int & i, int & j, int nbLoops=1 );
@@ -186,6 +214,8 @@ protected:
 
   int splitQuad(FaceQuadStruct::Ptr quad, int i, int j);
 
+  void shiftQuad(FaceQuadStruct::Ptr& quad, const int num );
+
   typedef std::map< StdMeshers_FaceSidePtr, std::vector< FaceQuadStruct::Ptr > > TQuadsBySide;
   void updateSideUV( FaceQuadStruct::Side&  side,
                      int                    iForced,