Bug #1279: Bad display of distance constraint in the sktech

[modules/shaper.git] / src / SketcherPrs / SketcherPrs_PositionMgr.cpp

diff --git a/src/SketcherPrs/SketcherPrs_PositionMgr.cpp b/src/SketcherPrs/SketcherPrs_PositionMgr.cpp
index 03fb8a9b2ef333d6c9248baf19e45732e22c2df0..1eb15216c24f051af4d2e9eed72d8857f84f9f5d 100644 (file)
--- a/src/SketcherPrs/SketcherPrs_PositionMgr.cpp
+++ b/src/SketcherPrs/SketcherPrs_PositionMgr.cpp
@@ -12,11 +12,9 @@
 #include <GeomAPI_Vertex.h>
 #include <GeomAPI_Dir.h>
 
-static const int MyStep = 20;
-
 static SketcherPrs_PositionMgr* MyPosMgr = NULL;
 
-
+// The class is implemented as a singlton
 SketcherPrs_PositionMgr* SketcherPrs_PositionMgr::get()
 {
   if (MyPosMgr == NULL) 
@@ -30,27 +28,32 @@ SketcherPrs_PositionMgr::SketcherPrs_PositionMgr()
 
 
 int SketcherPrs_PositionMgr::getPositionIndex(ObjectPtr theLine, 
-                                              Handle(SketcherPrs_SymbolPrs) thePrs)
+                                              const SketcherPrs_SymbolPrs* thePrs)
 {
   if (myShapes.count(theLine) == 1) {
+    // Find the map and add new [Presentation - Index] pair
     PositionsMap& aPosMap = myShapes[theLine];
-    if (aPosMap.count(thePrs.Access()) == 1) {
-      return aPosMap[thePrs.Access()];
+    if (aPosMap.count(thePrs) == 1) {
+      // return existing index
+      return aPosMap[thePrs];
     } else {
+      // Add a new [Presentation - Index] pair
       int aInd = aPosMap.size();
-      aPosMap[thePrs.Access()] = aInd;
+      aPosMap[thePrs] = aInd;
       return aInd;
     }
   } else {
+    // Create a new map with initial index
     PositionsMap aPosMap;
-    aPosMap[thePrs.Access()] = 0;
+    aPosMap[thePrs] = 0;
     myShapes[theLine] = aPosMap;
     return 0;
   }
 }
 
 gp_Pnt SketcherPrs_PositionMgr::getPosition(ObjectPtr theShape, 
-                                            Handle(SketcherPrs_SymbolPrs) thePrs)
+                                            const SketcherPrs_SymbolPrs* thePrs,
+                                            double theStep)
 {
   std::shared_ptr<GeomAPI_Shape> aShape = SketcherPrs_Tools::getShape(theShape);
   gp_Pnt aP; // Central point
@@ -72,6 +75,7 @@ gp_Pnt SketcherPrs_PositionMgr::getPosition(ObjectPtr theShape,
                   (aPnt1->z() + aPnt2->z())/2.);
 
     } else {
+      // this is a circle or arc
       double aMidParam = (aCurve->startParam() + aCurve->endParam()) / 2.;
       std::shared_ptr<GeomAPI_Pnt> aPnt = aCurve->getPoint(aMidParam);
       aP = aPnt->impl<gp_Pnt>();
@@ -89,10 +93,12 @@ gp_Pnt SketcherPrs_PositionMgr::getPosition(ObjectPtr theShape,
     std::shared_ptr<GeomAPI_Dir> aDir = thePrs->plane()->dirX();
     aVec1 = gp_Vec(aDir->impl<gp_Dir>());
   }
-  gp_Vec aShift = aVec1.Crossed(thePrs->plane()->norm()->impl<gp_Dir>());
+  // Compute shifting vector for a one symbol
+  gp_Vec aShift = aVec1.Crossed(thePrs->plane()->normal()->impl<gp_Dir>());
   aShift.Normalize();
-  aShift.Multiply(MyStep);
+  aShift.Multiply(theStep * 0.8);
 
+  // Shift the position coordinate according to position index
   int aPos = getPositionIndex(theShape, thePrs);
   int aM = 1;
   if ((aPos % 2) == 0) {
@@ -108,7 +114,7 @@ gp_Pnt SketcherPrs_PositionMgr::getPosition(ObjectPtr theShape,
     // Odd position
     aP.Translate(-aShift);
     if (aPos > 1) {
-      if (aPos % 4 == 0) 
+      if ((aPos - 1) % 4 == 0) 
         aM = (aPos - 1) / 4;
       else
         aM = -(aPos + 1) / 4;
@@ -117,24 +123,36 @@ gp_Pnt SketcherPrs_PositionMgr::getPosition(ObjectPtr theShape,
   if (aPos > 1) {
     // Normalize vector along the line
     aVec1.Normalize();
-    aVec1.Multiply(MyStep);
+    aVec1.Multiply(theStep);
     aP.Translate(aVec1.Multiplied(aM));
   }
   return aP;
 }
 
-void SketcherPrs_PositionMgr::deleteConstraint(Handle(SketcherPrs_SymbolPrs) thePrs)
+void SketcherPrs_PositionMgr::deleteConstraint(const SketcherPrs_SymbolPrs* thePrs)
 {
   std::map<ObjectPtr, PositionsMap>::iterator aIt;
+  std::list<ObjectPtr> aToDel;
+  // Clear map for deleted presentation
   for (aIt = myShapes.begin(); aIt != myShapes.end(); ++aIt) {
     PositionsMap& aPosMap = aIt->second;
-    if (aPosMap.count(thePrs.Access()) > 0) 
-      aPosMap.erase(aPosMap.find(thePrs.Access()));
-  }
-  for (aIt = myShapes.begin(); aIt != myShapes.end(); ++aIt) {
-    if (aIt->second.size() == 0) {
-      myShapes.erase(aIt);
-      aIt = myShapes.begin();
+    if (aPosMap.count(thePrs) > 0) {
+      // Erase index
+      aPosMap.erase(aPosMap.find(thePrs));
+      if (aPosMap.size() == 0)
+        // Delete the map
+        aToDel.push_back(aIt->first);
+      else {
+        // Reindex objects positions in order to avoid spaces
+        PositionsMap::iterator aIt;
+        int i = 0;
+        for (aIt = aPosMap.begin(); aIt != aPosMap.end(); aIt++, i++)
+          aIt->second = i;
+      }
     }
   }
+  std::list<ObjectPtr>::const_iterator aListIt;
+  for (aListIt = aToDel.cbegin(); aListIt != aToDel.cend(); ++aListIt) {
+    myShapes.erase(*aListIt);
+  }
 }