Merge branch 'V9_2_2_BR'

[modules/shaper.git] / src / SketchSolver / SketchSolver_Storage.cpp

diff --git a/src/SketchSolver/SketchSolver_Storage.cpp b/src/SketchSolver/SketchSolver_Storage.cpp
index 33fea2149611d6a8e910979e0824d0b4e8ee41b5..9fb0369d59208b274ce90c4b7cb47966636bd16b 100644 (file)
--- a/src/SketchSolver/SketchSolver_Storage.cpp
+++ b/src/SketchSolver/SketchSolver_Storage.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 <SketchSolver_Storage.h>
@@ -94,41 +93,12 @@ void SketchSolver_Storage::addConstraint(ConstraintPtr        theConstraint,
     theConstraint->data()->blockSendAttributeUpdated(myEventsBlocked);
 }
 
-static std::list<AttributePtr> pointAttributes(FeaturePtr theFeature)
-{
-  std::list<AttributePtr> aPoints;
-  if (!theFeature->data() || !theFeature->data()->isValid())
-    return aPoints;
-  if (theFeature->getKind() == SketchPlugin_Arc::ID()) {
-    aPoints.push_back(theFeature->attribute(SketchPlugin_Arc::CENTER_ID()));
-    aPoints.push_back(theFeature->attribute(SketchPlugin_Arc::START_ID()));
-    aPoints.push_back(theFeature->attribute(SketchPlugin_Arc::END_ID()));
-  }
-  else if (theFeature->getKind() == SketchPlugin_Circle::ID())
-    aPoints.push_back(theFeature->attribute(SketchPlugin_Circle::CENTER_ID()));
-  else if (theFeature->getKind() == SketchPlugin_Line::ID()) {
-    aPoints.push_back(theFeature->attribute(SketchPlugin_Line::START_ID()));
-    aPoints.push_back(theFeature->attribute(SketchPlugin_Line::END_ID()));
-  }
-  else if (theFeature->getKind() == SketchPlugin_Point::ID() ||
-           theFeature->getKind() == SketchPlugin_IntersectionPoint::ID())
-    aPoints.push_back(theFeature->attribute(SketchPlugin_Point::COORD_ID()));
-  return aPoints;
-}
-
 void SketchSolver_Storage::addEntity(FeaturePtr       theFeature,
                                      EntityWrapperPtr theSolverEntity)
 {
   if (theSolverEntity) {
     myFeatureMap[theFeature] = theSolverEntity;
     setNeedToResolve(true);
-  } else {
-    // feature links to the empty entity, add its attributes
-    std::list<AttributePtr> aPntAttrs = pointAttributes(theFeature);
-    std::list<AttributePtr>::const_iterator anAttrIt = aPntAttrs.begin();
-    for (; anAttrIt != aPntAttrs.end(); ++anAttrIt)
-      addEntity(*anAttrIt, EntityWrapperPtr());
-    myFeatureMap[theFeature] = theSolverEntity;
   }
 
   // block events if necessary