Change icons for chamfer

[modules/shaper.git] / src / SketchPlugin / SketchPlugin_IntersectionPoint.cpp

diff --git a/src/SketchPlugin/SketchPlugin_IntersectionPoint.cpp b/src/SketchPlugin/SketchPlugin_IntersectionPoint.cpp
index e4feff995637bff85554d14d5fc107634cd3f6b0..ec038bc965b2d1c3df7b00e60bfd565e94b5a99c 100644 (file)
--- a/src/SketchPlugin/SketchPlugin_IntersectionPoint.cpp
+++ b/src/SketchPlugin/SketchPlugin_IntersectionPoint.cpp
@@ -1,4 +1,4 @@
-// Copyright (C) 2014-2017  CEA/DEN, EDF R&D
+// Copyright (C) 2014-2019  CEA/DEN, EDF R&D
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -12,10 +12,9 @@
 //
 // You should have received a copy of the GNU Lesser General Public
 // License along with this library; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 //
-// See http://www.salome-platform.org/ or
-// email : webmaster.salome@opencascade.com<mailto:webmaster.salome@opencascade.com>
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
 
 #include "SketchPlugin_IntersectionPoint.h"
@@ -105,25 +104,32 @@ void SketchPlugin_IntersectionPoint::computePoint(const std::string& theID)
     for (std::list<GeomPointPtr>::iterator aPntIt = anIntersectionsPoints.begin();
          aPntIt != anIntersectionsPoints.end(); ++aPntIt, ++aResultIndex) {
       std::shared_ptr<SketchPlugin_Point> aCurSketchPoint;
-      ResultConstructionPtr aCurResult;
       if (aExistInterIt == anExistentIntersections.end()) {
-        // create new point and result
+        keepCurrentFeature();
+
+        // create new point
         aCurSketchPoint = std::dynamic_pointer_cast<SketchPlugin_Point>(
           sketch()->addFeature(SketchPlugin_Point::ID()));
         aCurSketchPoint->boolean(COPY_ID())->setValue(true);
         anIntersectionsList->append(aCurSketchPoint);
 
+        restoreCurrentFeature();
+      } else {
+        // update existent point
+        aCurSketchPoint = std::dynamic_pointer_cast<SketchPlugin_Point>(*aExistInterIt);
+        ++aExistInterIt;
+      }
+
+      ResultConstructionPtr aCurResult;
+      if (aResIt == aResults.end()) {
+        // create new result
         aCurResult = document()->createConstruction(data(), aResultIndex);
         aCurResult->setIsInHistory(false);
         aCurResult->setDisplayed(false);
-      }
-      else {
-        // update existent result point
-        aCurSketchPoint = std::dynamic_pointer_cast<SketchPlugin_Point>(*aExistInterIt);
+      } else {
+        // update existent result
         aCurResult = std::dynamic_pointer_cast<ModelAPI_ResultConstruction>(*aResIt);
         aCurResult->setShape(std::shared_ptr<GeomAPI_Edge>());
-
-        ++aExistInterIt;
         ++aResIt;
       }