X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FGeomAlgoAPI%2FGeomAlgoAPI_MakeShapeCustom.cpp;h=ae6be4163e5f6db17f47064a629904282e7c1879;hb=45a146b57c7d70f685bf653d6b26d66c3ae1100d;hp=88576740ef4505881b621a1ce0d93189798130eb;hpb=f85ae9faa90bb71573fe234331952a03f83bafb7;p=modules%2Fshaper.git

diff --git a/src/GeomAlgoAPI/GeomAlgoAPI_MakeShapeCustom.cpp b/src/GeomAlgoAPI/GeomAlgoAPI_MakeShapeCustom.cpp
index 88576740e..ae6be4163 100644
--- a/src/GeomAlgoAPI/GeomAlgoAPI_MakeShapeCustom.cpp
+++ b/src/GeomAlgoAPI/GeomAlgoAPI_MakeShapeCustom.cpp
@@ -1,70 +1,81 @@
-// Copyright (C) 2014-20xx CEA/DEN, EDF R&D
-
-// File:        GeomAlgoAPI_MakeShapeCustom.cpp
-// Created:     4 September 2015
-// Author:      Dmitry Bobylev
+// 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
+// License as published by the Free Software Foundation; either
+// 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
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// 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
+//
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
 
 #include <GeomAlgoAPI_MakeShapeCustom.h>
 
-//=================================================================================================
+//==================================================================================================
 GeomAlgoAPI_MakeShapeCustom::GeomAlgoAPI_MakeShapeCustom()
-: GeomAlgoAPI_MakeShape()
-{}
-
-//=================================================================================================
-void GeomAlgoAPI_MakeShapeCustom::setResult(const std::shared_ptr<GeomAPI_Shape> theShape)
 {
-  myShape = theShape;
 }
 
-//=================================================================================================
-bool GeomAlgoAPI_MakeShapeCustom::addModified(const std::shared_ptr<GeomAPI_Shape> theBase,
-                                              const std::shared_ptr<GeomAPI_Shape> theResult)
+//==================================================================================================
+void GeomAlgoAPI_MakeShapeCustom::setResult(const GeomShapePtr theShape)
 {
-  return myModified.add(theBase, theResult);
+  setShape(theShape);
 }
 
-//=================================================================================================
-bool GeomAlgoAPI_MakeShapeCustom::addGenerated(const std::shared_ptr<GeomAPI_Shape> theBase,
-                                               const std::shared_ptr<GeomAPI_Shape> theResult)
+//==================================================================================================
+bool GeomAlgoAPI_MakeShapeCustom::addModified(const GeomShapePtr theOldShape,
+                                              const GeomShapePtr theNewShape)
 {
-  return myGenerated.add(theBase, theResult);
+  if (!isValidForHistory(theNewShape)) return false;
+  GeomShapePtr aNewShape = theNewShape;
+  return myModified.add(theOldShape, aNewShape);
 }
 
-//=================================================================================================
-bool GeomAlgoAPI_MakeShapeCustom::addDeleted(const std::shared_ptr<GeomAPI_Shape> theShape)
+//==================================================================================================
+bool GeomAlgoAPI_MakeShapeCustom::addGenerated(const GeomShapePtr theOldShape,
+                                               const GeomShapePtr theNewShape)
 {
-  return myDeleted.bind(theShape, theShape);
+  if (!isValidForHistory(theNewShape)) return false;
+  GeomShapePtr aNewShape = theNewShape;
+  return myGenerated.add(theOldShape, aNewShape);
 }
 
-//=================================================================================================
-const std::shared_ptr<GeomAPI_Shape> GeomAlgoAPI_MakeShapeCustom::shape() const
+//==================================================================================================
+bool GeomAlgoAPI_MakeShapeCustom::addDeleted(const GeomShapePtr theOldShape)
 {
-  return myShape;
+  return myDeleted.bind(theOldShape, theOldShape);
 }
 
-//=================================================================================================
-void GeomAlgoAPI_MakeShapeCustom::generated(const std::shared_ptr<GeomAPI_Shape> theShape,
-                                            ListOfShape& theHistory)
+//==================================================================================================
+void GeomAlgoAPI_MakeShapeCustom::generated(const GeomShapePtr theOldShape,
+                                            ListOfShape& theNewShapes)
 {
   ListOfShape aGenerated;
-  if(myGenerated.find(theShape, aGenerated)) {
-    theHistory.insert(theHistory.end(), aGenerated.begin(), aGenerated.end());
+  if(myGenerated.find(theOldShape, aGenerated)) {
+    theNewShapes.insert(theNewShapes.end(), aGenerated.begin(), aGenerated.end());
   }
 }
 
-//=================================================================================================
-void GeomAlgoAPI_MakeShapeCustom::modified(const std::shared_ptr<GeomAPI_Shape> theShape,
-                                           ListOfShape& theHistory)
+//==================================================================================================
+void GeomAlgoAPI_MakeShapeCustom::modified(const GeomShapePtr theOldShape,
+                                           ListOfShape& theNewShapes)
 {
   ListOfShape aModified;
-  if(myModified.find(theShape, aModified)) {
-    theHistory.insert(theHistory.end(), aModified.begin(), aModified.end());
+  if(myModified.find(theOldShape, aModified)) {
+    theNewShapes.insert(theNewShapes.end(), aModified.begin(), aModified.end());
   }
 }
 
-//=================================================================================================
-bool GeomAlgoAPI_MakeShapeCustom::isDeleted(const std::shared_ptr<GeomAPI_Shape> theShape)
+//==================================================================================================
+bool GeomAlgoAPI_MakeShapeCustom::isDeleted(const GeomShapePtr theOldShape)
 {
-  return myDeleted.isBound(theShape);
-}
\ No newline at end of file
+  return myDeleted.isBound(theOldShape);
+}