X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FStdMeshers%2FStdMeshers_ProjectionUtils.hxx;h=958d55607f0193262b275db4fd50b04f8ea683d2;hb=066f625a46b60642f228a0c10fc6c2dcdc20d304;hp=55dd1a68e1b0e1f0f44b0c146cd02f7a1a6a3239;hpb=bd8f1aee7c78f7d2eb82bd4fec5e08c9e3d280ce;p=modules%2Fsmesh.git

diff --git a/src/StdMeshers/StdMeshers_ProjectionUtils.hxx b/src/StdMeshers/StdMeshers_ProjectionUtils.hxx
index 55dd1a68e..958d55607 100644
--- a/src/StdMeshers/StdMeshers_ProjectionUtils.hxx
+++ b/src/StdMeshers/StdMeshers_ProjectionUtils.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2013  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2015  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
@@ -30,10 +30,14 @@
 
 #include "SMESH_StdMeshers.hxx"
 
+#include "SMDS_MeshElement.hxx"
+
 #include <TopTools_DataMapOfShapeShape.hxx>
 #include <TopoDS_Edge.hxx>
-#include <TopoDS_Vertex.hxx>
 #include <TopoDS_Face.hxx>
+#include <TopoDS_Vertex.hxx>
+#include <gp_Trsf.hxx>
+#include <gp_Trsf2d.hxx>
 
 #include <list>
 #include <map>
@@ -44,6 +48,7 @@ class SMESH_Hypothesis;
 class SMESH_Mesh;
 class SMESH_subMesh;
 class TopTools_IndexedDataMapOfShapeListOfShape;
+class TopTools_IndexedMapOfShape;
 class TopoDS_Shape;
 
 /*!
@@ -76,7 +81,54 @@ namespace StdMeshers_ProjectionUtils
 {
   typedef StdMeshers_ShapeShapeBiDirectionMap                  TShapeShapeMap;
   typedef TopTools_IndexedDataMapOfShapeListOfShape            TAncestorMap;
-  typedef std::map<const SMDS_MeshNode*, const SMDS_MeshNode*> TNodeNodeMap;
+  typedef std::map<const SMDS_MeshNode*, const SMDS_MeshNode*,
+                   TIDCompare>                                 TNodeNodeMap;
+
+
+  /*!
+   * \brief Finds transformation beween two sets of 2D points using
+   *        a least square approximation
+   */
+  class TrsfFinder2D
+  {
+    gp_Trsf2d _trsf;
+    gp_XY     _srcOrig;
+  public:
+    TrsfFinder2D(): _srcOrig(0,0) {}
+
+    void Set( const gp_Trsf2d& t ) { _trsf = t; } // it's an alternative to Solve()
+
+    bool Solve( const std::vector< gp_XY >& srcPnts,
+                const std::vector< gp_XY >& tgtPnts );
+
+    gp_XY Transform( const gp_Pnt2d& srcUV ) const;
+
+    bool IsIdentity() const { return ( _trsf.Form() == gp_Identity ); }
+  };
+  /*!
+   * \brief Finds transformation beween two sets of 3D points using
+   *        a least square approximation
+   */
+  class TrsfFinder3D
+  {
+    gp_Trsf _trsf;
+    gp_XYZ  _srcOrig;
+  public:
+    TrsfFinder3D(): _srcOrig(0,0,0) {}
+
+    void Set( const gp_Trsf& t ) { _trsf = t; } // it's an alternative to Solve()
+
+    bool Solve( const std::vector< gp_XYZ > & srcPnts,
+                const std::vector< gp_XYZ > & tgtPnts );
+
+    gp_XYZ Transform( const gp_Pnt& srcP ) const;
+
+    gp_XYZ TransformVec( const gp_Vec& v ) const;
+
+    bool IsIdentity() const { return ( _trsf.Form() == gp_Identity ); }
+
+    bool Invert();
+  };
 
   /*!
    * \brief Looks for association of all sub-shapes of two shapes
@@ -156,11 +208,14 @@ namespace StdMeshers_ProjectionUtils
    * \brief Return an oriented propagation edge
    * \param aMesh - mesh
    * \param fromEdge - start edge for propagation
+   * \param chain - return, if provided, a propagation chain passed till
+   *        anEdge; if anEdge.IsNull() then a full propagation chain is returned
    * \retval pair<int,TopoDS_Edge> - propagation step and found edge
    */
-  std::pair<int,TopoDS_Edge> GetPropagationEdge( SMESH_Mesh*        aMesh,
-                                                 const TopoDS_Edge& anEdge,
-                                                 const TopoDS_Edge& fromEdge);
+  std::pair<int,TopoDS_Edge> GetPropagationEdge( SMESH_Mesh*                 aMesh,
+                                                 const TopoDS_Edge&          anEdge,
+                                                 const TopoDS_Edge&          fromEdge,
+                                                 TopTools_IndexedMapOfShape* chain=0);
 
   /*!
    * \brief Find corresponding nodes on two faces