From d5a7f2796accd81ecc7d23a1cc789ebca6f34b85 Mon Sep 17 00:00:00 2001
From: gdd <gdd>
Date: Fri, 18 Feb 2011 15:40:05 +0000
Subject: [PATCH] rnc : fully tested engine version

---
 idl/BLSURFPlugin_Algorithm.idl                |  15 +
 src/BLSURFPlugin/BLSURFPlugin_Attractor.cxx   | 264 ++++++------------
 src/BLSURFPlugin/BLSURFPlugin_Attractor.hxx   |  36 +--
 src/BLSURFPlugin/BLSURFPlugin_BLSURF.cxx      |  10 +-
 src/BLSURFPlugin/BLSURFPlugin_Hypothesis.cxx  |   2 +-
 .../BLSURFPlugin_Hypothesis_i.cxx             |   4 +-
 .../BLSURFPlugin_Hypothesis_i.hxx             |   4 +-
 src/GUI/BLSURFPluginGUI_HypothesisCreator.cxx |   2 +-
 8 files changed, 123 insertions(+), 214 deletions(-)

diff --git a/idl/BLSURFPlugin_Algorithm.idl b/idl/BLSURFPlugin_Algorithm.idl
index 1f577b4..291272a 100644
--- a/idl/BLSURFPlugin_Algorithm.idl
+++ b/idl/BLSURFPlugin_Algorithm.idl
@@ -272,6 +272,21 @@ module BLSURFPlugin
     string       GetAttractorEntry(in string entry);
     string_array GetAttractorEntries();
 
+    /*!
+     * Set/unset an attractor given as geom object on another geom object
+     */
+    void         SetAttractorGeom(in GEOM::GEOM_Object GeomObj, in GEOM::GEOM_Object AttractorShape, in double StartSize, in double EndSize, in double ActionRadius, in double ConstantRadius);
+  //  void         SetAttractorGeom(in GEOM::GEOM_Object theFace, in GEOM::GEOM_Object theAttractor, in string theParams, in long type);
+    void         UnsetAttractorGeom(in GEOM::GEOM_Object GeomObj);
+
+    /*!
+     * Set an attractor given by entry on a geom object given by entry
+     */
+   // void         SetClassAttractorEntry(in string entry, in string att_entry, in double StartSize, in double EndSize, in double ActionRadius, in double ConstantRadius );
+//     void         SetAttractorEntryGeom(in string theFaceEntry, in GEOM::GEOM_Object theAttractor, in string theParams, in long type);
+   // string       GetAttractorEntry(in string entry); // TODO a coder
+    //string_array GetAttractorEntries();
+
 /*
     void         SetCustomSizeMapEntry(in string entry, in string sizeMap);
     string       GetCustomSizeMapEntry(in string entry);
diff --git a/src/BLSURFPlugin/BLSURFPlugin_Attractor.cxx b/src/BLSURFPlugin/BLSURFPlugin_Attractor.cxx
index 0a67798..bd8c055 100644
--- a/src/BLSURFPlugin/BLSURFPlugin_Attractor.cxx
+++ b/src/BLSURFPlugin/BLSURFPlugin_Attractor.cxx
@@ -54,58 +54,33 @@ BLSURFPlugin_Attractor::BLSURFPlugin_Attractor (const TopoDS_Face& Face, const T
 {
   _face = Face;
   _attractorShape = Attractor;
-  //_mapGrid = 200;
   
   init();
 }
 
 bool BLSURFPlugin_Attractor::init(){ 
-  MESSAGE("construction d'un attracteur");
   Standard_Real u0,v0;
-  int i,j ;
-  //_known.clear();
+  int i,j,i0,j0 ;
+  _known.clear();
   _trial.clear();
   Handle(Geom_Surface) aSurf = BRep_Tool::Surface(_face);
-  Trial_Pnt TPnt(3,0); //TPnt(0,0,0); 
-  
-  // Discretization of the parameters
-  MESSAGE("Calcul des bornes de la surface : ");
-  //aSurf->Bounds(_u1, _u2, _v1, _v2);   // unusable in the generic case because the surface may be infinite (ok for prototype on a Sphere)
+  Trial_Pnt TPnt(3,0); 
   
-  // Calculation of the bounds for the generic case
+  // Calculation of the bounds of the face
   ShapeAnalysis::GetFaceUVBounds(_face,_u1,_u2,_v1,_v2);
   MESSAGE("u1 = "<<_u1<<" ,u2  = "<<_u2);
   MESSAGE("v1 = "<<_v1<<" ,v2  = "<<_v2);
   _gridU = floor (_u2 - _u1) / _step;
   _gridV = floor (_v2 - _v1) / _step;
-//   double Ustep = (_u2 - _u1) / _mapGrid;
-//   double Vstep = (_v2 - _v1) / _mapGrid; 
   for (i=0; i<=_gridU; i++){
     _vectU.push_back(_u1+i*(_u2-_u1)/_gridU) ;
   }
   for (j=0; j<=_gridV; j++){
     _vectV.push_back(_v1+j*(_v2-_v1)/_gridV) ;
   }
-
-  // Determination of the starting point
-  gp_Pnt P = BRep_Tool::Pnt(TopoDS::Vertex(_attractorShape));
-  GeomAPI_ProjectPointOnSurf projector( P, aSurf );
-  projector.LowerDistanceParameters(u0,v0);
-  MESSAGE("u0 = "<<u0<<" ,v0  = "<<v0);
-  //gp_Pnt2d P = BRep_Tool::Parameters(TopoDS::Vertex(_attractorShape),_face);
-  //u0 = P.X();
-  //v0 = P.Y();
-  int i0 = floor ( (u0 - _u1) * _gridU / (_u2 - _u1) + 0.5 );
-  int j0 = floor ( (v0 - _v1) * _gridV / (_v2 - _v1) + 0.5 );
-  MESSAGE("i0 = "<<i0<<" ,j0  = "<<j0);
-  TPnt[0]=0.;//.dist=0.;       // Set distance to 0.
-  TPnt[1]=i0;//.Ti=i0;
-  TPnt[2]=j0;//.Tj=j0;
-  _trial.insert(TPnt);         // Move starting point to _trial
   
-  // Initialization of _DMap
-  //std::vector<double> temp(_mapGrid+1,std::numeric_limits<double>::infinity()); // Set distance of all "far" points to Infinity 
-  std::vector<double> temp(_gridV+1,1.e+6); // Provisoirement infini = 10000
+  // Initialization of _DMap and _known
+  std::vector<double> temp(_gridV+1,std::numeric_limits<double>::infinity());  // Set distance of all "far" points to Infinity 
   for (i=0; i<=_gridU; i++){
     _DMap.push_back(temp);
   }
@@ -113,19 +88,46 @@ bool BLSURFPlugin_Attractor::init(){
   for (i=0; i<=_gridU; i++){
     _known.push_back(temp2);
   }
-  MESSAGE("DMap(0,0) : "<< _DMap[0][0]);
-  _DMap[i0][j0] = 0.;         // Set distance of starting point to 0.
-  
- // _buildMap();                // Computes the distance for all points of the discrete surface
-}
 
+  // Determination of the starting points
+  if (_attractorShape.ShapeType() == TopAbs_VERTEX){                           
+    gp_Pnt P = BRep_Tool::Pnt(TopoDS::Vertex(_attractorShape));
+    GeomAPI_ProjectPointOnSurf projector( P, aSurf );
+    projector.LowerDistanceParameters(u0,v0);
+    MESSAGE("u0 = "<<u0<<" ,v0  = "<<v0);
+    i0 = floor ( (u0 - _u1) * _gridU / (_u2 - _u1) + 0.5 );
+    j0 = floor ( (v0 - _v1) * _gridV / (_v2 - _v1) + 0.5 );
+    TPnt[0]=0.;                                                                // Set the distance of the starting point to 0.
+    TPnt[1]=i0;
+    TPnt[2]=j0;
+    _DMap[i0][j0] = 0.;
+    _trial.insert(TPnt);         // Move starting point to _trial
+  }
+  else if (_attractorShape.ShapeType() == TopAbs_EDGE){
+    gp_Pnt2d P2;
+    double first;
+    double last;
+    Handle(Geom2d_Curve) Curve2d = BRep_Tool::CurveOnSurface(TopoDS::Edge(_attractorShape), _face, first, last);
+    int N = 2 * (last - first) / _step;
+    for (i=0; i<=N; i++){
+      P2 = Curve2d->Value(first + i * (last-first) / N);
+      i0 = floor( (P2.X() - _u1) * _gridU / (_u2 - _u1) + 0.5 );
+      j0 = floor( (P2.Y() - _v1) * _gridV / (_v2 - _v1) + 0.5 );
+      MESSAGE("i0 = "<<i0<<" , j0 = "<<j0)
+      TPnt[0] = 0.;
+      TPnt[1] = i0;
+      TPnt[2] = j0;
+      _DMap[i0][j0] = 0.;
+      _trial.insert(TPnt);
+    }
+  }
+}
 
 void BLSURFPlugin_Attractor::SetParameters(double Start_Size, double End_Size, double Action_Radius, double Constant_Radius){
   _startSize = Start_Size;
   _endSize = End_Size;
   _actionRadius = Action_Radius;
   _constantRadius = Constant_Radius;
-  MESSAGE("_startSize = "<<_startSize<<"; _endSize = "<<_endSize<<" ; _actionRadius = "<<_actionRadius<<" ; _constantRadius = "<<_constantRadius)
 }
 
 double BLSURFPlugin_Attractor::_distance(double u, double v){
@@ -190,18 +192,17 @@ double BLSURFPlugin_Attractor::_distance(double u, double v){
   // BLSURF seems to perform a linear interpolation so it's sufficient to give it a non-continuous distance map
   int i = floor ( (u - _u1) * _gridU / (_u2 - _u1) + 0.5 );
   int j = floor ( (v - _v1) * _gridV / (_v2 - _v1) + 0.5 );
-
-//   int i = floor ( (u - _u1) * _mapGrid / (_u2 - _u1) );
-//   int j = floor ( (v - _v1) * _mapGrid / (_v2 - _v1) );
   
   return _DMap[i][j];
 
-
 }
 
 double BLSURFPlugin_Attractor::GetSize(double u, double v){
   
-  double myDist = 0.5 * (_distance(u,v) - _constantRadius + abs(_distance(u,v) - _constantRadius));
+  double myDist = 0.5 * (_distance(u,v) - _constantRadius + fabs(_distance(u,v) - _constantRadius));
+  if (myDist<0){
+    MESSAGE("Warning myDist<0 : myDist= "<<myDist)
+  }
   switch(_type)
   {
     case TYPE_EXP:
@@ -220,7 +221,6 @@ void BLSURFPlugin_Attractor::BuildMap(){
   MESSAGE("building the map");
   int i, j, k, n;  
   int count = 0;
-  //TPointSet::iterator pIt;
   int ip, jp, kp, np;
   int i0, j0;
   gp_Pnt P;
@@ -231,185 +231,91 @@ void BLSURFPlugin_Attractor::BuildMap(){
   double Dist = 0.;
   bool Dist_changed;
   IJ_Pnt Current_Pnt(2,0);
-  Trial_Pnt TPnt(3,0);//TPnt(0,0,0); 
+  Trial_Pnt TPnt(3,0);
   TTrialSet::iterator min;
   TTrialSet::iterator found;
-  //TPointSet::iterator kn_found;
   Handle(Geom_Surface) aSurf = BRep_Tool::Surface(_face);
   
-  while (_trial.size() > 0 && count < 1000000){
-    count++;
-    MESSAGE("boucle while : "<<count);
-    min = _trial.begin();       // Get trial point with min distance from start
-    i0 = (*min)[1];//min->Ti;//static_cast<int>((*min)[1]);
-    j0 = (*min)[2];//min->Tj;//static_cast<int>((*min)[2]);
-    MESSAGE("i0 = "<<i0<<" ,j0  = "<<j0<<" *min[0] = "<<(*min)[0]);
-    //MESSAGE("d(i0,j0) = "<<min->dist);//(*min)[0]); 
-//     Current_Pnt[0] = i0;        // Define it as the current point
-//     Current_Pnt[1] = j0;
-    //if (i0 == 23 && j0 == 49){
-      //MESSAGE(" point 23 49 insere dans known");
-      //break;
-    //}
-//     pIt =_known.find( Current_Pnt );
-    /*if (*pIt == test){
-      MESSAGE(" point 23 49 insere dans known");
-      break;
-    }*/
-//     if (pIt != _known.end()){
-//       MESSAGE("point "<<(*pIt)[0]<<" , "<<(*pIt)[1]<<" deja dans _known -> probleme");
-//       break;
-//     } 
-//     _known.insert(Current_Pnt); // Move it to _known and remove it from _trial
-    _known[i0][j0] = true;         // Move point to "Known"
-    //MESSAGE(Current_Pnt[0]<<" , "<<Current_Pnt[1]<<" insere dans known")
-    //MESSAGE("known contient : "<<_known.size()<<"elements");
-    //MESSAGE(" d("<<i0<<" , "<<j0<<") ="<<_DMap[i0][j0]);
-    //_DMap[i0][j0]=(*min)[0];//min->dist;//(*min)[0];
-    //MESSAGE("avt erase trial contient : "<<_trial.size()<<"elts");
-//     MESSAGE((*min)[0]<<", "<<(*min)[1]<<", "<<(*min)[2]<<" supprime de Trial");
-    _trial.erase(min);
-    //MESSAGE("trial contient mtnt : "<<_trial.size()<<"elts");
-    // ------------------------ // Loop on neighbours of the trial min 
+  // While there are points in "Trial" (representing a kind of advancing front), loop on them ------------------
+  while (_trial.size() > 0 ){
+    min = _trial.begin();                        // Get trial point with min distance from start
+    i0 = (*min)[1];
+    j0 = (*min)[2];
+    _known[i0][j0] = true;                       // Move it to "Known"
+    _trial.erase(min);                           // Remove it from "Trial"
+    // Loop on neighbours of the trial min ----------------------------------------------------------------------
     for (i=i0 - 1 ; i <= i0 + 1 ; i++){ 
-      //MESSAGE("boucle for sur i");
-      if (!aSurf->IsUPeriodic()){               // Periodic conditions in U	
-	//MESSAGE("surface is not U periodique");
+      if (!aSurf->IsUPeriodic()){                          // Periodic conditions in U	
 	if (i > _gridU ){
 	  break; }
 	else if (i < 0){
 	  i++; }
 	}
-      ip = (i + _gridU + 1) % (_gridU+1);        // We get a periodic index ip=modulo(i,N+2) so that  i=-1->ip=N; i=0 -> ip=0 ; ... ; i=N+1 -> ip=0;
+      ip = (i + _gridU + 1) % (_gridU+1);                  // We get a periodic index ip=modulo(i,N+2) so that  i=-1->ip=N; i=0 -> ip=0 ; ... ; i=N+1 -> ip=0;
       for (j=j0 - 1 ; j <= j0 + 1 ; j++){
-	//MESSAGE("boucle for sur j");
-	if (!aSurf->IsVPeriodic()){             // Periodic conditions in V . 
-	  //MESSAGE("surface is not V periodique");
+	if (!aSurf->IsVPeriodic()){                        // Periodic conditions in V . 
 	  if (j > _gridV ){
 	    break; }
 	  else if (j < 0){
 	    j++;
-	    if (j<0){
-	      MESSAGE("j = "<<j);
-	      //break;
-	    }
 	  }
 	}
 	jp = (j + _gridV + 1) % (_gridV+1);
-	//jp=j;
-// 	Current_Pnt[0] = ip;                    // Define the neighbour as current point
-// 	Current_Pnt[1] = jp;
-	//MESSAGE("i = "<<i<<" ; j = "<<j);
-	//MESSAGE("ip = "<<ip<<" ; jp = "<<jp);
-// 	pIt = _known.find( Current_Pnt );
-	//MESSAGE("found a point in Known with i = "<<(*pIt)[0]<<"j = "<<(*pIt)[1]);
-	if (!_known[ip][jp]){   //.find( Current_Pnt ) == _known.end()){  // If the distance is not known
-	  //MESSAGE("Le voisin "<<ip<<","<<jp<<" de min(_trial) n'est pas dans _known");
-	  aSurf->D1(_vectU[ip],_vectV[jp],P,D1U,D1V);       // Calculate the metric at (i,j)	
-	  Guu = D1U.X()*D1U.X() +  D1U.Y()*D1U.Y() + D1U.Z()*D1U.Z();    // Guu = ||dS/du||**2    G(i,j)= | ||dS/du||**2          *     | 
-	  Gvv = D1V.X()*D1V.X() +  D1V.Y()*D1V.Y() + D1V.Z()*D1V.Z();    // Gvv = ||dS/dv||**2            | <dS/du,dS/dv>  ||dS/dv||**2 |
+	
+	if (!_known[ip][jp]){                              // If the distance is not known yet
+	  aSurf->D1(_vectU[ip],_vectV[jp],P,D1U,D1V);      // Calculate the metric at (i,j)
+	  // G(i,j)  =  | ||dS/du||**2          *     | 
+	  //            | <dS/du,dS/dv>  ||dS/dv||**2 |
+	  Guu = D1U.X()*D1U.X() +  D1U.Y()*D1U.Y() + D1U.Z()*D1U.Z();    // Guu = ||dS/du||**2    
+	  Gvv = D1V.X()*D1V.X() +  D1V.Y()*D1V.Y() + D1V.Z()*D1V.Z();    // Gvv = ||dS/dv||**2           
 	  Guv = D1U.X()*D1V.X() +  D1U.Y()*D1V.Y() + D1U.Z()*D1V.Z();    // Guv = Gvu = < dS/du,dS/dv > 
-	  //Guv = 0; // test
-	  if (Guv > 1e-15){
-	    MESSAGE("WARNING : Guv != 0 ; Guv = "<<Guv);
-	  }
-	  //MESSAGE("u ("<<ip<<") = "<< _vectU[ip]<<"v ("<<jp<<") = "<< _vectV[jp]);
-	  if (count == 2500) {
-	    MESSAGE("Guu = " << Guu<<" , Gvv = "<<Gvv);
-	  }
-	  D_Ref = _DMap[ip][jp];                           // Set a ref. distance to the value in DMap (may be infinite or uncertain)
-	  //MESSAGE("D_Ref = "<<D_Ref);
-	  TPnt[0] = D_Ref;//.dist=D_Ref;                   // Store the point as a trial point
-	  TPnt[1] = ip;//.Ti=ip;//[1] = static_cast<double>(ip);
-	  TPnt[2] = jp;//.Tj=jp;//[2] = static_cast<double>(jp);
+	  D_Ref = _DMap[ip][jp];                           // Set a ref. distance of the point to its value in _DMap (may be infinite or uncertain)
+	  TPnt[0] = D_Ref;                  
+	  TPnt[1] = ip;
+	  TPnt[2] = jp;
 	  Dist_changed = false;
-	  // -------------------------------------------- // Calculate the min distance among the neighbours
+	  // Loop on neighbours to calculate the min distance from them ---------------------------------------------------------------------------------
 	  for (k=i - 1 ; k <= i + 1 ; k++){
-	    //MESSAGE("boucle for sur k");
-	    if (!aSurf->IsUPeriodic()){                   // Periodic conditions in U  
+	    if (!aSurf->IsUPeriodic()){                              // Periodic conditions in U  
 	      if(k > _gridU ){
-		MESSAGE("Break");
 		break;
 	      }
 	      else if (k < 0){
 		k++; }
 	      }
-	    kp = (k + _gridU + 1) % (_gridU+1);       // periodic index
-	    //MESSAGE(" k = "<<k<<" ; kp = "<<kp);
+	    kp = (k + _gridU + 1) % (_gridU+1);                      // periodic index
 	    for (n=j - 1 ; n <= j + 1 ; n++){ 
-	      //MESSAGE("boucle for sur n");
-	      if (!aSurf->IsVPeriodic()){                 // Periodic conditions in V 
-		if(n > _gridV){
-		  MESSAGE("Break");		  
+	      if (!aSurf->IsVPeriodic()){                            // Periodic conditions in V 
+		if(n > _gridV){	  
 		  break;
 		}
 		else if (n < 0){
 		  n++; }
 	      }
-	      np = (n + _gridV + 1) % (_gridV+1);
-	      //MESSAGE(" n = "<<n<<" ; np = "<<np);
-// 	      Current_Pnt[0] = kp;
-// 	      Current_Pnt[1] = np;
-	      if (_known[kp][np]){//.find( Current_Pnt ) != _known.end()){  // If distance of the neighbour is known
-		                                                // Calculate the distance from (k,n)
-		//MESSAGE("La distance du point ( "<<kp<<","<<np<<" ) de min(_trial) est connue");
+	      np = (n + _gridV + 1) % (_gridV+1);                    
+	      if (_known[kp][np]){                                   // If the distance of the neighbour is known
+		                                                     // Calculate the distance from (k,n)
 		du = (k-i) * (_u2 - _u1) / _gridU;
 		dv = (n-j) * (_v2 - _v1) / _gridV;
-		Dist = _DMap[kp][np] + sqrt( Guu * du*du + Gvv * dv*dv + 2*Guv * du*dv);   // ds**2 = du'Gdu + dv'Gdv + 2*du'Gdv  (G is symetrical)
-		//MESSAGE("D_Ref = "<<D_Ref);
-		//MESSAGE("Dist = "<<Dist);
-		//bool comp = Dist < D_Ref;
-		//MESSAGE("Dist < D_Ref ="<<comp);
-		if (Dist < D_Ref) {                             // If smaller than ref. distance -> update ref. distance
-		  //MESSAGE("update de la distance");
+		Dist = _DMap[kp][np] + sqrt( Guu * du*du + 2*Guv * du*dv + Gvv * dv*dv );   // ds**2 = du'Gdu + 2*du'Gdv + dv'Gdv  (G is always symetrical)
+		if (Dist < D_Ref) {                                  // If smaller than ref. distance  ->  update ref. distance
 		  D_Ref = Dist;
 		  Dist_changed = true;
-		  if (count == 2500) {
-		    MESSAGE("du = "<<du<<" , dv = "<<dv<<" , D_Ref = "<<D_Ref);
-		    MESSAGE("_DMap["<<kp<<"]["<<np<<"] = "<<_DMap[kp][np]);
-		    MESSAGE("_DMap[kp][np] + sqrt( Guu * du*du + Gvv * dv*dv ) ="<<_DMap[kp][np]<<" + sqrt( "<<Guu<<" * "<<du<<"**2 + "<<Gvv<<" * "<<dv<<"**2" );
-		    //MESSAGE("k - i = "<<k-i<<" , n - j = "<<n-j);
-		    //MESSAGE("(_v2 - _v1) = "<<_v2 - _v1 );
-		  }
 		}
 	      }
-	      //else
-		//MESSAGE("La distance du point ( "<<kp<<","<<np<<" ) de min(_trial) est INconnue");
 	    }
-	  }
-	  if (Dist_changed) {       // If distance has been updated, update _trial 
-	    //MESSAGE("trial contient : "<<_trial.size()<<"elements");
-	    //MESSAGE("Dist updated");
+	  } // End of the loop on neighbours --------------------------------------------------------------------------------------------------------------
+	  if (Dist_changed) {                              // If distance has been updated, update _trial 
 	    found=_trial.find(TPnt);
 	    if (found != _trial.end()){
-	      //MESSAGE("pnt : "<<(*found)[0]<<" , "<<(*found)[1]<<" , "<<(*found)[2]<<" efface de trial (avt update)");
-	      //MESSAGE("trial contient : "<<_trial.size()<<"elements");
-	      _trial.erase(found);
+	      _trial.erase(found);                         // Erase the point if it was already in _trial
 	    }
-	    TPnt[0] = D_Ref;//.dist = D_Ref;
-	    TPnt[1] = ip;//.Ti = ip;//[1] = static_cast<double>(ip);
-	    TPnt[2] = jp;//.Tj = jp;//[2] = static_cast<double>(jp);
-	    _DMap[ip][jp] = D_Ref;
-	    //MESSAGE("TPnt[0] = "<<TPnt[0]);
-	    //MESSAGE("updated distance d("<<ip<<","<<jp<<") = "<<D_Ref);
-	    //MESSAGE("Guu = "<<Guu<<","<<"Gvv = "<<Gvv);
-	    //found=_trial.find(TPnt);
-	    //MESSAGE("Recherche de : "<<TPnt[0]<<" , "<<TPnt[1]<<" , "<<TPnt[2]);
-	    //if (found != _trial.end()){
-	      //MESSAGE("pnt : "<<(*found)[0]<<" , "<<(*found)[1]<<" , "<<(*found)[2]<<" trouve");
-	      //MESSAGE("trial contient : "<<_trial.size()<<"elements");
-	    //}
-	    std::pair< TTrialSet::iterator, bool> result = _trial.insert(TPnt);
-// 	    if (result.second) {
-// 	      MESSAGE("Pnt : "<<TPnt[0]<<" , "<<TPnt[1]<<" , "<<TPnt[2]<<" insere ds trial");
-// 	    }
-// 	    else {
-// 	      MESSAGE(" !!!!!!! Pnt : "<<TPnt[0]<<" , "<<TPnt[1]<<" , "<<TPnt[2]<<" pas insere ds trial");
-// 	    }
-	      
-	    //MESSAGE("trial contient : "<<_trial.size()<<"elements");
+	    TPnt[0] = D_Ref;
+	    TPnt[1] = ip;
+	    TPnt[2] = jp;
+	    _DMap[ip][jp] = D_Ref;                         // Set it distance to the minimum distance found during the loop above
+	    _trial.insert(TPnt);                           // Insert it (or reinsert it) in _trial
 	  }
-	  //MESSAGE("trial contient : "<<_trial.size()<<"elements");
 	} // if
       } // for
     } // for
@@ -417,7 +323,7 @@ void BLSURFPlugin_Attractor::BuildMap(){
   _known.clear();
   _trial.clear();
   _isMapBuilt = true;
-  
+  MESSAGE("_gridU = "<<_gridU<<" , _gridV = "<<_gridV)  
 } // end of BuildMap()
 
 
diff --git a/src/BLSURFPlugin/BLSURFPlugin_Attractor.hxx b/src/BLSURFPlugin/BLSURFPlugin_Attractor.hxx
index 424df2a..f5cc2c4 100644
--- a/src/BLSURFPlugin/BLSURFPlugin_Attractor.hxx
+++ b/src/BLSURFPlugin/BLSURFPlugin_Attractor.hxx
@@ -132,15 +132,8 @@
 class BLSURFPlugin_Attractor {
   public:
     BLSURFPlugin_Attractor ();
-//     ~BLSURFPlugin_Attractor (){
-//       _DMap.clear();
-//       _trial.clear();
-//       _known.clear();
-//       _vectU.clear();
-//       _vectV.clear();
-//     }
     BLSURFPlugin_Attractor (const TopoDS_Face& Face, const TopoDS_Shape& Attractor, double Step = 0.015);
-    bool init();                                                       // Calculates the discrete points correponding to attractor, initialises the map and calls _buildMap
+    bool init();                                                // Calculates the discrete points correponding to attractor and intialises the map of distances
 
     double GetSize (double u, double v);
     TopoDS_Face GetFace() const { return _face; }
@@ -148,20 +141,16 @@ class BLSURFPlugin_Attractor {
     
     void SetParameters(double Start_Size, double End_Size, double Action_Radius, double Constant_Radius);
     void SetType(int type){ _type = type; }
-//     bool SetAttractorShape(TopoDS_Shape Attractor){ 
-//       _attractorShape = Attractor; 
-//     }
-    void BuildMap();                                                   // Builds the map of distances between source point and any point P(u,v)
-    bool IsMapBuilt() const { return _isMapBuilt; }
+    
+    void BuildMap();                                            // Builds the map of distances between source point and any point P(u,v)
+    bool IsMapBuilt() const { return _isMapBuilt; }             // Controls if the map has been built
     bool Empty() const { return _isEmpty; }
 
   
     typedef std::vector<double> TDiscreteParam;
     typedef std::vector< std::vector<double> > TDistMap;
-    //typedef std::set< std::vector<int> > TPointSet;
     typedef std::vector< std::vector<bool> > TPointSet;
     typedef std::set< std::vector<double> > TTrialSet;
-    //typedef std::set< Trial_Pnt, Trial_comp > TTrialSet;
     typedef std::vector<double> Trial_Pnt;
     typedef std::vector<int> IJ_Pnt;
           
@@ -174,18 +163,17 @@ class BLSURFPlugin_Attractor {
     TDistMap          _DMap;
     TPointSet         _known;
     TTrialSet         _trial;
-    int               _type;                                           // Type of function used to calculate the size from the distance 
- //   int               _mapGrid;                                        // Number of grid points in U and V directions
-    double            _step;
-    int               _gridU;
-    int               _gridV;
-    double            _u1, _u2, _v1, _v2;                              // Bounds of the parametric space of the face 
-    double            _startSize, _endSize; 
-    double            _actionRadius, _constantRadius;
+    int               _type;                                    // Type of function used to calculate the size from the distance (unused for now)
+    double            _step;                                    // Step between to value of the discretized parametric space in U or V direction
+    int               _gridU;                                   // Number of grid points in U direction
+    int               _gridV;                                   // Number of grid points in V direction
+    double            _u1, _u2, _v1, _v2;                       // Bounds of the parametric space of the face 
+    double            _startSize, _endSize;                     // User parameters
+    double            _actionRadius, _constantRadius;           //
     
-    //bool              _buildMap();                                     // Builds the map of distances between source point and any point P(u,v)
     bool              _isMapBuilt;
     bool              _isEmpty;
+    
     double            _distance(double u, double v);
 };    
 
diff --git a/src/BLSURFPlugin/BLSURFPlugin_BLSURF.cxx b/src/BLSURFPlugin/BLSURFPlugin_BLSURF.cxx
index 75f9f8d..66f53e2 100644
--- a/src/BLSURFPlugin/BLSURFPlugin_BLSURF.cxx
+++ b/src/BLSURFPlugin/BLSURFPlugin_BLSURF.cxx
@@ -866,7 +866,7 @@ void BLSURFPlugin_BLSURF::SetParameters(const BLSURFPlugin_Hypothesis* hyp,
 //           }
 //         }
                 
-        if (GeomType == TopAbs_FACE && AttShape.ShapeType() == TopAbs_VERTEX){
+        if (GeomType == TopAbs_FACE && (AttShape.ShapeType() == TopAbs_VERTEX || AttShape.ShapeType() == TopAbs_EDGE)){
 	  HasSizeMapOnFace = true;
 	  if (! FacesWithSizeMap.Contains(TopoDS::Face(GeomShape)) ) {
                 key = FacesWithSizeMap.Add(TopoDS::Face(GeomShape) );
@@ -1784,14 +1784,14 @@ status_t size_on_surface(integer face_id, real *uv, real *size, void *user_data)
     //PyGILState_Release(gstate);
   }
   if (FaceIndex2ClassAttractor.count(face_id) !=0){
-    MESSAGE("List of attractor is not empty")
-    MESSAGE("Attractor empty : "<< FaceIndex2ClassAttractor[face_id]->Empty())
+   // MESSAGE("List of attractor is not empty")
+   // MESSAGE("Attractor empty : "<< FaceIndex2ClassAttractor[face_id]->Empty())
     double result = FaceIndex2ClassAttractor[face_id]->GetSize(uv[0],uv[1]);
     *size = result;
-    MESSAGE("f(" << uv[0] << "," << uv[1] << ")" << " = " << result);
+   // MESSAGE("f(" << uv[0] << "," << uv[1] << ")" << " = " << result);
   }
   else {
-    MESSAGE("List of attractor is empty !!!")
+    // MESSAGE("List of attractor is empty !!!")
     *size = *((double*)user_data);
   }
   return STATUS_OK;
diff --git a/src/BLSURFPlugin/BLSURFPlugin_Hypothesis.cxx b/src/BLSURFPlugin/BLSURFPlugin_Hypothesis.cxx
index e1775c9..6f0dec0 100644
--- a/src/BLSURFPlugin/BLSURFPlugin_Hypothesis.cxx
+++ b/src/BLSURFPlugin/BLSURFPlugin_Hypothesis.cxx
@@ -451,7 +451,7 @@ void  BLSURFPlugin_Hypothesis::SetClassAttractorEntry(const std::string& entry,
   if ( !attExists || (attExists && !_classAttractors[entry]->GetAttractorShape().IsSame(AttractorShape))){
     ShapeAnalysis::GetFaceUVBounds(FaceShape,u1,u2,v1,v2);
     diag = sqrt((u2 - u1) * (u2 - u1) + (v2 - v1) * (v2 - v1));  
-    BLSURFPlugin_Attractor* myAttractor = new BLSURFPlugin_Attractor(FaceShape, AttractorShape, 0.005 * diag); //TODO calculer MapGrid
+    BLSURFPlugin_Attractor* myAttractor = new BLSURFPlugin_Attractor(FaceShape, AttractorShape, 0.002 * diag); //TODO calculer MapGrid
     myAttractor->BuildMap();
     //MESSAGE("Step = "<<Step)
     myAttractor->SetParameters(StartSize, EndSize, ActionRadius, ConstantRadius);
diff --git a/src/BLSURFPlugin/BLSURFPlugin_Hypothesis_i.cxx b/src/BLSURFPlugin/BLSURFPlugin_Hypothesis_i.cxx
index 4e5a339..c4fca27 100644
--- a/src/BLSURFPlugin/BLSURFPlugin_Hypothesis_i.cxx
+++ b/src/BLSURFPlugin/BLSURFPlugin_Hypothesis_i.cxx
@@ -811,7 +811,7 @@ void BLSURFPlugin_Hypothesis_i::UnsetAttractor(GEOM::GEOM_Object_ptr GeomObj)
 }
 
 
-void BLSURFPlugin_Hypothesis_i::SetAttractor_Geom(GEOM::GEOM_Object_ptr GeomObj, GEOM::GEOM_Object_ptr Attractor, double StartSize, double EndSize, double ActionRadius, double ConstantRadius)
+void BLSURFPlugin_Hypothesis_i::SetAttractorGeom(GEOM::GEOM_Object_ptr GeomObj, GEOM::GEOM_Object_ptr Attractor, double StartSize, double EndSize, double ActionRadius, double ConstantRadius)
 {
   ASSERT(myBaseImpl);
   string entry;
@@ -825,7 +825,7 @@ void BLSURFPlugin_Hypothesis_i::SetAttractor_Geom(GEOM::GEOM_Object_ptr GeomObj,
   SetClassAttractorEntry( entry.c_str(), FaceShape, AttractorShape, StartSize, EndSize, ActionRadius, ConstantRadius);
 }
 
-void BLSURFPlugin_Hypothesis_i::UnsetAttractor_Geom(GEOM::GEOM_Object_ptr GeomObj)
+void BLSURFPlugin_Hypothesis_i::UnsetAttractorGeom(GEOM::GEOM_Object_ptr GeomObj)
 {
   ASSERT(myBaseImpl);
   string entry;
diff --git a/src/BLSURFPlugin/BLSURFPlugin_Hypothesis_i.hxx b/src/BLSURFPlugin/BLSURFPlugin_Hypothesis_i.hxx
index 8c9e2a6..d3bce63 100644
--- a/src/BLSURFPlugin/BLSURFPlugin_Hypothesis_i.hxx
+++ b/src/BLSURFPlugin/BLSURFPlugin_Hypothesis_i.hxx
@@ -129,9 +129,9 @@ class BLSURFPlugin_Hypothesis_i:
   BLSURFPlugin::string_array* GetAttractorEntries();
   
   
-  void SetAttractor_Geom(GEOM::GEOM_Object_ptr GeomObj, GEOM::GEOM_Object_ptr Attractor, double StartSize, double EndSize, double ActionRadius, double ConstantRadius );
+  void SetAttractorGeom(GEOM::GEOM_Object_ptr GeomObj, GEOM::GEOM_Object_ptr Attractor, double StartSize, double EndSize, double ActionRadius, double ConstantRadius );
 
-  void UnsetAttractor_Geom(GEOM::GEOM_Object_ptr GeomObj);
+  void UnsetAttractorGeom(GEOM::GEOM_Object_ptr GeomObj);
 
   void SetClassAttractorEntry(const char* entry,const TopoDS_Face& FaceShape, const TopoDS_Shape& AttractorShape, double StartSize, double EndSize, double ActionRadius, double ConstantRadius)  throw (SALOME::SALOME_Exception);
 
diff --git a/src/GUI/BLSURFPluginGUI_HypothesisCreator.cxx b/src/GUI/BLSURFPluginGUI_HypothesisCreator.cxx
index da754af..824d2ac 100644
--- a/src/GUI/BLSURFPluginGUI_HypothesisCreator.cxx
+++ b/src/GUI/BLSURFPluginGUI_HypothesisCreator.cxx
@@ -1653,7 +1653,7 @@ bool BLSURFPluginGUI_HypothesisCreator::storeParamsToHypo( const BlsurfHypothesi
       }
       else if (sizeMap.startsWith("ATTRACTOR")) {
 //         MESSAGE("SetAttractorEntry(" << entry.toStdString() << ")= " << sizeMap.toStdString());
-        h->SetAttractorEntry( entry.toLatin1().constData(), sizeMap.toLatin1().constData() );
+        h->SetAttractorEntry( entry.toLatin1().constData(), sizeMap.toLatin1().constData());
       }
       else if (sizeMap.startsWith("def")) {
 //         MESSAGE("SetCustomSizeMapEntry(" << entry.toStdString() << ")= " << sizeMap.toStdString());
-- 
2.39.2